doctor-admin-components 1.0.13-beta.70 → 1.0.13-beta.72

package/package.json

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

package/packages/src/api/biz/bizContract.js

@@ -9,6 +9,14 @@ export function listBizContract(query) {
   });
 }
 
+// 查询合同的提单指令列表
+export function getContractBlList(contractId) {
+  return request({
+    url: "/biz/contract/blList/" + contractId,
+    method: "get",
+  });
+}
+
 // 合同追踪列表
 export function listContractTrace(query) {
   return request({

package/packages/src/api/biz/bizShipment.js

@@ -60,6 +60,15 @@ export function addWithContainer(data) {
   })
 }
 
+// 装运校验： 传提单号和订舱号
+export function addContainerCheck(data) {
+  return request({
+    url: '/biz/shipment/checkShipment',
+    method: 'post',
+    data: data
+  })
+}
+
 // 修改装运
 export function updateBizShipment(data) {
   return request({
@@ -118,3 +127,12 @@ export function getByContractId(contractId) {
     method: 'get'
   })
 }
+
+// 查询作废的装运销售合同列表
+export function haveVoidShipment(query) {
+  return request({
+    url: '/biz/contract/haveVoidShipment/list',
+    method: 'get',
+    params: query
+  })
+}

package/packages/src/components/DictTag/index.vue

@@ -35,6 +35,11 @@ export default {
       default: null,
     },
     value: [Number, String, Array],
+    // 自定义拼接字符
+    appendCallback: {
+      type: Function,
+      default: null
+    }
   },
   computed: {
     values() {
@@ -51,8 +56,13 @@ export default {
   },
   methods: {
     getName(item) {
-      return this.isChina ? item?.label : item?.raw?.dictLabelEn;
-    },
+      var str = this.isChina ? item?.label : item?.raw?.dictLabelEn
+      var append = this.appendCallback ? this.appendCallback() : null
+      if (append) {
+        str += append
+      }
+      return str
+    }
   },
 };
 </script>

package/packages/src/i18n/zh-CN/message.json

@@ -125,8 +125,8 @@
     "Contract_Status": "合同状态",
     "BLConfirm": "BLI确认",
     "BL_No": "提单号：",
-    "BL_Not_Confirm": "提单未确认",
-    "BL_Confirmed": "提单已确认",
+    "BL_Not_Confirm": "BLI未确认",
+    "BL_Confirmed": "BLI已确认",
     "BL_info_confirmed": "提单信息已确认",
     "bl_draft_confirm": "确认提单草稿",
     "editBLInformation": "编辑提单信息",

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

@@ -1,7 +1,12 @@
 <template>
   <div class="app-container">
     <!-- 添加或修改装运对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" :before-close="handleClose">
+    <el-dialog :visible.sync="open" z-index="1000" width="80%" :before-close="handleClose">
+      <slot name="">
+        <span>{{ title }}</span>
+        <span v-if="voidInvoiceList" style="color: red">【快捷转卖】：系统检测到此销售合同关联的采购合同存在【已作废】的装运，</span>
+        <el-button v-if="voidInvoiceList" @click="handleReference" size="mini" type="text">点击这里直接复制并引用</el-button>
+      </slot>
       <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="80px">
         <el-row>
           <el-col :span="6">
@@ -428,26 +433,33 @@
     </el-dialog>
 
     <select-booking ref="selectBooking" @submit="setBooking" @unSubmit="unSetBooking" />
+    <!-- 引用装运 -->
+    <reference-alert @referenced="handleReferenced" ref="referenceAlert" />
   </div>
 </template>
 
 <script>
-import { listBizShipment, getBizShipment, delBizShipment, addWithContainer, updateWithContainer, updateWithContainerAndInvoice } from '../../../api/biz/bizShipment'
+import { haveVoidShipment, listBizShipment, getBizShipment, delBizShipment, addWithContainer, addContainerCheck, updateWithContainer, updateWithContainerAndInvoice } from '../../../api/biz/bizShipment'
 import { generateFinalInvoiceByShipmentId } from '../../../api/biz/bizInvoice'
 import { updateBizContractDetail } from '../../../api/biz/bizContractDetail'
 import { Loading } from 'element-ui'
 import { listDictData } from '../../../api/biz/dictData'
 import selectBooking from './selectBooking.vue'
 import { listBizBooking } from '../../../api/biz/bizBooking'
+import ReferenceAlert from './referenceAlert.vue'
+import { MessageBox } from 'element-ui'
 
 export default {
   name: 'AddShipment',
   dicts: ['shipping_company'],
   components: {
-    selectBooking
+    selectBooking,
+    ReferenceAlert,
   },
   data() {
     return {
+      // 已作废的装运合同
+      voidInvoiceList: null,
       //目的地港口列表
       destinationPortList: [],
       //折叠面板
@@ -572,6 +584,20 @@ export default {
     }
   },
   methods: {
+    // 已用的数据，赋值给form
+    handleReferenced(data) {
+      //shipment, copyFileTypeList
+      this.form = {...this.form, ...data.shipment}
+      this.form.contractIds = [data.shipment.saleContractId]
+      // 需要去掉shipmentId
+      this.form.shipmentId = null
+      this.form.citeShipmentId = data.shipment.shipmentId
+      this.form.copyFileTypeList = data.copyFileTypeList
+    },
+    //引用已作废的装运
+    handleReference() {
+      this.$refs.referenceAlert.handleOpen(this.voidInvoiceList)
+    },
     //编辑开关
     openEditSwitch() {
       this.editSwitch = this.editSwitch = true
@@ -889,6 +915,13 @@ export default {
         .catch((error) => {
           console.error(error)
         })
+      // 查询是否有可引用的
+      haveVoidShipment({contractId: contract.id})
+        .then((res) => {
+          this.voidInvoiceList = res.rows && res.rows.length > 0 ? res.rows : null
+        })
+      // 测试数据
+      // this.voidInvoiceList = [{'contractId': '1', 'contractNo':'合同号1'}] 
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -1003,7 +1036,12 @@ export default {
       })
     },
     //仅生成装运
-    submitShipment() {
+    async submitShipment() {
+      // 装运前校验
+      let resOK = await this.checkPreShipment()
+      if (!resOK) {
+        return
+      }
       this.$refs['form'].validate((valid) => {
         if (valid) {
           let loadingInstance = Loading.service({
@@ -1046,7 +1084,12 @@ export default {
       })
     },
     //装运并下载
-    handleTemplate(command) {
+    async handleTemplate() {
+      // 装运前校验
+      let resOK = await this.checkPreShipment()
+      if (!resOK) {
+        return
+      }
       this.submitAndDownload(command)
     },
     //提交并下载
@@ -1102,8 +1145,29 @@ export default {
         fileName
       )
     },
+    // 装运前校验
+    async checkPreShipment() {
+      let res = await addContainerCheck({
+        'billOfLadingNo': this.form.billOfLadingNo,
+        'bookingNo': this.form.bookingNo
+      })
+      if (!res.data.checkShipmentTip) {
+        return true
+      }
+      let result = await MessageBox.confirm(res.data.checkShipmentTip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+      }).catch(err => err)
+      return result === 'confirm'
+    },
     /** 提交按钮 */
-    submitForm() {
+    async submitForm() {
+      // 装运前校验
+      let resOK = await this.checkPreShipment()
+      if (!resOK) {
+        return
+      }
       this.$refs['form'].validate((valid) => {
         if (valid) {
           let loadingInstance = Loading.service({

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

@@ -0,0 +1,167 @@
+<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 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 }).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('请选择您需要复制的数据或文件')
+      }
+      // 获取详情数据
+      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.contractId = null
+      this.isSelectAll = false
+      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>
@@ -291,13 +292,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 +310,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 +373,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 +453,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 +462,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 +547,27 @@ 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 && (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
-      })
+        // this.form.dealRecordDetailList.map((item) => {
+        //   if (item.imageList) {
+        //     item.askCover = item.imageList.toString()
+        //   }
+        // })
+        // this.loading = true
+      // })
     },
     /** 提交按钮 */
     submitForm() {
@@ -588,20 +605,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/contractTracingDetail.vue

@@ -19,7 +19,7 @@
           <div>{{ contract.reference  || '--' }}</div>
         </div>
         <div class="tab-root">
-          <div :class="['tab', activeName == tabsItem.name ? 'active' : '']" v-for="tabsItem in (contract.contractType == 'sale' ? saleTabsArr : purchaseTabsArr) " :key="tabsItem.id" @click="changeTabs(tabsItem)">
+          <div :class="['tab', activeName == tabsItem.name ? 'active' : '']" v-for="tabsItem in saleTabsArr" :key="tabsItem.id" @click="changeTabs(tabsItem)">
             {{ tabsItem.label }}
           </div>
         </div>
@@ -36,11 +36,16 @@
       <div class="app-container-right">
         <contract-summary v-if="activeName == 'first'" :channel="channel"></contract-summary>
         <contract-info v-if="activeName == 'second'" :channel="channel"></contract-info>
-
-        <bill-info :contract="contract" v-if="activeName == 'third'"
-          :channel="channel"
-        ></bill-info>
-
+        <!-- 提单指令 -->
+        <div v-if="activeName == 'third'">
+          <!-- 标题分栏 -->
+          <el-tabs v-model="activeBillIndex">
+            <el-tab-pane v-for="(bill, i) in blList" :key="i" :label="contract.contractNo+' 提单指令'" :name="i.toString()">
+              <bill-info @refresh="getBlList" :contract="contract" :billData="bill" :channel="channel"></bill-info>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+        
         <contract-file
           v-if="activeName == 'fourth' && contract.contractType"
           :contract="contract"
@@ -94,7 +99,7 @@
 </template>
 
 <script>
-import { getBizContract } from '../../../api/biz/bizContract';
+import { getBizContract, getContractBlList } from '../../../api/biz/bizContract';
 import ContractSummary from './contractSummary.vue';
 import BillInfo from './billInfo.vue';
 import ContractFile from '../bizFileInfo/contract.vue';
@@ -150,9 +155,14 @@ export default {
       }],
       
       selectFileList: [],
+      // 提单指令列表
+      blList: null,
+      activeBillIndex: null,
     };
   },
-  computed: {},
+  computed: {
+    
+  },
   watch: {},
   created() {
     const contractId = this.$route.params && this.$route.params.contractId;
@@ -219,8 +229,21 @@ export default {
         this.buyerFlag = this.contract?.contractNo
           ?.toLowerCase()
           ?.includes('arp');
+        // 获取提单指令
+        this.getBlList()
       });
     },
+    getBlList() {
+      const contractId = this.$route.params && this.$route.params.contractId;
+      getContractBlList(contractId).then((res) => {
+        this.blList = res.rows
+        // 默认选中第一个
+        if (!this.activeBillIndex) {
+          this.activeBillIndex = '0'
+        }
+      })
+    },
+
     handleClick(tab, event) {
       console.log(tab, event);
     },

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

@@ -4,10 +4,17 @@
       <div class="contract">
         <div class="info" id="printPdf">
           <!-- <div class="title">{{ $t("contract.billTip") }}</div> -->
-          <div style="padding-bottom: 20px">
-            <span style="font-size: 16px; font-weight: bold"> {{ $t('contractDetail.BLConfirm') + '：' }} </span>
-            <el-switch v-model="confirmFlag" :inactive-text="$t('contractDetail.BL_Not_Confirm')" :active-text="$t('contractDetail.BL_Confirmed')"> </el-switch>
-          </div>
+          <el-row>
+            <el-col :span="12" v-if="voidFlag">
+              <span style="font-size: 16px;color: red; font-weight: bold"> 已作废 </span>
+            </el-col>
+            <el-col :span="12" v-else>
+              <div style="padding-bottom: 20px">
+                <span style="font-size: 16px; font-weight: bold"> {{ $t('contractDetail.BLConfirm') + '：' }} </span>
+                <el-switch v-model="confirmFlag" :inactive-text="$t('contractDetail.BL_Not_Confirm')" :active-text="$t('contractDetail.BL_Confirmed')"> </el-switch>
+              </div>
+            </el-col>
+          </el-row>
           <el-form :model="form" ref="form" size="mini" :rules="rules" label-width="130px">
             <el-collapse v-model="expandItems">
               <el-collapse-item name="0" v-if="channel !== 'official-website'">
@@ -298,6 +305,8 @@ export default {
       open: false,
       // 是否已确认
       confirmFlag: false,
+      // 是否已作废
+      voidFlag: false,
       // 表单参数
       form: {
         //买家公司提单货物名称
@@ -379,7 +388,8 @@ export default {
         getBizContract(contractId)
           .then((response) => {
             this.contract = response.data
-            this.confirmFlag = this.contract.blConfirmFlag ?? false
+            this.confirmFlag = this.contract.blConfirmFlag == '1'
+            this.voidFlag = this.contract.blConfirmFlag == '2'
             resolve(response) // 异步操作成功，解决Promise
           })
           .catch((error) => {

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

@@ -189,7 +189,8 @@ export default {
     },
     /** 查询合同公司记录列表 */
     getList() {
-      const loading = this.$loading.service({
+      let loadingInstance = this.$loading || this.$loading.service
+      const loading = loadingInstance({
         lock: true,
         text: 'Loading',
         spinner: 'el-icon-loading',