YT-1435pc和pda端所有点击都需要增加loading

src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue

@@ -319,29 +319,34 @@ const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAcces
 // }
 const labelType = ref('') // 标签类别 采购还是制造等
 const handlePoint = async (row) => {
-  console.log(row.packingNumber,445555555555555);
-  PackageApi.getBalanceToPackage(row.relateNumber).then(res => {
-    console.log(777,res);
-    if (res.productionLineCode != null) {
-      labelType.value = 'zz'
-    } else {
-      labelType.value = 'cg'
-    }
-    PackageApi.batchPrintingLable((res.number)).then((resLable) =>{
-      console.log(159,resLable )
-      // 判断是采购还是制造
-      if (labelType.value == 'cg') {
-        const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-        console.log(159,resLable )
-        window.open(src.value+'&asn_number='+resLable)
+  console.log(row.packingNumber, 445555555555555);
+  tableObject.loading = true
+  try {
+    await PackageApi.getBalanceToPackage(row.relateNumber).then( async res => {
+      console.log(777,res);
+      if (res.productionLineCode != null) {
+        labelType.value = 'zz'
       } else {
-        const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-        window.open(src.value+'&asn_number='+resLable)
-      }
+        labelType.value = 'cg'
+        }
+      await PackageApi.batchPrintingLable((res.number)).then((resLable) =>{
+        console.log(159,resLable )
+        // 判断是采购还是制造
+        if (labelType.value == 'cg') {
+          const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+          console.log(159,resLable )
+          window.open(src.value+'&asn_number='+resLable)
+        } else {
+          const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+          window.open(src.value+'&asn_number='+resLable)
+        }
+      })
+    }).catch(err => {
+      console.log(err)
     })
-  }).catch(err => {
-    console.log(err)
-  })
+  } finally {
+    tableObject.loading = false
+  }
 }
 
 // form表单提交

src/views/wms/inventoryManage/balance/index.vue

@@ -381,7 +381,8 @@ const getLabelDetailPage = async (row, useToPackingNumber) => {
   //   item.width = item.table?.width || 150
   // })
   // detatableData1.value = tableObjectPrint.tableList
-
+ tableObject.loading = true
+  try {
   await ItembasicApi.getItembasicPage({
     pageSize: 10,
     pageNo: 1,
@@ -455,7 +456,10 @@ const getLabelDetailPage = async (row, useToPackingNumber) => {
   })
     console.log(1111)
  
-  labelPointFormRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
+    labelPointFormRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
+   } finally {
+    tableObject.loading = false
+  }
 }
 
 // 批量打印--预生产收货

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue

@@ -551,83 +551,90 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'cjbq') {
     // 创建标签
     // 判断 是否已创建标签
-    let isCreateLabel = false
-    await PackageApi.getPackagePage({
-      requestNumber: row.number
-    }).then((res) => {
-      if (res) {
-        if (res.list.length > 0) isCreateLabel = true
+    tableObject.loading = true
+    try {
+       let isCreateLabel = false
+      await PackageApi.getPackagePage({
+        requestNumber: row.number
+      }).then((res) => {
+        if (res) {
+          if (res.list.length > 0) isCreateLabel = true
+        }
+      })
+      if (isCreateLabel) {
+        message.warning('已创建过标签！！！')
+      tableObject.loading = false
+        return
       }
-    })
-    if (isCreateLabel) {
-      message.warning('已创建过标签！！！')
-      return
-    }
-    console.log('列表-操作按钮事件-创建标签')
-    detatableData.params = {
-      masterId: row.masterId
-    }
-    await getDetailList()
-    // 判断 是否已创建标签
-    if (detatableData.tableList[0].packingNumber) {
-      message.warning('已创建过标签！！！')
-      return
-    }
-    // 打开创建标签页面
-    // dialogVisible.value = true
-    formLabelRef.value.open('create', row)
-    
-        console.log(detailListTableColumns.tableFormColumns)
-    detatableData.tableList.map((item) => {
-      if (item.itemType == '可采购') {
-        item.disabled_productionLineCode = true
-        item.disabled_supplierCode = false
-        // 修改 tableform 属性
-        SupplieritemApi.getSupplieritemPage({
-          pageSize: 10,
-          pageNo: 1,
-          itemCode: item.itemCode,
-          sort: '',
-          by: 'ASC'
-        }).then((response) => {
-          detailListTableColumns.tableFormColumns.map((itemColumns) => {
-            if (itemColumns.field == 'supplierCode') {
-              item.supplierCode = response?.list[0]?.supplierCode
-            }
+      console.log('列表-操作按钮事件-创建标签')
+      detatableData.params = {
+        masterId: row.masterId
+      }
+      await getDetailList()
+      // 判断 是否已创建标签
+      if (detatableData.tableList[0].packingNumber) {
+        message.warning('已创建过标签！！！')
+        return
+      }
+      // 打开创建标签页面
+      // dialogVisible.value = true
+     tableObject.loading = false
+      formLabelRef.value.open('create', row)
+      console.log(detailListTableColumns.tableFormColumns)
+      detatableData.tableList.map((item) => {
+        if (item.itemType == '可采购') {
+          item.disabled_productionLineCode = true
+          item.disabled_supplierCode = false
+          // 修改 tableform 属性
+          SupplieritemApi.getSupplieritemPage({
+            pageSize: 10,
+            pageNo: 1,
+            itemCode: item.itemCode,
+            sort: '',
+            by: 'ASC'
+          }).then((response) => {
+            detailListTableColumns.tableFormColumns.map((itemColumns) => {
+              if (itemColumns.field == 'supplierCode') {
+                item.supplierCode = response?.list[0]?.supplierCode
+              }
+            })
           })
-        })
-      } else if (item.itemType == '可制造') {
-        item.disabled_supplierCode = true
-        item.disabled_productionLineCode = false
-        ProductionlineitemApi.getProductionlineitemPage({
-          pageNo: 1,
-          itemCode: item.itemCode,
-          sort: '',
-          by: 'ASC'
-        }).then((response) => {
-          detailListTableColumns.tableFormColumns.map((itemColumns) => {
-            if (itemColumns.field == 'productionLineCode') {
-              item.productionLineCode = response?.list[0]?.productionLineCode
+        } else if (item.itemType == '可制造') {
+          item.disabled_supplierCode = true
+          item.disabled_productionLineCode = false
+          ProductionlineitemApi.getProductionlineitemPage({
+            pageNo: 1,
+            itemCode: item.itemCode,
+            sort: '',
+            by: 'ASC'
+          }).then((response) => {
+            detailListTableColumns.tableFormColumns.map((itemColumns) => {
+              if (itemColumns.field == 'productionLineCode') {
+                item.productionLineCode = response?.list[0]?.productionLineCode
+              }
+            })
+          })
+        }
+        ruleApi
+          .getManagementPrecision({
+            itemCodes: [item['itemCode']],
+            locationCode: item['toLocationCode']
+          })
+          .then((res) => {
+            fromManagementPrecision.value = res[0].ManagementPrecision
+            if (fromManagementPrecision.value == 'BY_QUANTITY') {
+              item.batch = formatDate(new Date(), 'YYYYMMDD')
+              item['disabled_batch'] = false
+            } else {
+              item['disabled_batch'] = true
             }
           })
-        })
-      }
-      ruleApi
-        .getManagementPrecision({
-          itemCodes: [item['itemCode']],
-          locationCode: item['toLocationCode']
-        })
-        .then((res) => {
-          fromManagementPrecision.value = res[0].ManagementPrecision
-          if (fromManagementPrecision.value == 'BY_QUANTITY') {
-            item.batch = formatDate(new Date(), 'YYYYMMDD')
-            item['disabled_batch'] = false
-          } else {
-            item['disabled_batch'] = true
-          }
-        })
-    })
+      })
+    }finally {
+      tableObject.loading = false
+    }
   }
+   
 }
 
 /** 关闭按钮操作 */
@@ -945,21 +952,25 @@ const searchFormClick = (searchData) => {
 // 创建标签
 const submitFormLabel = async (formType, data) => {
   try {
+    formLabelRef.value.formLoading = true
     detatableData.tableList.forEach(async (item) => {
       await PackageApi.createPackageLabel(item)
         .then((res) => {
           isCreateLabel.value = true
           message.success('创建标签成功')
+          formLabelRef.value.formLoading = false
+          formLabelRef.value.dialogVisible = false
         })
         .catch((err) => {
           isCreateLabel.value = false
+          formLabelRef.value.formLoading = false
           console.log(err)
           message.error('创建标签失败')
         })
     })
   } finally {
-    formLabelRef.value.formLoading = false
-    formLabelRef.value.dialogVisible = false
+    // formLabelRef.value.formLoading = false
+    // formLabelRef.value.dialogVisible = false
   }
 }
 
@@ -1032,58 +1043,52 @@ const BASE_URL = getJmreportBaseUrl()
 const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
 const labelPrint = async (row) => {
   // 查询是否已创建过标签
-  await PackageApi.getPackagePage({
-    requestNumber: row.number
-  })
-    .then((res) => {
+  tableObject.loading = true
+  try {
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then((res) => {
       if (res.list.length > 0) {
         isCreateLabel.value = true
       } else {
         isCreateLabel.value = false
       }
-    })
-    .catch((err) => {
+    }).catch((err) => {
       isCreateLabel.value = false
       console.log(err)
     })
-  // 判断是采购还是制造
-  if (isCreateLabel.value) {
-    // labelPrint(row)
-    await UnplannedreceiptRequestDetailApi.getDetailList(row.masterId).then((res) => {
-    if (res.length > 0) {
-      const itemType = res.some((item) => item.itemType == '可采购')
-      const itemType1 = res.some((item) => item.itemType == '可制造')
-      if (itemType) {
-        window.open(
-          BASE_URL +
-            '/jmreport/view/1016234988731322368?token=' +
-            getAccessToken() +
-            '&request_number=' +
-            row.number
-        )
-      }
-      if (itemType1) {
-        // window.open(src.value + '&request_number=' + row.number)
-        PackageApi.batchPrintingLableForYT(row.number)
-          .then((res) => {
-            console.log(res)
-            const src = ref(
-              BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()
-            )
-            window.open(src.value + '&asn_number=' + res)
-          })
-          .catch((err) => {
-            console.log(err)
-            message.error('创建标签失败')
-          })
+    // 判断是采购还是制造
+    if (isCreateLabel.value) {
+      // labelPrint(row)
+      await UnplannedreceiptRequestDetailApi.getDetailList(row.masterId).then(async (res) => {
+        if (res.length > 0) {
+          const itemType = res.some((item) => item.itemType == '可采购')
+          const itemType1 = res.some((item) => item.itemType == '可制造')
+          if (itemType) {
+            window.open( BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken() + '&request_number=' + row.number )
+          }
+        if (itemType1) {
+          // window.open(src.value + '&request_number=' + row.number)
+          await PackageApi.batchPrintingLableForYT(row.number).then((res) => {
+              console.log(res)
+              const src = ref(
+                BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()
+              )
+              window.open(src.value + '&asn_number=' + res)
+            })
+            .catch((err) => {
+              console.log(err)
+              message.error('创建标签失败')
+            })
+        }
       }
-    }
-  })
+    })
   } else {
     message.warning('请先创建标签')
   }
-
-  
+  } finally {
+    tableObject.loading = false
+  }
   // window.open(src.value + '&request_number=' + row.number)
 }
 

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

@@ -534,6 +534,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'cjbq') { // 创建标签
     // 判断 是否已创建标签
     let isCreateLabel = false
+    tableObject.loading = true
     await PackageApi.getPackagePage({
       requestNumber: row.number
     }).then(res => {
@@ -543,6 +544,7 @@ const buttonTableClick = async (val, row) => {
     })
     if (isCreateLabel) {
       message.warning('已创建过标签！！！')
+      tableObject.loading = false
       return
     }
     detatableData.params = {
@@ -613,6 +615,7 @@ const buttonTableClick = async (val, row) => {
           return
         }
         
+        tableObject.loading = false
         formLabelRef.value.open('create', row)
       })
     })
@@ -701,6 +704,8 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
     message.warning("请先选择要打印的数据!")
     return
   }
+   tableObject.loading = true
+  try {
   // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
   let array = []//存储可采购数据
   let array1 = []//存储可制造数据
@@ -746,7 +751,10 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
   // }).catch(err => {
   //   console.log(err)
   //   message.error('创建标签失败')
-  // })
+    // })
+  } finally {
+    tableObject.loading = false
+  }
 }
 
 // 获取部门 用于详情 部门回显
@@ -901,31 +909,36 @@ const BASE_URL = getJmreportBaseUrl()
 // 标签打印
 const handlePoint = async (row) => {
   // 查询是否已创建过标签
-  await PackageApi.getPackagePage({
-    requestNumber: row.number
-  }).then((res) => {
-    if(res.list.length > 0) {
-      isCreateLabel.value = true
-      if (res.list[0].supplierCode != null) {
-        labelType.value = 'cg'
-      } else if(res.list[0].productionLineCode != null){
-        labelType.value = 'zz'
+  tableObject.loading = true
+  try {
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then((res) => {
+      if(res.list.length > 0) {
+        isCreateLabel.value = true
+        if (res.list[0].supplierCode != null) {
+          labelType.value = 'cg'
+        } else if(res.list[0].productionLineCode != null){
+          labelType.value = 'zz'
+        } else {
+          isCreateLabel.value = false
+          message.warning('不是采购类型也不是制造类型物料不能打印标签！')
+        }
       } else {
         isCreateLabel.value = false
-        message.warning('不是采购类型也不是制造类型物料不能打印标签！')
       }
-    } else {
+    }).catch(err => {
       isCreateLabel.value = false
+      console.log(err)
+    })
+    // 判断是采购还是制造
+    if (isCreateLabel.value) {
+      labelPrint(row)
+    } else {
+      message.warning('请先创建标签')
     }
-  }).catch(err => {
-    isCreateLabel.value = false
-    console.log(err)
-  })
-  // 判断是采购还是制造
-  if (isCreateLabel.value) {
-    labelPrint(row)
-  } else {
-    message.warning('请先创建标签')
+  } finally {
+    tableObject.loading = false
   }
 }
 

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

@@ -559,6 +559,8 @@ const buttonTableClick = async (val, row) => {
     // 创建标签
 
     // 判断 是否已创建标签
+    tableObject.loading = true
+    try {
     let isCreateLabel = false
     await PackageApi.getPackagePage({
       requestNumber: row.number
@@ -569,6 +571,7 @@ const buttonTableClick = async (val, row) => {
     })
     if (isCreateLabel) {
       message.warning('已创建过标签！！！')
+      tableObject.loading = false
       return
     }
     detatableData.params = {
@@ -578,6 +581,7 @@ const buttonTableClick = async (val, row) => {
     // 打开创建标签页面
     // dialogVisible.value = true
     formLabelRef.value.open('create', row)
+    tableObject.loading = false
     detatableData.tableList.map((item) => {
       // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线
       ItembasicApi.getItembasicPage({
@@ -638,6 +642,9 @@ const buttonTableClick = async (val, row) => {
           row['disabled_batch'] = true
         }
     })
+    }finally {
+      tableObject.loading = false
+    }
   } else if (val == 'mainHandle') {
     // 处理
     // 判断 是否已创建标签
@@ -859,25 +866,20 @@ const submitFormLabel = async (formType, submitData) => {
   if (data.masterId) {
     data.id = data.masterId
   }
-  try {
-    console.log('aaaaa', data)
-    data.subList = detatableData.tableList
-    console.log('bbbbb', data)
-    // 创建标签 要物料库区配置表中 入库包装规格
-    await ProductreceiptRequestMainApi.productCreateLabel(data)
-      .then((res) => {
-        isCreateLabel.value = true
-        message.success('创建标签成功')
-      })
-      .catch((err) => {
-        isCreateLabel.value = false
-        console.log(err)
-        message.error('创建标签失败')
-      })
-  } finally {
+  formLabelRef.value.formLoading = true
+  data.subList = detatableData.tableList
+  // 创建标签 要物料库区配置表中 入库包装规格
+  await ProductreceiptRequestMainApi.productCreateLabel(data).then((res) => {
+    isCreateLabel.value = true
+    message.success('创建标签成功')
     formLabelRef.value.formLoading = false
     formLabelRef.value.dialogVisible = false
-  }
+  }).catch((err) => {
+    isCreateLabel.value = false
+    console.log(err)
+    message.error('创建标签失败')
+    formLabelRef.value.formLoading = false
+  })
 }
 
 // 查看 Bom 按钮回调事件
@@ -957,7 +959,7 @@ const labelPrint = async (row) => {
 
   // 获得表格的各种操作
   const { getList: getListPrint } = tableMethods
-  getListPrint()
+  await getListPrint()
   tableObject.loading = false
   const tableColumns = SupplierdeliverRequestPackage2.allSchemas.tableFormColumns
   tableColumns.forEach((item) => {