From 1ec562641230d6f08b64da8e2de2d25357a0cebb Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 6 Mar 2024 14:32:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=80=E7=81=AB=E4=BA=A4=E6=8E=A5?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/mlog_tui.vue | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/views/wpm/mlog_tui.vue b/src/views/wpm/mlog_tui.vue
index a42cb6ec..423b41e5 100644
--- a/src/views/wpm/mlog_tui.vue
+++ b/src/views/wpm/mlog_tui.vue
@@ -163,21 +163,27 @@
         destroy-on-close @closed="handoverVisible = false">
         <el-form ref="dialogForm" :model="handoverForm" :rules="rules" label-width="120px">
             <el-row>
+                <el-col :md="24" :sm="24">
+                    <el-form-item label="交送物料" prop="wm">
+                        <el-select v-model="handoverForm.wm" placeholder="交送物料" clearable style="width: 100%"
+                            :disabled="handoverType == 'edit'">
+                            <el-option v-for="item in wmaterialList" :key="item.id">
+                                <span style="float: left">{{ item.material_name }} {{ item.batch }}</span>
+                                <span style="
+                                    float: right;
+                                    color: var(--el-text-color-secondary);
+                                    font-size: 13px;
+                                ">{{ item.count }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
                 <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'" />
                     </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-option v-for="item in wmaterialList" :key="item.id" :label="item.material_.name"
-                                :value="item.id"></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
                 <el-col :md="12" :sm="24">
                     <el-form-item label="交送数量" prop="count">
                         <el-input-number v-model="handoverForm.count" controls-position="right" :min="0" step="1"
@@ -249,13 +255,13 @@ export default {
             handoverVisible: false,
             deptOptions: [],
             userList: [],
-            userList2: []
+            userList2: [],
+            wmaterialList: []
         }
     },
     mounted() {
         this.initMgroup()
         this.getDepts();
-        this.getWmaterial();
     },
     methods: {
         add() {
@@ -338,9 +344,9 @@ export default {
                 }
             })
         },
-        //从生产日志生成交接记录
+        //创建交接记录
         addHandover(row) {
-            console.log('currentMgroup', this.currentMgroup.id)
+            this.getWmaterial();
             this.handoverForm.wm = '';
             this.handoverForm.send_date = "";
             this.handoverForm.send_user = "";
@@ -354,12 +360,11 @@ export default {
         },
         getWmaterial() {
             let obj = {};
-            obj.belong_dept__name = "8车间";
+            obj.belong_dept = this.currentMgroup.belong_dept;
+            obj.material__process = this.currentMgroup.process;
             obj.page = 0;
             obj.count__gte = 1;
             this.$API.wpm.wmaterial.list.req(obj).then(res => {
-                debugger;
-                console.log(res);
                 this.wmaterialList = res;
             })
         },