diff --git a/pages/management/ZlOperate.vue b/pages/management/ZlOperate.vue index b1316de..55a5655 100644 --- a/pages/management/ZlOperate.vue +++ b/pages/management/ZlOperate.vue @@ -3,6 +3,12 @@ + + + + + + @@ -16,9 +22,9 @@ - + - + @@ -60,7 +66,6 @@ - @@ -68,12 +73,12 @@ 选择 - 指令编号 - MES号 + 任务编号 + 任务类型 + 任务描述 起点设备 目的设备 - 入箱码 - 出箱码 + 料箱码 状态 物料编码 创建时间 @@ -85,11 +90,11 @@ {{e.instructoperate_num}} - {{e.mes_no}} + {{e.task_type}} + {{e.task_name}} {{e.startpoint_code}} {{e.nextpoint_code}} {{e.vehicle_code}} - {{e.outvehicle_code}} {{e.status_name}} {{e.processmaterial_code}} {{e.create_time}} @@ -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,