Merge remote-tracking branch 'origin/master'

src/views/inventoryControl/putInstorage/addOrUpdate.vue

@@ -421,7 +421,9 @@ function startIdSort() {
     const isBEmpty = b.startId === "" || b.startId === undefined || b.startId === null;
     if (isAEmpty && !isBEmpty) return 1;  // a是空，b不是，a排在后面
     if (!isAEmpty && isBEmpty) return -1; // a不是空，b是空，a排在前面
-    return a.startId - b.startId;         // 正常比较startId
+    if (isAEmpty && isBEmpty) return 0;
+    // 使用字符串比较避免精度问题
+    return a.startId.localeCompare(b.startId);
   });
 }
 
@@ -644,11 +646,11 @@ function exportHandle(list: IObject[]) {
 // 备货保存
 function saveHandle() {
   btnLoding.value = true;
-  if (typeOption.value === "add") {
-    if (addForm.value.storeCode !== undefined && addForm.value.storeCode !== null && addForm.value.storeCode.length !== 0) {
-      addForm.value.storeCode = addForm.value.storeCode[addForm.value.storeCode.length - 1]
-    }
-  }
+  // if (typeOption.value === "add") {
+  //   if (addForm.value.storeCode !== undefined && addForm.value.storeCode !== null && addForm.value.storeCode.length !== 0) {
+  //     addForm.value.storeCode = addForm.value.storeCode[addForm.value.storeCode.length - 1]
+  //   }
+  // }
   dataFormRef.value.validate((valid) => {
     if (!valid) {
       btnLoding.value = false;
@@ -676,7 +678,9 @@ function saveHandle() {
     params2.inventoryType = params.inventoryType;
     params2.ownType = params.ownType;
     params2.storeCode = params.storeCode;
-    params2.agencyId = interfaceLowerListArr.value.find(item => item.code === params.storeCode).agencyId;
+    var find = interfaceLowerListArr.value.find(item => item.code === params.storeCode);
+    console.log("find",find)
+    params2.agencyId = find.agencyId;
     params2.version = params.version;
     params2.cardType = params.cardType;
     params2.obuType = params.obuType;
@@ -700,7 +704,9 @@ function saveHandle() {
         btnLoding.value = false;
         ElMessage.error(res.message);
       }
-    })
+    }).catch(() => {
+      btnLoding.value = false;
+    });
   })
 
 }
@@ -739,7 +745,9 @@ function sureHandle() {
         btnLoding.value = false;
         ElMessage.error(res.message);
       }
-    })
+    }).catch(() => {
+      btnLoding.value = false;
+    });
   }
 }
 
@@ -786,6 +794,7 @@ function arraySpanMethod({row, column, rowIndex, columnIndex}) {
 // 合计行计算
 function getSummaries(param) {
   //table自定义合计行方法summary-method
+  // console.log("====>",param)
   const {columns, data} = param;
   const sums: any = [];
   columns.forEach((column, index) => {
@@ -801,24 +810,28 @@ function getSummaries(param) {
       sums[1] = sums[1]
     }
   })
-  // let str = "";
-  // if (sums[1]) {
-  //     str = `共${data.length}号段,${sums[1]}个设备`;
-  //     if (summary.value) {
-  //         console.log(data, '-----');
-  //         const successTotal = data.map((item) => Number(item.successTotal));
-  //         console.log(successTotal.value);
-  //         console.log(4535);
-  //         let totalNum = sums[1] = successTotal.reduce((prev, curr) => {
-  //             return prev + curr
-  //         }, 0)
-  //         str = str + '已校验可入库数量' + totalNum
-  //     }
-  // }
-  sums[1] = `共${data.length}号段,${sums[1]}个设备`;
+  let str = "";
+  if (sums[1]) {
+    str = `共${data.length}号段,${sums[1]}个设备`;
+    if (summary.value) {
+      // console.log(data, '-----');
+      // 计算 successTotal 总和（自动过滤无效值）
+      const totalNum = data.reduce((sum, item) => {
+        const num = Number(item.successTotal);
+        return sum + (isNaN(num) ? 0 : num);
+      }, 0);
+
+      // 更新 sums 和字符串（避免直接修改外部变量）
+      sums[1] = totalNum;
+      addForm.value.applyCount = totalNum
+      str = str + ',已校验可入库数量' + totalNum
+    }
+  }
+  sums[1] = str;
   return sums
 }
 
+
 // 获取仓库状态
 function getLowerList() {
   let params = {

src/views/inventoryControl/putInstorage/index.vue

@@ -526,6 +526,7 @@ function sureMoreHandle() {
   BaseService.postN('/invw/api/enterApply/batchConfirm', {ids: ids}).then(
       (res: any) => {
         if (res && res.code === 0) {
+          btnLoading.value = false;
           ElMessage.success(res.message)
         } else {
           ElMessage.error(res.message)