doctor-admin-components 1.0.14-beta.85 → 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.85",
+  "version": "1.0.14-beta.86",
   "private": false,
   "main1": "lib/index.umd.min.js",
   "main": "packages/index.js",

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

@@ -364,23 +364,18 @@
         @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">
       <!-- 生成装运 -->
       <SectionSlot @updateOpen="handleShippingUpdateOpen" :infoPro="shipProgressInfo" v-if="contractFileInfo && !contractFileInfo.shipmentFileInfoList">
         <template v-slot:header>
           <div style="position:relative">
-            <ProgressDetail :infoPro="shipProgressInfo">
-              <template slot="action" v-if="contract.contractType == 'purchase'">
-                <div style="position: absolute; margin-left: 15px;bottom: 5px;">
-                  <el-select v-model="selectSaleContractId" placeholder="请选择" size="mini">
-                    <el-option v-for="item in contract.associationContractList" :key="item.contractId" :label="item.contractNo" :value="item.contractId"></el-option>
-                  </el-select>
-                  <el-button class="ml5" type="success" size="mini" icon="el-icon-plus" @click.stop="handleAddShipment" circle></el-button>
-                </div>
-              </template>
-            </ProgressDetail>
+            <ProgressDetail :infoPro="shipProgressInfo"></ProgressDetail>
           </div>
         </template>
         <template v-slot:content>
@@ -1558,25 +1553,85 @@ export default {
   },
   mounted() { },
   methods: {
-    handleAddShipment() {
-      if (!this.selectSaleContractId) {
-        return this.$message.warning('请选择关联的销售合同')
+    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(() => {
-        // 添加装运接口
-        addBizShipment({
-          purchaseContractId: this.contract.contractId,
-          saleContractId: this.selectSaleContractId,
-        }).then(() => {
-          this.$message.success('添加成功')
-          this.handleRefresh()
-        })
+        this.addBizShipmentRequest()
       })
       .catch((e) => {
         console.log(e)

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/bizFileInfo/contractFile/ProgressDetail.vue

@@ -14,7 +14,6 @@
                     <img class="progress-img" :src="info.img" alt="">
                     <div class="progress-text">{{ info.text}}</div>
                 </div>
-                <slot name="action"></slot>
             </el-col>
             <el-col :span="info.hidden ? 11 : 16">
                 <div class="progress-info"