doctor-admin-components 1.0.14-beta.6 → 1.0.14-beta.61

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

@@ -12,7 +12,7 @@
       v-for="(bankData, i) in bankList"
       :key="i"
       class="bank-container"
-      :class="{ 'bank-container-select': !disableSelect && sellectIndex == i, 'bank-container-unselect': disableSelect || sellectIndex != i }"
+      :class="{ 'bank-container-select': sellectIndex == i, 'bank-container-unselect': sellectIndex != i }"
       @click="clickSelct(i)"
     >
       <el-row style="padding-bottom: 20px">
@@ -34,15 +34,18 @@
         <el-col :span="24">
           <div class="bank-item">Beneficiary Address：{{ bankData.beneficiaryAddress }}</div>
         </el-col>
+        <el-col :span="24">
+          <div class="bank-item" style="display:flex;"><p>Remark：</p><p style="white-space: pre-wrap;">{{ bankData.remark }}</p></div>
+        </el-col>
       </el-row>
     </div>
     <!-- 添加入口 -->
     <div v-if="!bankList || bankList.length == 0" style="padding-left: 30px; padding-top: 10px">
       <span>未添加收款账户信息，</span>
-      <el-button type="text" size="mini" @click="clickAdd">去添加</el-button>
+      <el-button type="text" size="mini"  v-hasPermi="['biz:company:payment:account:add']" @click="clickAdd">去添加</el-button>
     </div>
     <div v-else-if="bankList && bankList.length < 3" style="padding-left: 30px; padding-top: 10px">
-      <el-button type="text" size="mini" @click="clickAdd">去添加</el-button>
+      <el-button type="text" size="mini" @click="clickAdd" v-hasPermi="['biz:company:payment:account:add']">去添加</el-button>
       <span>收款账户信息</span>
     </div>
     <!-- 添加收款账户弹框 -->
@@ -79,6 +82,11 @@
               <el-input maxlength="500" v-model="form.beneficiaryAddress" placeholder="请输入内容" />
             </el-form-item>
           </el-col>
+          <el-col :span="18">
+            <el-form-item label="Remark" label-width="150px">
+              <el-input maxlength="500" type="textarea" rows="4" v-model="form.remark" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -137,7 +145,8 @@ export default {
         bankAddress: null,
         beneficiaryAccount: null,
         beneficiary: null,
-        beneficiaryAddress: null
+        beneficiaryAddress: null,
+        remark: null,
       },
       rules: {}
     }
@@ -154,13 +163,15 @@ export default {
         bankAddress: null,
         beneficiaryAccount: null,
         beneficiary: null,
-        beneficiaryAddress: null
+        beneficiaryAddress: null,
+        remark: null,
       }
     },
     handleCaclSelectIndex() {
-      if (!this.disableSelect && this.accountId) {
+      if (this.accountId) {
         this.sellectIndex = this.bankList.findIndex((item) => item.accountId == this.accountId)
-        if (this.sellectIndex == -1) {
+        console.log('---sellectIndex:', this.sellectIndex)
+        if (this.sellectIndex == -1 && !this.disableSelect) {
           console.log('pre accountId invalide')
           this.$emit('selectBank', null)
         }
@@ -194,7 +205,7 @@ export default {
     },
     clickConfirm() {
       let e = this.form
-      if (!(e.swiftCode || e.bankName || e.bankAddress || e.beneficiaryAccount || e.beneficiary || e.beneficiaryAddress)) {
+      if (!(e.swiftCode || e.bankName || e.bankAddress || e.beneficiaryAccount || e.beneficiary || e.beneficiaryAddress || e.remark)) {
         this.$modal.msgError('请输入内容')
         return
       }

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

@@ -0,0 +1,357 @@
+<template>
+  <div>
+    <h3 style="text-align: center">Additional Agreement</h3>
+    <div style="text-align: right;padding-right: 20px" v-if="editable">
+      <el-button type="text" @click="disable = !disable">{{ disable ? 'Edit' : 'View' }}</el-button>
+    </div>
+    <div v-if="form">
+      <div v-if="form.contractType == 'sale'">
+        <h3>ARTICLE 1 – DEFINITIONS</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="definitions"></text-content>
+        </div>
+        <h3>ARTICLE 2 – Annexure of Inquiry Page Content</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="annexure"></text-content>
+        </div>
+        <h3>ARTICLE 3 – ACCEPTANCE</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="acceptance"></text-content>
+        </div>
+        <h3>ARTICLE 4 – INCONSISTENT COMMODITY NAMES</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="inconsistent"></text-content>
+        </div>
+        <h3>ARTICLE 5 – QUALITY, CUSTOMS REJECTION</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="quality"></text-content>
+        </div>
+        <h3>ARTICLE 6 – CLAIM</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="claim"></text-content>
+        </div>
+        <h3>ARTICLE 7 – LOADING REQUIREMENT</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="loadingRequirement"></text-content>
+        </div>
+        <h3>ARTICLE 8 – PAYMENT</h3>
+        <div>
+          <div>
+            <!-- 比例 -->
+            <div v-if="form && form.depositType == '1'">
+            The Buyer shall pay a deposit of {{ form.deposit}}% of the total Contract Price to TTYY within {{ form.depositDays }} days {{ depositPaymentFormKey(form.depositPaymentForm)}}.
+            </div>
+            <!-- 固定金额 -->
+            <div v-else>
+            The Buyer shall pay a deposit of {{`$${form.advanceDepositAmount}`}} 
+            TTYY within {{ form.depositDays }} days {{ depositPaymentFormKey(form.depositPaymentForm) }}.
+            </div>
+            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>
+          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>
+        <div>
+          <text-content :form="form" :disable="disable" keys="saleMarginCall"></text-content>
+        </div>
+        <h3>ARTICLE 11 – PRICE ADJUSTMENT</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="priceAdjustment"></text-content>
+        </div>
+        <h3>ARTICLE 12 - PACKING, DELIVERY, SHIPPING & RISK OF LOSS</h3>
+        <div>
+          The delivery terms shall be set forth on the first page of the Contract. The Contract includes standard
+          commercial packaging for the goods. When special or export packaging is required or requested, the cost of the
+          special packaging will be separately invoiced.
+          <br /><br />
+          If the Buyer pays the deposit late (if the delay is within {{ form.latestShipment }} days of the original
+          contract deposit, the contract will be extended; if the delay exceeds {{ form.latestShipment }} days, the
+          delivery time cannot be guaranteed), the goods will be shipped within {{ form.latestShipment }} days from the
+          date of deposit payment.
+          <br /><br />
+          To be arranged by the Seller within {{ form.latestShipment }} days from the date of signature of this Agreement.
+          (For sake of clarity, within the above deadline, the Seller shall be obliged to arrange for the loading of the
+          Material in the containers, not for the loading onboard the vessel (which will be reflected in the Shipped on
+          Board date of BL). Seller has no control over shipping delays caused by the carrier and can therefore be
+          responsible only for the date by which the material is loaded in the container, not for the date of loading
+          onboard the vessel or for the sailing date. If container sailing is delayed due to delays by the shipping
+          lines, by customs, and/or by causes of force majeure, if by the expiry of the above deadline, the Material has
+          not yet been loaded into the respective containers, In the event that the Buyer does not exercise its
+          cancellation notice to the seller 3 days’ before deadline as per above, this Agreement shall be automatically
+          extended for additional 45 days. In any case, the Buyer shall not be entitled to cancel this Agreement once
+          the Material is loaded into the containers and notice thereof has been given by the Seller to the Buyer.
+        </div>
+        <h3>ARTICLE 13 - AS IS; NO WARRANTY</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="saleNoWarranty"></text-content>
+        </div>
+        <h3>ARTICLE 14 - TAXES, DUTIES, FEES</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="taxes"></text-content>
+        </div>
+        <h3>ARTICLE 15 - LICENSES/PERMITS</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="licenses"></text-content>
+        </div>
+        <h3>ARTICLE 16 - COMPLIANCE WITH LAWS AND STATUTORY REGULATIONS</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="complianceWithLaws"></text-content>
+        </div>
+        <h3>ARTICLE 17 - CANCELLATION AND TERMINATION</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="cancellation"></text-content>
+        </div>
+        <h3>ARTICLE 18 - LIMITATION OF LIABILITY</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="limitation"></text-content>
+        </div>
+        <h3>ARTICLE 19 – DISPUTES</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="disputes"></text-content>
+        </div>
+        <h3>ARTICLE 20 - LAW GOVERNING CONTRACT</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="lawGoverning"></text-content>
+        </div>
+        <h3>ARTICLE 21 – SEVERABILITY</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="severability"></text-content>
+        </div>
+        <h3>ARTICLE 22 – ASSIGNMENT</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="assignment"></text-content>
+        </div>
+        <h3>ARTICLE 23 – WAIVER</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="waiver"></text-content>
+        </div>
+        <h3>ARTICLE 24 – NONDISCLOSURE</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="saleNoNdisclosure"></text-content>
+        </div>
+        <h3>ARTICLE 25 - EXCUSABLE DELAYS</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="excusable"></text-content>
+        </div>
+        <h3>ARTICLE 26 – LANGUAGE</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="language"></text-content>
+        </div>
+        <h3>ARTICLE 27 – MISCELLANEOUS</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="miscellaneous"></text-content>
+        </div>
+      </div>
+      <div v-else>
+        <h3>ARTICLE 1 – DEFINITIONS</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="definitions"></text-content>
+        </div>
+        <h3>ARTICLE 2 – Annexure of Inquiry Page Content</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="annexure"></text-content>
+        </div>
+        <h3>ARTICLE 3 – ACCEPTANCE</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="acceptance"></text-content>
+        </div>
+        <h3>ARTICLE 4 – INCONSISTENT COMMODITY NAMES</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="inconsistent"></text-content>
+        </div>
+        <h3>ARTICLE 5 – QUALITY, CUSTOMS REJECTION</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="quality"></text-content>
+        </div>
+        <h3>ARTICLE 6 – CLAIM</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="claim"></text-content>
+        </div>
+        <h3>ARTICLE 7 – LOADING REQUIREMENT</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="loadingRequirement"></text-content>
+        </div>
+        <h3>ARTICLE 8 – PAYMENT</h3>
+        <div>
+            <!-- 比例 -->
+            <div v-if="form && form.depositType == '1'">
+              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>
+            <!-- 固定金额 -->
+            <div v-else>
+              TTYY's downstream customers shall pay a deposit of {{`$${form.advanceDepositAmount}`}} 
+              TTYY 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.
+          <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>
+        <div>
+          <text-content :form="form" :disable="disable" keys="priceAdjustment"></text-content>
+        </div>
+        <h3>ARTICLE 11 – PACKING, DELIVERY, SHIPPING & RISK OF LOSS</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="purchasePacking"></text-content>
+        </div>
+        <h3>ARTICLE 12 - SHIPMENT PERIOD</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="purchaseShipmentPeriod"></text-content>
+        </div>
+        <h3>ARTICLE 13 - TAXES, DUTIES, FEES</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="taxes"></text-content>
+        </div>
+        <h3>ARTICLE 14 - LICENSES/PERMITS</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="licenses"></text-content>
+        </div>
+        <h3>ARTICLE 15 - COMPLIANCE WITH LAWS AND STATUTORY REGULATIONS</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="complianceWithLaws"></text-content>
+        </div>
+        <h3>AARTICLE 16 - CANCELLATION AND TERMINATION</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="cancellation"></text-content>
+        </div>
+        <h3>ARTICLE 17 - LIMITATION OF LIABILITY</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="limitation"></text-content>
+        </div>
+        <h3>ARTICLE 18 – DISPUTES</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="disputes"></text-content>
+        </div>
+        <h3>ARTICLE 19 - LAW GOVERNING CONTRACT</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="lawGoverning"></text-content>
+        </div>
+        <h3>ARTICLE 20 – SEVERABILITY</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="severability"></text-content>
+        </div>
+        <h3>ARTICLE 21 – ASSIGNMENT</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="assignment"></text-content>
+        </div>
+        <h3>ARTICLE 22 – WAIVER</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="waiver"></text-content>
+        </div>
+        <h3>ARTICLE 23 - EXCUSABLE DELAYS</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="excusable"></text-content>
+        </div>
+        <h3>ARTICLE 24 – INSURANCE</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="purchaseInsurance"></text-content>
+        </div>
+        <h3>ARTICLE 25 – LANGUAGE</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="language"></text-content>
+        </div>
+        <h3>ARTICLE 26 – MISCELLANEOUS</h3>
+        <div>
+          <text-content :form="form" :disable="disable" keys="miscellaneous"></text-content>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import TextContent from './contractClauseComponenrts/TextContent'
+export default {
+  name: 'ContractClause',
+  dicts: ['deposit_payment_form', 'balance_payment_form'],
+  props: {
+    form: {
+      type: Object,
+      default: null
+    },
+    editable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  components: {
+    TextContent
+  },
+  data() {
+    return {
+      disable: true
+    }
+  },
+  created() {
+  },
+  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 || ''
+    }
+  }
+}
+</script>
+<style lang="scss" scoped></style>

package/packages/src/views/biz/contractTracing/contractClauseComponenrts/TextContent.vue

@@ -0,0 +1,53 @@
+<template>
+  <div>
+    <div class="text-content-text" v-if="disable">{{ form['contractClause'][keys] }}</div>
+    <el-input v-else type="textarea" v-model="form['contractClause'][keys]" :autosize="{ minRows: 3}"></el-input>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'TextContent',
+  props: {
+    form: {
+      type: Object,
+      default: () => {}
+    },
+    disable: {
+      type: Boolean,
+      default: true
+    },
+    keys: {
+      type: String,
+      default: ''
+    }
+  },
+
+  data() {
+    return {
+      
+    };
+  },
+
+  mounted() {
+    
+  },
+
+  methods: {
+    
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.text-content-text {
+  white-space: pre-wrap;
+  word-break:break-word;
+}
+
+.contract-textarea {
+  width: 100%;
+  height: max-content;
+}
+
+</style>