diff --git a/src/views/qms/inspection/inspectionJob/detail.vue b/src/views/qms/inspection/inspectionJob/detail.vue
index cb2d9d51c..1a2673a19 100644
--- a/src/views/qms/inspection/inspectionJob/detail.vue
+++ b/src/views/qms/inspection/inspectionJob/detail.vue
@@ -46,18 +46,9 @@
-
-
-
-
-
-
+
@@ -65,15 +56,6 @@
-
-
-
-
-
检验特性
@@ -121,20 +103,6 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/qms/samplingProcess/samplingProcess.data.ts b/src/views/qms/samplingProcess/samplingProcess.data.ts
index 955a0e91d..8ee0c907c 100644
--- a/src/views/qms/samplingProcess/samplingProcess.data.ts
+++ b/src/views/qms/samplingProcess/samplingProcess.data.ts
@@ -1,12 +1,14 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
import {getSamplingScheme} from "@/api/qms/samplingProcess";
+import { validateInteger } from '@/utils/validator'
// 表单校验
export const SamplingProcessRules = reactive({
sampleType: [required],
evaluationMode: [required],
description: [required],
+ inspectionQty: [required, {validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
})
const samplingSchemeList = await getSamplingScheme()
export const SamplingProcess = useCrudSchemas(reactive([
@@ -30,12 +32,12 @@ export const SamplingProcess = useCrudSchemas(reactive([
label: '取样类型',
field: 'sampleType',
sort: 'custom',
- dictType: DICT_TYPE.SAMPLING_TYPE,
- dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+ dictType: DICT_TYPE.SAMPLING_TYPE,
+ dictClass: 'string', // 默认都是字符串类型其他暂不考虑
isSearch: true,
- form: {
- component: 'Select'
- },
+ form: {
+ component: 'Select'
+ },
},
{
label: '评估模式',
@@ -43,15 +45,20 @@ export const SamplingProcess = useCrudSchemas(reactive([
sort: 'custom',
dictType: DICT_TYPE.EVALUATION_MODE,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
- form: {
- component: 'Select'
- },
+ form: {
+ component: 'Select'
+ },
},
{
label: '样品量',
field: 'sampleSize',
sort: 'custom',
},
+ {
+ label: '检验次数',
+ field: 'inspectionQty',
+ sort: 'custom',
+ },
{
label: '采样方案编码',
field: 'sampleProgCode',