doctor-admin-components 1.0.13-pro.0 → 1.0.14-beta.1

package/packages/src/views/biz/bizShipment/referenceAlert.vue

@@ -0,0 +1,168 @@
+<template>
+  <div class>
+    <el-dialog :title="title" :visible.sync="open" width="75%" append-to-body>
+      <el-form ref="form" :model="form" label-width="100%">
+        <el-form-item class="vertical-form-item" :required="true" label="请选择您需要复制的装运：">
+          <el-row> 合同号 </el-row>
+          <el-row>
+            <el-select @change="selectContract" v-model="contractId" placeholder="请选择合同号">
+              <el-option v-for="(item, i) in shipmentList" :key="i" :label="item.contractNo" :value="item.contractId"></el-option>
+            </el-select>
+          </el-row>
+          <el-row v-if="contractId" style="padding-top: 15px"> 提单号 </el-row>
+          <el-row v-if="contractId">
+            <el-radio-group v-model="form.citeShipmentId">
+              <div v-for="(item, i) in blList" :key="i">
+                <el-radio :label="item.shipmentId">
+                  <span>{{ item.billOfLadingNo }}</span>
+                  <span v-if="item.citeNumber">（</span>
+                  <span v-if="item.citeNumber" style="color: red">已被引用过{{ item.citeNumber }}次</span>
+                  <span v-if="item.citeNumber">）</span>
+                </el-radio>
+              </div>
+            </el-radio-group>
+          </el-row>
+        </el-form-item>
+
+        <el-form-item v-if="contractId" class="vertical-form-item" :required="true" label="请选择您需要复制的数据或文件：">
+          <el-row> 可复用的文件如下： </el-row>
+          <el-row>
+            <el-checkbox v-model="isSelectAll" @change="selectAll" label="0">选择全部</el-checkbox>
+          </el-row>
+          <el-row>
+            <el-checkbox-group @change="selectChange" v-model="form.copyFileTypeList">
+              <el-checkbox v-for="(item, i) in fileList" :key="i" :label="item.key">{{ item.value }}</el-checkbox>
+            </el-checkbox-group>
+          </el-row>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listBizShipment, getBizShipment } from '../../../api/biz/bizShipment'
+
+export default {
+  name: 'ReferenceAlert',
+  props: {},
+  components: {},
+  data() {
+    return {
+      // 弹出层标题
+      title: '请确认：',
+      // 是否显示弹出层
+      open: false,
+      // 表单参数
+      form: {
+        citeShipmentId: null,
+        copyFileTypeList: [] // 可复用的文件
+      },
+      // 选择的合同
+      contractId: null,
+      // 可引用的数据(销售合同列表)
+      shipmentList: null,
+      // 合同对应的提单列表
+      blList: null,
+      isSelectAll: false,
+      fileList: [
+        { key: 'booking_data', value: '订舱资料' },
+        { key: 'packingPhoto', value: '装箱照片' },
+        { key: 'draft_bill_of_lading', value: '草稿提单' },
+        { key: 'shipment_delivery_receipt', value: '正式提单' }
+      ]
+    }
+  },
+  computed: {},
+  watch: {},
+  methods: {
+    selectAll(val) {
+      if (val) {
+        this.form.copyFileTypeList = this.fileList.map((res) => res.key)
+      } else {
+        this.form.copyFileTypeList = []
+      }
+    },
+    selectChange(val) {
+      this.isSelectAll = this.form.copyFileTypeList.length == 4
+    },
+    selectContract(val) {
+      this.blList = null
+      // 获取提单
+      listBizShipment({ 'saleContractId': val, 'voidStatus': 1 }).then((res) => {
+        this.blList = res.rows
+      })
+    },
+
+    /** 提交按钮 */
+    submitForm() {
+      // 数据校验
+      if (!this.contractId) {
+        return this.$modal.msgError('请选择合同号')
+      }
+      if (!this.form.citeShipmentId) {
+        return this.$modal.msgError('请选择提单号')
+      }
+      if (this.form.copyFileTypeList.length == 0) {
+        return this.$modal.msgError('请选择您需要复制的数据或文件')
+      }
+      console.log('form', this.form)
+      // 获取详情数据
+      const loading = this.openLoading()
+      getBizShipment(this.form.citeShipmentId).then((res) => {
+        loading.close()
+        if (res.code == 200) {
+          // 回传数据
+          let shipment = res.data
+          this.$emit('referenced', { shipment: shipment, copyFileTypeList: this.form.copyFileTypeList })
+          this.open = false
+        }
+      })
+    },
+    /** 展示按钮操作 */
+    handleOpen(shipmentList) {
+      this.reset()
+      this.shipmentList = shipmentList
+      this.open = true
+      console.log('shipmentList', shipmentList)
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.shipmentList = null
+      this.form = {
+        citeShipmentId: null,
+        copyFileTypeList: this.fileList.map((res) => res.key) // 可复用的文件
+      }
+      this.contractId = null
+      this.isSelectAll = true
+      this.blList = null
+    }
+  },
+  computed: {}
+}
+</script>
+<style lang="scss" scoped>
+// 修改为上下布局
+.vertical-form-item {
+  display: block;
+}
+::v-deep .vertical-form-item .el-form-item__label {
+  text-align: left;
+  display: block;
+  margin-bottom: 5px !important; /* 根据需要调整间距 */
+}
+
+::v-deep .vertical-form-item .el-form-item__content {
+  display: block;
+  margin-left: 5px !important; /* 重置默认的margin-left，因为标签和输入控件不再水平排列 */
+}
+</style>

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div v-if="saleContract && saleContract.submitFlag">
+    <div v-if="billData && billData.submitFlag">
       <div class="info" id="printPdf" v-if="!printModel">
         <el-form :model="form" ref="form" size="mini" :rules="rules">
           <div v-if="form.shipperFlag">
@@ -49,9 +49,10 @@
           </div>
           <el-row>
             <el-col :span="22">
-              <div class="sub-title mb20">{{ $t('contract.consigneeInfo') }}</div>
+              <span class="sub-title mb20">{{ $t('contract.consigneeInfo') }}</span>
+              <span v-if="billData.blConfirmFlag == '2'" style="font-size: 16px; color: red; font-weight: bold; padding-left: 10px"> 已作废 </span>
             </el-col>
-            <el-col :span="2">
+            <el-col v-if="billData.blConfirmFlag != '2'" :span="2">
               <el-button type="text" @click="editBill">
                 {{ $t('contractDetail.edit') }}
               </el-button>
@@ -246,9 +247,14 @@
             </el-row>
           </el-row>
 
-          <el-form-item :label="$t('contractDetail.destination') + ':'">{{ contract.destination }}</el-form-item>
+          <el-form-item v-if="contract && contract.freightTerms && contract.freightTerms != 'EXW'" :label="$t('contractDetail.destination') + ':'">{{
+            contract.destination
+          }}</el-form-item>
+          <el-form-item v-else :label="'EXW Address' + ':'">{{ contract.exw }}</el-form-item>
 
-          <el-form-item :label="$t('contract.terminal') + ':'">{{ form.terminal }}</el-form-item>
+          <el-form-item v-if="contract && contract.freightTerms && contract.freightTerms != 'EXW'" :label="$t('contract.terminal') + ':'">{{
+            form.terminal
+          }}</el-form-item>
 
           <el-form-item :label="$t('contract.shippingMarks') + ':'">{{ form.shippingMark }}</el-form-item>
 
@@ -291,13 +297,13 @@
 </template>
 
 <script>
-import { getBizDealRecordByAskId, updateBizDealRecord } from '../../../api/biz/bizDealRecord'
+// import { getBizDealRecordByAskId, updateBizDealRecord } from '../../../api/biz/bizDealRecord'
 import { exportPdf } from '../../../utils/pdf'
 import { listBizContractCompany } from '../../../api/biz/bizContractCompany'
 import BillPdf from './billPdf.vue'
 import { listCompanyBillGoods } from '../../../api/biz/bizCompanyBillGoods'
 import EditBill from './editBill.vue'
-import { getSaleContractInfo } from '../../../api/biz/bizContract'
+// import { getSaleContractInfo } from '../../../api/biz/bizContract'
 
 export default {
   name: 'BillInfo',
@@ -309,13 +315,26 @@ export default {
     channel: {
       type: String,
       default: ''
+    },
+    // 提单指令数据
+    billData: {
+      type: Object,
+      default: null
     }
   },
   components: { BillPdf, EditBill },
+  watch: {
+    billData: {
+      handler(val) {
+        this.getDealRecord(this.contract.askId)
+      },
+      immediate: true
+    }
+  },
   data() {
     return {
       //
-      saleContract: null,
+      // saleContract: null,
       // 遮罩层
       loading: true,
       // 弹出层标题
@@ -359,19 +378,21 @@ export default {
     if (printModel == 1) {
       this.printModel = true
     }
-    this.getSaleContractInfo(this.contract.dealId)
+    // this.getSaleContractInfo(this.contract.dealId)
   },
   methods: {
-    getSaleContractInfo(dealId) {
-      getSaleContractInfo(dealId).then((res) => {
-        this.saleContract = res.data
-      })
-    },
+    // getSaleContractInfo(dealId) {
+    //   getSaleContractInfo(dealId).then((res) => {
+    //     this.saleContract = res.data
+    //   })
+    // },
     edit() {
-      this.getDealRecord(this.contract.askId)
+      // this.getDealRecord(this.contract.askId)
+      // 通知外层刷新数据
+      this.$emit('refresh')
     },
     editBill() {
-      this.$refs.editBill.handleEdit(this.contract.contractId, this.form.dealId)
+      this.$refs.editBill.handleEdit(this.billData.contractId, this.form.dealId)
     },
     //子公司更新
     changeSubCompanyList() {
@@ -437,7 +458,7 @@ export default {
         //成交没收货人公司取默认 否则取收货人公司信息
         if (!this.form.deliveryCompanyId && defaultDeliveryCompany) {
           this.form.deliveryCompanyId = defaultDeliveryCompany.contractCompanyId
-          this.form.deliveryCompany = defaultDeliveryCompany
+          this.$set(this.form, 'deliveryCompany', defaultDeliveryCompany)
         } else {
           const deliveryCompany = contractCompanyList.find((item) => item.contractCompanyId == this.form.deliveryCompanyId)
           this.$set(this.form, 'deliveryCompany', deliveryCompany)
@@ -446,7 +467,7 @@ export default {
         //成交没通知人公司取默认 否则取通知人公司信息
         if (!this.form.notifierCompanyId && notifierDeliveryCompany) {
           this.form.notifierCompanyId = notifierDeliveryCompany.contractCompanyId
-          this.form.notifierCompany = notifierDeliveryCompany
+          this.$set(this.form, 'notifierCompany', notifierDeliveryCompany)
         } else {
           const notifierCompany = contractCompanyList.find((item) => item.contractCompanyId == this.form.notifierCompanyId)
           this.$set(this.form, 'notifierCompany', notifierCompany)
@@ -531,26 +552,29 @@ export default {
       this.resetForm('form')
     },
     getDealRecord(askId) {
-      this.loading = false
-      this.reset()
-      getBizDealRecordByAskId(askId).then((response) => {
-        this.form = response.data
-        if (this.form.buyerCompanyBillGoods) {
+      // 使用新接口，传递进来的数据!
+      this.form = this.billData
+      // this.loading = false
+      // this.reset()
+      // getBizDealRecordByAskId(askId).then((response) => {
+      // this.form = response.data
+      if (this.form.buyerCompanyBillGoods) {
+        if (typeof this.form.buyerCompanyBillGoods === 'string') {
           this.form.buyerCompanyBillGoods = JSON.parse(this.form.buyerCompanyBillGoods)
-        } else {
-          this.form.buyerCompanyBillGoods = []
-          this.addBillGoods()
         }
-
-        this.getContractCompanyList(this.form.buyerCompanyId)
-        this.getCompanyBillGoods(this.form.buyerCompanyId)
-        this.form.dealRecordDetailList.map((item) => {
-          if (item.imageList) {
-            item.askCover = item.imageList.toString()
-          }
-        })
-        this.loading = true
-      })
+      } else {
+        this.form.buyerCompanyBillGoods = []
+        this.addBillGoods()
+      }
+      this.getContractCompanyList(this.form.buyerCompanyId)
+      this.getCompanyBillGoods(this.form.buyerCompanyId)
+      // this.form.dealRecordDetailList.map((item) => {
+      //   if (item.imageList) {
+      //     item.askCover = item.imageList.toString()
+      //   }
+      // })
+      // this.loading = true
+      // })
     },
     /** 提交按钮 */
     submitForm() {
@@ -588,20 +612,20 @@ export default {
         this.download(
           'biz/contract/downBill',
           {
-            contractId: this.contract.contractId,
+            contractId: this.billData.contractId,
             templateType: command
           },
-          `${'BLI-' + this.contract.contractNo + '_' + this.parseTime(new Date(), '{y}{m}{d}')}.xlsx`
+          `${'BLI-' + this.billData.contractNo + '_' + this.parseTime(new Date(), '{y}{m}{d}')}.xlsx`
         )
       }
       if (command == 'PDF') {
         this.download(
           'biz/contract/downBill',
           {
-            contractId: this.contract.contractId,
+            contractId: this.billData.contractId,
             templateType: command
           },
-          `${'BLI-' + this.contract.contractNo + '_' + this.parseTime(new Date(), '{y}{m}{d}')}.pdf`
+          `${'BLI-' + this.billData.contractNo + '_' + this.parseTime(new Date(), '{y}{m}{d}')}.pdf`
         )
       }
     }

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 />