计划单统计表、出运明细调整

src/views/cost-allocation-total/inancialReconciliation.vue

@@ -291,16 +291,7 @@ export default {
             return new Date(a.readyEndDate) > new Date(b.readyEndDate) ? 1 : -1;
           },
         }, 
-        {
-          title: '成衣通知时间',
-          width: 170,
-          dataIndex: 'readyNoticeDate',
-          scopedSlots: { customRender: 'readyNoticeDate' },
-          className: 'replacecolor',
-          sorter: (a, b) => {
-            return new Date(a.readyNoticeDate) > new Date(b.readyNoticeDate) ? 1 : -1;
-          },
-        },
+        
 
          
 
@@ -389,6 +380,18 @@ export default {
                   return temp1.localeCompare(temp2);
               },
          },
+         
+        {
+          title: '成衣通知时间',
+          width: 170,
+          dataIndex: 'readyNoticeDate',
+          scopedSlots: { customRender: 'readyNoticeDate' },
+          className: 'replacecolor',
+          sorter: (a, b) => {
+            return new Date(a.readyNoticeDate) > new Date(b.readyNoticeDate) ? 1 : -1;
+          },
+        },
+        
         {
           title: '交单日期',
           width: 120,
@@ -595,11 +598,11 @@ export default {
         planMan:record.planMan,
         remarks:record.remarks,
         
-        readyNoticeDate: record.readyNoticeDate!==''&&record.readyNoticeDate ? moment(record.readyNoticeDate).format('YYYY-MM-DD'):'',
+        readyNoticeDate: record.readyNoticeDate!==''&&record.readyNoticeDate ? moment(record.readyNoticeDate).format('YYYY-MM-DD'):null,
         planNumType:record.planNumType,
 
         id:record.id,
-        readyEndDate: record.readyEndDate!==''&&record.readyEndDate ? moment(record.readyEndDate).format('YYYY-MM-DD HH:mm:ss'):''
+        readyEndDate: record.readyEndDate!==''&&record.readyEndDate ? moment(record.readyEndDate).format('YYYY-MM-DD HH:mm:ss'):null
       }
       var newObj ={
           ccode:record.planNo,

src/views/shipment-details/shipmentList.vue

@@ -596,11 +596,11 @@ export default {
           { field: "salesman", key: "d", title: "业务员", align: "center", width: 100,sortBy: "", ellipsis: {showTitle: true,},},
           { field: "distributionPoint", key: "e", title: "分销点", align: "center", width: 110,sortBy: "", ellipsis: {showTitle: true,},},
           { field: "smallPo", key: "f", title: "小po", align: "center", width: 200,sortBy: "", ellipsis: {showTitle: true,},},
-          { field: "inventoryName", key: "g", title: "存货名称", align: "center", width: 240,sortBy: "", ellipsis: {showTitle: true},
+          { field: "inventoryName", key: "g", title: "存货名称", align: "center", width: 320,sortBy: "", ellipsis: {showTitle: true},
             renderBodyCell: ({ row, column, rowIndex }, h) => {
               const text = row[column.field];
-              if (text && text.length>15){
-                return text.substring(0,15)+'...';
+              if (text && text.length>30){
+                return text.substring(0,30)+'...';
               }
               return text;
             },},