From f8f8569e94d82c91d427118dc31e10835db486a3 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sun, 24 Dec 2023 18:58:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=206=E8=BD=A6=E9=97=B4=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA=E7=89=A9=E6=96=99=E5=85=A8=E5=90=8D=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=90=88=E6=A0=BC=E5=90=88?=
 =?UTF-8?q?=E8=AE=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/mlog_dept10.vue | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/views/wpm/mlog_dept10.vue b/src/views/wpm/mlog_dept10.vue
index 1901c754..94ede52d 100644
--- a/src/views/wpm/mlog_dept10.vue
+++ b/src/views/wpm/mlog_dept10.vue
@@ -63,7 +63,7 @@
                                         <span>任务信息</span>
                                         <span>
                                             <el-button type="primary" link @click="addMtaskInfo"
-                                                v-if="currentMtask &&currentMtask.peifen_kg===0&& (currentMtask.state == 20 || currentMtask.state == 10)">配粉料数</el-button>
+                                                v-if="currentMtask && currentMtask.peifen_kg === 0 && (currentMtask.state == 20 || currentMtask.state == 10)">配粉料数</el-button>
                                         </span>
                                     </div>
                                 </template>
@@ -91,7 +91,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">
@@ -99,11 +100,12 @@
                                         <el-table-column label="班次" prop="shift_name"> </el-table-column>
                                         <el-table-column label="出管总数" prop="count_real">
                                         </el-table-column>
-                                        <el-table-column label="规格" prop="mlogb" width="150">
+                                        <el-table-column label="规格" prop="mlogb" width="250">
                                             <template #default="scope">
                                                 <div v-for="item in scope.row.mlogb" :key="item" class="cateItem" style="">
-                                                    <span>{{ item.material_out_.name }}</span>
-                                                    <span>{{ item.count_ok }}</span>
+                                                    <span>{{ item.material_out_name }}|</span>
+                                                    <span style="color:darkblue; font-weight: bold;">{{ item.count_ok
+                                                    }}</span>
                                                 </div>
                                             </template>
                                         </el-table-column>
@@ -130,7 +132,7 @@
                                             </el-table-column>
                                             <el-table-column label="气线" prop="count_n_qx">
                                             </el-table-column>
-                                            <el-table-column label="合计" prop="count_n_qt">
+                                            <el-table-column label="合计" prop="count_notok">
                                             </el-table-column>
                                         </el-table-column>
                                         <el-table-column label="成型人" prop="handle_user_name">
@@ -243,10 +245,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>
@@ -257,10 +259,8 @@
             </el-container>
         </el-main>
         <save-dialog v-if="dialogSave" ref="saveDialog" :mtask="currentMtask.id" :mgroup="mgroup"
-            :material_out="material_out" :brothersList="brothersList" 
-            :material_in="material_in"
-            :activeType="activeName" @success="handleSaveSuccess"
-            @closed="dialogSave = false"></save-dialog>
+            :material_out="material_out" :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">