子卷

pages/ProductManage/ZjInStore.vue

@@ -4,9 +4,17 @@
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="filter_item">
-					<view class="filter_label">设备</view>
+					<view class="filter_label">区域</view>
 					<view class="filter_input_wraper">
-						<input type="text" class="filter_input" v-model="val1">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">设备</span>
+					</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
 					</view>
 				</view>
 				<view class="filter_item">
@@ -14,13 +22,6 @@
 					<view class="filter_input_wraper">
 						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
 					</view>
-					<view class="filter_search" :class="{'filter_search_disabled': !val1}" @tap="_devicePointQuery">查询</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label">区域</view>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
 				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
@@ -29,7 +30,6 @@
 						<thead>
 							<tr>
 								<th>序号</th>
-								<th>订单号</th>
 								<th>子卷号</th>
 								<th>机台编号</th>
 								<th>分切组</th>
@@ -37,14 +37,12 @@
 								<th>配送完成</th>
 								<th>生产顺序</th>
 								<th>生产日期</th>
-								
-								
+								<th>订单号</th>
 							</tr>
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.container_name === pkId}">
 								<td>{{Number(i) + 1}}</td>
-								<td>{{e.mfg_order_name}}</td>
 								<td>{{e.container_name}}</td>
 								<td>{{e.point_code}}</td>
 								<td>{{e.split_group}}</td>
@@ -52,6 +50,7 @@
 								<td>{{e.is_child_ps_ok}}</td>
 								<td>{{e.manufacture_sort}}</td>
 								<td>{{e.manufacture_date}}</td>
+								<td>{{e.mfg_order_name}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -68,7 +67,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {devicePointQuery, queryProductArea, queryMaterialInfo5, inConfirm} from '@/utils/getData2.js'
+	import {devicePointQuery, queryProductArea, queryDeviceByarea, queryMaterialInfo5, inConfirm} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -76,11 +75,12 @@
 		},
 		data() {
 			return {
-				val1: '',
 				options1: [],
 				index1: '',
 				options2: [],
 				index2: '',
+				options3: [],
+				index3: '',
 				dataList: [],
 				pkId: '',
 				pkObj: {},
@@ -98,17 +98,15 @@
 			},
 			selectChange2(e) {
 				this.index2 = e
+				if (e) {
+					this._queryDeviceByarea(e)
+				} else {
+					this.index3 = ''
+				}
 			},
 			/** 点位下拉框查询 */
-			async _devicePointQuery () {
-				if (!this.val1) {
-					uni.showToast({
-						title: '请输入设备号',
-						icon: 'none'
-					})
-					return
-				}
-				let res = await devicePointQuery(this.val1)
+			async _devicePointQuery (e) {
+				let res = await devicePointQuery(e)
 				this.options1 = [...res.data]
 			},
 			/** 生产区域下拉框查询 */
@@ -116,9 +114,23 @@
 				let res = await queryProductArea()
 				this.options2 = [...res.data]
 			},
+			/** 选择器3 */
+			selectChange3(e) {
+				this.index3 = e
+				if (e) {
+					this._devicePointQuery(e)
+				} else {
+					this.index1 = ''
+				}
+			},
+			/** 设备下拉框 */
+			async _queryDeviceByarea (e) {
+				let res = await queryDeviceByarea(e)
+				this.options3 = [...res.data]
+			},
 			/** 初始化查询 */
 			async _queryMaterialInfo () {
-				let res = await queryMaterialInfo5(this.val1, this.index2)
+				let res = await queryMaterialInfo5(this.index3, this.index2)
 				this.dataList = [...res.data]	
 			},
 			/** 确认 */
@@ -159,11 +171,4 @@
 </script>
 
 <style lang="stylus">
-	.slide_new table td:first-child, .slide_new table th:first-child
-		width 92rpx
-	.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
-		position sticky
-		left 89rpx
-		z-index 102
-		box-shadow 1px 0 2px rgba(0,0,0,.12)
 </style>