doctor-admin-components 1.0.14-beta.59 → 1.0.14-beta.60

package/package.json

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

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

@@ -37,26 +37,35 @@
       <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 {{depositPaymentFormKey(form.depositPaymentForm)}}
+          The Buyer shall pay a deposit of {{ form.depositType == '1' ? `${form.deposit}%` : `$${form.advanceDepositAmount}` }} 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 {{depositPaymentFormKey(form.depositPaymentForm)}}
+          The Buyer shall pay a deposit of {{ form.depositType == '1' ? `${form.deposit}%` : `$${form.advanceDepositAmount}` }} 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.
+        <br/>
         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.
       </div>
       <h3>ARTICLE 9 – FLOATING PRICE</h3>
       <div v-if="form.quoteType && form.quoteType != 'FIXED'">
         Price Period: The {{form.livePriceUsertype}} has the pricing authority option from container loaded date until {{form.livePriceDays}} days {{form.livePriceForm}} it arrives at the port.
+        <br/>
         FOR PRICING the Buyer and TTYY can communicate through email, Wechat group, WhatsApp group, phone call or the pricing function button of the APP.
+        <br/>
         The pricing will be determined based on the local working hours of either the Seller or the Buyer who provides the price option.   
+        <br/>
         If the Buyer is unable to fix the price within the agreed Price Fixing Period, the Buyer may request an extension. The request for extension must be submitted in writing to TTYY before the expiration of the initial Price Fixing Period.
+        <br/>
         The Buyer acknowledges and agrees that an extension of the Price Fixing Period shall be subject to supplier’s allowance.
+        <br/>
         The Buyer shall make a prompt payment (within two working days) to the Seller, amounting to 110% of the provisional pricing formula based on the LME/CME reference price on the day and at the time the Buyer declared the exercise of the Extension Option.
+        <br/>
         TTYY’s supplier reserves the right to approve or deny any request for an extension of the Price Fixing Period in its sole discretion. The granting of an extension does not constitute a waiver of TTYY's rights under this Contract.
+        <br/>
         If the Buyer fails to fix the price within the Price Fixing Period, including any extended period granted by TTYY, TTYY shall have the right to determine the contract price based on the Market Closing Price of the Price Fixing Deadline.
+        <br/>
         Any extension of the Price Fixing Period shall be the final extension, and no further extensions shall be granted unless otherwise agreed upon in writing by the parties.
       </div>
       <h3>ARTICLE 10 – MARGIN CALL</h3>
@@ -168,16 +177,19 @@
       <h3>ARTICLE 8 – PAYMENT</h3>
       <div>
        <div v-if="form.quoteType && form.quoteType != 'FIXED'">
-        TTYY's downstream customers shall pay a deposit of {{form.deposit}} the Seller within {{form.depositDays}} days {{ depositPaymentFormKey(form.depositPaymentForm)}}.</div>
+        TTYY's downstream customers shall pay a deposit of {{form.depositType == '1' ? `${form.deposit}%` : `$${form.advanceDepositAmount}`}} the Seller within {{form.depositDays}} days {{ depositPaymentFormKey(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 {{ depositPaymentFormKey(form.depositPaymentForm)}}.</div>
+        TTYY's downstream customers shall pay a deposit of {{form.depositType == '1' ? `${form.deposit}%` : `$${form.advanceDepositAmount}`}} of the total Contract Price to the Seller within {{form.depositDays}} days {{ depositPaymentFormKey(form.depositPaymentForm)}}.</div>
       </div>
       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)}}.
       <h3>AARTICLE 9 – FLOATING PRICE</h3>
       <div v-if="form.quoteType && form.quoteType != 'FIXED'">
-        Price Period: The {{form.livePriceUserType}} has the pricing option from container loaded date until {{form.livePriceDays}} days {{form.livePriceForm}} it arrives at the port.
+        Price Period: The {{form.livePriceUsertype}} has the pricing option from container loaded date until {{form.livePriceDays}} days {{form.livePriceForm}} it arrives at the port.
+        <br/>
         FOR PRICING the Seller and TTYY can communicate through email, Wechat group, WhatsApp group,Make a phone call or the pricing function button of the APP.
+        <br/>
         The pricing will be determined based on the local working hours of either the Seller or the Buyer who provides the price option. 
+        <br/>
         If one party is unable to fix the price within the agreed Price Fixing Period, it is permitted to apply for an extension pricing period application.The other party have the right to evaluate and offer extension pricing period or not.
       </div>
       <h3>ARTICLE 10 – PRICE ADJUSTMENT</h3>

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

@@ -96,9 +96,7 @@
         <div>{{ form.paymentTermFullText }}</div>
       </el-descriptions-item>
       <el-descriptions-item label="Price Fixing Option" v-if="form.livePriceSwitch">
-        {{ form.livePriceDays }} Days {{ form.livePriceForm }} cargo arrives at POD in
-        {{ form.livePriceUsertype }}
-        {{ form.livePriceType }}'s option
+        From the loading date to {{form.livePriceDays}} days {{form.livePriceForm}} cargo arrives at POD in {{form.livePriceUsertype}} option; Time based on China Standard Time (UTC+8).
       </el-descriptions-item>
 
       <el-descriptions-item label="Origin Country/Region">{{ form.originCountry }}</el-descriptions-item>