From 22deae4b647d4257590be77d9254963dc53abda3 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Thu, 20 Oct 2022 16:18:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes/qd/src/views/wms/sch/task/index.vue            | 14 +++++++-------
 .../src/views/wms/statistics/materPlan/index.vue   | 12 +++++++-----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/mes/qd/src/views/wms/sch/task/index.vue b/mes/qd/src/views/wms/sch/task/index.vue
index 18850094..a819bcfd 100644
--- a/mes/qd/src/views/wms/sch/task/index.vue
+++ b/mes/qd/src/views/wms/sch/task/index.vue
@@ -147,7 +147,7 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="50" />
-        <el-table-column v-if="false" prop="taskdtl_id" label="任务标识" />
+        <el-table-column v-if="false" prop="task_id" label="任务标识" />
         <el-table-column prop="task_code" label="任务编码" />
         <el-table-column v-if="false" prop="task_type" label="任务类型" />
         <el-table-column prop="task_type_name" label="任务类型"  />
@@ -205,7 +205,7 @@
       <!--  组件-->
       <component
         :is="currentComponent"
-        :task-uuid="taskdtl_id"
+        :task-uuid="task_id"
         :dialog-visible="viewDialogVisible"
       />
       <span slot="footer" class="dialog-footer">
@@ -234,8 +234,8 @@ export default {
     return CRUD({
       title: '任务',
       url: 'api/task',
-      idField: 'taskdtl_id',
-      sort: 'taskdtl_id,desc',
+      idField: 'task_id',
+      sort: 'task_id,desc',
       crudMethod: { ...crudTask },
       query: {
         task_code:'',vehicle_code:'',start_point_code:'',next_point_code:'',task_type:'',taskdtl_type:'',finished_type:'',task_status:""
@@ -253,7 +253,7 @@ export default {
     return {
       viewDialogVisible: false,
       fullscreen: false,
-      taskdtl_id: '',
+      task_id: '',
       currentComponent: '',
       openParam: {},
       create_time: [],
@@ -336,7 +336,7 @@ export default {
         return
       }
       const data = {
-        taskdtl_id: command.row.taskdtl_id,
+        task_id: command.row.task_id,
         method_name: method_name
       }
       crudTask.operation(data).then(res => {
@@ -347,7 +347,7 @@ export default {
       })
     },
     view(row) {
-      this.taskdtl_id = row.taskdtl_id
+      this.task_id = row.task_id
       switch (row.task_type) {
         case '01':// 入库
           this.fullscreen = true
diff --git a/mes/qd/src/views/wms/statistics/materPlan/index.vue b/mes/qd/src/views/wms/statistics/materPlan/index.vue
index fcd16f96..e32e9810 100644
--- a/mes/qd/src/views/wms/statistics/materPlan/index.vue
+++ b/mes/qd/src/views/wms/statistics/materPlan/index.vue
@@ -11,7 +11,7 @@
           label-width="80px"
           label-suffix=":"
         >
-          <el-form-item label="到货日期">
+          <el-form-item label="统计日期">
             <date-range-picker v-model="query.createTime" class="date-item"/>
           </el-form-item>
           <rrOperation/>
@@ -30,9 +30,10 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="index" label="序号" width="100" align="center"/>
+        <el-table-column type="index" label="序号" width="100" align="center" fixed/>
         <template v-for="(col,index) in cols">
-          <el-table-column v-if="col" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip/>
+          <el-table-column v-if="col.prop !== '1'" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip/>
+          <el-table-column v-if="col.prop === '1'" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip fixed/>
         </template>
       </el-table>
 
@@ -45,9 +46,10 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="index" label="序号" width="100" align="center"/>
+        <el-table-column type="index" label="序号" width="100" align="center" fixed/>
         <template v-for="(col,index) in cols2">
-          <el-table-column v-if="col" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip/>
+          <el-table-column v-if="!col.option" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip/>
+          <el-table-column v-if="col.option" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip fixed/>
         </template>
       </el-table>
       <!--分页组件-->