change

pages/entry/mater-group.vue

@@ -4,14 +4,6 @@
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">源单编码</span>
-					</view>
-					<view class="zd-col-17">
-						<search-box v-model="val1"/>
-					</view>
-				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
 						<span class="filter_label">载具编码</span>
@@ -28,6 +20,14 @@
 						<input type="text" class="filter_input" v-model="wlxxtext" @tap="toJump">
 					</view>
 				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">源单编码</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box v-model="val1"/>
+					</view>
+				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -53,7 +53,7 @@
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
 			<button class="zd-col-16 button-primary" :class="{'button-info': !this.val2 || !this.dataList.length}" :disabled="disabled" @tap="_groupPlate">组盘确认</button>
 		</view>
 	</view>
@@ -78,8 +78,6 @@
 				val3: '',
 				wlxxtext: '',
 				dataList: [],
-				options: [],
-				index: '',
 				disabled: false
 			};
 		},
@@ -97,9 +95,10 @@
 					url: '/pages/common/mater-list?title=查询物料'
 				})
 			},
-			toEmpty () {
+			clearUp () {
 				this.dataList = []
-				this.index = ''
+				this.val1 = ''
+				this.val2 = ''
 				this.disabled = false
 			},
 			async _groupPlate () {
@@ -110,11 +109,19 @@
 				}
 				try {
 					let res = await groupPlate(this.dataList, this.val2, this.val1)
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-					this.disabled = false
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.clearUp()
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
 				} catch (e) {
 					this.disabled = false
 				}