预托书新增页面字段调整

src/views/pre-book/addPreBookDrawer.vue

@@ -33,11 +33,11 @@
                 </a-form-model-item>
               </a-col>
 
-              <a-col :md="12" :sm="16">
+              <!-- <a-col :md="12" :sm="16">
                 <a-form-model-item label="外销发票号码" prop="exportInvoiceNo">
                   <a-input placeholder="请输入外销发票号码" v-model="addPreBook.exportInvoiceNo"></a-input>
                 </a-form-model-item>
-              </a-col>
+              </a-col> -->
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="经营单位" prop="unitInOperation">
@@ -68,6 +68,28 @@
                 </a-form-model-item>
               </a-col>
 
+               <a-col :md="6" :sm="8">
+                <a-form-model-item label="贸易国别" prop="tradeCountry">
+                  <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">
+                    <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="consignee">
                   <!-- <j-dict-select-tag 
@@ -101,27 +123,7 @@
                 </a-form-model-item>
               </a-col>
 
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="贸易国别" prop="tradeCountry">
-                  <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">
-                    <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">
                    <j-search-select-tag
@@ -160,7 +162,8 @@
                    <j-search-select-tag
                     placeholder="请选择成交方式"
                     v-model="addPreBook.termsOfDeliveryvalue"
-                    dict="transaction_method">
+                    dict="transaction_method"
+                    change>
                   </j-search-select-tag>
                   <!-- <a-input placeholder="请输入成交方式" v-model="addPreBook.termsOfDeliveryvalue"></a-input> -->
                 </a-form-model-item>
@@ -331,7 +334,6 @@ export default {
           width: 120,
           type:JVXETypes.inputNumber,
           className: 'replacecolor',
-           validateRules:[{ required: true, message: '${title}不能为空' }],
         },
 
         {
@@ -340,7 +342,6 @@ export default {
           width: 120,
           type:JVXETypes.inputNumber,
           className: 'replacecolor',
-          validateRules:[{ required: true, message: '${title}不能为空' }],
         },
         {
           title: '单价',
@@ -430,11 +431,18 @@ export default {
           shippingOrderDate:[{required: true, message: '托书日期不能为空!'}],
           consignee:[{required: true, message: '收货人不能为空!'}],
           depositaryReceiptNo:[{required: true, message: '预托书号不能为空!'}],
+          unitInOperation:[{required: true, message: '经营单位不能为空!'}],
+          unitInOperationAddress:[{required: true, message: '经营单位地址不能为空!'}],
+          tradeCountry:[{required: true, message: '贸易国别不能为空!'}],
+          arriveInCountry:[{required: true, message: '运抵国别不能为空!'}],
+          exportPort:[{required: true, message: '出口口岸不能为空!'}],
+          destinationPort:[{required: true, message: '目的港不能为空!'}],
       },
     }
   },
   created() {},
   methods: {
+    moment,
     // 参照预装箱单
     referadvancePackingList() {
       //子表中有数据时，传值给参照数据组件
@@ -591,6 +599,11 @@ export default {
           }).length == 0;
         });
         this.addPreBook.syLetterDepositItemList = this.addPreBook.syLetterDepositItemList.concat(filterList);
+        this.addPreBook.termsOfDeliveryvalue = 'T/T'
+        this.addPreBook.exchangeEarningsValue = 'FOB'
+        var dd = moment(new Date()).format('YYYY-MM-DD')
+         this.$set( this.addPreBook,'shippingOrderDate',dd)
+        // this.addPreBook.shippingOrderDate = moment(new Date()).format('YYYY-MM-DD')
         this.setHeadCalField();
         
     },