diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index c6843b4eb..1cc45251d 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -706,20 +706,20 @@ const submitForm = async () => { return } // 主子表——提交请求 - // try { + try { const data = unref(formRef)?.formModel emit('submitForm', formType.value, data) - // } finally { - // formLoading.value = false - // } + } finally { + // formLoading.value = false + } } else { // 编辑 - // try { + try { const data = unref(formRef)?.formModel emit('submitForm', formType.value, data) - // } finally { - // formLoading.value = false - // } + } finally { + // formLoading.value = false + } } } else { // 基础数据单表——提交请求 @@ -728,7 +728,7 @@ const submitForm = async () => { const data = unref(formRef)?.formModel emit('success', formType.value, data) } finally { - formLoading.value = false + // formLoading.value = false } } } diff --git a/src/views/qms/inspectionQ1/index.vue b/src/views/qms/inspectionQ1/index.vue index 9a217a668..cacbbaacf 100644 --- a/src/views/qms/inspectionQ1/index.vue +++ b/src/views/qms/inspectionQ1/index.vue @@ -187,6 +187,8 @@ nextTick(() => { handleTime: new Date().getTime(), claimTime: new Date().getTime(), priority: '3', + qty: 1, + claimAmount: 1,     })   }) } diff --git a/src/views/qms/inspectionQ1/inspectionQ1.data.ts b/src/views/qms/inspectionQ1/inspectionQ1.data.ts index 8e8742141..ee6e635a5 100644 --- a/src/views/qms/inspectionQ1/inspectionQ1.data.ts +++ b/src/views/qms/inspectionQ1/inspectionQ1.data.ts @@ -82,7 +82,15 @@ export const Q1 = useCrudSchemas( value: 'TRUE', isMainValue: false } - ] + ], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, isSearch: true @@ -143,7 +151,7 @@ export const Q1 = useCrudSchemas( form: { component: 'InputNumber', componentProps: { - min: 1, + min: 0.01, precision: 2 } } @@ -213,9 +221,14 @@ export const Q1 = useCrudSchemas( width: 150 }, form: { - component: 'InputNumber' + component: 'InputNumber', + componentProps: { + min: 0.01, + precision: 2 + } } }, + { label: '成本中心', field: 'costCode', @@ -225,6 +238,7 @@ export const Q1 = useCrudSchemas( form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本 searchField: 'costcentreCode', // 查询弹窗赋值字段 @@ -237,7 +251,15 @@ export const Q1 = useCrudSchemas( value: 'TRUE', isMainValue: false } - ] + ], + verificationParams: [{ + key: 'costcentreCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue index bd8e6e19e..59644abb8 100644 --- a/src/views/qms/inspectionQ2/index.vue +++ b/src/views/qms/inspectionQ2/index.vue @@ -195,6 +195,8 @@ nextTick(() => { handleTime: new Date().getTime(), claimTime: new Date().getTime(), priority: '3', + qty: 1, + claimAmount: 1,     })   }) } diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts index 718b6667e..d2fc1ffe9 100644 --- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts +++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts @@ -77,7 +77,15 @@ export const Q2 = useCrudSchemas( value: '0', isMainValue: false } - ] + ], + verificationParams: [{ + key: 'number', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, isSearch: true @@ -123,7 +131,15 @@ export const Q2 = useCrudSchemas( value: 'TRUE', isMainValue: false } - ] + ], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -218,7 +234,15 @@ export const Q2 = useCrudSchemas( value: 'itemCode', isMainValue: true } - ] + ], + verificationParams: [{ + key: 'number', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -234,7 +258,7 @@ export const Q2 = useCrudSchemas( form: { component: 'InputNumber', componentProps: { - min: 1, + min: 0.01, precision: 2 } } @@ -287,7 +311,11 @@ export const Q2 = useCrudSchemas( width: 150 }, form: { - component: 'InputNumber' + component: 'InputNumber', + componentProps: { + min: 0.01, + precision: 2 + } } }, { @@ -300,6 +328,7 @@ export const Q2 = useCrudSchemas( form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择成本中心', // 输入框占位文本 searchField: 'costcentreCode', // 查询弹窗赋值字段 @@ -312,7 +341,15 @@ export const Q2 = useCrudSchemas( value: 'TRUE', isMainValue: false } - ] + ], + verificationParams: [{ + key: 'costcentreCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, diff --git a/src/views/qms/inspectionQ3/index.vue b/src/views/qms/inspectionQ3/index.vue index 509f88af2..712d58db7 100644 --- a/src/views/qms/inspectionQ3/index.vue +++ b/src/views/qms/inspectionQ3/index.vue @@ -188,6 +188,8 @@ nextTick(() => {     basicFormRef.value.formRef.setValues({ handleTime: new Date().getTime(), priority: '3', + qty: 1, + amount: 1,     })   }) } diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts index c5743323a..57311e003 100644 --- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts +++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts @@ -71,7 +71,15 @@ export const Q3 = useCrudSchemas( value: '0', isMainValue: false } - ] + ], + verificationParams: [{ + key: 'number', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, isSearch: true @@ -103,6 +111,7 @@ export const Q3 = useCrudSchemas( width: 150 }, tableForm: { + enterSearch: true, isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -115,11 +124,20 @@ export const Q3 = useCrudSchemas( value: 'TRUE', isMainValue: false } - ] + ], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -132,7 +150,15 @@ export const Q3 = useCrudSchemas( value: 'TRUE', isMainValue: false } - ] + ], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -148,7 +174,7 @@ export const Q3 = useCrudSchemas( form: { component: 'InputNumber', componentProps: { - min: 1, + min: 0.01, precision: 2 } } @@ -254,7 +280,11 @@ export const Q3 = useCrudSchemas( width: 150 }, form: { - component: 'InputNumber' + component: 'InputNumber', + componentProps: { + min: 0.01, + precision: 2 + } } }, { @@ -267,6 +297,7 @@ export const Q3 = useCrudSchemas( form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择成本中心', // 输入框占位文本 searchField: 'costcentreCode', // 查询弹窗赋值字段 @@ -279,7 +310,15 @@ export const Q3 = useCrudSchemas( value: 'TRUE', isMainValue: false } - ] + ], + verificationParams: [{ + key: 'costcentreCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, diff --git a/src/views/qms/inspectionRecordFirst/addForm.vue b/src/views/qms/inspectionRecordFirst/addForm.vue index b89b7d47e..e0bcf9785 100644 --- a/src/views/qms/inspectionRecordFirst/addForm.vue +++ b/src/views/qms/inspectionRecordFirst/addForm.vue @@ -34,7 +34,9 @@
- + @@ -56,9 +58,9 @@
+ @blur="onBlur('inspectionScheme', InspectionSchemeApi.InspectionSchemePage)" + @focus="onFocus"/> { } } } +//失去焦点 +const onBlur = async (field, pageApi, item) => { + const dataObj = item ? item.inspectionCharacteristicsBaseVO : data.value + if (dataObj[field + 'Code']) { + const _searchCondition = {} + const filters: any[] = [] + filters.push( + { + action: '==', + column: 'available', + value: 'TRUE' + }, + { + column: 'code', + action: '==', + value: dataObj[field + 'Code']?.trim() + } + ) + // 参数整理 + _searchCondition.isSearch = true + _searchCondition.filters = filters + const array = await pageApi(_searchCondition) + Butttondata = [ + defaultButtons.formSaveBtn(null), // 保存 + defaultButtons.formCloseBtn(null) // 关闭 + ] + count.value++ + const obj = array.list[0] + if (obj) { + dataObj[field + 'Name'] = obj.description + } else { + message.alert('暂无数据') + dataObj[field + 'Code'] = '' + dataObj[field + 'Name'] = '' + } + } else { + dataObj[field + 'Name'] = '' + Butttondata = [ + defaultButtons.formSaveBtn(null), // 保存 + defaultButtons.formCloseBtn(null) // 关闭 + ] + count.value++ + } +} +const count = ref(0) +// 聚焦的时候不可以保存 +const onFocus = () => { + Butttondata = [ + defaultButtons.formSaveBtn({ disabled: true }), // 保存 + defaultButtons.formCloseBtn(null) // 关闭 + ] + count.value++ +}