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

package/package.json

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

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

@@ -36,6 +36,18 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="起运港" prop="originPort">
+              <el-select v-model="form.originPort" style="width: 100%" placeholder="请选择起运港" clearable filterable size="small">
+                <el-option v-for="(item, i) in portOptionList" :key="'origin'+i" :value="item.dictValue" :label="item.dictValue" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="海运距离(KM)" prop="portDistance">
+              <el-input v-decimal="2" v-model="form.portDistance" placeholder="请输入海运距离" size="small" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="6">
@@ -471,7 +483,7 @@ import { updateBizContractDetail } from '../../../api/biz/bizContractDetail'
 import { queryPurchaseContracts } from '../../../api/biz/bizContract'
 
 import { Loading } from 'element-ui'
-import { listDictData } from '../../../api/biz/dictData'
+import { listDictData, portDictList } from '../../../api/biz/dictData'
 import selectBooking from './selectBooking.vue'
 import { listBizBooking } from '../../../api/biz/bizBooking'
 import ReferenceAlert from './referenceAlert.vue'
@@ -490,6 +502,7 @@ export default {
       voidInvoiceList: null,
       //目的地港口列表
       destinationPortList: [],
+      portOptionList:[],
       //折叠面板
       activeName: ['1'],
       //折叠面板
@@ -568,6 +581,10 @@ export default {
     }
   },
   props: {
+    asyncGetDataFlag: {
+      type: Boolean,
+      default: false
+    },
     billInfoSummary: {
       type: Object,
       default: () => {
@@ -580,11 +597,14 @@ export default {
     }
   },
   created() {
-    listDictData({
-      dictType: 'DESTINATION PORT'
-    }).then((res) => {
-      this.destinationPortList = res.rows
-    })
+    if (this.asyncGetDataFlag) {
+      // 延时1s获取港口列表
+      setTimeout(() => {
+        this.getPortDatas()
+      }, 1200)
+    } else {
+      this.getPortDatas()
+    }
   },
   mounted() {
     const channel = new BroadcastChannel('ocrInfo-channnel');
@@ -593,7 +613,6 @@ export default {
       this.OCRDataFilling(event.data)
       // channel.close();
     });
-
   },
   computed: {
     containerList() {
@@ -626,6 +645,20 @@ export default {
     }
   },
   methods: {
+    getPortDatas() {
+      if (this.destinationPortList.length == 0) {
+        listDictData({
+          dictType: 'DESTINATION PORT'
+        }).then((res) => {
+          this.destinationPortList = res.rows
+        })
+      }
+      if (this.portOptionList.length == 0) {
+        portDictList().then((res) => {
+          this.portOptionList = res.rows
+        })
+      }
+    },
     // 已用的数据，赋值给form
     handleReferenced(data) {
       //shipment, copyFileTypeList
@@ -879,6 +912,8 @@ export default {
         bookingNo: null,
         billOfLadingNo: null,
         destinationPort: null,
+        originPort: null,  // 添加
+        portDistance: null,  // 添加
         purchaseContractNo: null,
         etd: null,
         eta: null,
@@ -888,7 +923,12 @@ export default {
         updateTime: null,
         containerList: [],
         etaUpdateOn: true,
-        loadingTime: this.utc2local(new Date(), 'yyyy-MM-DD HH:mm:ss')
+        loadingTime: this.utc2local(new Date(), 'yyyy-MM-DD HH:mm:ss'),
+        bookingId: null,  // 添加
+        citeShipmentId: null,  // 添加
+        copyFileTypeList: null,  // 添加
+        containerNum: 0,  // 添加
+        contractIds: null  // 添加
       }
       this.contract = {
         purchaseContractNos: null
@@ -943,6 +983,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd(contractDetailList, destinationPort, contract) {
       this.reset()
+      this.getPortDatas()
       if (contract.contractType == 'purchase') {
         this.$modal.msgError('请选择销售合同')
         return
@@ -1299,6 +1340,14 @@ export default {
             this.form.destinationPort = billInfoSummary.destinationPort
           }
 
+          if (billInfoSummary.originPort) {
+            this.form.originPort = billInfoSummary.originPort
+          }
+
+          if (billInfoSummary.portDistance) {
+            this.form.portDistance = billInfoSummary.portDistance
+          }
+
           // if (billInfoSummary.actualArrivalDate) {
           //   this.form.actualArrivalDate = billInfoSummary.actualArrivalDate;
           // }

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

@@ -102,7 +102,7 @@
 
       <el-descriptions-item label="Origin Country/Region">{{ form.originCountry }}</el-descriptions-item>
       <el-descriptions-item label="Loading Country/Region">{{ form.loadingCountry }}</el-descriptions-item>
-      <el-descriptions-item label="Loading Port">{{ form.originPort }}</el-descriptions-item>
+      <el-descriptions-item label="Loading Port" v-if="form.freightTerms != 'EXW'">{{ form.originPort }}</el-descriptions-item>
       <el-descriptions-item v-if="form.freightTerms != 'EXW'" label="Destination">{{ form.destination }}</el-descriptions-item>
       <el-descriptions-item v-else label="EXW Address">{{ form.exw }}</el-descriptions-item>
       <el-descriptions-item label="Containers">