doctor-admin-components 1.0.13-pro.1 → 1.0.14-beta.10

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

@@ -1,3 +1,11 @@
+/*
+ * @Author: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
+ * @Date: 2022-10-08 10:03:50
+ * @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
+ * @LastEditTime: 2024-04-12 14:41:50
+ * @FilePath: /doctor-admin-components 公共组件/packages/src/api/biz/bizFileInfo.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 import request from '../../utils/request'
 
 // 查询文件信息列表
@@ -50,4 +58,12 @@ export function exportBizFileInfo(query) {
     method: 'get',
     params: query
   })
+}
+
+// 草稿提单撤回
+export function shipmentWithDrawDraftBill({shipmentId}) {
+  return request({
+    url: `/biz/shipment/withdrawDraftBl/${shipmentId}`,
+    method: "get"
+  });
 }

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

@@ -156,7 +156,7 @@ export function uploadByShipmentId(data) {
   });
 }
 
-// 上传发票
+// 上传尾款发票
 export function uploadFinallyInvoice(data) {
   return request({
     url: "/biz/invoice/uploadFinallyInvoice",

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

@@ -60,6 +60,15 @@ export function addWithContainer(data) {
   })
 }
 
+// 装运校验： 传提单号和订舱号
+export function addContainerCheck(data) {
+  return request({
+    url: '/biz/shipment/checkShipment',
+    method: 'post',
+    data: data
+  })
+}
+
 // 修改装运
 export function updateBizShipment(data) {
   return request({
@@ -118,3 +127,32 @@ export function getByContractId(contractId) {
     method: 'get'
   })
 }
+
+// 查询作废的装运销售合同列表
+export function haveVoidShipment(contractId) {
+  return request({
+    url: '/biz/contract/haveVoidShipment/' + contractId,
+    method: 'get',
+    params: {}
+  })
+}
+
+// 保存草稿
+export function saveDraft(data) {
+  return request({
+    url: '/biz/shipment/saveDraft',
+    method: 'post',
+    data
+  })
+}
+
+// 保存草稿
+export function getDraft(contractId) {
+  return request({
+    url: '/biz/shipment/getDraft',
+    method: 'get',
+    params: {
+      contractId
+    }
+  })
+}

package/packages/src/components/DictTag/index.vue

@@ -35,6 +35,11 @@ export default {
       default: null,
     },
     value: [Number, String, Array],
+    // 自定义拼接字符
+    appendCallback: {
+      type: Function,
+      default: null
+    }
   },
   computed: {
     values() {
@@ -51,8 +56,13 @@ export default {
   },
   methods: {
     getName(item) {
-      return this.isChina ? item?.label : item?.raw?.dictLabelEn;
-    },
+      var str = this.isChina ? item?.label : item?.raw?.dictLabelEn
+      var append = this.appendCallback ? this.appendCallback() : null
+      if (append) {
+        str += append
+      }
+      return str
+    }
   },
 };
 </script>

package/packages/src/components/FileUpload/contract-drag-new.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="upload-file">
+  <div class="upload-file" :style="photos && 'width:115px'">
     <el-upload
       action
       :before-upload="handleBeforeUpload"
@@ -8,13 +8,23 @@
       :on-exceed="handleExceed"
       :show-file-list="false"
       drag
-      class="upload-file-uploader"
+      :class="['upload-file-uploader', photos ? 'photos-uploader' : '']"
       ref="upload"
       multiple
     >
       <!-- 上传按钮 -->
-      <i class="el-icon-upload"></i>
-      <!-- <div class="el-upload__text">将文件拖到此处</div> -->
+
+      <div v-if="photos" class="photos">
+        <i class="el-icon-upload"></i>
+        <span>{{ $t('contractDetail.upload') }}<span style="margin-top:10px">{{ photosStr1 }}</span></span>
+      </div>
+      <div v-else>
+        <div class="el-upload__text">{{ $t('contractDetail.tip15') }}</div>
+        <div class="upload-button">
+          <i class="el-icon-upload"></i>
+          <span>{{ $t('contractDetail.upload') }}<span class="name-size">{{ uploadNameStr }}</span></span>
+        </div>
+      </div>
       <!-- 上传提示 -->
       <div class="el-upload__tip" slot="tip" v-if="showTip">
         请上传
@@ -37,7 +47,7 @@ import { v2Upload } from '../../api/biz/file';
 import { Loading } from 'element-ui';
 // import { v2Upload } from "@/api/biz/file";
 export default {
-  name: 'ApkUpload',
+  name: 'ContractFileDragUpload',
   props: {
     // 值
     value: [String, Object, Array],
@@ -79,6 +89,18 @@ export default {
       type: Boolean,
       default: false,
     },
+    uploadNameStr: {
+      type: String,
+      default: '文件',
+    },
+    photos: {
+      type: Boolean,
+      default: false,
+    },
+    photosStr: {
+      type: String,
+      default: '',
+    },
   },
   data() {
     return {
@@ -92,6 +114,7 @@ export default {
       uploadStatus: null, // 进度条上传状态
       percentage: 0, // 进度条百分比
       uploadName: '', //Object所在Bucket的完整路径
+      photosStr1: '',
     };
   },
   created() {
@@ -120,6 +143,13 @@ export default {
       deep: true,
       immediate: true,
     },
+    photosStr: {
+      handler(val) {
+        this.photosStr1 = val || this.$t('contractDetail.packingPhoto');
+      },
+      deep: true,
+      immediate: true,
+    },
   },
   computed: {
     // 是否显示提示
@@ -143,7 +173,7 @@ export default {
       }
       this.loading = Loading.service({
         lock: true,
-        text: '上传中',
+        text: this.$t('contractDetail.uploadIng'),
         background: 'rgba(0, 0, 0, 0.7)',
       });
       //走阿里云前端直接上传
@@ -166,7 +196,7 @@ export default {
     //普通上传
     async putObject() {
       if (!this.file) {
-        this.$message.error('请选择文件');
+        this.$message.error(this.$t('contractDetail.please_select_file'));
         return;
       }
       try {
@@ -189,10 +219,34 @@ export default {
 
 <style scoped lang="scss">
 ::v-deep .el-upload-dragger {
-  width: 140px;
+  width: 300px;
   height: 80px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  border: 1px dashed #54B8FF;
+}
+.photos-uploader {
+  ::v-deep .el-upload-dragger {
+    width: 100px;
+    height: 100px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    border: 1px dashed #54B8FF;
+    .is-dragover {
+      background-color: #54B8FF;
+    }
+  }
 }
+::v-deep .is-dragover {
+  background-color: #54B8FF;
+}
+
 .upload-file {
+  margin-top: 10px; 
   width: 140px;
   display: flex;
 }
@@ -215,9 +269,44 @@ export default {
   margin-right: 10px;
 }
 .el-upload-dragger .el-icon-upload {
-  font-size: 67px;
-  color: #c0c4cc;
-  margin: 16px 0 16px;
+  font-size: 22px;
+  color: #fff;
+  margin:0;
   line-height: 50px;
 }
+.photos {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  font-size:10px;
+  .el-icon-upload  {
+    font-size: 36px;
+    color: #54B8FF;
+    line-height: 36px;
+  }
+}
+.upload__text {
+  font-size: 10px;
+}
+.name-size {
+  font-size: 16px;
+  color: #fff;
+  font-weight:600;
+}
+.upload-button {
+  min-width: 114px;
+  margin-top:10px;
+  width:max-content;
+  display:flex;
+  padding:5px 10px;
+  justify-content: space-between;
+  align-items: center;
+  height: 26px;
+  background: #54B8FF;
+  color: #fff;  
+  border-radius: 13px 13px 13px 13px;
+  text-align:center;
+  line-height: 26px;
+}
 </style>

package/packages/src/i18n/en/message.json

@@ -0,0 +1,305 @@
+{
+  "contract": {
+    "Claim_ID": "Claim ID",
+    "Claim_Type": "Claim type",
+    "Claim_records": "Claim records",
+    "Claim_status": "Claim status",
+    "Quality_Feedback": "Quality Feedback",
+    "Track_Shipment": "Track Shipment",
+    "View": "View",
+    "address": "Address",
+    "billCargoName": "Bill of Lading Cargo Name",
+    "billInfo": "Bill of Lading Information",
+    "billTip": "Please confirm the Bill of Lading information.",
+    "bliRemark": "BLI remarks (commonly used)",
+    "commitTime": "Commit time",
+    "company": "company",
+    "companyAddress": "Company Address",
+    "companyName": "Company Name",
+    "companyTip": "The system will automatically populate information based on your selected company.",
+    "consignee": "Consignee",
+    "consigneeAddress": "Consignee Address",
+    "consigneeCompanyTitle": "Manage the consignee company",
+    "consigneeInfo": "Consignee Information",
+    "consigneeTip": "Please select the recipient company",
+    "contact": "Contacts",
+    "contactInfo": "Contact information",
+    "contract": "contract Company",
+    "shipperInfo": "Shipper information",
+    "contractInfo": "Contract Information",
+    "create_time": "Create time",
+    "destination": "port of destination:",
+    "disputeTip": "If you have any objections to any content of the contract, you can fill in and submit it here. After submitting, our staff will contact you within 48 hours.",
+    "disputeTitle": "Contract dispute(optional)",
+    "email": "Email",
+    "hsCode": "Hs Code",
+    "landline": "lanline",
+    "next": "Next ",
+    "noDisputes": "No disputes",
+    "notifier": "Notify",
+    "notifierAddress": "Notify Address",
+    "notifierCompanyTitle": "Manage the notifier company",
+    "notifierInfo": "Notify Information",
+    "option": "Option",
+    "otherInfo": "Other information",
+    "phoneNumber": "Phone Number",
+    "picture": "picture",
+    "preferred": "Preferred ",
+    "product": "Product",
+    "remark": "Remarks",
+    "selectCompany": "select",
+    "shippingMarks": "Shipping Marks",
+    "stepOne": "Step 1",
+    "stepOneTip": "Confirm contract company and contract terms",
+    "stepTwo": "Step 2",
+    "stepTwoTip": "Confirm bill of lading instructions",
+    "successTip": "Submitted successfully",
+    "successTip2": "    Thank you for submitting your contract. Our logistics department will\n      process it as soon as possible and will reach out if there are any\n      questions or issues. Please monitor your email for any updates or required\n      actions. We appreciate your cooperation and look forward to working\n      together!",
+    "taxId": "Tax ID",
+    "telePhone": "TelePhone",
+    "terminal": "Terminal dock",
+    "tip1": "The buyer has not provided the required Bill of Lading information.\n",
+    "tip10": "Tax number cannot be empty",
+    "tip12": "Quantity not more than",
+    "tip13": "individual",
+    "tip2": "Once the buyer submits the Bill of Lading information, you will be able to view it at this location.",
+    "tip3": "Contract dispute cannot be empty",
+    "tip4": "Please upload",
+    "tip5": "File size is less than",
+    "tip6": "The file type is",
+    "tip7": "Company name cannot be empty",
+    "tip8": "The company address cannot be empty",
+    "tip9": "Email cannot be empty",
+    "withDispute": "With disputes",
+    "firstNotifier": "1st Notify Party",
+    "attachments": "attachment",
+    "tip14": "Click to upload",
+    "tip15": "Drag files here, or",
+    "secondNotifier": "2st Notify Party",
+    "shipper": "Shipper",
+    "shipperAddress": "Shipper's address",
+    "terminalTip": "If you need to ship to the designated terminal dock, please add it here.",
+    "shippingMarksTip": "Please enter the shipping mark",
+    "remarkTip": "Please enter a note",
+    "Payable_Amount": "Payable Amount",
+    "Amount_Paid": "Amount Paid",
+    "Balance_Due": "Balance Due",
+    "Voided": "Voided"
+  },
+  "contractDetail": {
+    "Reference_No": "Reference No.",
+    "Deposit_invoice_to_be_provided": "Deposit invoice to be uploaded",
+    "tip": "Tip",
+    "Waiting_for_the_seller_to_ship": "Waiting for the seller to ship",
+    "Please_select_a_buyer_below_who_you_need_to_ship_to": "Please select a buyer below who you need to ship to",
+    "Please_select_the_receiving_buyer_first": "Please select the receiving buyer first",
+    "confirm": "Confirm",
+    "cancel": "Cancel",
+    "Draft_bill_of_lading_to_be_updated": "Draft bill of lading to be updated",
+    "Packing_list_to_be_updated": "Packing list to be updated",
+    "Generate_shipment": "Generate shipment",
+    "Deposit_received": "Deposit received",
+    "Deposit_invoice_to_be_uploaded": "Deposit invoice to be uploaded",
+    "Generate_deposit_invoice": "Generate deposit invoice",
+    "Payment_voucher": "Deposit Remittance Receipt/Swift",
+    "Please_enter_a_file_name": "Please enter a file name",
+    "rename": "Rename",
+    "tip15": "Drag and drop the files to upload",
+    "Final_payment_unpaid": "Final Payment Unpaid",
+    "Final_payment_voucher": "Remittance Voucher/Swift",
+    "final_payment_warning": "The system automatically calculates the reference final payment based on the weight x unit price minus deposit, which can be used to verify the invoice. Click on the blue font to view the system's data source details and modify the automatically calculated deduction deposit.",
+    "Copy_of_formal_bill_of_lading": "BL copy",
+    "Formal_bill_of_lading_copy_to_be_updated": "Formal bill of lading copy to be updated",
+    "Draft_bill_to_be_confirmed": "Draft bill of lading information to be confirmed",
+    "identify": "identify",
+    "claim": "Claim",
+    "Booking_information_to_be_updated": "Booking information to be updated",
+    "uploadIng": "Uploading",
+    "please_select_file": "Please select a file",
+    "Selected": "Selected",
+    "item": "",
+    "Download_All": "Download All",
+    "Delete_All": "Delete All",
+    "Deselect": "Deselect",
+    "BLCopy": "Original BL",
+    "loading": "Loading",
+    "Claim_completion": "Claim completion",
+    "Claim_documents": "Claim documents",
+    "Contract_No": "Contract No.",
+    "Contract_Status": "Contract Status",
+    "Credit_Note": "Credit Note",
+    "BL_No": "BL：",
+    "Debit_Note": "Debit Note",
+    "Deposit": "Deposit",
+    "Deposit_Paid": "Deposit Paid",
+    "Deposit_Unpaid": "Deposit Unpaid",
+    "Final_payment": "Final payment",
+    "reference_invince": "Reference purchase invoice",
+    "select_receive_buyer": "Please select the receiving buyer first",
+    "select_receive_buyer_tips": "Please select a buyer below who you need to ship to",
+    "Payment_receipt": "Payment receipt",
+    "please_waiting": "Please waiting",
+    "view_history": "View historical version",
+    "Pending_Confirmation": "Pending Confirmation",
+    "askId": "Associated ASK ID",
+    "askName": "ASK Name",
+    "askOverview": "ASK Overview",
+    "update_after_shipping": " will be updated after the seller has shipped",
+    "billOfLadingNo": "BL LadingNO.",
+    "billTo": "Bill To",
+    "ship_create_tips": "Are you sure to directly generate shipment? Please note that the deposit invoice for this contract has not been generated or has been generated but not received. Please confirm the relevant situation first!",
+    "blInfo": "BL instruction",
+    "blInfo_unconfirm": "BL instruction to be confirmed",
+    "bookingConfirmation": "Booking Confirmation",
+    "withdraw_sign": "Withdraw Signed",
+    "withdraw_sign_success": "Withdraw signed successfully",
+    "invoice_list": "Invoice List",
+    "categoryName": "Category",
+    "chargingStatus": "Telex Release Status",
+    "closeInvoiceInfo": "Collapse invoice information",
+    "commodityInfo": "Commodity Information",
+    "commodityPicture": "Commodity Pictures",
+    "conrainerNo": "Container NO.",
+    "contractInfoConfirm": "Contract Information",
+    "contractNo": "Contract number",
+    "contractStatus": "Contract Status",
+    "dealSummary": "Summary of Deals",
+    "dealTime": "Deal Time",
+    "delete": "Delete",
+    "deleteAndUpload": "Delete and re upload",
+    "deposit": "Deposit",
+    "depositInvoice": "Deposit Invoice",
+    "deposit_unpaid": "Deposit Unpaid",
+    "identification_summary": "Identification Summary",
+    "edit_shipment": "Edit Shipment",
+    "add_shipment": "Add Shipment",
+    "upload_by": "Uploaded on ",
+    "share": "Share",
+    "select_all": "Select All",
+    "deposit_unreceipt": "Payment voucher to be provided",
+    "depositPaid": "Deposit Paid",
+    "depositRemittanceReceipt": "Deposit Remittance Receipt/Swift",
+    "description": "Description",
+    "destination": "Port",
+    "download": "download",
+    "downloadZip": "Batch Download",
+    "draftBillOfLading": "Draft BL",
+    "draftBillOfLading_confirm_success": "Draft BL comfirmed successfully",
+    "edit": "Edit",
+    "BLConfirm": "B/L Instruction",
+    "BL_Not_Confirm": "Buyer Not Confirmed",
+    "BL_Confirmed": "Buyer Confirmed",
+    "BL_info_confirmed": "BL information confirmed",
+    "bl_draft_confirm": "Confirmed BL Draft",
+    "editBLInformation": "Edit BL information",
+    "fileManage": "Docs Manage",
+    "fileNmae": "file name",
+    "finalPaymentMemo": "Final Payment Remittance Receipt",
+    "finallyInvoice": "Final invoice",
+    "info": "Contract Details",
+    "invoiceDate": "Invoice Date",
+    "invoiceInfo": "Invoice Information",
+    "invoiceNo": "invoice NO.",
+    "invoiceSpecies": "Invoice Species",
+    "invoiceType": "Invoice Type",
+    "issuer": "Issuer",
+    "loadingCountry": "Loading Country/Region",
+    "no": "No",
+    "operate": "operation",
+    "originCountry": "Country of Origin",
+    "otherFile": "Other files",
+    "otherShipmentFile": "Other Shipping Documents",
+    "packaging": "Packaging",
+    "packingList": "Packing list",
+    "packingPhoto": "Photos of Packing",
+    "paymentTerms": "PaymentTerms",
+    "paymentType": "Payment Type",
+    "payment_voucher": "payment voucher",
+    "preferredQuoteMethod": "Preferred Quote Method",
+    "preview": "Preview",
+    "purchaseContract": "Purchase contract",
+    "quotePrice": "Buyer Price/MT",
+    "quoteType": "QuotationType",
+    "relatedContract": "Related contract",
+    "remark": "Remarks",
+    "saleContract": "Sales Contract",
+    "saleFinallyInvoice": "Fixed Invoice",
+    "normalFinallyInvoice": "Fixed Invoice",
+    "sellerFinallyInvoice": "Seller purchase invoice",
+    "uploadPurchaseInvoice": "Upload Purchase Invoice",
+    "saleTemporaryFinallyInvoice": "Provision Invoice",
+    "Temporary_final_payment_invoice_to_be_updated": "Provisional Payment Invoice to be updated",
+    "sellerPrice": "Seller Price/MT",
+    "shipmentDays": "Shipment Date",
+    "shipmentStatus": "Shipping Status",
+    "shipping": "Shipping",
+    "shipment": "Shipment",
+    "contract": "Contract",
+    "receiving": "Receiving",
+    "progress": "Progress",
+    "signContract": "Signed Contract",
+    "signContract_success": "Signed contract successfully",
+    "release_success": "Telex release successfully",
+    "drag_and_upload": "Drag and drop the file here to upload",
+    "upload": "Upload ",
+    "signPuchaseContract": "Sign back the puchase contract",
+    "signSaleContract": "Sign back the sales contract",
+    "signed": "Signed",
+    "containers_shipped": " containers to be shipped",
+    "packinglist_true": "Packing List updated",
+    "packinglist_false": "Shipping docs-Packing list to be updated",
+    "balance_invoice_true": "Invoice and Packing List updated",
+    "balance_invoice_false": "Balance Invoice to be updated",
+    "container_photos_true": "Packing photos updated",
+    "container_photos_false": "Shipping docs-Shipping photos to be updated",
+    "draftBl_true": "Draft BL updated",
+    "draftBl_false": "Shipping docs-Draft BL to be updated",
+    "draftBl_buyer_confirm_true": "Draft BL confirmed",
+    "draftBl_buyer_confirm_false": "Draft BL to be confirmed",
+    "balancePartPaid_true": "Final Payment partially paid",
+    "Balance_Invoice_to_be_paid": "Balance Invoice to be paid",
+    "balancePartPaid_false": "Balance Invoice to be paid",
+    "balancePaid_true": "Final Payment paid",
+    "balancePaid_false": "Balance Invoice to be paid",
+    "releasedTelex_true": "Bill of Lading release",
+    "releasedTelex_false": "Bill of Lading release to be done",
+    "claiming": "Claiming",
+    "claiming_update": "Claiming-CN/DN issued",
+    "claiming_closed": "Claim closed",
+    "draftContract_unsend": "Draft contract to be sent out",
+    "bl_confirm_true": "BL Instruction confirmed",
+    "bl_confirm_false": "BL Instruction to be confirmed",
+    "contract_send_true": "Formal Contract have been  sent out",
+    "contract_send_false": "Formal contract to be sent out",
+    "contract_signback_true": "Signed Contract has been signed back",
+    "contract_signback_false": "Formal contract to be signed back",
+    "depositPaid_true": "Deposit paid",
+    "depositPaid_false": "Deposit to be paid",
+    "no_files": "There are currently no files",
+    "add_success": "Successfully added",
+    "has_copy": "Copied to clipboard",
+    "subCategory": "SubCategory",
+    "summary": "Order Review",
+    "swift": "swift",
+    "tip1": "Delivery within ",
+    "tip2": " days after transaction",
+    "tip3": "Origin Certificate Provided",
+    "tip4": "Responsible for Customs Rejection",
+    "tip5": "Shipment",
+    "tip6": "Release BL Or Other Documents",
+    "tip7": "Release Order",
+    "tip8": "Completion of contract performance",
+    "totalQuote": "Total Price/MT",
+    "viewPaymentInfo": "View payment information",
+    "voided": "Voided",
+    "voucherOrReceipt": "Voucher/Receipt",
+    "weight": "weight(MT)",
+    "yes": "Yes",
+    "cndn": "Debit note & Credit note"
+  },
+  "distpicker":{
+    "province": "Province",
+    "city": "City",
+    "area": "Area"
+  }
+}

package/packages/src/i18n/index.js

@@ -0,0 +1,38 @@
+/*
+ * @Author: zhangpengwei 15038779532@163.com
+ * @Date: 2023-08-08 15:48:42
+ * @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
+ * @LastEditTime: 2024-03-29 15:18:51
+ * @FilePath: /recycle-vue-ui再生博士后台管理/src/i18n/index.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+// index.js
+import Vue from 'vue'
+import VueI18n from 'vue-i18n'
+import Cookies from 'js-cookie'
+import locale from 'element-ui/lib/locale'
+import en from './en'
+import zh_CN from './zh-CN'
+import moment from 'moment'
+
+export const defaultLang = 'zh-CN'
+
+Vue.use(VueI18n)
+
+const i18n = new VueI18n({
+  // 设置语言 选项 en | zh
+  locale: Cookies.get('language') || defaultLang,
+  // 设置文本内容
+  messages: {
+    en,
+    'zh-CN': zh_CN
+  }
+})
+
+export function loadLanguageAsync(lang = defaultLang) {
+  moment.locale(lang)
+}
+
+locale.i18n((key, value) => i18n.t(key, value))
+
+export default i18n