出运明细调整

src/views/shipment-details/shipmentList.vue

@@ -27,7 +27,7 @@
                 </a-form-model-item>
               </a-col>
 
-              
+
             <a-col :md="5" :sm="8">
               <a-form-item label="预发货日期">
                 <a-range-picker
@@ -61,7 +61,7 @@
                 </j-search-select-tag>
                 </a-form-item>
               </a-col>
-              
+
               <a-col :md="5" :sm="8">
                 <a-form-item label="是否被参照">
                   <a-select v-model="queryParam.refer">
@@ -131,7 +131,7 @@
                 </j-search-select-tag>
                 </a-form-item>
               </a-col>
-              
+
 
               <a-col :md="5" :sm="8">
                 <a-form-model-item label="申报要素是否维护">
@@ -182,7 +182,7 @@
         <a-button type="primary" icon="close" @click="cancelSubmit">批量取消提交</a-button>
         <a-button type="primary" icon="close" @click="batchDelete">批量删除</a-button>
       </div>
-      
+
       <!-- 测试 -->
       <ve-table :columns="columns" :rowSelection="{ fixed: true, columnWidth: 60 }" :virtual-scroll-option="virtualScrollOption"  :max-height="600" :table-data="shipmentListData" style="width:100%" :border-y="true" :sort-option="sortOption" :scroll-width="2500"  row-key-field-name="itemIds"   :checkbox-option="checkboxOption">
       </ve-table>
@@ -286,7 +286,7 @@ export default {
                         this.selectedRowKeys.map(event=>{
                           if(item.itemIds == event) {rows.push(item)}
                         })
-                        
+
                       })
                         this.selectedRows= rows
                        this.selectedNumber =this.selectedRowKeys.length
@@ -347,7 +347,7 @@ export default {
           ellipsis: true,
           className: 'replacecolor',
           sorter:(a, b) => a.salesman - b.salesman,
-          
+
         },
         {
           title: '分销点',
@@ -454,7 +454,7 @@ export default {
           dataIndex: 'englishProductName',
           width: 110,
           className: 'replacecolor',
-          // customRender: t => ellipsis(t),
+          customRender: t => ellipsis(t),
            ellipsis: true,
           sorter:(a, b) => a.englishProductName - b.englishProductName,
 
@@ -528,7 +528,7 @@ export default {
           sorter:(a, b) => a.documentNo - b.documentNo,
 
         },
-  
+
         // {
         //   title: '推送结果',
         //   dataIndex: 'pushState',
@@ -594,20 +594,20 @@ export default {
                             if(text=='0'){
                               return (
                                 <span>否</span>
-                              ) 
+                              )
                             }else if(text=='1'){
                               return (
                                 <span>是</span>
                               );
                             }
-                            
+
                         },},
           { field: "preDeliveryDate", key: "j", title: "预发货日期", align: "center", width: 120,sortBy: "", ellipsis: {showTitle: true,}, renderBodyCell: ({ row, column, rowIndex }, h) => {
                             const text = row[column.field];
                             if(text&&text!==''){
                               return (
                                 moment(text).format('YYYY-MM-DD')
-                              ) 
+                              )
                             }else{
                               return ''
                             }
@@ -616,7 +616,14 @@ export default {
           { field: "customsDeclarationUnitPrice", key: "m", title: "报关单价", align: "center", width: 100,sortBy: "",ellipsis: {showTitle: true,}, },
           { field: "garmentFactory", key: "l", title: "成衣工厂", align: "center", width: 100,sortBy: "" ,ellipsis: {showTitle: true,},},
           { field: "hsCode", key: "n", title: "HScode", align: "center", width: 120,sortBy: "",ellipsis: {showTitle: true,}, },
-          { field: "englishProductName", key: "o", title: "英文品名", align: "center", width: 150,sortBy: "",ellipsis: {showTitle: true,},  },
+          { field: "englishProductName", key: "o", title: "英文品名", align: "center", width: 150,sortBy: "",ellipsis: {showTitle: true,},
+            renderBodyCell: ({ row, column, rowIndex }, h) => {
+              const text = row[column.field];
+              if (text && text.length>25){
+                return text.substring(0,25)+'...';
+              }
+              return text;
+            }},
           { field: "materialComposition", key: "p", title: "物料成分", align: "center", width: 180,sortBy: "",ellipsis: {showTitle: true,}, },
           { field: "purOrSubOrder", key: "q", title: "采购/委外订单号", align: "center", width: 180,sortBy: "",ellipsis: {showTitle: true,}, },
           { field: "numberOfSets", key: "r", title: "套装件数", align: "center", width: 100,sortBy: "",ellipsis: {showTitle: true,}, },
@@ -629,7 +636,7 @@ export default {
                             if(text=='0'){
                               return (
                                 <a-tag color="orange" >已保存</a-tag>
-                              ) 
+                              )
                             }else{
                               return (
                                 <a-tag color="green">已提交</a-tag>
@@ -664,7 +671,7 @@ export default {
           },
         ],
       dateFormat: 'YYYY-MM-DD',
-      
+
     }
   },
   created() {
@@ -677,16 +684,16 @@ export default {
     moment,
     //默认预发货日期
     defalutDate(){
-     var now = new Date(); //当前日期 
-      var nowMonth = now.getMonth(); //当前月 
+     var now = new Date(); //当前日期
+      var nowMonth = now.getMonth(); //当前月
       var nextMonth = nowMonth+1; //下个月
       var nowYear = now.getFullYear(); //当前年
-      this.monthStartDate = moment(new Date(nowYear, nowMonth, 1)).format('YYYY-MM-DD');  
-      this.nextMonthStartDate = moment(new Date(nowYear, nextMonth, 1)).format('YYYY-MM-DD');  
+      this.monthStartDate = moment(new Date(nowYear, nowMonth, 1)).format('YYYY-MM-DD');
+      this.nextMonthStartDate = moment(new Date(nowYear, nextMonth, 1)).format('YYYY-MM-DD');
       if([1, 3, 5, 7, 8, 10, 12].indexOf(nextMonth+1) > -1){
-        this.nextMonthEndDate = moment(new Date(nowYear, nextMonth, 31)).format('YYYY-MM-DD');  
+        this.nextMonthEndDate = moment(new Date(nowYear, nextMonth, 31)).format('YYYY-MM-DD');
       }else {
-        this.nextMonthEndDate = moment(new Date(nowYear, nextMonth, 30)).format('YYYY-MM-DD'); 
+        this.nextMonthEndDate = moment(new Date(nowYear, nextMonth, 30)).format('YYYY-MM-DD');
       }
       this.preDeliveryDate.push(this.nextMonthStartDate,this.nextMonthEndDate)
       this.queryParam.preDeliveryDateB = this.nextMonthStartDate
@@ -722,7 +729,7 @@ export default {
             for (var i=0; i<this.shipmentListData.length; i++){
               this.shipmentListData.randomId = randomUUID();
             }
-            
+
             this.selectedRowKeys = []
             this.checkboxOption.selectedRowKeys = []
           }else {
@@ -734,7 +741,7 @@ export default {
     //关闭申报要素弹窗
      async closeDeclare(){
        //判断是否是新增的数据
-      // await this.judageAdd()        
+      // await this.judageAdd()
       var cc = []
       this.shipmentListData.map(item =>{
         this.selectedRows.map(item1 =>{
@@ -782,7 +789,7 @@ export default {
     //参照订单数据
     referOrderDataOpen(){
       this.$refs.referOrderDataModal.referOrderDataModVis = true
-      this.$refs.referOrderDataModal.range.push(this.monthStartDate)     
+      this.$refs.referOrderDataModal.range.push(this.monthStartDate)
       this.$refs.referOrderDataModal.queryParam.preDeliveryDateS = this.monthStartDate;
       this.$refs.referOrderDataModal.queryParam.preDeliveryDateE  = '';
     },
@@ -844,12 +851,12 @@ export default {
       this.$refs.itemNumEleModal.editItemNumber.itemIds = record.itemIds
       this.$refs.itemNumEleModal.editItemNumber.itemNumber = record.itemNumber
       this.$refs.itemNumEleModal.record = record
-      
+
       this.$refs.itemNumEleModal.editItemNumber.materialComposition = record.materialComposition
       this.$refs.itemNumEleModal.editItemNumber.isTc = record.isTc
       if(record.materialComposition == ''  || !record.materialComposition){
         var ccode = record.inventoryCcode.substring(0,2);
-       
+
         if(ccode =='19'){ //如果是成衣取规格型号,否则取物料名称
           this.$refs.itemNumEleModal.editItemNumber.materialComposition = record.specificationAndModel
         }else{
@@ -873,7 +880,7 @@ export default {
       //     await this.getShipmentList()
       //   }
     },
-    
+
 
     // 导出
     handleExportXls(fileName) {
@@ -904,7 +911,7 @@ export default {
         obj.selectAll = '0'
         obj.flourOrGarment =this.queryParam.flourOrGarment
         }
-        
+
       }
       if(yesA == 'yes'){
         this.loading = true
@@ -938,9 +945,9 @@ export default {
         }
       })
       }
-      
 
-     
+
+
     },
 
     //明细导出
@@ -967,14 +974,14 @@ export default {
         obj.selectAll = '0'
         obj.flourOrGarment =this.queryParam.flourOrGarment
         }
-        
+
       }
       if( yesA == 'yes'){
         this.loading = true
         listExportXls(obj).then(res =>{
         if(res.success==false){
           this.$message.error(res.message)
-        }else{  
+        }else{
       downFile('/shippingDetails/syShippingDetails/exportXlsShipping',obj).then(data => {
         this.loading = false
         if (!data) {
@@ -998,7 +1005,7 @@ export default {
     }
      })
       }
-      
+
     },
 
     //  编辑
@@ -1018,7 +1025,7 @@ export default {
               this.$forceUpdate()
             }else {
               this.$refs.editShipDetDrawer.manualYarnDisabled = false
-            }      
+            }
           })
           this.$refs.editShipDetDrawer.syShippingDetailsItemList = res.result.syShippingDetailsItemList
           this.$refs.editShipDetDrawer.readyFabric = this.queryParam.flourOrGarment
@@ -1113,7 +1120,7 @@ export default {
         })
       })
     },
-    
+
     //批量删除
     batchDelete(){
       this.$nextTick(() => {
@@ -1202,7 +1209,7 @@ export default {
           }
         })
         }
-        
+
       })
     },
 
@@ -1224,7 +1231,7 @@ export default {
           }
         })
         }
-        
+
       })
     },
 
@@ -1260,7 +1267,7 @@ export default {
       this.toggleSearchStatus = false
       if(this.queryParam.flourOrGarment === '' || !this.queryParam.hasOwnProperty('flourOrGarment')){
        this.$message.error('请选择查询类型！');
-      }else if(this.queryParam.flourOrGarment == '1' && 
+      }else if(this.queryParam.flourOrGarment == '1' &&
       ((this.queryParam.itemNumber==''||!this.queryParam.itemNumber)&&
       (this.queryParam.orderNumber==''||!this.queryParam.orderNumber)&&
       (this.queryParam.salesman==''||!this.queryParam.salesman)&&
@@ -1271,24 +1278,24 @@ export default {
         this.$message.error('款号/订单号/预发货日期/业务员/供应商/客户均未选择！');
       }else{
          if(this.preDeliveryDate.length ==2){
-            var separator = "-"; //日期分隔符  
-            var startDates = this.queryParam.preDeliveryDateB.split(separator);  
-            var endDates = this.queryParam.preDeliveryDateE.split(separator);  
-            var startDate = new Date(startDates[0], startDates[1]-1, startDates[2]);  
-            var endDate = new Date(endDates[0], endDates[1]-1, endDates[2]);  
+            var separator = "-"; //日期分隔符
+            var startDates = this.queryParam.preDeliveryDateB.split(separator);
+            var endDates = this.queryParam.preDeliveryDateE.split(separator);
+            var startDate = new Date(startDates[0], startDates[1]-1, startDates[2]);
+            var endDate = new Date(endDates[0], endDates[1]-1, endDates[2]);
             var timeInterval= parseInt(Math.abs(endDate - startDate ) / 1000 / 60 / 60 /24) + 1;
             if(timeInterval > 60){
              this.$message.error('预发货时间区间超过60天，请重新选择！');
-            }else { 
+            }else {
               this.queryParam.id = ''
-             this.getShipmentList() 
-             
-           }       
+             this.getShipmentList()
+
+           }
          }else{
           this.queryParam.id = ''
-           this.getShipmentList() 
+           this.getShipmentList()
          }
-         
+
       }
     },
 
@@ -1318,13 +1325,13 @@ export default {
     },
 
     //关闭新增弹窗
-    async closeAdd(data,id,range){  
+    async closeAdd(data,id,range){
       this.queryParam ={}
       this.queryParam.flourOrGarment = data
       this.queryParam.id = id
       this.preDeliveryDate=range
-      this.queryParam.preDeliveryDateB =(this.preDeliveryDate[0]&&this.preDeliveryDate[0]!=='')? this.preDeliveryDate[0].format('YYYY-MM-DD'):''; 
-      this.queryParam.preDeliveryDateE =(this.preDeliveryDate[1]&&this.preDeliveryDate[1]!=='')? this.preDeliveryDate[1].format('YYYY-MM-DD'):''; 
+      this.queryParam.preDeliveryDateB =(this.preDeliveryDate[0]&&this.preDeliveryDate[0]!=='')? this.preDeliveryDate[0].format('YYYY-MM-DD'):'';
+      this.queryParam.preDeliveryDateE =(this.preDeliveryDate[1]&&this.preDeliveryDate[1]!=='')? this.preDeliveryDate[1].format('YYYY-MM-DD'):'';
       //其他地方使用
       this.returnId = id
       this.returnFlourOrGarment = data