From 58e7ea29adb44aa6f4bfc96bb0a9558618e39a91 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 31 Jan 2024 13:19:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E7=81=AB=E6=97=B6=E8=BD=A6=E9=97=B4?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9A=84=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/mlog_tui.vue      |  5 +++--
 src/views/wpm/worktask_form.vue | 23 +++++++++++++++--------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/views/wpm/mlog_tui.vue b/src/views/wpm/mlog_tui.vue
index e9a4c1ec..0289125a 100644
--- a/src/views/wpm/mlog_tui.vue
+++ b/src/views/wpm/mlog_tui.vue
@@ -208,8 +208,9 @@
             <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" :belongdept="currentMgroup.belong_dept" :mgroup="currentMgroup.id"
+        :mgroupShiftRule="currentMgroup.shift_rule" :activeType="activeName" @success="handleSaveSuccess"
+        @closed="dialogSave = false">
     </save-dialog>
 </template>
 <script>
diff --git a/src/views/wpm/worktask_form.vue b/src/views/wpm/worktask_form.vue
index 95f95e5c..1f9ade7d 100644
--- a/src/views/wpm/worktask_form.vue
+++ b/src/views/wpm/worktask_form.vue
@@ -129,9 +129,14 @@
         </el-col>
         <el-col :md="12" :sm="24">
           <el-form-item label="批次号" prop="material_in">
-            <el-select v-model="form.batch" placeholder="批次号" filterable clearable allow-create style="width: 100%">
-              <el-option v-for="item in wMaterialOptions" :key="item.batch" :label="item.batch"
-                :value="item.batch"></el-option>
+            <el-select v-model="form.batch" placeholder="批次号" filterable clearable style="width: 100%">
+              <el-option v-for="item in wMaterialOptions" :key="item.batch" :label="item.batch" :value="item.batch">
+                <div style="display:flex;justify-content:space-between">
+                  <span>{{ item.batch }}</span>
+                  <span style="color:#aaaaaa">{{ item.count }}</span>
+                </div>
+
+              </el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -577,7 +582,8 @@ export default {
     material_out: { type: String, default: "" },
     material_model: { type: String, default: "" },
     brothersList: { type: Array, default: () => [] },
-    mtaskDate: { type: String, default: "" }
+    mtaskDate: { type: String, default: "" },
+    belongdept: { type: String, default: "" }
   },
   data() {
     return {
@@ -654,7 +660,9 @@ export default {
     } else {
       batchDate = dateNow;
     }
-    this.form.batch = this.material_model + '-' + batchDate;
+    if (this.activeType == "10车间" || this.activeType == "7车间") {
+      this.form.batch = this.material_model + '-' + batchDate;
+    }
     this.getMaterial();
     this.getUserList();
     this.getEquipment();
@@ -670,10 +678,9 @@ export default {
   },
   methods: {
     routeChange(item) {
-      this.form.material_out = item.material_out;
       this.form.material_out = item.material_out;
       this.form.material_in = item.material_in
-      this.form.mgroup = item.mgroup
+      this.form.mgroup = item.mgroup;
       this.getWorkShopMaterial();
     },
     getRouteOptions() {
@@ -797,7 +804,7 @@ export default {
       let that = this;
       if (this.form.material_in) {
         this.$API.wpm.wmaterial.list
-          .req({ material: this.form.material_in, page: 0, count__gte: 1 })
+          .req({ material: this.form.material_in, page: 0, count__gte: 1, belong_dept: that.belongdept })
           .then((res) => {
             that.wMaterialOptions = res;
           });