loading添加

src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue

@@ -165,12 +165,19 @@ const formsSuccess = async (formType,data) => {
   }
   if(data.activeTime==0)data.activeTime = null;
   if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await CustomerDeliveryForecastApi.createCustomerDeliveryForecast(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await CustomerDeliveryForecastApi.updateCustomerDeliveryForecast(data)
-    message.success(t('common.updateSuccess'))
+  
+  basicFormRef.value.formLoading = true
+  try {
+    if (formType === 'create') {
+      await CustomerDeliveryForecastApi.createCustomerDeliveryForecast(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await CustomerDeliveryForecastApi.updateCustomerDeliveryForecast(data)
+      message.success(t('common.updateSuccess'))
+    }
+  } finally {
+    basicFormRef.value.formLoading = false
+
   }
   basicFormRef.value.dialogVisible = false
   getList()

src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue

@@ -614,9 +614,9 @@ const submitForm = async (formType, data) => {
     }
   })
   if (flag.value) {
-    basicFormRef.value.formLoading = false
     return
   }
+  basicFormRef.value.formLoading = true
   try {
     if (formType === 'create') {
       if (tableData.value.length <= 0) {

src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue

@@ -363,6 +363,7 @@ const submitForm = async (formType, submitData) => {
     data.id = data.masterId
   }
   data.subList = tableData.value // 拼接子表数据参数
+  formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       await CustomerreceiptRequestMainApi.createCustomerreceiptRequestMain(data)

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue

@@ -724,9 +724,9 @@ const submitForm = async (formType, submitData) => {
     }
   })
   if(flag.value){
-    formRef.value.formLoading = false
     return
   }
+  formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       await CustomerreturnRequestMainApi.createCustomerreturnRequestMain(data)

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@@ -532,7 +532,6 @@ const submitForm = async (formType, submitData) => {
   data.businessType = businessType.value
     console.log(data);
   if (isExist) {
-    formRef.value.formLoading = false
     return message.warning('物料代码重复')
   }
   data.subList.forEach(obj => { 
@@ -543,9 +542,9 @@ const submitForm = async (formType, submitData) => {
     }
   })
   if(flag.value){
-    formRef.value.formLoading = false
     return
   }
+  formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       if(tableData.value.length <= 0){

src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue

@@ -501,7 +501,6 @@ const submitForm = async (formType, submitData) => {
     }
   })
   if(flag.value){
-    formRef.value.formLoading = false
     return
   }
  var isHave =DeliverPlanMain.allSchemas.formSchema.some(function (item) {
@@ -517,6 +516,7 @@ const submitForm = async (formType, submitData) => {
       if(!data.beginTime)data.beginTime = null;
       if(!data.planDate)data.planDate = null;
       if(!data.endTime)data.endTime = null;
+  formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       await DeliverPlanMainApi.createDeliverPlanMain(data)

src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue

@@ -354,9 +354,10 @@ const submitForm = async (formType, submitData) => {
    if(rs.length > 1) isExist = true
   })
   if (isExist) {
-    basicFormRef.value.formLoading = false
+    // basicFormRef.value.formLoading = false
     return message.warning('物料代码重复')
   }
+  basicFormRef.value.formLoading = true
   try {
     if (formType === 'create') {
       if(tableData.value.length <= 0){

src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue

@@ -457,7 +457,6 @@ const submitForm = async (formType, submitData) => {
    if(rs.length > 1) isExist = true
   })
   if (isExist) {
-    formRef.value.formLoading = false
     return message.warning('物料代码重复')
   }
   data.subList.forEach(obj => {
@@ -468,9 +467,9 @@ const submitForm = async (formType, submitData) => {
     }
   })
   if(flag.value){
-    formRef.value.formLoading = false
     return
   }
+  formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       if(tableData.value.length <= 0){

src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue

@@ -499,6 +499,8 @@ const submitForm = async (formType, submitData) => {
     data.id = data.masterId
   }
   data.subList = tableData.value // 拼接子表数据参数
+  formRef.value.formLoading = true
+
   try {
     if (formType === 'create') {
       await PreparetoissueMainApi.createPreparetoissueMain(data).then(async (res) => {

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue

@@ -661,6 +661,7 @@ const submitForm = async (formType, submitData) => {
   }
   // 合格退料 添加参数 isOK
   data.isOK = true
+  formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       // 子表不能为空

src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue

@@ -591,6 +591,7 @@ const submitForm = async (formType, submitData) => {
   data.subList.forEach(item => {
     item.productionLineCode = data.productionLineCode
   })
+  formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       // 子表不能为空

src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue

@@ -391,9 +391,9 @@ const submitForm = async (formType, submitData) => {
   // }
   if(tableData.value.find(item => (item.qty <= 0))) {
     message.warning('数量必须大于0')
-    formRef.value.formLoading = false
     return
   }
+  formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       await RepleinshRequestMainApi.createRepleinshRequestMain(data)

src/views/wms/productionManage/productionplan/productionMain/index.vue

@@ -597,9 +597,9 @@ const submitForm = async (formType, submitData) => {
     }
   if(tableData.value.find(item => (item.planQty <= 0))) {
     message.warning('数量必须大于0')
-    formRef.value.formLoading = false
     return
   }
+  formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       data.subList = tableData.value // 拼接子表数据参数

src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue

@@ -595,9 +595,9 @@ const submitForm = async (formType, submitData) => {
     }
   if(tableData.value.find(item => (item.planQty <= 0))) {
     message.warning('数量必须大于0')
-    formRef.value.formLoading = false
     return
   }
+  formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       data.subList = tableData.value // 拼接子表数据参数

src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue

@@ -588,9 +588,9 @@ const submitForm = async (formType, submitData) => {
     }
   if(tableData.value.find(item => (item.planQty <= 0))) {
     message.warning('数量必须大于0')
-    formRef.value.formLoading = false
     return
   }
+  formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       data.subList = tableData.value // 拼接子表数据参数

src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue

@@ -386,6 +386,7 @@ const submitForm = async (formType, submitData) => {
     formRef.value.formLoading = false
     return
   }
+  formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       await ProductputawayRequestMainApi.createProductputawayRequestMain(data)

src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue

@@ -387,6 +387,7 @@ const submitForm = async (formType, submitData) => {
     formRef.value.formLoading = false
     return
   }
+  formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       await ProductputawayRequestMainApi.createProductputawayRequestMain(data)

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue

@@ -615,6 +615,7 @@ const submitForm = async (formType, submitData) => {
     formRef.value.formLoading = false
     return
   }
+  formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       await ProductreceiptRequestMainApi.createProductreceiptRequestMain(data)

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue

@@ -616,6 +616,7 @@ const submitForm = async (formType, submitData) => {
     formRef.value.formLoading = false
     return
   }
+  formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       await ProductreceiptRequestMainApi.createProductreceiptRequestMain(data)

src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue

@@ -596,9 +596,9 @@ const submitForm = async (formType, submitData) => {
   data.subList = tableData.value // 拼接子表数据参数
   if(data.subList.find(item => (item.qty <= 0))) {
     message.warning('数量必须大于0')
-    formRef.value.formLoading = false
     return
   }
+  formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       data.productionLineCode = data.subList[0].productionLineCode;

src/views/wms/productionManage/productredress/productredressRequestMain/index.vue

@@ -421,6 +421,7 @@ const submitForm = async (formType, submitData) => {
     formRef.value.formLoading = false
     return
   }
+  formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       await ProductredressRequestMainApi.createProductredressRequestMain(data)

src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue

@@ -711,9 +711,9 @@ const submitForm = async (formType, submitData) => {
   })
   if (!childListRs) {
     message.warning('请填写Bom信息！')
-    formRef.value.formLoading = false
     return
   }
+  formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       if(data.subList.length == 0){

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue

@@ -758,6 +758,7 @@ const submitForm = async (formType, submitData) => {
     row['expireDate'] = row['expireTime']?addDay(row['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf()
   })
   data.subList = tableData.value // 拼接子表数据参数
+  formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       data.orderTypeM='1';

src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue

@@ -876,6 +876,7 @@ const submitForm = async (formType, submitData) => {
     return
   }
   data.subList = tableData.value // 拼接子表数据参数
+  formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       let flag = false

src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue

@@ -445,6 +445,7 @@ const submitForm = async (formType, submitData) => {
     data.id = data.masterId
   }
   data.subList = tableData.value // 拼接子表数据参数
+  formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       await PutawayRequestMainApi.createPutawayRequestMain(data)

src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue

@@ -600,6 +600,7 @@ const submitForm = async (formType, submitData) => {
     data.id = data.masterId
   }
   data.subList = tableData.value // 拼接子表数据参数
+  formRef.value.formLoading = true
   try {
     if (formType === 'create') {
       data.orderTypeM='1';