doctor-admin-components 1.0.14-beta.10 → 1.0.14-beta.12

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "doctor-admin-components",
   "version1": "1.0.11",
-  "version": "1.0.14-beta.10",
+  "version": "1.0.14-beta.12",
   "private": false,
   "main1": "lib/index.umd.min.js",
   "main": "packages/index.js",

package/packages/src/utils/zip.js

@@ -32,18 +32,35 @@ export function batchAsZip(fileList, zipName) {
     background: "rgba(0, 0, 0, 0.7)",
   });
   const zip = new JSZip();
-  const promises = [];
-  const cache = {};
+  // const promises = [];
+  // const cache = {};
   console.log(fileList);
-  fileList.forEach((item) => {
-    const promise = getFile(item.url).then((data) => {
-      // 下载文件, 并存成ArrayBuffer对象
-      // const file_name = item.realName // 获取文件名
-      zip.file(item.fileName, data, { binary: true });
-      cache[item.fileName] = data;
-    });
-    promises.push(promise);
-  });
+  const usedFileNames = {} // 用于跟踪已使用的文件名
+  // fileList.forEach((item) => {
+  //   const promise = getFile(item.url).then((data) => {
+  //     // 下载文件, 并存成ArrayBuffer对象
+  //     // const file_name = item.realName // 获取文件名
+  //     zip.file(item.fileName, data, { binary: true });
+  //     cache[item.fileName] = data;
+  //   });
+  //   promises.push(promise);
+  // });
+  const promises = fileList.map((item) => {
+    return getFile(item.url).then((data) => {
+      let fileName = item.fileName
+      let count = 1
+
+      // 如果文件名已存在，则添加递增的数字后缀
+      while (usedFileNames[fileName]) {
+        fileName = `${count}_${item.fileName}`
+        count++
+      }
+
+      usedFileNames[fileName] = true
+
+      zip.file(fileName, data, { binary: true })
+    })
+  })
   Promise.all(promises)
     .then(() => {
       zip.generateAsync({ type: "blob" }).then((f) => {
@@ -57,6 +74,7 @@ export function batchAsZip(fileList, zipName) {
     })
     .catch((res) => {
       Message.error("下载文件出现错误，请联系管理员！");
+      console.log(res)
       downloadLoadingInstance.close();
     });
 }

package/packages/src/views/biz/bizFileInfo/contract.vue

@@ -56,12 +56,13 @@
                       "
                     />
                 </div>
-                <div class="file-list">
+                <div class="file-list" style="width: 100%;min-height: 1px;">
                   <file-show 
                   :hiddenOperation="channel == 'official-website'"
                   @refresh="handleRefresh" @checked="handleChecked" @uncheck="handleUncheck"  :selectFileListProp="selectFileList" :file-info="item"
                     v-for="(item, i) in fileInfo.personalBillFileInfo" :key="i" />
                   <contract-file-drag-upload 
+                  v-if="contract.contractType == 'sale'"
                   v-show="(!fileInfo.personalBillFileInfo || fileInfo.personalBillFileInfo.length == 0) && channel !== 'official-website'"
                   @upload="
                     handleUpload(
@@ -390,7 +391,7 @@
       <div v-else>
         <SectionSlot @updateOpen="handleShippingUpdateOpen" :infoPro="shipProgressInfo" v-for="(
                   shipmentFileInfo, shipmentIndex
-                ) in contractFileInfo.shipmentFileInfoList" :key="shipmentIndex" v-if="shipmentIndex == shipBillNo">
+                ) in contractFileInfo.shipmentFileInfoList" :key="'shipment'+shipmentIndex" v-if="shipmentIndex == shipBillNo">
           <template v-slot:header>
             <div style="position:relative">
               <ProgressDetail :infoPro="shipProgressInfo"></ProgressDetail>
@@ -515,7 +516,7 @@
                       bgTime: contract.contractType == 'purchase' ? shipmentFileInfo.purchasePersonalPackingList && timeFormate(shipmentFileInfo.purchasePersonalPackingList) : shipmentFileInfo.packingList && timeFormate(shipmentFileInfo.packingList),
                       bgcolor: shipProgressInfo.bgcolor
                   }"></ContentTitle>
-                  <span class="bg-history" @click="handleHistory('purchase_personal_shipment_packing_list', shipmentFileInfo.shipmentId)">{{ $t('contractDetail.view_history') }}</span>
+                  <span class="bg-history" @click="handleHistory(contract.contractType == 'purchase' ? 'purchase_personal_shipment_packing_list' : 'shipment_packing_list', shipmentFileInfo.shipmentId)">{{ $t('contractDetail.view_history') }}</span>
                   <div class="sub-title" style="margin-bottom: 0;" v-if="contract.contractType == 'purchase'">
                     <span style="color: #1890ff; cursor: pointer" v-if="shipmentFileInfo &&
                       shipmentFileInfo.purchasePersonalPackingList &&
@@ -1120,7 +1121,7 @@
       ref="SectionReceiving"
         :infoPro="getGoodsProgressInfo" v-for="(
                 shipmentFileInfo, shipmentIndex
-              ) in contractFileInfo.shipmentFileInfoList" :key="shipmentIndex" v-if="shipmentIndex == shipBillNo"
+              ) in contractFileInfo.shipmentFileInfoList" :key="'receiving'+shipmentIndex" v-if="shipmentIndex == shipBillNo"
       >
         <template v-slot:header>
           <div>
@@ -1177,7 +1178,7 @@
       :infoPro="claimProgressInfo" 
           v-for="(
             shipmentFileInfo, shipmentIndex
-          ) in contractFileInfo.shipmentFileInfoList" :key="shipmentIndex" 
+          ) in contractFileInfo.shipmentFileInfoList" :key="'claim'+shipmentIndex" 
           v-if="shipmentIndex == shipBillNo"
       >
         <template v-slot:header>
@@ -1590,6 +1591,7 @@ export default {
           const ids = this.selectFileList.map((item) => item.fileId)
           delBizFileInfo(ids).then(() => {
             this.$message.success('删除成功')
+            this.selectFileList = []
             this.handleRefresh()
           })
         })
@@ -1626,8 +1628,10 @@ export default {
       return this.$refs['container_packing_photo_' + containerId][0].clickSelectAll()
     },
 
-    hasSelectAllContainer(containerId) {
-      return this.$refs['container_packing_photo_' + containerId] && this.$refs['container_packing_photo_' + containerId][0].hasSelectAll()
+    hasSelectAllContainer(containerId) { 
+      setTimeout(() => {
+        return this.$refs['container_packing_photo_' + containerId] && this.$refs['container_packing_photo_' + containerId][0]?.hasSelectAll()
+      }, 1000);
     },
 
     changeShipBillNo(index) {