From 889114a6c8362ca54586781f5bf284afa83dffaf Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 06 三月 2025 17:06:02 +0800
Subject: [PATCH] 检验任务提交流程修改

---
 src/views/business/inspectionTask/index.vue |   68 ++++++++++++++++++++--------------
 1 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index e10d812..eabfb22 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -196,7 +196,7 @@
           鏂板
         </el-button>
       </div>
-      <el-table :data="bindTableData" style="width: 100%" height="70vh">
+      <el-table :data="bindTableData" style="width: 100%" height="70vh" v-loading="bindTableDataLoading">
         <el-table-column prop="inspectionItemClass" label="妫�楠岄」鍒嗙被" width="150">
         </el-table-column>
         <el-table-column prop="inspectionItem" label="妫�楠岄」" width="150">
@@ -232,7 +232,10 @@
       ref="showInfoDialog"
       :showInfoDialog="showInfoDialog"
     ></ShowInfo> -->
+    <!--淇敼妫�楠屽�煎脊妗�-->
     <edit-inspection-item ref="editInspectionItem"></edit-inspection-item>
+    <!--鏌ョ湅宸ユ椂寮规-->
+    <viewManHourDia ref="viewManHourDia"></viewManHourDia>
   </div>
 </template>
 
@@ -240,6 +243,7 @@
 import { getYearAndMonthAndDays } from "@/utils/date";
 import EditInspectionItem from "./components/EditInspectionItem.vue";
 import limsTable from "@/components/Table/lims-table.vue";
+import viewManHourDia from "./components/viewManHourDia.vue"
 import {
   claimInsOrderPlan,
   upPlanUser2,
@@ -258,6 +262,7 @@
   components: {
     EditInspectionItem,
     limsTable,
+    viewManHourDia
   },
   dicts: ["urgency_level", "inspection_task_state"],
   computed: {
@@ -268,6 +273,7 @@
       InspectionKey: 1,
       bindDialogVisible: false,
       bindAddDialogVisible: false,
+      bindTableDataLoading: false,
       bindTableData: [],
       bindAddTableData: [],
       chooseBindAddList: [],
@@ -375,6 +381,9 @@
           formatData: (params) => {
             return this.urgencyLevel.find((m) => m.value == params).label;
           },
+          formatType: (params) => {
+            return this.urgencyLevel.find((m) => m.value == params).type;
+          },
         },
         {
           label: "妫�楠岀被鍨�",
@@ -393,8 +402,7 @@
           prop: "insState",
           dataType: "tag",
           formatData: (params) => {
-            return this.inspectionTaskState.find((m) => m.value == params)
-              .label;
+            return this.inspectionTaskState.find((m) => m.value == params).label;
           },
           formatType: (params) => {
             return this.inspectionTaskState.find((m) => m.value == params).type;
@@ -425,9 +433,17 @@
                 this.editInspection(row);
               },
               disabled: (row) => {
-                return (
-                  row.userName == null || row.insState == 3 || row.insState == 5
-                );
+                return (row.userName == null || row.insState == 3 || row.insState == 5) && this.checkPermi(['update:product:onPlan'])
+              },
+            },
+            {
+              name: "鏌ョ湅宸ユ椂",
+              type: "text",
+              clickFun: (row) => {
+                this.viewManHour(row);
+              },
+              showHide: (row) => {
+                return this.checkPermi(['get:working:hours:byOrder'])
               },
             },
             {
@@ -522,13 +538,15 @@
             if (obj) {
               return this.insResultList.find((m) => m.value == params).label;
             } else {
-              return ''
+              return null
             }
           },
           formatType: (params) => {
             let obj = this.insResultList.find((m) => m.value == params)
             if (obj) {
               return this.insResultList.find((m) => m.value == params).type;
+            } else {
+              return null
             }
           },
         },
@@ -563,7 +581,7 @@
       // 鏁版嵁鏌ョ湅鐩稿叧瀛楁---缁撴潫
     };
   },
-  created() {
+  mounted() {
     this.getAuthorizedPerson();
     this.currentTime = getYearAndMonthAndDays();
     this.getDicts("urgency_level").then((response) => {
@@ -572,9 +590,10 @@
     this.getDicts("inspection_task_state").then((response) => {
       this.inspectionTaskState = this.dictToValue(response.data);
     });
-  },
-  mounted() {
+    this.refreshTable();
     this.queryParams.userId = this.userId;
+  },
+  activated() {
     this.refreshTable();
   },
   methods: {
@@ -625,9 +644,9 @@
     editInspection(row) {
       this.$refs.editInspectionItem.showDialog(row.id);
     },
-    // 鍒锋柊椤甸潰
-    refreshView() {
-      this.getList();
+    // 鏌ョ湅宸ユ椂
+    viewManHour(row) {
+      this.$refs.viewManHourDia.showDialog(row.id, row.insState);
     },
     // 鏁版嵁鏌ョ湅
     handleDataLook(row) {
@@ -948,10 +967,6 @@
       })
         .then((res) => {
           this.loading = false;
-          if (res.code == 201) {
-            this.$message.error("缁戝畾澶辫触");
-            return;
-          }
           this.$message.success("缁戝畾鎴愬姛");
           this.bindAddDialogVisible = false;
           this.getBinding(this.bindCurrentInfo);
@@ -966,17 +981,14 @@
         cancelButtonText: "鍙栨秷",
         type: "warning",
       }).then(async () => {
-        delProductTreeByProductId({ productId: row.id })
-          .then((res) => {
-            if (res.coe == 201) {
-              // this.$message.error('鏈粦瀹氭楠岄」')
-              return;
-            }
-            this.getBinding(this.bindCurrentInfo);
-          })
-          .catch((error) => {
-            console.error(error);
-          });
+        this.bindTableDataLoading = true
+        delProductTreeByProductId({ productId: row.id }).then((res) => {
+          this.bindTableDataLoading = false
+          this.getBinding(this.bindCurrentInfo);
+        }).catch((error) => {
+          this.bindTableDataLoading = false
+          console.error(error);
+        });
       });
     },
   },

--
Gitblit v1.9.3