change

pages/entry/groupplate-instore.vue

@@ -4,6 +4,16 @@
 		<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="val2"
+						/>
+					</view>
+				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
 						<span class="filter_label">载具编码</span>
@@ -49,7 +59,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_confirmIn">确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_confirmIn">确认</button>
 		</view>
 	</view>
 </template>
@@ -67,6 +77,7 @@
 			return {
 				title: '',
 				val1: '',
+				val2: '',
 				// options: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
 				options: [],
 				index: '',
@@ -105,7 +116,7 @@
 				try {
 					let res = await getVehicleMaterial(this.val1, this.val2, this.index)
 					if (res) {
-						this.dataList = res.data
+						this.dataList = res
 					} else {
 						this.dataList = []
 					}
@@ -115,18 +126,19 @@
 			},
 			clearUp () {
 				this.val1 = ''
+				this.val2 = ''
 				this.index = ''
 				this.disabled = false
 				this.dataList = []
 			},
 			async _confirmIn () {
 				this.disabled = true
-				if (!this.val1 || !this.index) {
+				if (!this.val1 || !this.val2 || !this.index) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await confirmIn(this.val1, this.index)
+					let res = await confirmIn(this.val1, this.val2, this.index)
 					if (res.code === '200') {
 						uni.showToast({
 							title: res.message,