From 83d484ae66f74a22906cbff9af14a57211dc08f4 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 10 Apr 2024 10:31:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=98=AF=E5=90=A6=E5=8F=AF?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/qms/samplingProcess/index.ts | 8 ++++++- src/utils/validator.ts | 14 ++++++++++- src/views/qms/aql/aql.data.ts | 22 ++++++++--------- .../inspectionMethod/inspectionMethod.data.ts | 22 ++++++++--------- src/views/qms/sampleCode/sampleCode.data.ts | 22 ++++++++--------- .../samplingProcess/samplingProcess.data.ts | 22 ++++++++--------- .../qms/samplingScheme/samplingScheme.data.ts | 24 +++++++++---------- 7 files changed, 76 insertions(+), 58 deletions(-) diff --git a/src/api/qms/samplingProcess/index.ts b/src/api/qms/samplingProcess/index.ts index 9f3f57dca..9fcdcd20f 100644 --- a/src/api/qms/samplingProcess/index.ts +++ b/src/api/qms/samplingProcess/index.ts @@ -1,4 +1,5 @@ import request from '@/config/axios' +import { validatePercent } from '@/utils/validator' export interface SamplingProcessVO { id: number @@ -7,10 +8,15 @@ export interface SamplingProcessVO { sampleType: string evaluationMode: string sampleSize: number - sampleProgCode: number + sampleProgCode: String available: string } +const rules = ref({ + sampleSize:[ + {validator:validatePercent,message:'百分比范围 0 ~ 100', trigger:'blur'} + ] +}) // 查询采样过程列表 export const getSamplingProcessPage = async (params) => { if (params.isSearch) { diff --git a/src/utils/validator.ts b/src/utils/validator.ts index 490cd75e7..4bb0e51d0 100644 --- a/src/utils/validator.ts +++ b/src/utils/validator.ts @@ -748,6 +748,17 @@ export function validateYS(rule, value, callback) { callback() } } +// 校验百分比 +export function validatePercent(rule, value, callback){ + if (!value) { + return callback(new Error('百分比不能为空')) + } else { + if(value < 0 || value > 100){ + return callback(new Error('百分比范围 0 ~ 100')) + } + callback() + } +} export default { validateCode, @@ -780,5 +791,6 @@ export default { validateName, validateChargeperson, validateYS, - validateMaxNumber5 + validateMaxNumber5, + validatePercent } diff --git a/src/views/qms/aql/aql.data.ts b/src/views/qms/aql/aql.data.ts index b29c071fe..5cd5baa56 100644 --- a/src/views/qms/aql/aql.data.ts +++ b/src/views/qms/aql/aql.data.ts @@ -7,7 +7,7 @@ export const AqlRules = reactive({ inspectionQualification: [required], sampleCharacterCode: [required], sampleSize: [required], - available: [required], + // available: [required], }) export const Aql = useCrudSchemas(reactive([ @@ -306,16 +306,16 @@ export const Aql = useCrudSchemas(reactive([ field: 'r1000', sort: 'custom', }, - { - label: '是否可用', - field: 'available', - sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - form: { - component: 'SelectV2' - }, - }, + // { + // label: '是否可用', + // field: 'available', + // sort: 'custom', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + // form: { + // component: 'SelectV2' + // }, + // }, { label: '创建时间', field: 'createTime', diff --git a/src/views/qms/inspectionMethod/inspectionMethod.data.ts b/src/views/qms/inspectionMethod/inspectionMethod.data.ts index 618c5d5c2..c07ff64cf 100644 --- a/src/views/qms/inspectionMethod/inspectionMethod.data.ts +++ b/src/views/qms/inspectionMethod/inspectionMethod.data.ts @@ -3,7 +3,7 @@ import { dateFormatter } from '@/utils/formatTime' // 表单校验 export const InspectionMethodRules = reactive({ - available: [required], + // available: [required], description: [required], }) @@ -37,16 +37,16 @@ export const InspectionMethod = useCrudSchemas(reactive([ field: 'operationGuidance', sort: 'custom', }, - { - label: '是否可用', - field: 'available', - sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - form: { - component: 'SelectV2' - }, - }, + // { + // label: '是否可用', + // field: 'available', + // sort: 'custom', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + // form: { + // component: 'SelectV2' + // }, + // }, { label: '文件', field: 'videoAddress', diff --git a/src/views/qms/sampleCode/sampleCode.data.ts b/src/views/qms/sampleCode/sampleCode.data.ts index 69876648a..6a8d31c98 100644 --- a/src/views/qms/sampleCode/sampleCode.data.ts +++ b/src/views/qms/sampleCode/sampleCode.data.ts @@ -6,7 +6,7 @@ import {getSamplingScheme} from '@/api/qms/sampleCode/index' export const SampleCodeRules = reactive({ code: [required], batchUpperLimiting: [required], - available: [required], + // available: [required], }) const samplingSchemeList = await getSamplingScheme() export const SampleCode = useCrudSchemas(reactive([ @@ -88,16 +88,16 @@ export const SampleCode = useCrudSchemas(reactive([ field: 'g3', sort: 'custom', }, - { - label: '是否可用', - field: 'available', - sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - form: { - component: 'Select' - }, - }, + // { + // label: '是否可用', + // field: 'available', + // sort: 'custom', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + // form: { + // component: 'Select' + // }, + // }, { label: '创建时间', field: 'createTime', diff --git a/src/views/qms/samplingProcess/samplingProcess.data.ts b/src/views/qms/samplingProcess/samplingProcess.data.ts index dac6c5e60..ba7f06d33 100644 --- a/src/views/qms/samplingProcess/samplingProcess.data.ts +++ b/src/views/qms/samplingProcess/samplingProcess.data.ts @@ -5,7 +5,7 @@ import { dateFormatter } from '@/utils/formatTime' export const SamplingProcessRules = reactive({ sampleType: [required], evaluationMode: [required], - available: [required], + // available: [required], description: [required], }) @@ -64,16 +64,16 @@ export const SamplingProcess = useCrudSchemas(reactive([ component: 'Select' }, }, - { - label: '是否可用', - field: 'available', - sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - form: { - component: 'Select' - }, - }, + // { + // label: '是否可用', + // field: 'available', + // sort: 'custom', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + // form: { + // component: 'Select' + // }, + // }, { label: '创建时间', field: 'createTime', diff --git a/src/views/qms/samplingScheme/samplingScheme.data.ts b/src/views/qms/samplingScheme/samplingScheme.data.ts index 3cf173eb3..be0d12e81 100644 --- a/src/views/qms/samplingScheme/samplingScheme.data.ts +++ b/src/views/qms/samplingScheme/samplingScheme.data.ts @@ -3,7 +3,7 @@ import { dateFormatter } from '@/utils/formatTime' // 表单校验 export const SamplingSchemeRules = reactive({ - available: [required], + // available: [required], description: [required], }) @@ -28,17 +28,17 @@ export const SamplingScheme = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, }, - { - label: '是否可用', - field: 'available', - sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - isSearch: true, - form: { - component: 'SelectV2' - }, - }, + // { + // label: '是否可用', + // field: 'available', + // sort: 'custom', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + // isSearch: true, + // form: { + // component: 'SelectV2' + // }, + // }, { label: '创建时间', field: 'createTime',