doctor-admin-components 1.0.14-beta.6 → 1.0.14-beta.61

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.6",
+  "version": "1.0.14-beta.61",
   "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,12 @@ import {
   CompanyBanks,
   VDistpicker,
   ContractFileDragUpload,
-  FileShow
+  FileShow,
+  ShipmentPurchaseAmount,
+  ContractClause,
+  ContractInfo
+
+
 } from "./src";
 // 组件列表
 const components = [
@@ -69,7 +73,10 @@ const components = [
   CompanyBanks,
   VDistpicker,
   ContractFileDragUpload,
-  FileShow
+  FileShow,
+  ShipmentPurchaseAmount,
+  ContractClause,
+  ContractInfo
 ];
 
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，那么所有的组件都会被注册
@@ -142,5 +149,8 @@ export default {
   CompanyBanks,
   VDistpicker,
   ContractFileDragUpload,
-  FileShow
+  FileShow,
+  ShipmentPurchaseAmount,
+  ContractClause,
+  ContractInfo
 };

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

@@ -20,11 +20,28 @@ export function queryPurchaseContracts(saleContractId) {
 // 查询合同的提单指令列表
 export function getContractBlList(contractId) {
   return request({
-    url: "/biz/contract/blList/" + contractId,
+    url: "/biz/contract/bli/list/" + contractId,
     method: "get",
   });
 }
 
+// 查询合同的提单详情
+export function getContractBliDetail(contractId) {
+  return request({
+    url: "/biz/contract/bli/" + contractId,
+    method: "get",
+  });
+}
+
+// 修改合同bli
+export function updateContractBli(data) {
+  return request({
+    url: "/biz/contract/bli/addOrEdit",
+    method: "put",
+    data: data,
+  });
+}
+
 // 合同追踪列表
 export function listContractTrace(query) {
   return request({
@@ -100,7 +117,7 @@ export function getBizContractFileInfo(id) {
   //                     "linkType": "dealRecord",
   //                     "fileName": "0414cc54-e649-4bda-8e69-2758a9052178.CNT__",
   //                     "fileType": "personal_deal_bill",
-  //                     "url": "https://s3.cdn.doctorscrap.com/develop/2024/03/11/fe9193a409f746379a437552f6c515fd.CNT__",
+  //                     "url": "https://s3.doctorscrap.com/develop/2024/03/11/fe9193a409f746379a437552f6c515fd.CNT__",
   //                     "coverUrl": null,
   //                     "createTime": "2024-03-11 03:25:25",
   //                     "ext": ".CNT__",
@@ -121,7 +138,7 @@ export function getBizContractFileInfo(id) {
   //                     "linkType": "contract",
   //                     "fileName": "20240307-095507.jpeg",
   //                     "fileType": "contract_sign",
-  //                     "url": "https://s3.cdn.doctorscrap.com/develop/2024/03/12/eea2a0771a7147e0a7004f44c7a13797.jpeg",
+  //                     "url": "https://s3.doctorscrap.com/develop/2024/03/12/eea2a0771a7147e0a7004f44c7a13797.jpeg",
   //                     "coverUrl": null,
   //                     "createTime": "2024-03-12 10:09:00",
   //                     "ext": ".jpeg",
@@ -248,7 +265,7 @@ export function getBizContractFileInfo(id) {
   //                     "linkType": "invoice",
   //                     "fileName": "02b0ef972253423c990e4d674a5e52f3 (1).jpeg",
   //                     "fileType": "personal_proforma_invoice",
-  //                     "url": "https://s3.cdn.doctorscrap.com/develop/2024/03/12/ee52b404a79842e7823e71f5ec7bd6a4.jpeg",
+  //                     "url": "https://s3.doctorscrap.com/develop/2024/03/12/ee52b404a79842e7823e71f5ec7bd6a4.jpeg",
   //                     "coverUrl": null,
   //                     "createTime": "2024-03-12 09:48:04",
   //                     "ext": ".jpeg",
@@ -287,7 +304,7 @@ export function getBizContractFileInfo(id) {
   //                             "linkType": "shipment",
   //                             "fileName": "port-data.png",
   //                             "fileType": "sale_personal_shipment_packing_list",
-  //                             "url": "https://s3.cdn.doctorscrap.com/develop/2024/03/11/5b94778c1bdc447daf21056a1c2786f4.png",
+  //                             "url": "https://s3.doctorscrap.com/develop/2024/03/11/5b94778c1bdc447daf21056a1c2786f4.png",
   //                             "coverUrl": null,
   //                             "createTime": "2024-03-11 06:23:36",
   //                             "ext": ".png",
@@ -311,7 +328,7 @@ export function getBizContractFileInfo(id) {
   //                                     "linkType": "container",
   //                                     "fileName": "port-data.png",
   //                                     "fileType": "container_packing_photo",
-  //                                     "url": "https://s3.cdn.doctorscrap.com/develop/2024/03/11/6c6b0f69b2ef473680df021ce1a177a5.png",
+  //                                     "url": "https://s3.doctorscrap.com/develop/2024/03/11/6c6b0f69b2ef473680df021ce1a177a5.png",
   //                                     "coverUrl": null,
   //                                     "createTime": "2024-03-11 06:48:58",
   //                                     "ext": ".png",
@@ -328,7 +345,7 @@ export function getBizContractFileInfo(id) {
   //                                     "linkType": "container",
   //                                     "fileName": "20240103-102832.jpeg",
   //                                     "fileType": "container_packing_photo",
-  //                                     "url": "https://s3.cdn.doctorscrap.com/develop/2024/03/11/64327bfa54074b61899359cc21fbb4ac.jpeg",
+  //                                     "url": "https://s3.doctorscrap.com/develop/2024/03/11/64327bfa54074b61899359cc21fbb4ac.jpeg",
   //                                     "coverUrl": null,
   //                                     "createTime": "2024-03-11 06:52:27",
   //                                     "ext": ".jpeg",
@@ -446,7 +463,7 @@ export function getBizContractFileInfo(id) {
   //                             "linkType": "shipment",
   //                             "fileName": "port-data.png",
   //                             "fileType": "sale_shipment_other",
-  //                             "url": "https://s3.cdn.doctorscrap.com/develop/2024/03/11/c80277e21f5848d89f47bbf30af202d8.png",
+  //                             "url": "https://s3.doctorscrap.com/develop/2024/03/11/c80277e21f5848d89f47bbf30af202d8.png",
   //                             "coverUrl": null,
   //                             "createTime": "2024-03-11 08:07:01",
   //                             "ext": ".png",
@@ -723,7 +740,7 @@ export function getBizContractFileInfo(id) {
                     "linkType": "contract",
                     "fileName": "索赔申请书文案未更新.png",
                     "fileType": "contract_sign",
-                    "url": "https://s3.cdn.doctorscrap.com/develop/2024/03/14/7f0f6dd70e3c40c183a5b2a3a5db5dcc.png",
+                    "url": "https://s3.doctorscrap.com/develop/2024/03/14/7f0f6dd70e3c40c183a5b2a3a5db5dcc.png",
                     "coverUrl": null,
                     "createTime": "2024-03-14 10:07:49",
                     "ext": ".png",
@@ -1130,3 +1147,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: 2025-05-13 17:25:39
  * @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,9 @@ 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'
+import ContractClause from '../src/views/biz/contractTracing/contractClause.vue'
+import ContractInfo from '../src/views/biz/contractTracing/info.vue'
 
 // 为组件提供 install 安装方法，供按需引入
 
@@ -65,6 +68,16 @@ FileShow.install = function (Vue) {
   Vue.component(FileShow.name, FileShow);
 };
 
+ShipmentPurchaseAmount.install = function (Vue) {
+  Vue.component(ShipmentPurchaseAmount.name, ShipmentPurchaseAmount);
+};
+ContractClause.install = function (Vue) {
+  Vue.component(ContractClause.name, ContractClause);
+};
+ContractInfo.install = function (Vue) {
+  Vue.component(ContractInfo.name, ContractInfo);
+};
+
 // 导出组件
 export {
   EditBill,
@@ -76,5 +89,8 @@ export {
   CompanyBanks,
   VDistpicker,
   ContractFileDragUpload,
-  FileShow
+  FileShow,
+  ShipmentPurchaseAmount,
+  ContractClause,
+  ContractInfo
 };

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