doctor-admin-components 1.0.13-beta.93 → 1.0.13-beta.95

package/package.json

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

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

@@ -374,11 +374,11 @@
                   channel !== 'official-website' && contract.contractType == 'sale'
                 "
               >增加装运</div>  -->
-              <div class="addshipment" @click.stop="handleGeneratePurchase"
+              <!-- <div class="addshipment" @click.stop="handleGeneratePurchase"
                   v-if="
                   channel !== 'official-website' && contract.contractType == 'purchase'
                 "
-              >{{ $t('contractDetail.add_shipment') }}</div> 
+              >{{ $t('contractDetail.add_shipment') }}</div>  -->
             </div>
           </template>
           <template v-slot:content>

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

@@ -7,7 +7,7 @@
         <span v-if="voidInvoiceList" style="color: red">【快捷转卖】：系统检测到此销售合同关联的采购合同存在【已作废】的装运，</span>
         <el-button v-if="voidInvoiceList" @click="handleReference" size="mini" type="text">点击这里直接复制并引用</el-button>
       </slot>
-      <div v-if="reason" style="color:#f00;padding-left:60px;margin-bottom:10px;">{{ reason }}</div>
+      <div v-if="reason" style="color: #f00; padding-left: 60px; margin-bottom: 10px">{{ reason }}</div>
       <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="80px">
         <el-row>
           <el-col :span="6">
@@ -94,7 +94,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="对应采购合同" prop="purchaseContractNo" label-width="100">
-              <el-select v-model="form.purchaseContractNo" size="small">
+              <el-select v-model="form.purchaseContractNo" size="small" clearable="">
                 <el-option v-for="item in contract.purchaseContractNos" :key="item" :label="item" :value="item" />
               </el-select>
             </el-form-item>
@@ -440,7 +440,16 @@
 </template>
 
 <script>
-import { haveVoidShipment, listBizShipment, getBizShipment, delBizShipment, addWithContainer, addContainerCheck, 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 { queryPurchaseContracts } from '../../../api/biz/bizContract'
@@ -457,7 +466,7 @@ export default {
   dicts: ['shipping_company'],
   components: {
     selectBooking,
-    ReferenceAlert,
+    ReferenceAlert
   },
   data() {
     return {
@@ -595,7 +604,7 @@ export default {
     handleReferenced(data) {
       //shipment, copyFileTypeList
       let contractIds = this.form.contractIds // 保持不变
-      this.form = {...this.form, ...data.shipment, 'contractIds':contractIds}
+      this.form = { ...this.form, ...data.shipment, contractIds: contractIds }
       // 需要去掉shipmentId
       this.form.shipmentId = null
       this.form.citeShipmentId = data.shipment.shipmentId
@@ -817,6 +826,7 @@ export default {
         bookingNo: null,
         billOfLadingNo: null,
         destinationPort: null,
+        purchaseContractNo: null,
         etd: null,
         eta: null,
         actualArrivalDate: null,
@@ -894,8 +904,7 @@ export default {
         return { ...v, selected: false }
       })
       // 过滤作废的采购合同
-      queryPurchaseContracts(contract.contractId)
-      .then((res) => {
+      queryPurchaseContracts(contract.contractId).then((res) => {
         let purchaseContractNos = res.rows
         this.contract.purchaseContractNos = purchaseContractNos
         if (purchaseContractNos && purchaseContractNos.length == 1) {
@@ -934,12 +943,11 @@ export default {
           console.error(error)
         })
       // 查询是否有可引用的
-      haveVoidShipment(contract.contractId)
-        .then((res) => {
-          this.voidInvoiceList = res.rows && res.rows.length > 0 ? res.rows : null
-        })
+      haveVoidShipment(contract.contractId).then((res) => {
+        this.voidInvoiceList = res.rows && res.rows.length > 0 ? res.rows : null
+      })
       // 测试数据
-      // this.voidInvoiceList = [{'contractId': '1', 'contractNo':'合同号1'}] 
+      // this.voidInvoiceList = [{'contractId': '1', 'contractNo':'合同号1'}]
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -1166,18 +1174,18 @@ export default {
     // 装运前校验
     async checkPreShipment() {
       let res = await addContainerCheck({
-        'billOfLadingNo': this.form.billOfLadingNo,
-        'bookingNo': this.form.bookingNo,
-        'shipmentId': this.form.shipmentId
+        billOfLadingNo: this.form.billOfLadingNo,
+        bookingNo: this.form.bookingNo,
+        shipmentId: this.form.shipmentId
       })
       if (!res.data.checkShipmentTip) {
         return true
       }
       let result = await MessageBox.confirm(res.data.checkShipmentTip, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-      }).catch(err => err)
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).catch((err) => err)
       return result === 'confirm'
     },
     /** 提交按钮 */