diff --git a/src/api/qms/aql/index.ts b/src/api/qms/aql/index.ts index aa13d10fd..e8726a613 100644 --- a/src/api/qms/aql/index.ts +++ b/src/api/qms/aql/index.ts @@ -2,7 +2,7 @@ import request from '@/config/axios' export interface AqlVO { id: number - sampleProgCode: string + code: string inspectionQualification: string sampleCharacterCode: string sampleSize: number diff --git a/src/components/Detail/src/DetailQmsCode.vue b/src/components/Detail/src/DetailQmsCode.vue index 3a54e68e0..e66979512 100644 --- a/src/components/Detail/src/DetailQmsCode.vue +++ b/src/components/Detail/src/DetailQmsCode.vue @@ -699,7 +699,6 @@ const openForm = async (type: string, row?: number) => { } // form 提交 const submitForm = async (formType, data) => { - debugger try { // 子表新增编辑校验 如果业务需要子表提交校验 需在主页详情组件添加 detailValidate 参数及方法 const rs = (await props.detailValidate) ? await props.detailValidate(data) : true diff --git a/src/views/qms/aql/aql.data.ts b/src/views/qms/aql/aql.data.ts index b652ae563..b29c071fe 100644 --- a/src/views/qms/aql/aql.data.ts +++ b/src/views/qms/aql/aql.data.ts @@ -3,7 +3,7 @@ import { dateFormatter } from '@/utils/formatTime' // 表单校验 export const AqlRules = reactive({ - sampleProgCode: [required], + code: [required], inspectionQualification: [required], sampleCharacterCode: [required], sampleSize: [required], @@ -19,8 +19,8 @@ export const Aql = useCrudSchemas(reactive([ isForm: false, }, { - label: '编码', - field: 'sampleProgCode', + label: '采样方案编码', + field: 'code', sort: 'custom', isSearch: true, }, diff --git a/src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts b/src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts index f4c6c33a9..709f84219 100644 --- a/src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts +++ b/src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts @@ -12,7 +12,10 @@ const trueFalse = [{ // 表单校验 export const DynamicRuleRules = reactive({ - description: [required] + description: [ + required, + { max: 1024, message: '不得超过1024个字符', trigger: 'blur' }, + ] }) export const DynamicRule = useCrudSchemas(reactive([ diff --git a/src/views/qms/basicDataManage/dynamicRule/index.vue b/src/views/qms/basicDataManage/dynamicRule/index.vue index a6e697802..40fe1130a 100644 --- a/src/views/qms/basicDataManage/dynamicRule/index.vue +++ b/src/views/qms/basicDataManage/dynamicRule/index.vue @@ -131,7 +131,7 @@ const { getList, setSearchParams } = tableMethods const HeadButttondata = [ defaultButtons.defaultAddBtn({hasPermi:'qms:dynamic-rule:create'}), // 新增 // defaultButtons.defaultImportBtn({hasPermi:'qms:dynamic-rule:import'}), // 导入 - // defaultButtons.defaultExportBtn({hasPermi:'qms:dynamic-rule:export'}), // 导出 + defaultButtons.defaultExportBtn({hasPermi:'qms:dynamic-rule:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index e6e75974d..72255bf61 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -12,7 +12,7 @@ - @@ -96,7 +96,7 @@