doctor-admin-components 1.0.14-beta.85 → 1.0.14-beta.87

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.87",
   "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"

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

@@ -36,12 +36,13 @@
         </div>
         <h3>ARTICLE 8 – PAYMENT</h3>
         <div>
+          <text-content :form="form" :disable="disable" keys="payment"></text-content>
+        </div>
+        <!-- <div>
           <div>
-            <!-- 比例 -->
             <div v-if="form && form.depositType == '1'">
             The Buyer shall pay a deposit of {{ form.deposit}}% of the total Contract Price to TTYY within {{ form.depositDays }} days {{ depositPaymentFormKey(form.depositPaymentForm)}}.
             </div>
-            <!-- 固定金额 -->
             <div v-else>
             The Buyer shall pay a deposit of {{`$${form.advanceDepositAmount}`}} 
             TTYY within {{ form.depositDays }} days {{ depositPaymentFormKey(form.depositPaymentForm) }}.
@@ -56,9 +57,12 @@
           <br />
           If the Buyer fails to make any payment within the stipulated time frames, TTYY shall be entitled to charge
           interest on the overdue amount at a rate of 0.05% per day from the due date until the date of actual payment.
-        </div>
+        </div> -->
         <h3>ARTICLE 9 – FLOATING PRICE</h3>
         <div v-if="form.quoteType && form.quoteType != 'FIXED'">
+          <text-content :form="form" :disable="disable" keys="floatingPrice"></text-content>
+        </div>
+        <!-- <div v-if="form.quoteType && form.quoteType != 'FIXED'">
           Price Period: The {{ form.livePriceUsertype }} has the pricing authority option from container loaded date until
           {{ form.livePriceDays }} days {{ form.livePriceForm }} it arrives at the port.
           <br />
@@ -89,7 +93,7 @@
           <br />
           Any extension of the Price Fixing Period shall be the final extension, and no further extensions shall be
           granted unless otherwise agreed upon in writing by the parties.
-        </div>
+        </div> -->
         <h3>ARTICLE 10 – MARGIN CALL</h3>
         <div>
           <text-content :form="form" :disable="disable" keys="saleMarginCall"></text-content>
@@ -100,6 +104,9 @@
         </div>
         <h3>ARTICLE 12 - PACKING, DELIVERY, SHIPPING & RISK OF LOSS</h3>
         <div>
+          <text-content :form="form" :disable="disable" keys="salePacking"></text-content>
+        </div>
+        <!-- <div>
           The delivery terms shall be set forth on the first page of the Contract. The Contract includes standard
           commercial packaging for the goods. When special or export packaging is required or requested, the cost of the
           special packaging will be separately invoiced.
@@ -120,7 +127,7 @@
           cancellation notice to the seller 3 days’ before deadline as per above, this Agreement shall be automatically
           extended for additional 45 days. In any case, the Buyer shall not be entitled to cancel this Agreement once
           the Material is loaded into the containers and notice thereof has been given by the Seller to the Buyer.
-        </div>
+        </div> -->
         <h3>ARTICLE 13 - AS IS; NO WARRANTY</h3>
         <div>
           <text-content :form="form" :disable="disable" keys="saleNoWarranty"></text-content>
@@ -213,11 +220,12 @@
         </div>
         <h3>ARTICLE 8 – PAYMENT</h3>
         <div>
-            <!-- 比例 -->
+          <text-content :form="form" :disable="disable" keys="payment"></text-content>
+        </div>
+        <!-- <div>
             <div v-if="form && form.depositType == '1'">
               TTYY's downstream customers shall pay a deposit of {{ form.deposit}}% of the total Contract Price to the Seller within {{ form.depositDays }} days {{ depositPaymentFormKey(form.depositPaymentForm)}}.
             </div>
-            <!-- 固定金额 -->
             <div v-else>
               TTYY's downstream customers shall pay a deposit of {{`$${form.advanceDepositAmount}`}} 
               TTYY within {{ form.depositDays }} days {{ depositPaymentFormKey(form.depositPaymentForm) }}.
@@ -225,9 +233,12 @@
         </div>
         The remaining {{ form && form.depositType == '1' && form.balance > 0 ?  `${form.balance}%` : '' }} balance of the total Contract Price shall
         be paid to the Seller via Telegraphic Transfer ({{ form.balancePaymentType }}) no later than {{ form.balanceDays }}
-        days {{ balancePaymentFormKey(form.balancePaymentForm) }}.
+        days {{ balancePaymentFormKey(form.balancePaymentForm) }}. -->
         <h3>AARTICLE 9 – FLOATING PRICE</h3>
         <div v-if="form.quoteType && form.quoteType != 'FIXED'">
+          <text-content :form="form" :disable="disable" keys="floatingPrice"></text-content>
+        </div>
+        <!-- <div v-if="form.quoteType && form.quoteType != 'FIXED'">
           Price Period: The {{ form.livePriceUsertype }} has the pricing option from container loaded date until
           {{ form.livePriceDays }} days {{ form.livePriceForm }} it arrives at the port.
           <br />
@@ -240,7 +251,7 @@
           If one party is unable to fix the price within the agreed Price Fixing Period, it is permitted to apply for an
           extension pricing period application.The other party have the right to evaluate and offer extension pricing
           period or not.
-        </div>
+        </div> -->
         <h3>ARTICLE 10 – PRICE ADJUSTMENT</h3>
         <div>
           <text-content :form="form" :disable="disable" keys="priceAdjustment"></text-content>