From ce247af69bdbd81f50213e637cab608ba1bb6938 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 03 十一月 2026 16:49:40 +0800
Subject: [PATCH] feat(outsourcing): 新增外协订单管理模块及配套功能优化

---
 src/views/business/inspectionTask/inspection.vue |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index bf77e81..6db42c7 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -6,7 +6,7 @@
   >
     <el-row class="title">
       <el-col
-        v-if="insOrder.ifsOrderType !== '02wg'"
+        v-if="effectiveOrderType !== '02wg'"
         :span="8"
         style="text-align: left"
       >
@@ -42,11 +42,11 @@
         </el-form>
       </el-col>
       <el-col
-        :span="insOrder.ifsOrderType !== '02wg' ? 16 : 24"
+        :span="effectiveOrderType !== '02wg' ? 16 : 24"
         style="text-align: right"
       >
         <el-button
-          v-if="insOrder.ifsOrderType && insOrder.ifsOrderType === '02wg'"
+          v-if="effectiveOrderType === '02wg'"
           size="small"
           type="primary"
           @click="showMaterialPropsDialog"
@@ -179,7 +179,7 @@
             supplierDensity
           }}</el-descriptions-item>
           <template
-            v-if="insOrder.ifsOrderType && insOrder.ifsOrderType === '02wg'"
+            v-if="effectiveOrderType === '02wg'"
           >
             <el-descriptions-item label="杞藉叿缂栧彿">{{
               insOrder.drumNo
@@ -1545,6 +1545,10 @@
   // 鐢ㄤ簬涓婁紶鏂囦欢鐨勪俊鎭�
   computed: {
     ...mapGetters(["userId"]),
+    // 浣跨敤鍚庡彴纭畾鐨勫鐞嗘祦绋嬶紝鐪熷疄閿�鍞垎绫讳粛淇濈暀鍦� ifsOrderType銆�
+    effectiveOrderType() {
+      return this.insOrder.flowOrderType || this.insOrder.ifsOrderType;
+    },
     action() {
       return this.javaApi + "/insOrderPlan/uploadFile";
     },
@@ -1835,7 +1839,7 @@
         laboratory: this.sonLaboratory,
       }).then(async (res) => {
         this.insOrder = res.data.insOrder;
-        if (res.data.insOrder.ifsOrderType === "02wg") {
+        if (this.effectiveOrderType === "02wg") {
           //鏌ヨ闆朵欢灞炴��
           this.getPartProps(res.data.insOrder.ifsInventoryId);
         }
@@ -3539,18 +3543,18 @@
         this.$message.error("璇锋寚瀹氬鏍镐汉鍛�");
         return;
       }
-      if (!this.otherForm.humidity && this.insOrder.ifsOrderType !== "02wg") {
+      if (!this.otherForm.humidity && this.effectiveOrderType !== "02wg") {
         this.$message.error("璇疯緭鍏ユ箍搴�");
         return;
       }
       if (
         !this.otherForm.temperature &&
-        this.insOrder.ifsOrderType !== "02wg"
+        this.effectiveOrderType !== "02wg"
       ) {
         this.$message.error("璇疯緭鍏ユ俯搴�");
         return;
       }
-      if (!this.insOrder.lotPartId && this.insOrder.ifsOrderType === "02wg") {
+      if (!this.insOrder.lotPartId && this.effectiveOrderType === "02wg") {
         this.$message.error("璇峰~鍐橧FS搴撳瓨鐗╂枡鎵规灞炴��");
         return;
       }

--
Gitblit v1.9.3