From e355fcedc7a06f2ef441a1e905b23b82585fdf57 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 25 Dec 2023 12:48:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=206=E8=BD=A6=E9=97=B4=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=AD=9B=E9=80=89=E5=8F=8A=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/mlog_dept6.vue | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/src/views/wpm/mlog_dept6.vue b/src/views/wpm/mlog_dept6.vue
index 350a8451..bd38d1c4 100644
--- a/src/views/wpm/mlog_dept6.vue
+++ b/src/views/wpm/mlog_dept6.vue
@@ -7,30 +7,17 @@
           <el-container>
             <el-header>
               <div class="left-panel">
-                <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>
+                <el-date-picker v-model="queryMtask.start_date" type="date" value-format="YYYY-MM-DD"
+                  @change="handleQueryMtask" />
               </div>
             </el-header>
             <el-main>
               <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 label="任务编号" prop="number" width="130">
                 </el-table-column>
-                <el-table-column label="产品名称" prop="material" show-overflow-tooltip>
-                  <template #default="scope">
-                    <span v-if="scope.row.material_out_">{{ scope.row.material_out_.name }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="规格" prop="material">
-                  <template #default="scope">
-                    <span v-if="scope.row.material_out_">{{ scope.row.material_out_.specification }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="型号" prop="material">
-                  <template #default="scope">
-                    <span v-if="scope.row.material_out_">{{ scope.row.material_out_.model }}</span>
-                  </template>
+                <el-table-column label="产品全名" prop="material_out_name" show-overflow-tooltip width="250">
                 </el-table-column>
                 <el-table-column label="计划数量" prop="count">
                 </el-table-column>
@@ -59,7 +46,6 @@
             </el-header>
             <el-main>
               <scTable ref="tableprocess" row-key="id" stripe :hideDo="hideDo" :data="processList" @row-click="itemClick">
-                <el-table-column type="index" width="50" />
                 <el-table-column label="任务编号" prop="number" width="150">
                 </el-table-column>
                 <el-table-column label="日期" prop="start_date" width="120">
@@ -98,7 +84,6 @@
             </el-header>
             <el-main>
               <scTable ref="table_handover" :apiObj="apiObjHandover" row-key="id" stripe :params="paramsHandover">
-                <el-table-column type="index" width="50" />
                 <el-table-column label="送料日期" prop="send_date">
                 </el-table-column>
                 <el-table-column label="产物" prop="material" show-overflow-tooltip>
@@ -162,10 +147,10 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="已到工序" prop="material">
-                            <template #default="scope">{{
-                                scope.row.material_.process_name
-                            }}</template>
-                        </el-table-column>
+                  <template #default="scope">{{
+                    scope.row.material_.process_name
+                  }}</template>
+                </el-table-column>
                 <el-table-column label="批次" prop="batch"> </el-table-column>
                 <el-table-column label="数量" prop="count" width="80">
                 </el-table-column>
@@ -245,7 +230,7 @@ export default {
       });
     },
     handleQueryMtask() {
-      this.$refs.table.refresh(this.queryMtask);
+      this.$refs.table.queryData(this.queryMtask);
     },
     table_submit(row) {
       this.$API.pm.mtask.submit.req(row.id).then(res => {