托书新增页面字段调整

src/views/book/addBookDrawer.vue

@@ -30,11 +30,11 @@
                 </a-form-model-item>
               </a-col>
 
-              <a-col :md="6" :sm="8">
+              <!-- <a-col :md="6" :sm="8">
                 <a-form-model-item label="外销发票号码" prop="exportInvoiceNo">
                   <a-input placeholder="请输入外销发票号码" v-model="addBook.exportInvoiceNo"></a-input>
                 </a-form-model-item>
-              </a-col>
+              </a-col> -->
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="经营单位" prop="unitInOperation">
@@ -71,6 +71,29 @@
                 </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="addBook.arriveInCountry"
+                    dict="country_of_arrival">
+                  </j-search-select-tag>
+                  <!-- <a-input placeholder="请输入运抵国别" v-model="addBook.arriveInCountry"></a-input> -->
+                </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="addBook.tradeCountry"
+                    dict="trade_country">
+                  </j-search-select-tag>
+                  <!-- <a-input placeholder="请输入贸易国别" v-model="addBook.tradeCountry"></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 
@@ -104,27 +127,8 @@
                 </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="addBook.tradeCountry"
-                    dict="trade_country">
-                  </j-search-select-tag>
-                  <!-- <a-input placeholder="请输入贸易国别" v-model="addBook.tradeCountry"></a-input> -->
-                </a-form-model-item>
-              </a-col>
 
-              <a-col :md="6" :sm="8">
-                <a-form-model-item label="运抵国别" prop="arriveCountry">
-                   <j-search-select-tag
-                    placeholder="请选择运抵国别"
-                    v-model="addBook.arriveInCountry"
-                    dict="country_of_arrival">
-                  </j-search-select-tag>
-                  <!-- <a-input placeholder="请输入运抵国别" v-model="addBook.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
@@ -137,7 +141,7 @@
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="目的港" prop="destinationport">
+                <a-form-model-item label="目的港" prop="destinationPort">
                   <j-search-select-tag
                     placeholder="请选择目的港"
                     v-model="addBook.destinationPort"
@@ -353,94 +357,46 @@ export default {
     return {
       // 表头
       addBookColumns: [
+        // {
+        //   title: '单据号',
+        //   dataIndex: 'documentNo',
+        //   width: 120,
+        //   ellipsis: true,
+        //   fixed: 'left',
+        //   className: 'replacecolor'
+        // },
+        
         {
-          title: '单据号',
-          dataIndex: 'documentNo',
-          width: 120,
-          ellipsis: true,
-          fixed: 'left',
-          className: 'replacecolor'
-        },
-         {
-          title: '制单人',
-          dataIndex: 'createBy',
-          width: 120,
-          ellipsis: true,
-          fixed: 'left',
-          className: 'replacecolor'
-        },
-         {
-          title: '外销发票号',
-          dataIndex: 'exportInvoiceNo',
+          title: '款号',
+          dataIndex: 'itemNumber',
           width: 120,
           ellipsis: true,
-          // fixed: 'left',
           className: 'replacecolor'
         },
          {
-          title: '集装箱号',
-          dataIndex: 'containerNumber',
-          ellipsis: true,
-          scopedSlots: { customRender: 'containerNumber' },
-          width: 120,
-          // fixed: 'left',
-          className: 'replacecolor'
-        },
-        {
-          title: '成衣工厂',
-          dataIndex: 'garmentFactory',
-          width: 120,
-          ellipsis: true,
-          // fixed: 'left',
-          className: 'replacecolor'
-        },
-        {
-          title: '供应商',
-          dataIndex: 'supplierPrintingPlant',
-          width: 120,
-          ellipsis: true,
-          className: 'replacecolor'
-        },
-        {
-          title: '铅分号',
-          dataIndex: 'plumbumNo',
-          width: 120,
-          ellipsis: true,
-          className: 'replacecolor'
-        },
-        {
-          title: '总件数',
-          dataIndex: 'total',
-          width: 90,
-          ellipsis: true,
-          className: 'replacecolor'
-        },
-
-        {
-          title: '款号',
-          dataIndex: 'itemNumber',
+          title: '小po',
+          dataIndex: 'smallPo',
           width: 120,
           ellipsis: true,
           className: 'replacecolor'
         },
         {
-          title: '小po',
-          dataIndex: 'smallPo',
+          title: '数量',
+          dataIndex: 'number',
           width: 120,
           ellipsis: true,
           className: 'replacecolor'
         },
-        {
+         {
           title: '箱数',
           dataIndex: 'planQuantity',
           width: 160,
           ellipsis: true,
           className: 'replacecolor'
         },
-        {
+         {
           title: '毛重',
           dataIndex: 'grossWeight',
-          customRender: t => ellipsis(t),
           width: 120,
           ellipsis: true,
           className: 'replacecolor'
@@ -453,7 +409,6 @@ export default {
           // scopedSlots: { customRender: 'containerCode' },
           className: 'replacecolor'
         },
-
         {
           title: '体积',
           dataIndex: 'totalVolume',
@@ -469,16 +424,16 @@ export default {
           ellipsis: true,
           className: 'replacecolor'
         },
-        //         {
-        //   title: '创建时间',
-        //   dataIndex: 'createTime',
-        //   align: 'center',
-        //   sorter: true,
-        //   customRender: text => {
-        //     return moment(text).format('YYYY-MM-DD')
-        //   }
-        // },
         {
+          title: '集装箱号',
+          dataIndex: 'containerNumber',
+          ellipsis: true,
+          scopedSlots: { customRender: 'containerNumber' },
+          width: 120,
+          // fixed: 'left',
+          className: 'replacecolor'
+        },
+          {
           title: '集装箱代号',
           dataIndex: 'containerCode',
           scopedSlots: { customRender: 'containerCode' },
@@ -486,14 +441,13 @@ export default {
           ellipsis: true,
           className: 'replacecolor'
         },
-        {
+          {
           title: '单价',
           dataIndex: 'price',
           width: 120,
           ellipsis: true,
           className: 'replacecolor'
         },
-
         {
           title: '金额',
           dataIndex: 'totalPrice',
@@ -501,29 +455,16 @@ export default {
           ellipsis: true,
           className: 'replacecolor'
         },
-        {
-          title: '预发货日期',
-          dataIndex: 'preDeliveryDate',
-          width: 160,
-          ellipsis: true,
-          className: 'replacecolor'
-        },
 
-        {
-          title: '业务员',
-          dataIndex: 'salesman',
-          width: 160,
-          ellipsis: true,
-          className: 'replacecolor'
-        },
          {
-          title: '业务部门',
-          dataIndex: 'salesDepartment',
-          width: 160,
+          title: '制单人',
+          dataIndex: 'createBy',
+          width: 120,
           ellipsis: true,
+          // fixed: 'left',
           className: 'replacecolor'
         },
-         {
+           {
           title: '采购/委外订单号',
           dataIndex: 'purOrSubOrder',
           width: 160,
@@ -537,13 +478,6 @@ export default {
           ellipsis: true,
           className: 'replacecolor'
         },
-        {
-          title: '订单号',
-          dataIndex: 'orderNumber',
-          width: 160,
-          ellipsis: true,
-          className: 'replacecolor'
-        },
         {
           title: '操作',
           dataIndex: 'operation',
@@ -611,8 +545,14 @@ export default {
       dateFormat: 'YYYY-MM-DD',
       validatorRules: {
           shippingOrderDate:[{required: true, message: '托书日期不能为空!'}],
+          shippingOrderNumber:[{required: true, message: '托书号不能为空!'}],
           consignee:[{required: true, message: '收货人不能为空!'}],
-          shippingOrderNumber:[{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: '目的港不能为空!'}],
       }
     }
   },
@@ -642,12 +582,18 @@ export default {
          item.readyFabric=item.readyFabric
          item.tailoringFabricItemId=item.itemId
          item.tailoringFabricId=item.id
+         item.clientAbbreviation = item.customerAbbreviation
          var str = item.preDeliveryDate
          var n=str.split(" ");
          item.preDeliveryDate = n[0]
       })
         // var subList = this.convertReferToSub(data);
         this.addBookData = this.addBookData.concat(data);
+        this.addBook.termsOfDeliveryvalue = 'T/T'
+        this.addBook.exchangeEarningsValue = 'FOB'
+        this.addBook.exportPort='宁波'
+        var dd = moment(new Date()).format('YYYY-MM-DD')
+         this.$set( this.addBook,'shippingOrderDate',dd)
         this.setHeadCalField()
     },
 
@@ -763,6 +709,17 @@ export default {
           newObj.rmbList = this.rmbList
           newObj.usdList = this.usdList
           newObj.syShippingOrderItemList = this.addBookData
+            for(var i =0;i<newObj.syShippingOrderItemList.length;i++){
+             var row = newObj.syShippingOrderItemList[i]
+             if(row.containerCode === '' || !row.containerCode){
+                this.$message.error('第'+(i+1)+'行集装箱代号未填，无法保存！');
+                return
+              }
+             if(row.containerNumber === '' || !row.containerNumber){
+                this.$message.error('第'+(i+1)+'行集装箱号未填，无法保存！');
+                return
+              }
+            }
           if(this.defaultMethod === 'add'){
            addPackingList(newObj).then(res => {
             if (res.success) {
@@ -790,7 +747,6 @@ export default {
       // this.getShipmentList() // 刷新托书列表
     },
     close() {
-      this.$emit('close')
       this.addBook ={}
       this.addBookData =[]
       this.rmbList = [{}]