rev:调度：深坑物料维护

mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue

@@ -64,11 +64,11 @@
         </el-table-column>
         <el-table-column prop="material_name" label="物料名称" width="200px" show-overflow-tooltip />
         <el-table-column prop="material_spec" label="物料规格" width="200px" show-overflow-toolti />
-        <el-table-column prop="deviceinstor_qty" label="深坑物料数量" align="center" width="120px" show-overflow-tooltip>
+        <el-table-column prop="deviceinstor_qty" label="物料数量(单位:个)" align="center" width="120px" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.deviceinstor_qty" /></template>
         </el-table-column>
-        <el-table-column prop="deviceinstor_weight" label="深坑物料数量" align="center" width="120px" show-overflow-tooltip>
+        <el-table-column prop="deviceinstor_weight" label="物料重量(单位:g)" align="center" width="120px" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.deviceinstor_weight" /></template>
         </el-table-column>

mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js

@@ -105,7 +105,7 @@ export function getReportWork(data) {
 
 export function reportQuery(data) {
   return request({
-    url: '/api/produceWorkorder/reportQuery',
+    url: '/api/produceWorkorder/reportQuery2',
     method: 'post',
     data
   })

mes/qd/src/views/wms/scheduler_manage/task/index.vue

@@ -109,7 +109,7 @@
             <el-select
               v-model="task_status"
               multiple
-              style="width: 400px"
+              style="width: 200px"
               placeholder="任务状态"
               class="filter-item"
               clearable
@@ -129,6 +129,13 @@
           </el-form-item>
 
           <rrOperation />
+          <el-form-item label="未完结任务数">
+          <el-input
+            v-model="undo"
+            clearable
+            style="width: 180px"
+          />
+          </el-form-item>
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -144,13 +151,14 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="50" />
+        <el-table-column prop="product_area" label="生产车间" />
         <el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="table_fk_id" label="业务编码" min-width="100" show-overflow-tooltip />
         <el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
         <el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
         <el-table-column prop = "acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip :formatter = "acsTypeName"></el-table-column>
         <el-table-column prop="task_name" label="任务类型" min-width="120" show-overflow-tooltip />
         <el-table-column v-if="false" prop="task_status" label="任务状态" />
-        <el-table-column prop="product_area" label="生产车间" />
         <el-table-column prop="task_status_name" label="任务状态" width="120px" :formatter="formatTaskStatusName" />
         <el-table-column prop="point_code1" label="起点" width="100" />
         <el-table-column prop="point1_region_name" label="起点区域" width="120" />
@@ -273,6 +281,7 @@ export default {
       fullscreen: false,
       currentComponent: '',
       openParam: {},
+      undo: 0,
       create_time: [],
       task_status: ['-1'],
       taskStatusList: [],