doctor-admin-components 1.0.14-beta.4 → 1.0.14-beta.40

package/README.md

@@ -2,7 +2,7 @@
  * @Author: zhangpengwei 15038779532@163.com
  * @Date: 2023-07-24 15:11:26
  * @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
- * @LastEditTime: 2024-07-25 18:01:56
+ * @LastEditTime: 2024-07-29 18:10:31
  * @FilePath: /doctor-admin-components/README.md
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE1
 -->
@@ -85,3 +85,6 @@ VDistpicker
 ```
 
 https://npmmirror.com/package/doctor-admin-components/versions?
+
+
+npm config set proxy http://127.0.0.1:7890

package/package.json

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

package/packages/index.js

@@ -21,7 +21,6 @@ import plugins from "./src/plugins";
 // import VueI18n from 'vue-i18n'
 // Vue.use(plugins)
 // Vue.use(VueI18n)
-
 import {
   parseTime,
   resetForm,
@@ -55,7 +54,9 @@ import {
   CompanyBanks,
   VDistpicker,
   ContractFileDragUpload,
-  FileShow
+  FileShow,
+  ShipmentPurchaseAmount
+
 } from "./src";
 // 组件列表
 const components = [
@@ -69,7 +70,8 @@ const components = [
   CompanyBanks,
   VDistpicker,
   ContractFileDragUpload,
-  FileShow
+  FileShow,
+  ShipmentPurchaseAmount
 ];
 
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，那么所有的组件都会被注册
@@ -142,5 +144,6 @@ export default {
   CompanyBanks,
   VDistpicker,
   ContractFileDragUpload,
-  FileShow
+  FileShow,
+  ShipmentPurchaseAmount
 };

package/packages/src/api/biz/bizContract.js

@@ -1130,3 +1130,13 @@ export function editReferenceNo(data) {
     data: data,
   });
 }
+
+
+// 获取第二通知人
+export function getSecondNotifyInfo(query) {
+  return request({
+    url: "/biz/contract/getSecondNotifyInfo",
+    method: "get",
+    params: query,
+  });
+}

package/packages/src/api/biz/bizShipment.js

@@ -155,4 +155,33 @@ export function getDraft(contractId) {
       contractId
     }
   })
-}
+}
+
+
+
+// 保存草稿
+export function containerEditBatch(data) {
+  return request({
+    url: '/biz/container/editBatch',
+    method: 'put',
+    data
+  })
+}
+
+
+// 保存草稿
+export function deductionRecords(data) {
+  return request({
+    url: `biz/shipment/deposit/deduction/record/${data.shipmentId}`,
+    method: 'get',
+    data:{}
+  })
+}
+// 更新 eta更新时间
+export function refreshUpdateTime(data) {
+  return request({
+    url: '/biz/shipment/refreshUpdateTime',
+    method: 'put',
+    data: data
+  })
+}

package/packages/src/i18n/zh-CN/message.json

@@ -131,7 +131,7 @@
     "BL_No": "提单号：",
     "BL_Not_Confirm": "BLI未确认",
     "BL_Confirmed": "BLI已确认",
-    "BL_info_confirmed": "提单信息已确认",
+    "BL_info_confirmed": "草稿提单已确认",
     "bl_draft_confirm": "确认提单草稿",
     "editBLInformation": "编辑提单信息",
     "Credit_Note": "Credit note",

package/packages/src/index.js

@@ -2,7 +2,7 @@
  * @Author: error: git config user.name && git config user.email & please set dead value or install git
  * @Date: 2022-07-25 11:24:53
  * @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
- * @LastEditTime: 2024-07-24 12:09:33
+ * @LastEditTime: 2024-08-23 16:19:29
  * @FilePath: /zpw-com-test/src/lib-components/index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -23,6 +23,7 @@ import CompanyBanks from "./views/biz/contractTracing/companyBanks.vue";
 import VDistpicker from "./views/components/RegionPicker/Distpicker.vue";
 import ContractFileDragUpload from '../src/components/FileUpload/contract-drag-new.vue';
 import FileShow from  '../src/views/biz/bizFileInfo/fileShow.vue'
+import ShipmentPurchaseAmount from '../src/views/biz/contractTracing/shipmentPurchaseAmount.vue'
 
 // 为组件提供 install 安装方法，供按需引入
 
@@ -65,6 +66,11 @@ FileShow.install = function (Vue) {
   Vue.component(FileShow.name, FileShow);
 };
 
+ShipmentPurchaseAmount.install = function (Vue) {
+  Vue.component(ShipmentPurchaseAmount.name, ShipmentPurchaseAmount);
+};
+
+
 // 导出组件
 export {
   EditBill,
@@ -76,5 +82,6 @@ export {
   CompanyBanks,
   VDistpicker,
   ContractFileDragUpload,
-  FileShow
+  FileShow,
+  ShipmentPurchaseAmount
 };

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();
     });
 }