From fb0b523bb106ae87a9508888ee99dc2ae9d1beb1 Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Mon, 29 Apr 2024 13:40:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspection/inspectionRequest/index.vue    |  2 +-
 ....data.ts => inspectionRequestMain.data.ts} | 22 ++++++++++--
 .../samplingProcess/samplingProcess.data.ts   | 35 ++++---------------
 3 files changed, 28 insertions(+), 31 deletions(-)
 rename src/views/qms/inspection/inspectionRequest/{inspectionMain.data.ts => inspectionRequestMain.data.ts} (96%)

diff --git a/src/views/qms/inspection/inspectionRequest/index.vue b/src/views/qms/inspection/inspectionRequest/index.vue
index a25100b0e..be4b972ee 100644
--- a/src/views/qms/inspection/inspectionRequest/index.vue
+++ b/src/views/qms/inspection/inspectionRequest/index.vue
@@ -61,7 +61,7 @@
 
 <script setup lang="ts">
   import download from '@/utils/download'
-  import { InspectionMain, InspectionMainRules,InspectionRequestPackage,InspectionRequestPackageRules } from './inspectionMain.data'
+  import { InspectionMain, InspectionMainRules,InspectionRequestPackage,InspectionRequestPackageRules } from './inspectionRequestMain.data'
   import * as InspectionMainApi from '@/api/qms/inspectionRequest'
   import * as InspectionRequestPackageApi from '@/api/qms/inspectionRequest/InspectionRequestPackage'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
diff --git a/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts b/src/views/qms/inspection/inspectionRequest/inspectionRequestMain.data.ts
similarity index 96%
rename from src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts
rename to src/views/qms/inspection/inspectionRequest/inspectionRequestMain.data.ts
index 68489bf6c..1b486a144 100644
--- a/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts
+++ b/src/views/qms/inspection/inspectionRequest/inspectionRequestMain.data.ts
@@ -338,8 +338,26 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     }
-  },
-  {
+  }, {
+    label: '检验水平',
+    field: 'inspectionLevel',
+    sort: 'custom',
+    dictType: DICT_TYPE.INSPECTION_LEVEL,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  }, {
+    label: 'aql',
+    field: 'aql',
+    sort: 'custom',
+    dictType: DICT_TYPE.BASIC_AQL,
+    dictClass: 'string',
+    table: {
+      width: 150
+    }
+  }, {
     label: '操作',
     field: 'action',
     isForm: false,
diff --git a/src/views/qms/samplingProcess/samplingProcess.data.ts b/src/views/qms/samplingProcess/samplingProcess.data.ts
index 24605dfa1..5e1f5e608 100644
--- a/src/views/qms/samplingProcess/samplingProcess.data.ts
+++ b/src/views/qms/samplingProcess/samplingProcess.data.ts
@@ -29,10 +29,7 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
     label: '描述',
     field: 'description',
     sort: 'custom',
-    isSearch: true,
-    table: {
-      width: 175
-    }
+    isSearch: true
   },
   {
     label: '取样类型',
@@ -43,31 +40,22 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     form: {
       component: 'Select'
-    },
-    table: {
-      width: 140
     }
   },
   {
     label: '评估模式',
     field: 'evaluationMode',
     sort: 'custom',
-      dictType: DICT_TYPE.EVALUATION_MODE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-      form: {
-        component: 'Select'
-      },
-      table: {
-        width: 140
-      }
+    dictType: DICT_TYPE.EVALUATION_MODE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'Select'
+    }
   },
   {
     label: '样品份数',
     field: 'sampleQty',
-    sort: 'custom',
-    table: {
-      width: 140
-    }
+    sort: 'custom'
   },
   {
     label: '采样方案编码',
@@ -82,9 +70,6 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
           valueField: 'code'
         },
       }
-    },
-    table: {
-      width: 175
     }
   },
  {
@@ -104,9 +89,6 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
        dateFormat: 'YYYY-MM-DD HH:mm:ss',
        valueFormat: 'x',
      }
-   },
-   table: {
-     width: 175
    }
  },
   {
@@ -122,9 +104,6 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
         inactiveValue: 'FALSE',
         activeValue: 'TRUE'
       }
-    },
-    table: {
-      width: 110
     }
   },
   {