修改入库组盘、入库确认

pages.json

@@ -72,6 +72,14 @@
             }
             
         }
+        ,{
+            "path" : "pages/task/rkzp",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",

pages/home/home.vue

@@ -32,6 +32,7 @@
 			return {
 				userName: '',
 				menuList: [
+					{title: '入库组盘', icon: 'RF7', path: '/pages/task/rkzp'},
 					{title: '入库确认', icon: 'RF1', path: '/pages/task/rkqr'},
 					{title: '出库确认', icon: 'RF2', path: '/pages/task/ckqr'},
 					{title: '盘点确认', icon: 'RF3', path: '/pages/task/pdqr'},

pages/task/rkqr.vue

@@ -2,14 +2,7 @@
 	<view class="zd_container">
 		<nav-bar :title="title"></nav-bar>
 		<!-- 入库确认 -->
-		<view class="zd_content" style="padding-bottom: 20rpx">
+		<view class="zd_content">
-			<view class="zd_wrapper">
-				<search-box
-				placeholder="请扫码"
-				v-model="code"
-				@handleChange="handleChange"
-				/>
-			</view>
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
 					<view class="zd-col-6">
@@ -22,46 +15,6 @@
 						/>
 					</view>
 				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-6">
-						<span class="filter_label">物料编码</span>
-					</view>
-					<view class="zd-col-18 filter_select">
-						<input type="text" class="filter_input" v-model="initData.material_code" disabled>
-					</view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-6">
-						<span class="filter_label">批次</span>
-					</view>
-					<view class="zd-col-18 filter_select">
-						<input type="text" class="filter_input" v-model="initData.pcsn" disabled>
-					</view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-6">
-						<span class="filter_label">数量</span>
-					</view>
-					<view class="zd-col-18 filter_select">
-						<input type="text" class="filter_input" v-model="initData.qty" disabled>
-					</view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-6">
-						<span class="filter_label">单位</span>
-					</view>
-					<view class="zd-col-18 filter_select">
-						<input type="text" class="filter_input" v-model="initData.qty_unit_name" disabled>
-					</view>
-				</view>
-				<view class="zd-row jccenter mgt10">
-					<view class="mgt10">
-						<button type="default" size="mini" style="margin-right: 10px" @tap="clearUp1">清空</button>
-						<button type="primary" size="mini" :disabled="disabled1" @tap="_groupPlate">组盘确认</button>
-					</view>
-				</view>
-			</view>
-			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
 					<view class="zd-col-6">
 						<span class="filter_label">点位编码</span>
@@ -78,12 +31,6 @@
 						<uni-data-select v-model="sectId" :localdata="options"></uni-data-select>
 					</view>
 				</view>
-				<view class="zd-row jccenter mgt10">
-					<view class="mgt10">
-						<button type="default" size="mini" style="margin-right: 10px" @tap="clearUp2">清空</button>
-						<button type="primary" size="mini" :disabled="disabled2" @tap="_confirmIn">入库确认</button>
-					</view>
-				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -112,13 +59,17 @@
 				</view>
 			</view>
 		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="clearUp2">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !vcode || !pointCode || !sectId}" :disabled="disabled2" @tap="_confirmIn">入库确认</button>
+		</view>
 	</view>
 </template>
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {sweepCode, getPlateDtl, getSect, groupPlate, confirmIn, deleteDtl} from '@/utils/getData.js'
+	import {getPlateDtl, getSect, confirmIn, deleteDtl} from '@/utils/getData.js'
 	export default {
 		components: {
 			NavBar,
@@ -127,9 +78,7 @@
 		data() {
 			return {
 				title: '',
-				code: '',
 				vcode: '',
-				initData: {},
 				dataList: [],
 				pointCode: '',
 				sectId: '',
@@ -145,32 +94,11 @@
 			this._getSect()
 		},
 		methods: {
-			handleChange (e) {
-				if (e) {
-					this._sweepCode(e)
-				}
-			},
 			handleChange1 (e) {
 				if (e) {
 					this._getPlateDtl(e)
 				}
 			},
-			async _sweepCode (e) {
-				try {
-					let res = await sweepCode(e)
-					if (res && res.data) {
-						this.initData = res.data
-						this.vcode = res.data.storagevehicle_code
-						if (this.vcode) {
-							this._getPlateDtl(this.vcode)
-						}
-					} else {
-						this.initData = {}
-					}
-				} catch (e) {
-					this.initData = {}
-				}
-			},
 			async _getPlateDtl (e) {
 				try {
 					let res = await getPlateDtl(e)
@@ -183,40 +111,13 @@
 					this.dataList = []
 				}
 			},
-			clearUp1 () {
-				this.code = ''
-				this.vcode = ''
-				this.initData = {}
-				this.dataList = []
-				this.id = ''
-				this.disabled = false
-			},
 			clearUp2 () {
+				this.vcode = ''
 				this.pointCode = ''
 				this.sectId = ''
 				this.disabled = false
-			},
+				this.dataList = []
-			// 组盘确认
+				
-			async _groupPlate () {
-				this.disabled1 = true
-				if (!this.vcode || JSON.stringify(this.initData) === '{}') {
-					this.disabled1 = false
-					return
-				}
-				try {
-					const obj = Object.assign({}, this.initData, {storagevehicle_code: this.vcode})
-					let res = await groupPlate(obj)
-					this.disabled1 = false
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-					this.code = ''
-					this.initData = {}
-					this._getPlateDtl(this.vcode)
-				} catch (e) {
-					this.disabled1 = false
-				}
 			},
 			async _getSect () {
 				try {
@@ -246,7 +147,6 @@
 						title: res.message,
 						icon: 'none'
 					})
-					this.clearUp1()
 					this.clearUp2()
 				} catch (e) {
 					this.disabled2 = false

pages/task/rkzp.vue

@@ -0,0 +1,150 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<!-- 入库组盘 -->
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<search-box
+				placeholder="请扫码"
+				v-model="code"
+				@handleChange="handleChange"
+				/>
+			</view>
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">载具码</span>
+					</view>
+					<view class="zd-col-18 filter_select">
+						<search-box
+						v-model="vcode"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-6">
+						<span class="filter_label">物料编码</span>
+					</view>
+					<view class="zd-col-18 filter_select">
+						<input type="text" class="filter_input" v-model="initData.material_code" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-6">
+						<span class="filter_label">物料名称</span>
+					</view>
+					<view class="zd-col-18 filter_select">
+						<input type="text" class="filter_input" v-model="initData.material_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-6">
+						<span class="filter_label">物料规格</span>
+					</view>
+					<view class="zd-col-18 filter_select">
+						<input type="text" class="filter_input" v-model="initData.material_spec" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-6">
+						<span class="filter_label">批次</span>
+					</view>
+					<view class="zd-col-18 filter_select">
+						<input type="text" class="filter_input" v-model="initData.pcsn" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-6">
+						<span class="filter_label">数量</span>
+					</view>
+					<view class="zd-col-18 filter_select">
+						<input type="text" class="filter_input" v-model="initData.qty" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-6">
+						<span class="filter_label">单位</span>
+					</view>
+					<view class="zd-col-18 filter_select">
+						<input type="text" class="filter_input" v-model="initData.qty_unit_name" disabled>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="clearUp1">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !vcode || JSON.stringify(initData) === '{}'}" :disabled="disabled1" @tap="_groupPlate">组盘确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {sweepCode, groupPlate} from '@/utils/getData.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				code: '',
+				vcode: '',
+				initData: {},
+				disabled1: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			handleChange (e) {
+				if (e) {
+					this._sweepCode(e)
+				}
+			},
+			async _sweepCode (e) {
+				try {
+					let res = await sweepCode(e)
+					if (res && res.data) {
+						this.initData = res.data
+						this.vcode = res.data.storagevehicle_code
+					} else {
+						this.initData = {}
+					}
+				} catch (e) {
+					this.initData = {}
+				}
+			},
+			clearUp1 () {
+				this.code = ''
+				this.vcode = ''
+				this.initData = {}
+				this.disabled1 = false
+			},
+			// 组盘确认
+			async _groupPlate () {
+				this.disabled1 = true
+				if (!this.vcode || JSON.stringify(this.initData) === '{}') {
+					this.disabled1 = false
+					return
+				}
+				try {
+					const obj = Object.assign({}, this.initData, {storagevehicle_code: this.vcode})
+					let res = await groupPlate(obj)
+					this.disabled1 = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.code = ''
+					this.initData = {}
+				} catch (e) {
+					this.disabled1 = false
+				}
+			}
+		}
+	}
+</script>