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 1/2] =?UTF-8?q?fix:=206=E8=BD=A6=E9=97=B4=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=89=A7=E8=A1=8C=E7=AD=9B=E9=80=89=E5=8F=8A=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=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 => {

From 02162eb83ee4bd4885fd4103a93add28745b41a3 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 25 Dec 2023 13:09:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E8=BD=A6=E9=97=B4=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BAcount=5F=5Fgte?=
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  | 11 ++----
 src/views/wpm/mlog_dept7.vue  | 21 +++++-----
 src/views/wpm/mlog_tui.vue    | 73 +++++++++++++++++------------------
 4 files changed, 50 insertions(+), 56 deletions(-)

diff --git a/src/views/wpm/mlog_dept10.vue b/src/views/wpm/mlog_dept10.vue
index b1915dbc..b762fa02 100644
--- a/src/views/wpm/mlog_dept10.vue
+++ b/src/views/wpm/mlog_dept10.vue
@@ -360,6 +360,7 @@ export default {
                     this.apiObjHandover = this.$API.wpm.handover.list
 
                     this.paramsWm.belong_dept = this.currentDept.id
+                    this.paramsWm.count__gte = 1
                     this.apiObjWm = this.$API.wpm.wmaterial.list
                 } else {
                     this.$message.error("未找到车间");
diff --git a/src/views/wpm/mlog_dept6.vue b/src/views/wpm/mlog_dept6.vue
index bd38d1c4..bf42a642 100644
--- a/src/views/wpm/mlog_dept6.vue
+++ b/src/views/wpm/mlog_dept6.vue
@@ -17,7 +17,7 @@
                 <el-table-column type="index" width="50" />
                 <el-table-column label="任务编号" prop="number" width="130">
                 </el-table-column>
-                <el-table-column label="产品全名" prop="material_out_name" show-overflow-tooltip width="250">
+                <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>
@@ -86,11 +86,7 @@
               <scTable ref="table_handover" :apiObj="apiObjHandover" row-key="id" stripe :params="paramsHandover">
                 <el-table-column label="送料日期" prop="send_date">
                 </el-table-column>
-                <el-table-column label="产物" prop="material" show-overflow-tooltip>
-                  <template #default="scope"><span v-if="scope.row.material_">{{
-                    scope.row.material_.name
-                  }}</span>
-                  </template>
+                <el-table-column label="产物" prop="material_name" show-overflow-tooltip>
                 </el-table-column>
                 <el-table-column label="批次" prop="batch"> </el-table-column>
                 <el-table-column label="数量" prop="count">
@@ -188,7 +184,8 @@ export default {
         recive_dept__name: '6车间'
       },
       paramsWm: {
-        belong_dept__name: '6车间'
+        belong_dept__name: '6车间',
+        count__gte: 1
       },
       paramsMtask: {
         mgroup__belong_dept__name: '6车间',
diff --git a/src/views/wpm/mlog_dept7.vue b/src/views/wpm/mlog_dept7.vue
index 3f2302f8..62081be2 100644
--- a/src/views/wpm/mlog_dept7.vue
+++ b/src/views/wpm/mlog_dept7.vue
@@ -84,7 +84,8 @@
                                 <el-header>
                                     <div class="left-panel">
                                         <el-button type="primary" icon="el-icon-plus" @click="addMlog"
-                                            v-if="currentMtask && currentMtask.state == 20" v-auth="'mlog.create'">新增</el-button>
+                                            v-if="currentMtask && currentMtask.state == 20"
+                                            v-auth="'mlog.create'">新增</el-button>
                                     </div>
                                 </el-header>
                                 <el-main class="nopadding">
@@ -242,10 +243,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>
@@ -255,13 +256,8 @@
                 </el-main>
             </el-container>
         </el-main>
-        <save-dialog v-if="dialogSave" ref="saveDialog" 
-            :mtask="currentMtask.id" 
-            :mgroup="mgroup" 
-            :material_out="material_out" 
-            :material_in="material_in" 
-            :activeType="activeName" 
-            @success="handleSaveSuccess"
+        <save-dialog v-if="dialogSave" ref="saveDialog" :mtask="currentMtask.id" :mgroup="mgroup"
+            :material_out="material_out" :material_in="material_in" :activeType="activeName" @success="handleSaveSuccess"
             @closed="dialogSave = false">
         </save-dialog>
         <showDrawer ref="showDrawer" v-if="visibleDrawer" :mlogId="mlogId" @closed="visibleDrawer = false">
@@ -370,6 +366,7 @@ export default {
                     this.apiObjHandover = this.$API.wpm.handover.list
 
                     this.paramsWm.belong_dept = this.currentDept.id
+                    this.paramsWm.count__gte = 1
                     this.apiObjWm = this.$API.wpm.wmaterial.list
                 } else {
                     this.$message.error("未找到车间");
diff --git a/src/views/wpm/mlog_tui.vue b/src/views/wpm/mlog_tui.vue
index aafb7840..a92aa826 100644
--- a/src/views/wpm/mlog_tui.vue
+++ b/src/views/wpm/mlog_tui.vue
@@ -13,7 +13,7 @@
                         <el-table-column label="物料名" prop="material_out_name">
                             <template #default="scope">
                                 <span v-if="scope.row.material_out_">
-                                    {{scope.row.material_out_.name}}
+                                    {{ scope.row.material_out_.name }}
                                 </span>
                             </template>
                         </el-table-column>
@@ -67,7 +67,7 @@
                                 <el-table-column label="产物" prop="material" show-overflow-tooltip>
                                     <template #default="scope">
                                         <span v-if="scope.row.material_out_">
-                                            {{scope.row.material_out_.name}}
+                                            {{ scope.row.material_out_.name }}
                                         </span>
                                     </template>
                                 </el-table-column>
@@ -130,10 +130,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>
@@ -144,19 +144,20 @@
             </el-container>
         </el-main>
     </el-container>
-    <el-dialog :title="titleOptions[handoverType]" ref="handoverDialog" v-model="handoverVisible" :size="1000" destroy-on-close
-        @closed="handoverVisible = false">
+    <el-dialog :title="titleOptions[handoverType]" ref="handoverDialog" v-model="handoverVisible" :size="1000"
+        destroy-on-close @closed="handoverVisible = false">
         <el-form ref="dialogForm" :model="handoverForm" :rules="rules" label-width="120px">
             <el-row>
                 <el-col :md="12" :sm="24">
                     <el-form-item label="送料日期" prop="send_date">
                         <el-date-picker v-model="handoverForm.send_date" type="date" value-format="YYYY-MM-DD"
-                            style="width: 100%" :disabled="handoverType=='edit'"/>
+                            style="width: 100%" :disabled="handoverType == 'edit'" />
                     </el-form-item>
                 </el-col>
                 <el-col :md="12" :sm="24">
                     <el-form-item label="交送物料" prop="wm">
-                        <el-select v-model="handoverForm.wm" placeholder="交送物料" clearable style="width: 100%" :disabled="handoverType=='edit'">
+                        <el-select v-model="handoverForm.wm" placeholder="交送物料" clearable style="width: 100%"
+                            :disabled="handoverType == 'edit'">
                             <el-option v-for="item in wmaterialList" :key="item.id" :label="item.material_.name"
                                 :value="item.id"></el-option>
                         </el-select>
@@ -171,7 +172,8 @@
                 </el-col>
                 <el-col :md="12" :sm="24">
                     <el-form-item label="交送人" prop="send_user">
-                        <el-select v-model="handoverForm.send_user" placeholder="交送人" clearable style="width: 100%" :disabled="handoverType=='edit'">
+                        <el-select v-model="handoverForm.send_user" placeholder="交送人" clearable style="width: 100%"
+                            :disabled="handoverType == 'edit'">
                             <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
                         </el-select>
                     </el-form-item>
@@ -179,7 +181,7 @@
                 <el-col :md="12" :sm="24">
                     <el-form-item label="接收部门" prop="recive_dept">
                         <el-select v-model="handoverForm.recive_dept" placeholder="接收部门" clearable style="width: 100%"
-                            @change="getUserList2" :disabled="handoverType=='edit'">
+                            @change="getUserList2" :disabled="handoverType == 'edit'">
                             <el-option v-for="item in deptOptions" :key="item.id" :label="item.name"
                                 :value="item.id"></el-option>
                         </el-select>
@@ -187,7 +189,8 @@
                 </el-col>
                 <el-col :md="12" :sm="24">
                     <el-form-item label="接收人" prop="recive_user">
-                        <el-select v-model="handoverForm.recive_user" placeholder="接收人" clearable style="width: 100%" :disabled="handoverType=='edit'">
+                        <el-select v-model="handoverForm.recive_user" placeholder="接收人" clearable style="width: 100%"
+                            :disabled="handoverType == 'edit'">
                             <el-option v-for="item in userList2" :key="item.id" :label="item.name" :value="item.id" />
                         </el-select>
                     </el-form-item>
@@ -199,13 +202,8 @@
             <el-button type="primary" @click="submitHandover">提交</el-button>
         </el-footer>
     </el-dialog>
-    <save-dialog v-if="dialogSave" 
-        ref="saveDialog"
-        :mgroup="currentMgroup.id"
-        :mgroupShiftRule = "currentMgroup.shift_rule"
-        :activeType="activeName"
-        @success="handleSaveSuccess" 
-        @closed="dialogSave = false">
+    <save-dialog v-if="dialogSave" ref="saveDialog" :mgroup="currentMgroup.id" :mgroupShiftRule="currentMgroup.shift_rule"
+        :activeType="activeName" @success="handleSaveSuccess" @closed="dialogSave = false">
     </save-dialog>
 </template>
 <script>
@@ -216,11 +214,11 @@ export default {
     },
     data() {
         return {
-            activeName:'退火',
-            handoverType:'add',
-            titleOptions:{
-                'add':'新增',
-                'edit':'编辑',
+            activeName: '退火',
+            handoverType: 'add',
+            titleOptions: {
+                'add': '新增',
+                'edit': '编辑',
             },
             currentMgroup: {},
             apiObj: null,
@@ -230,7 +228,7 @@ export default {
             apiObjWm: null,
             paramsWm: {},
             handoverForm: {},
-            dialogSave:false,
+            dialogSave: false,
             handoverVisible: false,
             deptOptions: [],
             userList: [],
@@ -268,13 +266,13 @@ export default {
                     this.$refs.table.refresh();
                     return res;
                 })
-                .catch((err) => {
-                    return err;
-                });
+                    .catch((err) => {
+                        return err;
+                    });
             })
-            .catch(() => { });
+                .catch(() => { });
         },
-        handleSaveSuccess(){
+        handleSaveSuccess() {
             this.$refs.table.refresh();
         },
         getDepts() {
@@ -298,6 +296,7 @@ export default {
                     this.apiObjHandover = this.$API.wpm.handover.list
 
                     this.paramsWm.belong_dept = this.currentMgroup.belong_dept
+                    this.paramsWm.count__gte = 1
                     this.apiObjWm = this.$API.wpm.wmaterial.list
 
                     this.$API.system.user.list.req({ page: 0, belong_dept: this.currentMgroup.belong_dept }).then(res => {
@@ -310,24 +309,24 @@ export default {
         },
         //从生产日志生成交接记录
         addHandover(row) {
-            console.log('currentMgroup',this.currentMgroup.id)
+            console.log('currentMgroup', this.currentMgroup.id)
             this.handoverForm.wm = '';
             this.handoverForm.send_date = "";
             this.handoverForm.send_user = "";
             this.handoverForm.count = 1;
-            
+
             this.handoverForm.recive_user = '';//接收人
             this.handoverForm.recive_dept = '';//接收车间
             this.handoverForm.send_mgroup = this.currentMgroup.id;
-            this.handoverType='add';
+            this.handoverType = 'add';
             this.handoverVisible = true;
         },
-        getWmaterial(){
+        getWmaterial() {
             let obj = {};
             obj.belong_dept__name = "8车间";
             obj.page = 0;
             obj.count__gte = 1;
-            this.$API.wpm.wmaterial.list.req(obj).then(res=>{
+            this.$API.wpm.wmaterial.list.req(obj).then(res => {
                 debugger;
                 console.log(res);
                 this.wmaterialList = res;
@@ -343,7 +342,7 @@ export default {
         handover_edit(row) {
             Object.assign(this.handoverForm, row);
             this.getUserList2(row.recive_dept);
-            this.handoverType='edit';
+            this.handoverType = 'edit';
             this.handoverVisible = true;
         },
         handover_delete(row) {