change

pages/management/ZlOperate.vue

@@ -3,6 +3,12 @@
 		<nav-bar title="指令操作"></nav-bar>
 		<view class="search-confirm-wrap">
 			<view class="search-wrap">
+				<view class="search-item">
+					<label class="search-label">生产区域</label>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
 				<view class="search-item">
 					<label class="search-label">状态</label>
 					<view class="filter_input_wraper">
@@ -16,9 +22,9 @@
 					</view>
 				</view>
 				<view class="search-item">
-					<label class="search-label">AGV号</label>
+					<label class="search-label">任务描述</label>
 					<view class="filter_input_wraper">
-						<input type="text" class="search-input-l" placeholder="车号" v-model="agvNum">
+						<input type="text" class="search-input-l" placeholder="车号" v-model="taskName">
 					</view>
 				</view>
 				<view class="search-item">
@@ -60,7 +66,6 @@
 				<button class="confirm-button" :disabled="disabled" @tap="toSure('8')">取消</button>
 				<button class="confirm-button" :disabled="disabled" @tap="toSure('7')">完成</button>
 				<button class="confirm-button" :disabled="disabled" @tap="toSure('5')">重发</button>
-				<button class="confirm-button" :disabled="disabled" @tap="toSure('4')">WCS取消</button>
 			</view>
 		</view>
 		<view class="grid-wrap">
@@ -68,12 +73,12 @@
 				<thead>
 					<tr>
 						<th>选择</th>
-						<th>指令编号</th>
+						<th>任务编号</th>
-						<th>MES号</th>
+						<th>任务类型</th>
+						<th>任务描述</th>
 						<th>起点设备</th>
 						<th>目的设备</th>
-						<th>入箱码</th>
+						<th>料箱码</th>
-						<th>出箱码</th>
 						<th>状态</th>
 						<th>物料编码</th>
 						<th>创建时间</th>
@@ -85,11 +90,11 @@
 							<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.instruct_uuid}"></view>
 						</td>
 						<td>{{e.instructoperate_num}}</td>
-						<td>{{e.mes_no}}</td>
+						<td>{{e.task_type}}</td>
+						<td>{{e.task_name}}</td>
 						<td>{{e.startpoint_code}}</td>
 						<td>{{e.nextpoint_code}}</td>
 						<td>{{e.vehicle_code}}</td>
-						<td>{{e.outvehicle_code}}</td>
 						<td>{{e.status_name}}</td>
 						<td>{{e.processmaterial_code}}</td>
 						<td>{{e.create_time}}</td>
@@ -132,10 +137,12 @@
 				page: 1,
 				options1: [],
 				index1: '',
+				options2: [{text: 'A1', value: 'A1'}, {text: 'A2', value: 'A2'}],
+				index2: 'A1',
 				startDate: dateFtt(new Date()),
 				endDate: dateFtt(new Date(new Date().setDate(new Date().getDate() + 1))),
 				instNum: '',
-				agvNum: '',
+				taskName: '',
 				startPoint: '',
 				endPoint: '',
 				val1: '',
@@ -180,6 +187,10 @@
 			selectChange1(e) {
 				this.index1 = e
 			},
+			/** 选择器1 */
+			selectChange2(e) {
+				this.index2 = e
+			},
 			async _instStatusQuery (id) {
 				let res = await instStatusQuery(id)
 				this.options1 = [...res]
@@ -196,7 +207,9 @@
 					size: this.pageSize + '',
 					status: this.index1,
 					inst_num: this.instNum,
-					agv_num: this.agvNum,
+					task_name: this.taskName,
+					task_type: this.taskName,
+					product_area: this.taskName,
 					vehicle_code: this.val1,
 					start_point: this.startPoint,
 					end_point: this.endPoint,