diff --git a/src/api/wms/supplieritem/index.ts b/src/api/wms/supplieritem/index.ts index d6c801830..704d97276 100644 --- a/src/api/wms/supplieritem/index.ts +++ b/src/api/wms/supplieritem/index.ts @@ -68,7 +68,10 @@ export const importTemplate = () => { // 查询供应商物品列表 export const selectItembasicTypeToSupplieritem = async (params) => { - + if (params.isSearch) { + const data = {...params} + return await request.post({ url: `/wms/supplieritem/pageItembasicTypeToSupplieritemSenior`, data }) + } else { return await request.get({ url: `/wms/supplieritem/pageItembasicTypeToSupplieritem`, params }) - +} } \ No newline at end of file diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index 74d4da509..46e27e462 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -369,11 +369,12 @@ const submitForm = async (formType, data) => { if(obj.qty == 0){ message.error(`数量不能为0!`) flag.value = true - formRef.value.formLoading = false + return; } }) if(flag.value){ + formRef.value.formLoading = false return } try { diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index 392460b6a..e9b711654 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -388,11 +388,11 @@ const submitForm = async (formType, data) => { if(obj.qty == 0){ message.warning(`数量不能为0!`) flag.value = true - formRef.value.formLoading = false return; } }) if(flag.value){ + formRef.value.formLoading = false return } try { diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue index 9c81fc4b3..1dd94f489 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue @@ -333,11 +333,11 @@ const submitForm = async (formType, data) => { if(obj.qty == 0){ message.error(`数量不能为0!`) flag.value = true - formRef.value.formLoading = false return; } }) if(flag.value){ + formRef.value.formLoading = false return } var isHave =DeliverPlanMain.allSchemas.formSchema.some(function (item) {