Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

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

@@ -319,15 +319,17 @@ 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(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 {
         labelType.value = 'cg'
         }
-    PackageApi.batchPrintingLable((res.number)).then((resLable) =>{
+      await PackageApi.batchPrintingLable((res.number)).then((resLable) =>{
         console.log(159,resLable )
         // 判断是采购还是制造
         if (labelType.value == 'cg') {
@@ -342,6 +344,9 @@ const handlePoint = async (row) => {
     }).catch(err => {
       console.log(err)
     })
+  } finally {
+    tableObject.loading = false
+  }
 }
 
 // form表单提交

src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue

@@ -143,9 +143,9 @@ const onChange = (field, cur, formRef)=>{
 }
 const inputNumberChange = (field, index, row, val) => {
   console.log('inputNumberChange',field, index, row, val)
+  console.log(row['beforeTaxAmount'])
+  console.log(row['taxAmount'])
   
-  // 含税金额 = 未税价格+税额,四舍五入保留2位小数
-  row['afterTaxAmount'] = row['beforeTaxAmount'] + row['taxAmount']
 
   // 模具分摊单价 默认从模具分摊对账单带出，未税金额修改后重新计算，等于未税金额/数量-销售单价
   row['allocationPrice'] = row['beforeTaxAmount']/row['qty'] - row['price']
@@ -156,6 +156,9 @@ const inputNumberChange = (field, index, row, val) => {
   // 税额：taxAmount  未税价格*税率/100,四舍五入保留2位小数
   row['taxAmount'] = (row['beforeTaxAmount'] * formRef.value.formRef.formModel['taxRate'])/100 //含税金额
   
+  // 含税金额 = 未税价格+税额,四舍五入保留2位小数
+  row['afterTaxAmount'] = row['beforeTaxAmount'] + row['taxAmount']
+
   
 }
 const flag = ref(false)

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,
@@ -456,6 +457,9 @@ const getLabelDetailPage = async (row, useToPackingNumber) => {
     console.log(1111)
  
     labelPointFormRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
+   } finally {
+    tableObject.loading = false
+  }
 }
 
 // 批量打印--预生产收货

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

@@ -551,6 +551,8 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'cjbq') {
     // 创建标签
     // 判断 是否已创建标签
+    tableObject.loading = true
+    try {
        let isCreateLabel = false
       await PackageApi.getPackagePage({
         requestNumber: row.number
@@ -561,6 +563,7 @@ const buttonTableClick = async (val, row) => {
       })
       if (isCreateLabel) {
         message.warning('已创建过标签！！！')
+      tableObject.loading = false
         return
       }
       console.log('列表-操作按钮事件-创建标签')
@@ -575,8 +578,8 @@ const buttonTableClick = async (val, row) => {
       }
       // 打开创建标签页面
       // dialogVisible.value = true
+     tableObject.loading = false
       formLabelRef.value.open('create', row)
-    
       console.log(detailListTableColumns.tableFormColumns)
       detatableData.tableList.map((item) => {
         if (item.itemType == '可采购') {
@@ -627,7 +630,11 @@ const buttonTableClick = async (val, row) => {
             }
           })
       })
+    }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,40 +1043,33 @@ const BASE_URL = getJmreportBaseUrl()
 const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
 const labelPrint = async (row) => {
   // 查询是否已创建过标签
+  tableObject.loading = true
+  try {
     await PackageApi.getPackagePage({
       requestNumber: row.number
-  })
-    .then((res) => {
+    }).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) => {
+      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
-        )
+            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) => {
+          await PackageApi.batchPrintingLableForYT(row.number).then((res) => {
               console.log(res)
               const src = ref(
                 BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()
@@ -1082,8 +1086,9 @@ const labelPrint = async (row) => {
   } 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 = []//存储可制造数据
@@ -747,6 +752,9 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
   //   console.log(err)
   //   message.error('创建标签失败')
     // })
+  } finally {
+    tableObject.loading = false
+  }
 }
 
 // 获取部门 用于详情 部门回显
@@ -901,6 +909,8 @@ const BASE_URL = getJmreportBaseUrl()
 // 标签打印
 const handlePoint = async (row) => {
   // 查询是否已创建过标签
+  tableObject.loading = true
+  try {
     await PackageApi.getPackagePage({
       requestNumber: row.number
     }).then((res) => {
@@ -927,6 +937,9 @@ const handlePoint = async (row) => {
     } else {
       message.warning('请先创建标签')
     }
+  } finally {
+    tableObject.loading = false
+  }
 }
 
 const searchTableRef = ref()

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)
+  formLabelRef.value.formLoading = true
   data.subList = detatableData.tableList
-    console.log('bbbbb', data)
   // 创建标签 要物料库区配置表中 入库包装规格
-    await ProductreceiptRequestMainApi.productCreateLabel(data)
-      .then((res) => {
+  await ProductreceiptRequestMainApi.productCreateLabel(data).then((res) => {
     isCreateLabel.value = true
     message.success('创建标签成功')
-      })
-      .catch((err) => {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+  }).catch((err) => {
     isCreateLabel.value = false
     console.log(err)
     message.error('创建标签失败')
-      })
-  } finally {
     formLabelRef.value.formLoading = false
-    formLabelRef.value.dialogVisible = 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) => {