From 61282c106068d9a792e1b084746e2d6b9a997b99 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 15 九月 2026 15:29:52 +0800
Subject: [PATCH] 新疆——新聚lims 1.不需要判定要求、检测方法、检验结果、结论 2.设备不需要绑定每个检验子项,只需要绑定当前的的检验委托单 3.判定结果检测的时候不要出现,复核的时候才判断选择最终结果是否合格

---
 src/views/business/reportPreparation/index.vue |  114 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index 33d4743..6501a8d 100644
--- a/src/views/business/reportPreparation/index.vue
+++ b/src/views/business/reportPreparation/index.vue
@@ -11,23 +11,23 @@
             <el-option v-for="(a, i) in queryStatusList" :key="i" :label="a.label" :value="a.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="鎶ュ憡绫诲瀷" prop="reportType">
-          <el-select v-model="entity.reportType" clearable size="small" @change="refreshTable()">
-            <el-option v-for="item in reportTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="涓嬪崟绫诲埆" prop="typeSource">
-          <el-select v-model="entity.typeSource" clearable size="small" @change="refreshTable()">
-            <el-option v-for="(a, i) in typeSourceList" :key="i" :label="a.label" :value="a.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="鐗╂枡灞炴��" prop="materialProp">
-          <el-select clearable size="small" v-model="entity.materialProp" style="width: 100%">
-            <el-option v-for="dict in dict.type.material_prop_type" :key="dict.value" :label="dict.label"
-                       :value="dict.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="鎶ュ憡绫诲瀷" prop="reportType">-->
+<!--          <el-select v-model="entity.reportType" clearable size="small" @change="refreshTable()">-->
+<!--            <el-option v-for="item in reportTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="涓嬪崟绫诲埆" prop="typeSource">-->
+<!--          <el-select v-model="entity.typeSource" clearable size="small" @change="refreshTable()">-->
+<!--            <el-option v-for="(a, i) in typeSourceList" :key="i" :label="a.label" :value="a.value"></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="鐗╂枡灞炴��" prop="materialProp">-->
+<!--          <el-select clearable size="small" v-model="entity.materialProp" style="width: 100%">-->
+<!--            <el-option v-for="dict in dict.type.material_prop_type" :key="dict.value" :label="dict.label"-->
+<!--                       :value="dict.value">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="妫�楠岀被鍒�" prop="orderType">
           <el-select v-model="entity.orderType" clearable size="small" @change="refreshTable()">
             <el-option v-for="(a, i) in orderTypeList" :key="i" :label="a.label" :value="a.value"></el-option>
@@ -276,8 +276,8 @@
       orderTypeList: [
         { label: '濮旀墭璇曢獙', value: 'Customer-ordered test' },
         { label: '鎶芥', value: '鎶芥' },
-        { label: '杩涘巶妫�楠�', value: '杩涘巶妫�楠�' },
-        { label: '瀛e害妫�楠�', value: 'Quarterly inspection' },
+        // { label: '杩涘巶妫�楠�', value: '杩涘巶妫�楠�' },
+        // { label: '瀛e害妫�楠�', value: 'Quarterly inspection' },
       ],
       reportTypeList: [
         { label: '妫�娴嬫姤鍛�', value: 0 },
@@ -366,44 +366,44 @@
           dataType: "link",
           linkMethod: "selectAllByOne",
         },
-        {
-          label: '鎶ュ憡绫诲瀷',
-          prop: 'reportType',
-          width: '100px',
-          dataType: 'tag',
-          formatData: (params) => params === 0 ? '妫�娴嬫姤鍛�' : '妫�楠屾姤鍛�',
-          formatType: (params) => params === 0 ? 'warning' : 'success',
-        },
-        {
-          label: "涓嬪崟绫诲埆",
-          prop: "typeSource",
-          width: "100px",
-          dataType: "tag",
-          formatData: (params) => {
-            if (params == 0) {
-              return "澶栬喘涓嬪崟";
-            } else if(params==1) {
-              return "鍘熸潗鏂欎笅鍗�";
-            }else{
-              return "濮旀墭涓嬪崟";
-            }
-          },
-        },
-        {
-          label: '鐗╂枡灞炴��',
-          prop: 'materialProp',
-          formatData: (params) => {
-            if (!params) return null
-
-            for (let i = 0; i < this.dict.type.material_prop_type.length; i++) {
-              const item = this.dict.type.material_prop_type[i]
-              if (item.value == params) {
-                return item.label
-              }
-            }
-            return null
-          }
-        },
+        // {
+        //   label: '鎶ュ憡绫诲瀷',
+        //   prop: 'reportType',
+        //   width: '100px',
+        //   dataType: 'tag',
+        //   formatData: (params) => params === 0 ? '妫�娴嬫姤鍛�' : '妫�楠屾姤鍛�',
+        //   formatType: (params) => params === 0 ? 'warning' : 'success',
+        // },
+        // {
+        //   label: "涓嬪崟绫诲埆",
+        //   prop: "typeSource",
+        //   width: "100px",
+        //   dataType: "tag",
+        //   formatData: (params) => {
+        //     if (params == 0) {
+        //       return "澶栬喘涓嬪崟";
+        //     } else if(params==1) {
+        //       return "鍘熸潗鏂欎笅鍗�";
+        //     }else{
+        //       return "濮旀墭涓嬪崟";
+        //     }
+        //   },
+        // },
+        // {
+        //   label: '鐗╂枡灞炴��',
+        //   prop: 'materialProp',
+        //   formatData: (params) => {
+        //     if (!params) return null
+        //
+        //     for (let i = 0; i < this.dict.type.material_prop_type.length; i++) {
+        //       const item = this.dict.type.material_prop_type[i]
+        //       if (item.value == params) {
+        //         return item.label
+        //       }
+        //     }
+        //     return null
+        //   }
+        // },
         {
           label: "妫�楠岀被鍨�",
           prop: "orderType",

--
Gitblit v1.9.3