From 6e6186d14310579debd5163f0d7779fb68b3e7ee Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 4 Mar 2024 16:54:00 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=80=80=E7=81=AB=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/mlog_tui.vue | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/views/wpm/mlog_tui.vue b/src/views/wpm/mlog_tui.vue
index 0289125a..a42cb6ec 100644
--- a/src/views/wpm/mlog_tui.vue
+++ b/src/views/wpm/mlog_tui.vue
@@ -30,22 +30,24 @@
                         <el-table-column label="不合格数" prop="count_notok">
                         </el-table-column>
                         <el-table-column label="操作" fixed="right" align="center" width="180">
+
                             <template #default="scope">
-                                <el-button link type="primary" :disabled="scope.row.submit_user != null"
+                                <el-button link type="primary" v-if="scope.row.submit_time == null"
                                     @click="table_edit(scope.row)" v-auth="'mlog.update'">
                                     编辑
                                 </el-button>
+                                <el-button link type="danger" @click="table_del(scope.row)" v-auth="'mlog.delete'"
+                                    v-if="scope.row.submit_time == null">
+                                    删除
+                                </el-button>
                                 <el-button link type="success" v-if="scope.row.submit_user == null"
                                     @click="table_submit(scope.row)" v-auth="'mlog.submit'">
                                     提交
                                 </el-button>
-                                <el-button link type="warning" v-else @click="table_revert(scope.row)"
-                                    v-auth="'mlog.submit'">
+                                <el-button link type="warning" v-if="scope.row.submit_time != null"
+                                    @click="table_revert(scope.row)" v-auth="'mlog.submit'">
                                     撤回
                                 </el-button>
-                                <el-button link type="danger" @click="table_del(scope.row)" v-auth="'mlog.delete'">
-                                    删除
-                                </el-button>
                             </template>
                         </el-table-column>
                     </scTable>
@@ -71,6 +73,7 @@
                                 <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_out_">
                                             {{ scope.row.material_out_.full_name }}
@@ -85,12 +88,14 @@
                                 <el-table-column label="接收人" prop="recive_user_name">
                                 </el-table-column>
                                 <el-table-column label="是否确认" prop="submit_time">
+
                                     <template #default="scope">
                                         <span v-if="scope.row.submit_time">是</span>
                                         <span v-else>否</span>
                                     </template>
                                 </el-table-column>
                                 <el-table-column label="操作" fixed="right" align="left" width="100">
+
                                     <template #default="scope">
                                         <el-button link type="primary" @click="handover_edit(scope.row)"
                                             v-auth="'handover.update'" v-if="scope.row.submit_time == null">
@@ -121,24 +126,28 @@
                             <scTable ref="table_wm" :apiObj="apiObjWm" row-key="id" :params="paramsWm" stripe
                                 hidePagination>
                                 <el-table-column label="物料名" prop="material">
+
                                     <template #default="scope">{{
-                                        scope.row.material_.name
-                                    }}</template>
+                            scope.row.material_.name
+                        }}</template>
                                 </el-table-column>
                                 <el-table-column label="规格" prop="material">
+
                                     <template #default="scope">{{
-                                        scope.row.material_.specification
-                                    }}</template>
+                            scope.row.material_.specification
+                        }}</template>
                                 </el-table-column>
                                 <el-table-column label="型号" prop="material">
+
                                     <template #default="scope">{{
-                                        scope.row.material_.model
-                                    }}</template>
+                            scope.row.material_.model
+                        }}</template>
                                 </el-table-column>
                                 <el-table-column label="已到工序" prop="material">
+
                                     <template #default="scope">{{
-                                        scope.row.material_.process_name
-                                    }}</template>
+                            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">
@@ -213,6 +222,7 @@
         @closed="dialogSave = false">
     </save-dialog>
 </template>
+
 <script>
 import saveDialog from "./worktask_form.vue";
 export default {