doctor-admin-components 1.0.14-beta.57 → 1.0.14-beta.58

package/package.json

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

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

@@ -37,12 +37,12 @@
       <h3>ARTICLE 8 – PAYMENT</h3>
       <div>
         <div v-if="form.quoteType && form.quoteType != 'FIXED'">
-          The Buyer shall pay a deposit of {{form.deposit}} TTYY within {{form.depositDays}} days {{form.depositPaymentForm}}
-          The remaining {{form.balance}}% balance of the total Contract Price shall be paid by the Buyer to TTYY via Telegraphic Transfer ({{form.balanceDays}}) days no later than {{form.balancePaymentType}} days {{form.balancePaymentForm}}. 
+          The Buyer shall pay a deposit of {{form.deposit}} TTYY within {{form.depositDays}} days {{depositPaymentFormKey(form.depositPaymentForm)}}
+          The remaining {{form.depositAmount != null ? ``:`${form.balance}%`}} balance of the total Contract Price shall be paid by the Buyer to TTYY via Telegraphic Transfer ({{form.balanceDays}}) days no later than {{form.balancePaymentType}} days {{ balancePaymentFormKey(form.balancePaymentForm)}}. 
         </div>
         <div v-else>
-          The Buyer shall pay a deposit of {{form.deposit}} of the total Contract Price to TTYY within {{form.depositDays}} days {{form.depositPaymentForm}}
-          The remaining {{form.balance}}% balance of the total Contract Price shall be paid by the Buyer to TTYY via Telegraphic Transfer ({{form.balancePaymentType}}) no later than {{form.balanceDays}} days {{form.balancePaymentForm}}. 
+          The Buyer shall pay a deposit of {{form.deposit}} of the total Contract Price to TTYY within {{form.depositDays}} days {{depositPaymentFormKey(form.depositPaymentForm)}}
+          The remaining {{form.depositAmount != null ? ``:`${form.balance}%`}} balance of the total Contract Price shall be paid by the Buyer to TTYY via Telegraphic Transfer ({{form.balancePaymentType}}) no later than {{form.balanceDays}} days {{ balancePaymentFormKey(form.balancePaymentForm)}}. 
         </div>
         The Buyer shall ensure that all payments are made free and clear of any deductions, charges, fees, or withholdings imposed by any governmental or regulatory authority. If any such deductions or withholdings are required by law, the Buyer shall increase the amount payable to TTYY so that, after any such deductions or withholdings, TTYY receives an amount equal to the Contract Price.
         If the Buyer fails to make any payment within the stipulated time frames, TTYY shall be entitled to charge interest on the overdue amount at a rate of 0.05% per day from the due date until the date of actual payment.
@@ -171,7 +171,7 @@
         TTYY's downstream customers shall pay a deposit of {{form.deposit}} the Seller within {{form.depositDays}} days {{form.depositPaymentForm}}.</div>
        <div v-else> 
         TTYY's downstream customers shall pay a deposit of {{form.deposit}} of the total Contract Price to the Seller within {{form.depositDays}} days {{form.depositPaymentForm}}.</div>
-        The remaining {{form.balance}}% balance of the total Contract Price shall be paid to the Seller via Telegraphic Transfer ({{form.balancePaymentType}}) no later than {{form.balanceDays}} days {{form.balancePaymentForm}}.
+        The remaining {{form.depositAmount != null ? ``:`${form.balance}%`}} balance of the total Contract Price shall be paid to the Seller via Telegraphic Transfer ({{form.balancePaymentType}}) no later than {{form.balanceDays}} days {{ balancePaymentFormKey(form.balancePaymentForm)}}.
       </div>
       <h3>AARTICLE 9 – FLOATING PRICE</h3>
       <div v-if="form.quoteType && form.quoteType != 'FIXED'">
@@ -256,6 +256,7 @@
 import TextContent from './contractClauseComponenrts/TextContent'
 export default {
   name: 'ContractClause',
+  dicts: ['deposit_payment_form', 'balance_payment_form'],
   props: {
     form: {
       type: Object,
@@ -279,6 +280,14 @@ export default {
   methods: {
     disableEdit() {
       this.disable = true
+    },
+    depositPaymentFormKey(value) {
+      let label = this.dict.type.deposit_payment_form.find(item => item.value == value)?.raw?.dictLabelEn
+      return label || ''
+    },
+    balancePaymentFormKey(value) {
+      let label = this.dict.type.balance_payment_form.find(item => item.value == value)?.raw?.dictLabelEn
+      return label || ''
     }
   }
 }