doctor-admin-components 1.0.13-beta.79 → 1.0.13-beta.80

package/package.json

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

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

@@ -80,43 +80,46 @@
     "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"
+    "remarkTip": "Please enter a note",
+    "Payable_Amount": "Payable Amount",
+    "Amount_Paid": "Amount Paid",
+    "Balance_Due": "Balance Due"
   },
   "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",
+    "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",
+    "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",
+    "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",
+    "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",
+    "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",
+    "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",
@@ -171,7 +174,7 @@
     "add_shipment": "Add Shipment",
     "upload_by": "Uploaded on ",
     "share": "Share",
-    "select_all":"Select All",
+    "select_all": "Select All",
     "deposit_unreceipt": "Payment voucher to be provided",
     "depositPaid": "Deposit Paid",
     "depositRemittanceReceipt": "Deposit Remittance Receipt/Swift",
@@ -241,8 +244,7 @@
     "signPuchaseContract": "Sign back the puchase contract",
     "signSaleContract": "Sign back the sales contract",
     "signed": "Signed",
-
-    "containers_shipped":" containers to be shipped",
+    "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",
@@ -254,7 +256,7 @@
     "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",
+    "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",
@@ -272,7 +274,6 @@
     "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",

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

@@ -80,43 +80,46 @@
     "shipperAddress": "发货人地址",
     "terminalTip": "如果您需要发货到指定的码头，请此处添加",
     "shippingMarksTip": "请输入唛头",
-    "remarkTip": "请输入备注"
+    "remarkTip": "请输入备注",
+    "Payable_Amount": "应付金额",
+    "Amount_Paid": "已付金额",
+    "Balance_Due": "待付余额"
   },
   "contractDetail": {
     "Reference_No": "合同参考号",
-    "Deposit_invoice_to_be_provided":"定金发票待提供",
-    "tip":"提示",
-    "Waiting_for_the_seller_to_ship":"等待卖家发货",
-    "Please_select_a_buyer_below_who_you_need_to_ship_to":"请在下方选择一个您需要发货的买家",
-    "Please_select_the_receiving_buyer_first":"请先选择收货买家",
+    "Deposit_invoice_to_be_provided": "定金发票待提供",
+    "tip": "提示",
+    "Waiting_for_the_seller_to_ship": "等待卖家发货",
+    "Please_select_a_buyer_below_who_you_need_to_ship_to": "请在下方选择一个您需要发货的买家",
+    "Please_select_the_receiving_buyer_first": "请先选择收货买家",
     "confirm": "确认",
     "cancel": "取消",
-    "Draft_bill_of_lading_to_be_updated":"提单草稿待更新",
-    "Packing_list_to_be_updated":"装箱单待更新",
-    "Generate_shipment":"生成装运",
+    "Draft_bill_of_lading_to_be_updated": "提单草稿待更新",
+    "Packing_list_to_be_updated": "装箱单待更新",
+    "Generate_shipment": "生成装运",
     "Deposit_received": "定金已收",
-    "Deposit_invoice_to_be_uploaded":"定金发票待上传",
-    "Generate_deposit_invoice":"生成定金发票",
-    "Payment_voucher":"支付凭证",
-    "Please_enter_a_file_name":"请输入文件名",
-    "rename":"重命名",
+    "Deposit_invoice_to_be_uploaded": "定金发票待上传",
+    "Generate_deposit_invoice": "生成定金发票",
+    "Payment_voucher": "支付凭证",
+    "Please_enter_a_file_name": "请输入文件名",
+    "rename": "重命名",
     "tip15": "将文件拖拽到此处上传",
-    "Final_payment_unpaid":"尾款待付",
-    "Final_payment_voucher":"尾款支付凭证",
-    "final_payment_warning":"系统根据【重量x单价-扣除定金】自动计算出参考尾款，可以据此核对发票。点击蓝色字体可以查看系统的数据来源明细，修改系统自动计算的扣减定金。",
-    "Copy_of_formal_bill_of_lading":"正式提单Copy",
+    "Final_payment_unpaid": "尾款待付",
+    "Final_payment_voucher": "尾款支付凭证",
+    "final_payment_warning": "系统根据【重量x单价-扣除定金】自动计算出参考尾款，可以据此核对发票。点击蓝色字体可以查看系统的数据来源明细，修改系统自动计算的扣减定金。",
+    "Copy_of_formal_bill_of_lading": "正式提单Copy",
     "Formal_bill_of_lading_copy_to_be_updated": "正式提单Copy待更新",
     "Draft_bill_to_be_confirmed": "草稿提单信息待确认",
     "identify": "识别",
-    "claim":"索赔",
+    "claim": "索赔",
     "Booking_information_to_be_updated": "订舱信息待更新",
     "uploadIng": "上传中",
-    "please_select_file":"请选择文件",
-    "Selected":"已选择",
-    "item":"项",
-    "Download_All":"批量下载",
-    "Delete_All":"批量删除",
-    "Deselect":"取消选择",
+    "please_select_file": "请选择文件",
+    "Selected": "已选择",
+    "item": "项",
+    "Download_All": "批量下载",
+    "Delete_All": "批量删除",
+    "Deselect": "取消选择",
     "BLCopy": "正式提单",
     "loading": "请稍候",
     "Claim_completion": "索赔完成",
@@ -201,7 +204,7 @@
     "otherFile": "其他文件",
     "upload_by": "上传时间 ",
     "share": "分享",
-    "select_all":"全选照片",
+    "select_all": "全选照片",
     "otherShipmentFile": "其他装运文件",
     "packaging": "装箱",
     "packingList": "装箱单",
@@ -243,8 +246,7 @@
     "withdraw_sign_success": "撤回回签成功",
     "signPuchaseContract": "回签采购合同",
     "signSaleContract": "回签销售合同",
-
-    "containers_shipped":"柜待装运",
+    "containers_shipped": "柜待装运",
     "packinglist_true": "装箱单已上传",
     "packinglist_false": "装箱单待上传",
     "balance_invoice_true": "发票、箱单已上传",
@@ -256,7 +258,7 @@
     "draftBl_buyer_confirm_true": "草稿提单已确认",
     "draftBl_buyer_confirm_false": "草稿提单待买家确认",
     "balancePartPaid_true": "尾款已部分支付",
-    "Balance_Invoice_to_be_paid":"尾款待支付",
+    "Balance_Invoice_to_be_paid": "尾款待支付",
     "balancePartPaid_false": "尾款待买家支付",
     "balancePaid_true": "尾款已支付",
     "balancePaid_false": "尾款待买家支付",
@@ -274,7 +276,6 @@
     "contract_signback_false": "回签合同待上传",
     "depositPaid_true": "定金已支付",
     "depositPaid_false": "定金待支付",
-    
     "signed": "已签订",
     "subCategory": "小类",
     "summary": "订单概括",

package/packages/src/views/biz/contractTracing/contractInfo.vue

@@ -63,7 +63,7 @@
           </el-table-column>
         </el-table>
       </el-form-item>
-      <el-button type="text" size="small" @click="handleChangeLog">历史记录</el-button>
+      <el-button type="text" v-if="channel !== 'official-website'" size="small" @click="handleChangeLog">历史记录</el-button>
       <contract-pdf :contract="contract" :dynamicTags="dynamicTags" :customClause="customClause"></contract-pdf>
     </el-form>
     <contract-change-log ref="contractChangeLog"></contract-change-log>

package/packages/src/views/biz/contractTracing/contractSummary.vue

@@ -2,7 +2,7 @@
  * @Author: zhangpengwei 15038779532@163.com
  * @Date: 2023-08-28 19:04:39
  * @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
- * @LastEditTime: 2024-03-20 09:46:11
+ * @LastEditTime: 2024-05-24 10:26:37
  * @FilePath: /doctor-admin-components/packages/src/views/biz/contractTracing/contractSummary.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -221,7 +221,7 @@
           <el-table-column v-if="channel !== 'official-website'" label="总金额" align="center" prop="amount" width="100" />
 
           <!-- 官网 -->
-          <el-table-column v-if="channel == 'official-website'" :label="$t('contract.Payable_Amount')" align="center" prop="amount" width="100" />
+          <el-table-column v-if="channel == 'official-website'" :label="$t('contract.Payable_Amount')" align="center" prop="amount" width="140" />
           <el-table-column v-if="channel == 'official-website'" :label="$t('contract.Amount_Paid')" align="center" prop="amount" width="100">
             <template slot-scope="{ row }">{{ row.amount - row.remainingAmount }}</template>
           </el-table-column>
@@ -825,11 +825,14 @@ ${invoiceNoTitleZh}：${invoiceNo}
             }
           })
           listBizInvoice({
-            contractId: this.contractId
+            contractId: this.contractId,
+            voidFlagSearch: this.channel == 'official-website' ? [0] : []
           }).then((response) => {
             this.invoiceList = response.rows
           })
-          var queryParams = {}
+          var queryParams = {
+            voidStatus: this.channel == 'official-website' ? 0 : null
+          }
           if (this.contract.contractType == 'sale') {
             queryParams.saleContractId = this.contractId
           } else {

package/packages/src/views/biz/contractTracing/subCompanyDialog.vue

@@ -131,7 +131,7 @@
 </template>
 
 <script>
-import { Form } from 'element-ui'
+import { Form, Loading } from 'element-ui'
 import { listBizContractCompany, delBizContractCompany, updateBizContractCompany } from '../../../api/biz/bizContractCompany'
 import AddSubCompany from './addSubCompany'
 
@@ -189,8 +189,7 @@ export default {
     },
     /** 查询合同公司记录列表 */
     getList() {
-      let loadingInstance = this.$loading || this.$loading.service
-      const loading = loadingInstance({
+      const loading = Loading.service({
         lock: true,
         text: 'Loading',
         spinner: 'el-icon-loading',