doctor-admin-components 1.0.14-beta.82 → 1.0.14-beta.86

package/package.json

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

package/packages/src/i18n/en/message.json

@@ -295,7 +295,8 @@
     "voucherOrReceipt": "Voucher/Receipt",
     "weight": "weight(MT)",
     "yes": "Yes",
-    "cndn": "Debit note & Credit note"
+    "cndn": "Debit note & Credit note",
+    "addShipment": "Add Shipment"
   },
   "distpicker":{
     "province": "Province",

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

@@ -295,7 +295,8 @@
     "voucherOrReceipt": "凭证/条款",
     "weight": "重量(MT)",
     "yes": "Yes",
-    "cndn": "Debit note & Credit note"
+    "cndn": "Debit note & Credit note",
+    "addShipment": "添加装运"
   },
   "distpicker":{
     "province": "省",

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

@@ -364,7 +364,11 @@
         @changeShipBillNo="changeShipBillNo"
         :progressInfo="shipProgressInfo"
         :shipBillNoProp="shipBillNo"
-      ></BillOfLadingNoTab>
+      >
+      <template slot="action" v-if="contract.contractType == 'purchase'">
+        <el-button class="mt5" type="success" size="mini" icon="el-icon-plus" @click.stop="clickAddShipment" circle></el-button>
+      </template>
+    </BillOfLadingNoTab>
     <!-- 装运 -->
     <div id="contract_shipping_id">
       <!-- 生成装运 -->
@@ -722,10 +726,10 @@
                 </el-col>
               </el-col>
               <!-- 临时尾款发票 -->
-              <el-col :span="24" v-if="contract.quoteType != 'FIXED'">
+              <el-col :span="24">
                 <div class="hr-class"></div>
               </el-col>
-              <el-col :span="24" v-if="contract.quoteType != 'FIXED'">
+              <el-col :span="24">
                 <div class="content-root-row" style="display: flex;">
                   <ContentTitle :contentTitleProp="{
                     bgButton: $t('contractDetail.saleTemporaryFinallyInvoice'),
@@ -1521,7 +1525,9 @@ export default {
       //参考采购价
       shipmentPurchaseAmountMessage: '',
       loadingInstance: null,
-      purchaseBalanceMoney: null
+      purchaseBalanceMoney: null,
+      // 新增：选择关联合同
+      selectSaleContractId: null,
     };
   },
   created() {
@@ -1547,6 +1553,90 @@ export default {
   },
   mounted() { },
   methods: {
+    async clickAddShipment() {
+      //弹出选择框，选择关联的销售合同，点击确定后，执行新增
+      const list = this.contract.associationContractList || []
+      if (!list.length) {
+        this.$message.warning('暂无可关联的销售合同')
+        return
+      }
+      // 单个直接确认
+      if (list.length === 1) {
+        this.selectSaleContractId = list[0].contractId
+        this.handleAddShipment(true)
+        return
+      }
+      
+      // 多个：用 render 函数渲染 el-select 弹窗
+      let selectedId = list[0].contractId  // 默认选中第一个
+      
+      try {
+        await this.$msgbox({
+          title: '请选择关联的销售合同',
+          message: this.$createElement('div', [
+            this.$createElement('el-select', {
+              props: { value: selectedId, placeholder: '请选择', style: 'width: 100%;', popperAppendToBody: false },
+              on: { input: val => selectedId = val }  // 闭包更新值
+            }, 
+            list.map(item => 
+              this.$createElement('el-option', {
+                props: { label: item.contractNo, value: item.contractId }
+              })
+            )),
+            // 间隔占位
+            this.$createElement('div', { style: 'height: 80px;' })
+          ]),
+          showCancelButton: true,
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          beforeClose: (action, instance, done) => {
+            if (action === 'confirm' && !selectedId) {
+              this.$message.warning('请选择关联的销售合同')
+              return
+            }
+            done()
+          }
+        })
+        
+        // 用户确认后执行
+        this.selectSaleContractId = selectedId
+        this.handleAddShipment(false)
+        
+      } catch (e) {
+        // 取消
+      }
+
+    },
+    addBizShipmentRequest() {
+      // 添加装运接口
+      addBizShipment({
+        purchaseContractId: this.contract.contractId,
+        saleContractId: this.selectSaleContractId,
+      }).then(() => {
+        this.$message.success('添加成功')
+        this.handleRefresh()
+      })
+    },
+    handleAddShipment(showAlert = true) {
+      console.log('==handleAddShipment==', this.selectSaleContractId)
+      
+      // 弹框二次确认
+      if (!showAlert) {
+        return this.addBizShipmentRequest()
+      }
+      
+      this.$confirm('是否添加空白装运', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+      .then(() => {
+        this.addBizShipmentRequest()
+      })
+      .catch((e) => {
+        console.log(e)
+      })
+    },
     // 装运模块状态变化，需要同步关联模块
     handleShippingUpdateOpen(isOpen) {
       this.$refs.SectionReceiving && this.$refs.SectionReceiving[0]?.setOpen(isOpen)
@@ -2389,13 +2479,13 @@ export default {
     },
   },
   watch: {
-    // selectFileListProp: {
-    //   handler(val) {
-    //     this.selectFileList = val
-    //   },
-    //   immediate: true,
-    //   deep: true
-    // },
+    contract: {
+      handler(val) {
+        this.selectSaleContractId = val.associationContractList[0].contractId
+      },
+      immediate: true,
+      deep: true
+    },
   },
   destroyed() {
     clearTimeout(this.timer);

package/packages/src/views/biz/bizFileInfo/contractFile/BillOfLadingNoTab.vue

@@ -21,6 +21,9 @@
           <i v-if="open" class="el-icon-caret-top"></i>
           <i v-else class="el-icon-caret-bottom"></i>
         </div>
+        <div>
+          <slot name="action"></slot>
+        </div>
       </div>
 </template>
 

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

@@ -2,6 +2,10 @@
   <div class="app-container">
     <!-- 添加或修改装运对话框 -->
     <el-dialog :visible.sync="open" z-index="1000" width="80%" :before-close="handleClose" :title="title">
+      <template slot="title">
+        <strong style="font-size: 18px;">{{ form.shipmentId ? '修改装运' : title }}</strong>
+        <span style="color: red">（注意“目的港”、“起运港”两个字段，如果为空，可参考后面括号内的值进行选择）</span>
+      </template>
       <slot name="billOfLadingUpload"></slot>
       <slot name="">
         <span v-if="isDraft" style="color: red">提示: 当前打开了【{{ form.lastUpdateUserName }}】在【{{ form.updateTime }}】保存的装运草稿</span>
@@ -24,7 +28,6 @@
         <el-form-item label="提单号" prop="billOfLadingNo">
           <el-input v-model="form.billOfLadingNo" placeholder="请输入提单号" size="small" />
         </el-form-item>
-
         <el-form-item label="目的港" prop="destinationPort">
           <!-- <el-select v-model="form.destinationPort" style="width: 100%" placeholder="请选择目的港" clearable filterable size="small">
             <el-option v-for="(item, i) in destinationPortList" :key="i" :value="item.dictValue" :label="item.dictValue" />
@@ -40,9 +43,11 @@
             }"
             placeholder="请选择目的港"
             :show-all-levels="false"
+            :filter-method="filterPortMethod"
             clearable
             filterable
           ></el-cascader>
+          <span>（{{ form.destinationPort }}）</span>
         </el-form-item>
 
         <el-form-item label="起运港" prop="originPort">
@@ -60,9 +65,11 @@
             }"
             placeholder="请选择起运港"
             :show-all-levels="false"
+            :filter-method="filterPortMethod"
             clearable
             filterable
           ></el-cascader>
+          <span>（{{ form.originPort }}）</span>
         </el-form-item>
 
         <el-form-item label="海运距离(KM)" prop="portDistance">
@@ -152,7 +159,8 @@
           </div>
         </el-row>
         <el-divider></el-divider>
-        <el-row v-for="(dt, index) in form.containerList" :key="'dt' + index">
+        <el-button v-if="!form.containerList || form.containerList.length==0" icon="el-icon-plus" size="mini" type="warning" circle @click="addContainerRow"></el-button>
+        <el-row v-else v-for="(dt, index) in form.containerList" :key="'dt' + index">
           <el-row>
             <el-col :span="2">
               <div style="font-weight: bolder; margin-top: 10px">
@@ -654,6 +662,10 @@ export default {
     }
   },
   methods: {
+    filterPortMethod(node, keyword) {
+      // console.log('node:', node, "keyword:", keyword)
+      return node.data.dictValue.toLowerCase().indexOf(keyword.toLowerCase()) !== -1 || node.data.dictLabel.indexOf(keyword) !== -1
+    },
     getPortDatas() {
       if (this.destinationPortList.length == 0) {
         getPortTree({
@@ -1056,7 +1068,9 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      console.log("shipment handleUpdate:", row)
       this.reset()
+      this.getPortDatas()
       const shipmentId = row.shipmentId
       this.$emit('openFullscreenLoading')
       getBizShipment(shipmentId).then((response) => {
@@ -1066,7 +1080,6 @@ export default {
         this.contractDetailList = contract.contractDetailList.map((v) => {
           return { ...v, selected: false }
         })
-
         var purchaseContractNos = contract?.purchaseContractNos
         if (typeof purchaseContractNos == 'string') {
           purchaseContractNos = purchaseContractNos?.split(',')