gai

pages/manage/sgyk.vue

@@ -36,9 +36,9 @@
 						<thead>
 							<tr>
 								<th>序号</th>
-								<th>载具号</th>
 								<th>物料编码</th>
 								<th>物料名称</th>
+								<th>载具号</th>
 								<th>数量</th>
 								<th>单位</th>
 							</tr>
@@ -46,9 +46,9 @@
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i">
 								<td>{{i+1}}</td>
-								<td>{{e.storagevehicle_code}}</td>
 								<td>{{e.material_code}}</td>
 								<td>{{e.material_name}}</td>
+								<td>{{e.storagevehicle_code}}</td>
 								<td>{{e.qty}}</td>
 								<td>{{e.unit_code}}</td>
 							</tr>
@@ -59,7 +59,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2 || !val3}" :disabled="disabled" @tap="_movestorMove">确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val3 || !dataList.length}" :disabled="disabled" @tap="_movestorMove">确认</button>
 		</view>
 	</view>
 </template>
@@ -107,25 +107,20 @@
 			},
 			async _movestorMove () {
 				this.disabled = true
-				if (!this.val1 || !this.val2 || !this.val3) {
+				if (!this.val3 || !this.dataList.length) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await movestorMove(this.val1, this.val2, this.val3)
+					let res = await movestorMove(this.val1, this.val2, this.val3, this.dataList)
 					if (res.status === '200') {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this._movestorQuerydtl()
-					} else {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.disabled = false
+						this.toEmpty()
 					}
+					this.disabled = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
 				} catch (e) {
 					this.disabled = false
 				}