doctor-admin-components 1.0.13-beta.77 → 1.0.13-beta.79

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "doctor-admin-components",
   "version1": "1.0.11",
-  "version": "1.0.13-beta.77",
+  "version": "1.0.13-beta.79",
   "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 queryPurchaseContracts(saleContractId) {
+  return request({
+    url: "/biz/contract/queryPurchaseContracts/"+saleContractId,
+    method: "get",
+  });
+}
+
 // 查询合同的提单指令列表
 export function getContractBlList(contractId) {
   return request({

package/packages/src/views/biz/bizFileInfo/contract.vue

@@ -1594,7 +1594,7 @@ export default {
       let timer = Date.now();
       addBizShipmentPurchase({
         bookingNo: 'bookingNo-' + timer,
-        billOfLadingNo: 'billOfLadingNo-' + timer,
+        billOfLadingNo: `Refer BL ${this.contract.contractNo}-${(this.contractFileInfo?.shipmentFileInfoList?.length || 0) + 1}`,
         saleContractId: purchaseBuyerInfo.contractId,
         purchaseContractId: this.contract.contractId,
         containerList: [{

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

@@ -442,6 +442,8 @@
 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 { queryPurchaseContracts } from '../../../api/biz/bizContract'
+
 import { Loading } from 'element-ui'
 import { listDictData } from '../../../api/biz/dictData'
 import selectBooking from './selectBooking.vue'
@@ -587,12 +589,13 @@ export default {
     // 已用的数据，赋值给form
     handleReferenced(data) {
       //shipment, copyFileTypeList
-      this.form = {...this.form, ...data.shipment}
-      this.form.contractIds = [data.shipment.saleContractId]
+      let contractIds = this.form.contractIds // 保持不变
+      this.form = {...this.form, ...data.shipment, 'contractIds':contractIds}
       // 需要去掉shipmentId
       this.form.shipmentId = null
       this.form.citeShipmentId = data.shipment.shipmentId
       this.form.copyFileTypeList = data.copyFileTypeList
+      console.log('form:', this.form)
     },
     //引用已作废的装运
     handleReference() {
@@ -885,19 +888,29 @@ export default {
       this.contractDetailList = contractDetailList.map((v) => {
         return { ...v, selected: false }
       })
-      var purchaseContractNos = contract?.purchaseContractNos
-      if (typeof purchaseContractNos == 'string') {
-        purchaseContractNos = purchaseContractNos?.split(',')
+      // 过滤作废的采购合同
+      queryPurchaseContracts(contract.contractId)
+      .then((res) => {
+        let purchaseContractNos = res.rows
         this.contract.purchaseContractNos = purchaseContractNos
         if (purchaseContractNos && purchaseContractNos.length == 1) {
           this.form.purchaseContractNo = purchaseContractNos[0]
         }
-      } else {
-        this.contract.purchaseContractNos = purchaseContractNos
-        if (purchaseContractNos && purchaseContractNos.length == 1) {
-          this.form.purchaseContractNo = purchaseContractNos[0]
-        }
-      }
+      })
+      // var purchaseContractNos = contract?.purchaseContractNos
+      // if (typeof purchaseContractNos == 'string') {
+      //   purchaseContractNos = purchaseContractNos?.split(',')
+      //   this.contract.purchaseContractNos = purchaseContractNos
+      //   if (purchaseContractNos && purchaseContractNos.length == 1) {
+      //     this.form.purchaseContractNo = purchaseContractNos[0]
+      //   }
+      // } else {
+      //   this.contract.purchaseContractNos = purchaseContractNos
+      //   if (purchaseContractNos && purchaseContractNos.length == 1) {
+      //     this.form.purchaseContractNo = purchaseContractNos[0]
+      //   }
+      // }
+
       let containerNum = 1
       this.form.destinationPort = destinationPort
       this.form.contractIds = Array.from(new Set(contractDetailList.map((i) => i.contractId)))