From ce2570f8555ff6668da4f149521b4620bdd9d8bf Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 23 九月 2026 15:25:22 +0800
Subject: [PATCH] feat(order): 添加订单委托要求字段并优化界面流程 - 新增分包内容、样品处置、结果评价、报告交付方式等委托要求字段 - 添加分包单位信息、报告寄送地址、收件人电话等关联信息录入功能 - 更新订单状态标签,新增作废状态和全部状态页签 - 调整报告准备页面审批流程,防止审核人和批准人为同一人

---
 src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue b/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
index 81c4baa..c829dac 100644
--- a/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
+++ b/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
@@ -15,7 +15,6 @@
 </template>
 
 <script>
-import ValueTable from "@/components/Table/value-table.vue";
 import UnPassRetestResult from "./unPassRetestResult.vue";
 import limsTable from "@/components/Table/lims-table.vue";
 import {getRetestResult, selectSampleAndProductByOrderId} from "@/api/business/rawMaterialOrder";
@@ -23,7 +22,7 @@
 export default {
   name: "dataLookVisible",
   // import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
-  components: {limsTable, UnPassRetestResult, ValueTable},
+  components: {limsTable, UnPassRetestResult},
   props: {
     dataDialogVisible: {
       type: Boolean,
@@ -63,7 +62,7 @@
             } else if (params == 3) {
               return '涓嶅垽瀹�'
             } else {
-              return ''
+              return null
             }
           },
           formatType: (params) => {
@@ -74,7 +73,7 @@
             } else if (params == 3) {
               return ''
             }  else {
-              return ''
+              return null
             }
           }
         },
@@ -91,7 +90,7 @@
                 this.getRetestResult(row);
               },
               disabled: (row, index) =>  {
-                return row.insResult!==0
+                return row.insResult!=0
               }
             },
           ]
@@ -139,7 +138,7 @@
         this.entity.id = this.dataLookInfo.quarterOrderId
       }
       this.tableLoading = true
-      const params = {...this.entity}
+      const params = {...this.entity, ...this.page}
       selectSampleAndProductByOrderId(params).then(res => {
         this.tableLoading = false
         if (res.code === 200) {

--
Gitblit v1.9.3