sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

BUG修改

master_hella_20240701
添砖-JAVA\Administrator 7 months ago
parent
0b5767d552
commit
91d19a67ff
3 changed files with 72 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 122
      src/views/qms/aql/aql.data.ts
  2. 20
      src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts
  3. 1
      src/views/qms/basicDataManage/selectedSet/index.vue

122
src/views/qms/aql/aql.data.ts
View File

@ -1,66 +1,66 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime' import { dateFormatter } from '@/utils/formatTime'
import {getSamplingScheme} from "@/api/qms/aql"; import { getSamplingScheme } from "@/api/qms/aql";
import {validateNum} from "@/utils/validator"; import { validateNum } from "@/utils/validator";
// 表单校验 // 表单校验
export const AqlRules = reactive({ export const AqlRules = reactive({
code: [required], code: [required],
inspectionQualification: [required], inspectionQualification: [required],
sampleCharacterCode: [required], sampleCharacterCode: [{ required, max: 1, message: '长度不得超过1个字符', trigger: 'blur' }],
sampleSize: [required], sampleSize: [required],
a0separator010: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a0separator010: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r0separator010: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r0separator010: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a0separator015: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a0separator015: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r0separator015: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r0separator015: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a0separator025: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a0separator025: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r0separator025: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r0separator025: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a0separator040: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a0separator040: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r0separator040: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r0separator040: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a0separator065: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a0separator065: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r0separator065: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r0separator065: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a0separator10: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a0separator10: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r0separator10: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r0separator10: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a0separator15: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a0separator15: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r0separator15: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r0separator15: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a0separator25: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a0separator25: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r0separator25: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r0separator25: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a0separator40: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a0separator40: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r0separator40: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r0separator40: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a0separator65: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a0separator65: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r0separator65: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r0separator65: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a1separator0: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a1separator0: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r1separator0: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r1separator0: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a1separator5: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a1separator5: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r1separator5: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r1separator5: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a2separator5: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a2separator5: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r2separator5: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r2separator5: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a4separator0: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a4separator0: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r4separator0: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r4separator0: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a6separator5: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a6separator5: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r6separator5: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r6separator5: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a10: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a10: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r10: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r10: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a15: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a15: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r15: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r15: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a25: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a25: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r25: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r25: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a40: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a40: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r40: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r40: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a65: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a65: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r65: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r65: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a100: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a100: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r100: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r100: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a150: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a150: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r150: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r150: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a250: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a250: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r250: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r250: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a400: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a400: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r400: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r400: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a650: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a650: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r650: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r650: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
a1000: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], a1000: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r1000: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], r1000: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
}) })
const samplingSchemeList = await getSamplingScheme() const samplingSchemeList = await getSamplingScheme()
export const Aql = useCrudSchemas(reactive<CrudSchema[]>([ export const Aql = useCrudSchemas(reactive<CrudSchema[]>([
@ -88,12 +88,12 @@ export const Aql = useCrudSchemas(reactive<CrudSchema[]>([
label: '检验严格性', label: '检验严格性',
field: 'inspectionQualification', field: 'inspectionQualification',
sort: 'custom', sort: 'custom',
dictType: DICT_TYPE.INSPECTION_SEVERITY, dictType: DICT_TYPE.INSPECTION_SEVERITY,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑 dictClass: 'string', // 默认都是字符串类型其他暂不考虑
isSearch: true, isSearch: true,
form: { form: {
component: 'Select' component: 'Select'
}, },
table: { table: {
width: 130 width: 130
} }
@ -543,7 +543,7 @@ export const Aql = useCrudSchemas(reactive<CrudSchema[]>([
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
style: {width: '100%'}, style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x',

20
src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts
View File

@ -33,14 +33,14 @@ export const DynamicRule = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom', sort: 'custom',
isSearch: true isSearch: true
}, },
{ {
label: '操作', label: '操作',
field: 'action', field: 'action',
isForm: false, isDetail: false,
isDetail: false, isForm: false,
table: { table: {
width: 150, width: 330,
fixed: 'right' fixed: 'right'
} },
} }
])) ]))

1
src/views/qms/basicDataManage/selectedSet/index.vue
View File

@ -77,6 +77,7 @@
:detailButtonIsShowDelete=true :detailButtonIsShowDelete=true
@detailOpenForm="detailOpenForm" @detailOpenForm="detailOpenForm"
@detailBasicFormOnChange="detailBasiFormOnChange" @detailBasicFormOnChange="detailBasiFormOnChange"
:detailButtonIsShowFilter="false"
/> />
<!-- 导入 --> <!-- 导入 -->

Write Preview
Loading…
Cancel
Save