From d8f49bb9c5019e9711f6ce41c83ce13d267db546 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 21 Dec 2023 01:26:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=9F=A5=E8=AF=A2=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/mlog_dept10.vue       |  1 +
 src/views/wpm/mlog_dept6.vue        | 31 ++++++++++++-----------------
 src/views/wpm/mlog_dept6_detail.vue |  7 ++-----
 src/views/wpm/mlog_dept7.vue        |  1 +
 4 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/views/wpm/mlog_dept10.vue b/src/views/wpm/mlog_dept10.vue
index 0c7f8e3c..19860b1a 100644
--- a/src/views/wpm/mlog_dept10.vue
+++ b/src/views/wpm/mlog_dept10.vue
@@ -353,6 +353,7 @@ export default {
                 if (res.length == 1) {
                     this.currentDept = res[0]
                     this.paramsMtask.mgroup__belong_dept = this.currentDept.id
+                    this.paramsMtask.state__in = '20,40'
                     this.apiMtask = this.$API.pm.mtask.list
 
                     this.paramsHandover.recive_dept = this.currentDept.id
diff --git a/src/views/wpm/mlog_dept6.vue b/src/views/wpm/mlog_dept6.vue
index 92a652a0..350a8451 100644
--- a/src/views/wpm/mlog_dept6.vue
+++ b/src/views/wpm/mlog_dept6.vue
@@ -7,13 +7,13 @@
           <el-container>
             <el-header>
               <div class="left-panel">
-                <el-date-picker v-model="query.date" type="date" value-format="YYYY-MM-DD" />
+                <el-date-picker v-model="queryMtask.start_date" type="date" value-format="YYYY-MM-DD" />
                 <el-button type="primary" icon="el-icon-search" @click="handleQueryMtask">查询</el-button>
               </div>
             </el-header>
             <el-main>
-              <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query" hidePagination
-                @row-click="rowClick" hideDo>
+              <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="paramsMtask" :query="queryMtask"
+                @row-click="rowClick">
                 <el-table-column type="index" width="50" />
                 <el-table-column label="任务编号" prop="number">
                 </el-table-column>
@@ -185,12 +185,7 @@ export default {
         save: false,
       },
       apiObj: null,
-      query: {
-        page: 1,
-        page_size: 20,
-        belong_dept_name: '6车间',
-        date: '2023-10-24'
-      },
+      query: {},
       processList: [],//工序进度
       state_: {
         10: '创建中',
@@ -210,12 +205,18 @@ export default {
       paramsWm: {
         belong_dept__name: '6车间'
       },
+      paramsMtask: {
+        mgroup__belong_dept__name: '6车间',
+        is_count_utask: true,
+        state__in: "20,40"
+      },
+      queryMtask: {}
     }
   },
   mounted() {
     let NowDate = new Date();
-    this.query.date = NowDate.getFullYear() + '-' + (NowDate.getMonth() + 1) + '-' + NowDate.getDate();
-    this.apiObj = this.$API.pm.mtask.daylist;
+    // this.queryMtask.start_date = NowDate.getFullYear() + '-' + (NowDate.getMonth() + 1) + '-' + NowDate.getDate();
+    this.apiObj = this.$API.pm.mtask.list;
   },
   methods: {
     tomio() {
@@ -244,13 +245,7 @@ export default {
       });
     },
     handleQueryMtask() {
-      this.$refs.table.refresh();
-    },
-    handleQuery() {
-      this.$refs.table.queryData(this.query)
-    },
-    resetQuery() {
-      this.query = {};
+      this.$refs.table.refresh(this.queryMtask);
     },
     table_submit(row) {
       this.$API.pm.mtask.submit.req(row.id).then(res => {
diff --git a/src/views/wpm/mlog_dept6_detail.vue b/src/views/wpm/mlog_dept6_detail.vue
index 7d455eb7..5750e3aa 100644
--- a/src/views/wpm/mlog_dept6_detail.vue
+++ b/src/views/wpm/mlog_dept6_detail.vue
@@ -10,11 +10,8 @@
         </template>
         <el-descriptions>
           <el-descriptions-item label="任务编号">{{ currentMtask.number }}</el-descriptions-item>
-          <el-descriptions-item label="产品名称">
-            <span v-if="currentMtask.material_out_">{{ currentMtask.material_out_.name }}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="规格型号">
-            <span v-if="currentMtask.material_out_">{{ currentMtask.material_out_.specification }}</span>
+          <el-descriptions-item label="产品全称">
+            <span v-if="currentMtask.material_out_">{{ currentMtask.material_out_name }}</span>
           </el-descriptions-item>
           <el-descriptions-item label="计划数量">{{ currentMtask.count }}</el-descriptions-item>
           <el-descriptions-item label="计划日期">{{ currentMtask.start_date }}</el-descriptions-item>
diff --git a/src/views/wpm/mlog_dept7.vue b/src/views/wpm/mlog_dept7.vue
index d6a1b92a..27a41cf7 100644
--- a/src/views/wpm/mlog_dept7.vue
+++ b/src/views/wpm/mlog_dept7.vue
@@ -357,6 +357,7 @@ export default {
                 if (res.length == 1) {
                     this.currentDept = res[0]
                     this.paramsMtask.mgroup__belong_dept = this.currentDept.id
+                    this.paramsMtask.state__in = '20,40'
                     this.apiMtask = this.$API.pm.mtask.list
 
                     this.paramsHandover.recive_dept = this.currentDept.id