doctor-admin-components 1.0.13-beta.9 → 1.0.13-beta.90

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

@@ -0,0 +1,228 @@
+<template>
+  <div class="bank-view-container">
+    <!-- 收款账户信息-展示（业务场景：生成收付款、收付款票据） -->
+    <el-row style="padding-top: 15px; padding-left: 10px">
+      <div style="font-size: 16px; color: #222222">收款账号信息</div>
+      <div style="padding-left: 30px; padding-top: 2px">
+        选择的收款账户信息会提供给财务进行打款/对账
+      </div>
+    </el-row>
+    <!-- 列表数据 -->
+    <div
+      v-for="(bankData, i) in bankList"
+      :key="i"
+      class="bank-container"
+      :class="{ 'bank-container-select': !disableSelect && sellectIndex == i, 'bank-container-unselect': disableSelect || sellectIndex != i }"
+      @click="clickSelct(i)"
+    >
+      <el-row style="padding-bottom: 20px">
+        <el-col :span="24">
+          <div class="bank-item" style="padding-top: 5px">Swift Code：{{ bankData.swiftCode }}</div>
+        </el-col>
+        <el-col :span="24">
+          <div class="bank-item">Bank Name：{{ bankData.bankName }}</div>
+        </el-col>
+        <el-col :span="24">
+          <div class="bank-item" style="padding-bottom: 20px">Bank Address：{{ bankData.bankAddress }}</div>
+        </el-col>
+        <el-col :span="24">
+          <div class="bank-item">Beneficiary Account：{{ bankData.beneficiaryAccount }}</div>
+        </el-col>
+        <el-col :span="24">
+          <div class="bank-item">Beneficiary：{{ bankData.beneficiary }}</div>
+        </el-col>
+        <el-col :span="24">
+          <div class="bank-item">Beneficiary Address：{{ bankData.beneficiaryAddress }}</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>
+    </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>
+      <span>收款账户信息</span>
+    </div>
+    <!-- 添加收款账户弹框 -->
+    <el-dialog title="添加收款账户" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="18">
+            <el-form-item label="Swift Code" label-width="150px">
+              <el-input maxlength="500" v-model="form.swiftCode" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="18">
+            <el-form-item label="Bank Name" label-width="150px">
+              <el-input maxlength="500" v-model="form.bankName" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="18">
+            <el-form-item label="Bank Address" label-width="150px">
+              <el-input maxlength="500" v-model="form.bankAddress" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="18">
+            <el-form-item label="Beneficiary Account" label-width="150px">
+              <el-input maxlength="500" v-model="form.beneficiaryAccount" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="18">
+            <el-form-item label="Beneficiary" label-width="150px">
+              <el-input maxlength="500" v-model="form.beneficiary" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="18">
+            <el-form-item label="Beneficiary Address" label-width="150px">
+              <el-input maxlength="500" v-model="form.beneficiaryAddress" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="clickCancel">取 消</el-button>
+        <el-button type="primary" @click="clickConfirm">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { insertCompanyBank, getCompanyBanks } from '../../../api/biz/bizContract'
+
+export default {
+  name: 'CompanyBanks',
+  props: {
+    // 收款账户的公司id（目前是合同contractId）
+    companyId: {
+      type: String | Number,
+      default: null
+    },
+    // 是否禁止选择功能
+    disableSelect: {
+      type: Boolean,
+      default: false
+    },
+    // 之前选择的id
+    accountId: {
+      type: String | Number,
+      default: null
+    }
+  },
+  watch: {
+    companyId: {
+      handler(newVal, oldVal) {
+        console.log('companyId changed:', newVal)
+        this.sellectIndex = -1
+        this.getBankList()
+      }
+    },
+    accountId: {
+      handler(newVal, oldVal) {
+        console.log('accountId changed:', newVal)
+        this.handleCaclSelectIndex()
+      }
+    }
+  },
+  data() {
+    return {
+      open: false,
+      sellectIndex: -1,
+      bankList: null,
+      form: {
+        swiftCode: null,
+        bankName: null,
+        bankAddress: null,
+        beneficiaryAccount: null,
+        beneficiary: null,
+        beneficiaryAddress: null
+      },
+      rules: {}
+    }
+  },
+  created() {
+    // 获取收款账户信息
+    this.getBankList()
+  },
+  methods: {
+    restForm() {
+      this.form = {
+        swiftCode: null,
+        bankName: null,
+        bankAddress: null,
+        beneficiaryAccount: null,
+        beneficiary: null,
+        beneficiaryAddress: null
+      }
+    },
+    handleCaclSelectIndex() {
+      if (!this.disableSelect && this.accountId) {
+        this.sellectIndex = this.bankList.findIndex((item) => item.accountId == this.accountId)
+        if (this.sellectIndex == -1) {
+          console.log('pre accountId invalide')
+          this.$emit('selectBank', null)
+        }
+      }
+    },
+    getBankList() {
+      if (!this.companyId) {
+        return
+      }
+      getCompanyBanks(this.companyId).then((res) => {
+        this.bankList = res.data?.paymentAccountList
+        this.handleCaclSelectIndex()
+      })
+    },
+    clickAdd() {
+      this.restForm()
+      this.open = true
+    },
+    clickSelct(index) {
+      if (this.disableSelect) {
+        console.log('disableSelect')
+        return
+      }
+      this.sellectIndex = index
+      let data = this.bankList[index]
+      console.log('select data', data)
+      this.$emit('selectBank', data)
+    },
+    clickCancel() {
+      this.open = false
+    },
+    clickConfirm() {
+      let e = this.form
+      if (!(e.swiftCode || e.bankName || e.bankAddress || e.beneficiaryAccount || e.beneficiary || e.beneficiaryAddress)) {
+        this.$modal.msgError('请输入内容')
+        return
+      }
+      insertCompanyBank({
+        contractId: this.companyId,
+        paymentAccountList: [e]
+      }).then((res) => {
+        this.getBankList()
+        this.open = false
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.bank-container {
+  background-color: rgb(240, 240, 240);
+  padding: 20px 10px 5px;
+  margin-top: 10px;
+}
+.bank-container-select {
+  border: 1px solid blue;
+}
+.bank-container-unselect {
+  border: 1px solid rgb(240, 240, 240);
+}
+.bank-item {
+  padding: 2px 40px 2px;
+}
+</style>

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/contractPdf.vue

@@ -117,14 +117,17 @@
             <div v-else>{{ contract.otherPaymentTerm }}</div>
           </el-descriptions-item>
           <el-descriptions-item label="Price Fixing Option">
-            {{ contract.livePriceDays }} Days {{ contract.livePriceForm }} cargo arrives at POD in
-            {{ contract.livePriceUsertype }}
-            {{ contract.livePriceType }}'s option
+            <div v-if="contract.livePriceSwitch">
+              {{ contract.livePriceDays }} Days {{ contract.livePriceForm }} cargo arrives at POD in
+              {{ contract.livePriceUsertype }}
+              {{ contract.livePriceType }}'s option
+            </div>
           </el-descriptions-item>
 
           <el-descriptions-item label="Origin Country/Region">{{ contract.originCountry }}</el-descriptions-item>
           <el-descriptions-item label="Loading Country/Region">{{ contract.loadingCountry }}</el-descriptions-item>
-          <el-descriptions-item label="Destination">{{ contract.destination }}</el-descriptions-item>
+          <el-descriptions-item v-if="contract.freightTerms != 'EXW'" label="Destination">{{ contract.destination }}</el-descriptions-item>
+          <el-descriptions-item v-else label="EXW Address">{{ contract.exw }}</el-descriptions-item>
           <el-descriptions-item label="Special Instructions">
             {{ contract.numberOfContainersForTwenty }}x 20' Container
             <br />

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: 2023-10-23 17:08:54
+ * @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
 -->
@@ -101,7 +101,8 @@
               <el-form-item :label="$t('contractDetail.paymentType')">{{ dealRecord.paymentType }}</el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item :label="$t('contractDetail.destination')">{{ dealRecord.buyerDestination }}</el-form-item>
+              <el-form-item v-if="dealRecord.paymentType != 'EXW'" :label="$t('contractDetail.destination')">{{ dealRecord.buyerDestination }}</el-form-item>
+              <el-form-item v-else label="EXW">{{ dealRecord.exw }}</el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -221,7 +222,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>
@@ -338,9 +339,9 @@
                   >
                   <!-- v-if="channel == 'official-website' && scope.row.showFallbackQuality" -->
                   <el-button
-                    v-if="channel == 'official-website' && scope.row.showFallbackQuality"
+                    v-if="channel == 'official-website'"
                     size="mini"
-                    type="primary"
+                    :type="scope.row.showFallbackQuality ? 'primary' : 'info'"
                     style="padding-left: 5px; padding-right: 5px"
                     @click.stop="qualityFeedback(scope.row)"
                     >{{ $t('contract.Quality_Feedback') }}</el-button
@@ -534,6 +535,11 @@ export default {
           code: 3,
           en: 'Completed',
           cn: '已结束'
+        },
+        4: {
+          code: 4,
+          en: 'Obsoleted',
+          cn: '已作废'
         }
       }
       const obj = claimTypeMap[type || '1']
@@ -547,6 +553,10 @@ export default {
      */
     qualityFeedback(row) {
       this.$buryingPoint({ data: { funcKey: 'click_feedback' } })
+      if (!row.showFallbackQuality) {
+        this.$message.warning(this.$t('contract.No_quality_feedback'))
+        return
+      }
 
       this.$store.commit('setBillNoInfo', {
         eta: row.eta,
@@ -820,11 +830,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/contractTracingDetail copy.vue

@@ -0,0 +1,107 @@
+<!--
+ * @Author: zhangpengwei 15038779532@163.com
+ * @Date: 2023-07-20 17:13:54
+ * @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
+ * @LastEditTime: 2024-01-19 13:54:56
+ * @FilePath: /recycle-vue-ui再生博士后台管理/src/views/biz/contractTracing/contractTracingDetail.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <div class="app-container">
+    <div style="position: relative">
+      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+        <el-tab-pane :label="$t('contractDetail.summary')" name="first">
+          <contract-summary v-if="activeName == 'first'" :channel="channel"></contract-summary>
+        </el-tab-pane>
+        <el-tab-pane :label="$t('contractDetail.info')" name="second">
+          <contract-info v-if="activeName == 'second'" :channel="channel"></contract-info>
+        </el-tab-pane>
+        <el-tab-pane
+          v-if="contract.contractType == 'sale'"
+          :label="$t('contractDetail.blInfo')"
+          name="third"
+        >
+          <bill-info :contract="contract" v-if="activeName == 'third'"
+          :channel="channel"
+          ></bill-info>
+        </el-tab-pane>
+        <el-tab-pane :label="$t('contractDetail.fileManage')" name="fourth">
+          <contract-file
+            v-if="activeName == 'fourth'"
+            :contract="contract"
+            :channel="channel"
+            :buyerFlag="buyerFlag"
+          ></contract-file>
+        </el-tab-pane>
+      </el-tabs>
+
+      <!-- 这里添加合同编号的显示 -->
+      <div
+        style="
+          position: absolute;
+          right: 10px;
+          top: 5px;
+          margin-top: 10px;
+          font-weight: bold;
+        "
+      >{{$t('contractDetail.Contract_No')}}：{{ contract.contractNo }}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getBizContract } from '../../../api/biz/bizContract';
+import ContractSummary from './contractSummary.vue';
+import BillInfo from './billInfo.vue';
+import ContractFile from '../bizFileInfo/contract.vue';
+import ContractInfo from './contractInfo.vue';
+
+export default {
+  name: 'ContractTracingDetail',
+  mixins: [],
+  components: {
+    ContractSummary,
+    BillInfo,
+    ContractFile,
+    ContractInfo,
+  },
+  props: {
+    channel: '',
+  },
+  data() {
+    return {
+      activeName: 'first',
+      contract: {},
+      buyerFlag: true,
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {
+    const contractId = this.$route.params && this.$route.params.contractId;
+    this.getContract(contractId);
+    const activeName = this.$route.query && this.$route.query.activeName;
+    this.activeName = activeName || 'first';
+    localStorage.setItem('contractDetail', location.href);
+    location.href;
+  },
+  mounted() {},
+  methods: {
+    getContract(contractId) {
+      getBizContract(contractId).then((res) => {
+        this.contract = res.data;
+        // Debit note是给卖家的，要放在 ARS 下
+        // Credit note是给买家的，要放在 ARP 下
+        this.buyerFlag = this.contract?.contractNo
+          ?.toLowerCase()
+          ?.includes('arp');
+      });
+    },
+    handleClick(tab, event) {
+      console.log(tab, event);
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss"></style>