From 5ed9cd6d728eff6ba7e7fc2b1152a1975f661ed1 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 24 Jan 2024 09:02:29 +0800
Subject: [PATCH] =?UTF-8?q?batch=E8=B7=9F=E9=9A=8Fmtask=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/mlog_dept10.vue   | 21 ++++++++++++---------
 src/views/wpm/worktask_form.vue | 13 +++++++++++--
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/views/wpm/mlog_dept10.vue b/src/views/wpm/mlog_dept10.vue
index d3da882d..70ec776e 100644
--- a/src/views/wpm/mlog_dept10.vue
+++ b/src/views/wpm/mlog_dept10.vue
@@ -258,9 +258,10 @@
                 </el-main>
             </el-container>
         </el-main>
-        <save-dialog v-if="dialogSave" ref="saveDialog" :mtask="currentMtask.id" :mgroup="mgroup"
-            :material_out="material_out" :material_model="material_model" :brothersList="brothersList" :material_in="material_in" :activeType="activeName"
-            @success="handleSaveSuccess" @closed="dialogSave = false"></save-dialog>
+        <save-dialog v-if="dialogSave" ref="saveDialog" :mtask="currentMtask.id" :mgroup="mgroup" :mtaskDate="mtaskDate"
+            :material_out="material_out" :material_model="material_model" :brothersList="brothersList"
+            :material_in="material_in" :activeType="activeName" @success="handleSaveSuccess"
+            @closed="dialogSave = false"></save-dialog>
         <showDrawer ref="showDrawer" v-if="visibleDrawer" :mlogId="mlogId" @closed="visibleDrawer = false">
         </showDrawer>
         <el-dialog title="编辑任务" v-model="addMtaskInfoVisible">
@@ -313,8 +314,9 @@ export default {
             paramsWm: {},
             mgroup: '',
             mlogId: '',
+            mtaskDate: '',
             material_out: '',
-            material_model:'',
+            material_model: '',
         }
     },
     mounted() {
@@ -400,6 +402,7 @@ export default {
             let that = this;
             if (that.currentMtask && that.currentMtask.id) {
                 that.mgroup = that.currentMtask.mgroup;
+                that.mtaskDate = that.currentMtask.start_date;
                 that.material_out = that.currentMtask.material_out;
                 that.material_model = that.currentMtask.material_out_.model;
                 let arr = [];
@@ -420,10 +423,10 @@ export default {
             }
         },
         table_submit(row) {
-            let lengths = row.mlogs.length,infoText = '';
-            if(lengths>0){
-                infoText = '该任务有'+lengths+'条日志，确定提交吗？';
-            }else{
+            let lengths = row.mlogs.length, infoText = '';
+            if (lengths > 0) {
+                infoText = '该任务有' + lengths + '条日志，确定提交吗？';
+            } else {
                 infoText = '该任务没有日志，确定提交吗？';
             }
             this.$confirm(infoText, "提示", {
@@ -433,7 +436,7 @@ export default {
                     this.$message.success('操作成功')
                     this.$refs.table_mtask.refresh()
                     this.mtaskClick(this.currentMtask)
-                }).catch(err => {})
+                }).catch(err => { })
             })
         },
         // table_submit(row) {
diff --git a/src/views/wpm/worktask_form.vue b/src/views/wpm/worktask_form.vue
index ea45de57..db87e6b8 100644
--- a/src/views/wpm/worktask_form.vue
+++ b/src/views/wpm/worktask_form.vue
@@ -577,6 +577,7 @@ export default {
     material_out: { type: String, default: "" },
     material_model: { type: String, default: "" },
     brothersList: { type: Array, default: () => [] },
+    mtaskDate: { type: String, default: "" }
   },
   data() {
     return {
@@ -645,7 +646,15 @@ export default {
     this.form.mtask = this.mtask;
     this.form.mgroup = this.mgroup;
     this.form.handle_date = handle_date;
-    this.form.batch = this.material_model + '-' + dateNow;
+    let batchDate = '';
+    console.log(this.mtaskDate);
+    if (this.mtaskDate !== '') {
+      batchDate = this.mtaskDate.split('-').join('');
+      console.log(batchDate);
+    } else {
+      batchDate = dateNow;
+    }
+    this.form.batch = this.material_model + '-' + batchDate;
     this.getMaterial();
     this.getUserList();
     this.getEquipment();
@@ -787,7 +796,7 @@ export default {
         let obj = {};
         obj.page = 0;
         obj.is_hidden = false;
-
+        obj.type__in = '10,20,30';
         this.$API.mtm.material.list.req(obj).then((res) => {
           this.materialOptions = res;
         });