From 3fa440547a9e34ef3d5e901b59761dc0abd3eb96 Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Mon, 29 Apr 2024 11:53:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspectionTemplate/addForm.vue            |   2 +-
 .../inspectionRequest/inspectionMain.data.ts  | 105 +++---------------
 2 files changed, 15 insertions(+), 92 deletions(-)

diff --git a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
index cd63b2c85..729e1fcef 100644
--- a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
@@ -783,7 +783,7 @@ const submitForm = async () => {
     console.log(99,arr2)
     if (arr2 && arr2.length > 0) {
       const str = arr2.map((item) => item.description).join(',')
-      message.error(`${str}上限值应大目标值大于下限值`)
+      message.error(`${str}上限值应大于目标值大于下限值`)
       return
     }
     if (formType.value == 'create') {
diff --git a/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts b/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts
index 9d2643818..68489bf6c 100644
--- a/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts
+++ b/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts
@@ -15,10 +15,10 @@ export const InspectionMainRules = reactive({
   requestInspectionNum: [required,{ validator:validateTwoNum, message: '小数点后最多2位', trigger: 'blur'}],
   referenceCertificateRow: [{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}],
   inspectionType: [required],
+  minPackageQty: [required],
 })
 
 export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
-
   {
     label: '申请编码',
     field: 'number',
@@ -311,15 +311,6 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     }
   },
-  // {
-  //   label: '检验方案编码',
-  //   field: 'inspectionSchemeCode',
-  //   sort: 'custom',
-  //   isSearch: false,
-  //   table: {
-  //     width: 150
-  //   }
-  // },
   {
     label: '检验类型',
     field: 'inspectionType',
@@ -335,77 +326,19 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 175
     }
   },
-  // {
-  //   label: '检验阶段',
-  //   field: 'inspectionStage',
-  //   sort: 'custom',
-  //   isSearch: false,
-  //   form: {
-  //     component: 'InputNumber',
-  //     value: 0,
-  //     componentProps: {
-  //       disabled: true
-  //     }
-  //   },
-  //   table: {
-  //     width: 130
-  //   }
-  // },
-  // {
-  //   label: '检验严格性',
-  //   field: 'inspectionStringency',
-  //   sort: 'custom',
-  //   isSearch: false,
-  //   dictType: DICT_TYPE.INSPECTION_SEVERITY,
-  //   dictClass: 'string',
-  //   form: {
-  //     componentProps: {
-  //       disabled: true
-  //     }
-  //   },
-  //   table: {
-  //     width: 150
-  //   }
-  // },
-  // {
-  //   label: '检验申请包装列表',
-  //   field: 'applicationPackageCode',
-  //   sort: 'custom',
-  //   isSearch: false,
-  //   table: {
-  //     width: 150
-  //   }
-  // },
-  // {
-  //   label: '检验水平',
-  //   field: 'inspectionLevel',
-  //   dictType: DICT_TYPE.INSPECTION_LEVEL,
-  //   sort: 'custom',
-  //   isSearch: false,
-  //   table: {
-  //     width: 150
-  //   }
-  // },
-  // {
-  //   label: 'AQL值',
-  //   field: 'aqlValue',
-  //   sort: 'custom',
-  //   isSearch: false,
-  //   dictType: DICT_TYPE.BASIC_AQL,
-  //   table: {
-  //     width: 150
-  //   }
-  // },
-  // {
-  //   label: '是否可用',
-  //   field: 'available',
-  //   sort: 'custom',
-  //   isSearch: false,
-  //   dictType: DICT_TYPE.TRUE_FALSE,
-  //   table: {
-  //     width: 150
-  //   }
-  // },
+  {
+    label: '小包装数',
+    field: 'minPackageQty',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    table: {
+      width: 150
+    }
+  },
   {
     label: '操作',
     field: 'action',
@@ -498,15 +431,5 @@ export const InspectionRequestPackage = useCrudSchemas(reactive<CrudSchema[]>([
     table:{
       width:150
     }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    isTable:true,
-    table: {
-      width: 120,
-      fixed: 'right'
-    }
   }
 ]))