预托书调整

src/views/pre-book/addPreBookDrawer.vue

@@ -18,8 +18,8 @@
               
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="托书号" prop="shippingOrderNumber">
-                  <a-input placeholder="自动生产" v-model="addPreBook.shippingOrderNumber" readOnly></a-input>
+                <a-form-model-item label="预托书号" prop="depositaryReceiptNo">
+                  <a-input placeholder="请填写预托书号" v-model="addPreBook.depositaryReceiptNo"></a-input>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="8">
@@ -64,7 +64,7 @@
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="最终船期" prop="theFinalShippingDate">
-                  <a-input placeholder="请输入最终船期" v-model="addPreBook.theFinalShippingDate"></a-input>
+                  <a-date-picker placeholder="请输入最终船期" style="width:100%;" v-model="addPreBook.theFinalShippingDate"/>
                 </a-form-model-item>
               </a-col>
 
@@ -81,54 +81,84 @@
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="收货人地址" prop="consigneeAddress">
-                  <a-input placeholder="请输入收货人地址" v-model="addPreBook.consigneeAddress"></a-input>
+                  <a-input placeholder="根据收货人自动带出" v-model="addPreBook.consigneeAddress" ></a-input>
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="通知方" prop="notifyParty">
-                  <a-input placeholder="请输入通知方" v-model="addPreBook.notifyParty"></a-input>
+                  <a-input placeholder="根据收货人自动带出" v-model="addPreBook.notifyParty" ></a-input>
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="通知方地址" prop="notifyPartyAddress">
-                  <a-input placeholder="请输入通知方地址" v-model="addPreBook.notifyPartyAddress"></a-input>
+                  <a-input placeholder="根据收货人自动带出" v-model="addPreBook.notifyPartyAddress" ></a-input>
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="贸易国别" prop="tradeCountry">
-                  <a-input placeholder="请输入贸易国别" v-model="addPreBook.tradeCountry"></a-input>
+                  <j-search-select-tag
+                    placeholder="请选择贸易国别"
+                    v-model="addPreBook.tradeCountry"
+                    dict="trade_country">
+                  </j-search-select-tag>
+                  <!-- <a-input placeholder="请输入贸易国别" v-model="addPreBook.tradeCountry"></a-input> -->
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="运抵国别" prop="arriveInCountry">
-                  <a-input placeholder="请输入运抵国别" v-model="addPreBook.arriveInCountry"></a-input>
+                    <j-search-select-tag
+                    placeholder="请选择运抵国别"
+                    v-model="addPreBook.arriveInCountry"
+                    dict="country_of_arrival">
+                  </j-search-select-tag>
+                  <!-- <a-input placeholder="请输入运抵国别" v-model="addPreBook.arriveInCountry"></a-input> -->
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="出口口岸" prop="exportPort">
-                  <a-input placeholder="请输入出口口岸" v-model="addPreBook.exportPort"></a-input>
+                   <j-search-select-tag
+                    placeholder="请选择出口口岸"
+                    v-model="addPreBook.exportPort"
+                    dict="export_port">
+                  </j-search-select-tag>
+                  <!-- <a-input placeholder="请输入出口口岸" v-model="addPreBook.exportPort"></a-input> -->
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="目的港" prop="destinationPort">
-                  <a-input placeholder="请输入目的港" v-model="addPreBook.destinationPort"></a-input>
+                    <j-search-select-tag
+                    placeholder="请选择目的港"
+                    v-model="addPreBook.destinationPort"
+                    dict="port_of_destination">
+                  </j-search-select-tag>
+                  <!-- <a-input placeholder="请输入目的港" v-model="addPreBook.destinationPort"></a-input> -->
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="收汇方式" prop="exchangeEarningsValue">
-                  <a-input placeholder="请输入收汇方式" v-model="addPreBook.exchangeEarningsValue"></a-input>
+                  <j-search-select-tag
+                    placeholder="请选择收汇方式"
+                    v-model="addPreBook.exchangeEarningsValue"
+                    dict="collection_method">
+                  </j-search-select-tag>
+                  <!-- <a-input placeholder="请输入收汇方式" v-model="addPreBook.exchangeEarningsValue"></a-input> -->
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="成交方式" prop="termsOfDeliveryvalue">
-                  <a-input placeholder="请输入成交方式" v-model="addPreBook.termsOfDeliveryvalue"></a-input>
+                   <j-search-select-tag
+                    placeholder="请选择成交方式"
+                    v-model="addPreBook.termsOfDeliveryvalue"
+                    dict="transaction_method">
+                  </j-search-select-tag>
+                  <!-- <a-input placeholder="请输入成交方式" v-model="addPreBook.termsOfDeliveryvalue"></a-input> -->
                 </a-form-model-item>
               </a-col>
 
@@ -564,14 +594,24 @@ export default {
       },
       // 收货人下拉框
       consigneeSelectChange(value){
-        var arr = value.split("-");
+
+        if(value !=null && value !='' &&value != 'undefined'){
+        var arr = value.split("+");
         this.addPreBook.consignee = arr[0];
-        if (arr.length >= 4){
+        if (arr.length == 4){
           this.addPreBook.consigneeAddress = arr[1];
           this.addPreBook.notifyParty = arr[2];
           this.addPreBook.notifyPartyAddress = arr[3];
+        }else{
+           this.$message.error('收货信息维护有问题，请检查！')
+        }
+        }else{
+          this.addPreBook.consigneeAddress = '';
+          this.addPreBook.notifyParty = '';
+          this.addPreBook.notifyPartyAddress = '';
         }
       },
+   
       // 设置表头计算字段
       setHeadCalField(){
         var money = 0

src/views/pre-book/advancePackingListModal.vue

@@ -128,7 +128,7 @@ export default {
         },
         {
           title: '小PO',
-          dataIndex: 'poNo',
+          dataIndex: 'small_po',
           width: 120,
           customRender: t => ellipsis(t),
           className: 'replacecolor'
@@ -213,19 +213,19 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
-        {
-          title: '集装箱代号',
-          dataIndex: 'containerCode',
-          width: 120,
-          className: 'replacecolor'
-        },
+        // {
+        //   title: '集装箱代号',
+        //   dataIndex: 'containerCode',
+        //   width: 120,
+        //   className: 'replacecolor'
+        // },
 
-        {
-          title: '集装箱号',
-          dataIndex: 'containerNumber',
-          width: 120,
-          className: 'replacecolor'
-        },
+        // {
+        //   title: '集装箱号',
+        //   dataIndex: 'containerNumber',
+        //   width: 120,
+        //   className: 'replacecolor'
+        // },
         {
           title: '总净重',
           dataIndex: 'totalNetWeight',

src/views/system/modules/DictItemModal.vue

@@ -164,10 +164,10 @@
           param.id = this.model.id
         }
         if(value){
-          let reg=new RegExp("[`_~!@#$^&*()=|{}'.<>《》/?！￥（）—【】‘；：”“。，、？]")
-          if(reg.test(value)){
-            callback("数据值不能包含特殊字符！")
-          }else{
+          //let reg=new RegExp("[`_~!@#$^&*()=|{}'.<>《》/?！￥（）—【】‘；：”“。，、？]")
+          //if(reg.test(value)){
+          //  callback("数据值不能包含特殊字符！")
+         // }else{
             //update--begin--autor:lvdandan-----date:20201203------for：JT-27【数据字典】字典 - 数据值可重复
             getAction("/sys/dictItem/dictItemCheck",param).then((res)=>{
               if(res.success){
@@ -177,7 +177,7 @@
               }
             });
             //update--end--autor:lvdandan-----date:20201203------for：JT-27【数据字典】字典 - 数据值可重复
-          }
+         // }
         }else{
           callback()
         }