doctor-admin-components 1.0.14-beta.62 → 1.0.14-beta.63

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/packages/src/views/biz/contractTracing/contractClause.vue +3 -4
  3. package/packages/src/views/biz/contractTracing/info.vue +9 -4
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "doctor-admin-components",
3
3
  "version1": "1.0.11",
4
- "version": "1.0.14-beta.62",
4
+ "version": "1.0.14-beta.63",
5
5
  "private": false,
6
6
  "main1": "lib/index.umd.min.js",
7
7
  "main": "packages/index.js",
package/packages/src/views/biz/contractTracing/contractClause.vue CHANGED
@@ -46,9 +46,8 @@
46
46
  The Buyer shall pay a deposit of {{`$${form.advanceDepositAmount}`}}
47
47
  TTYY within {{ form.depositDays }} days {{ depositPaymentFormKey(form.depositPaymentForm) }}.
48
48
  </div>
49
- The remaining {{ form && form.depositType == '1' ? `${form.balance}%` : '' }} balance of the total Contract Price
50
- shall be paid by the Buyer to TTYY via Telegraphic Transfer ({{ form.balanceDays }}) days no later than
51
- {{ form.balancePaymentType }} days {{ balancePaymentFormKey(form.balancePaymentForm) }}.
49
+ The remaining {{ form && form.depositType == '1' && form.balance > 0 ? `${form.balance}%` : '' }} balance of the total Contract Price
50
+ shall be paid by the Buyer to TTYY via Telegraphic Transfer ({{form.balancePaymentType}}) no later than {{form.balanceDays}} days {{balancePaymentFormKey(form.balancePaymentForm)}}
52
51
  </div>
53
52
  The Buyer shall ensure that all payments are made free and clear of any deductions, charges, fees, or
54
53
  withholdings imposed by any governmental or regulatory authority. If any such deductions or withholdings are
@@ -224,7 +223,7 @@
224
223
  TTYY within {{ form.depositDays }} days {{ depositPaymentFormKey(form.depositPaymentForm) }}.
225
224
  </div>
226
225
  </div>
227
- The remaining {{ form && form.depositType == '1' ? `${form.balance}%` : '' }} balance of the total Contract Price shall
226
+ The remaining {{ form && form.depositType == '1' && form.balance > 0 ? `${form.balance}%` : '' }} balance of the total Contract Price shall
228
227
  be paid to the Seller via Telegraphic Transfer ({{ form.balancePaymentType }}) no later than {{ form.balanceDays }}
229
228
  days {{ balancePaymentFormKey(form.balancePaymentForm) }}.
230
229
  <h3>AARTICLE 9 – FLOATING PRICE</h3>
package/packages/src/views/biz/contractTracing/info.vue CHANGED
@@ -96,7 +96,8 @@
96
96
  <div>{{ form.paymentTermFullText }}</div>
97
97
  </el-descriptions-item>
98
98
  <el-descriptions-item label="Price Fixing Option" v-if="form.livePriceSwitch">
99
- 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).
99
+ From the loading date to {{form.livePriceDays}} days {{form.livePriceForm}} cargo arrives at POD in {{form.livePriceUsertype}} option.
100
+ <span v-if="form.contractType == 'sale'">Time based on China Standard Time (UTC+8).</span>
100
101
  </el-descriptions-item>
101
102
 
102
103
  <el-descriptions-item label="Origin Country/Region">{{ form.originCountry }}</el-descriptions-item>
@@ -125,13 +126,17 @@
125
126
  </div>
126
127
  </el-descriptions-item>
127
128
  <el-descriptions-item label="Shipment Quantity Tolerance"> ± {{ form.toleranceFloat * 100 }}%</el-descriptions-item>
128
- <el-descriptions-item label="Shortage Tolerance"> &lt;{{ form.weightTolerance }}% / {{ form.weightToleranceWeight }} kg</el-descriptions-item>
129
+ <el-descriptions-item label="Shortage Tolerance"> &lt;{{ form.weightTolerance }}%{{ form.weightToleranceWeight > 0 ? ` / ${form.weightToleranceWeight}kg` : '' }}</el-descriptions-item>
129
130
  <el-descriptions-item label="Packing Type"> {{ form.packingMethod ? form.packingMethod.replace(/,/g, '/') : '' }}</el-descriptions-item>
130
131
  <el-descriptions-item label="Partial Shipment"> {{ form.partialShipment }}</el-descriptions-item>
131
132
  <el-descriptions-item label="Transshipment"> {{ form.transshipment }}</el-descriptions-item>
132
133
  <el-descriptions-item label="Quality" v-if="form.qualityCertificateSwitch">{{ form.qualityCertificate }}</el-descriptions-item>
133
- <el-descriptions-item label="Claim" v-if="form.claimSwitch">{{ form.claim }}</el-descriptions-item>
134
- <el-descriptions-item label="Timeline of document submission" v-if="form.arbitrationSwitch">{{ form.arbitration }}</el-descriptions-item>
134
+ <el-descriptions-item label="Claim" v-if="form.claimSwitch">
135
+ <div v-html="form.claim" style="white-space: pre-wrap; word-break: break-word;"></div>
136
+ </el-descriptions-item>
137
+ <el-descriptions-item label="Timeline of document submission" v-if="form.arbitrationSwitch">
138
+ <div v-html="form.arbitration" style="white-space: pre-wrap; word-break: break-word;"></div>
139
+ </el-descriptions-item>
135
140
  <el-descriptions-item label="Specification" v-if="form.memoSwitch">{{ form.memo }}</el-descriptions-item>
136
141
  <el-descriptions-item v-for="(item, index) in this.customClause" :label="item.title" :key="index">{{ item.content }}</el-descriptions-item>
137
142
  </el-descriptions>