diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 17ebdb7ae..37c569f8b 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -89,7 +89,11 @@ @inputNumberChange="inputNumberChange" @tableFormSelectOnBlur="tableFormSelectOnBlur" @formFormDateChange="formFormDateChange" - /> + > + +
{ - if(props.sumFormData){ +const sumFormDataByTable = () => { + if(props.sumFormDataField){ const sumObject = {} - props.sumFormData.forEach(sumItem=>{ - sumObject[sumItem?.formField]= props.tableData.reduce((prev, item) => prev + item[sumItem?.valueField],0) + props.sumFormDataField.forEach(sumItem=>{ + sumObject[sumItem?.formField]= props.tableData.reduce((prev, item) => prev + item[sumItem?.tableField],0) }) nextTick(()=>{ formRef.value.setValues(sumObject) @@ -407,7 +416,13 @@ const changeSumFormData = () => { } } watch(()=>props.tableData,() => { - changeSumFormData() + sumFormDataByTable() + +},{ + deep:true +}) +watch(()=>unref(formRef)?.formModel,() => { + props?.sumFormDataByForm(formRef,unref(formRef)?.formModel) },{ deep:true }) diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index ee1a8b6c2..c70baed07 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -69,6 +69,9 @@ /> + + + + @submitForm="submitForm" + > + + { nextTick(() => { @@ -566,3 +576,12 @@ const importSuccess = () => { importTemplateData.templateUrl = await SupplierinvoiceRequestMainApi.importTemplate() }) + + diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 9feb3aa58..6952d3c09 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -187,6 +187,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( componentProps: { min: 0, precision: 6, + disabled: true, } }, tableForm: { @@ -734,6 +735,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive