行高调整

src/views/advance-packingList/adPaList-clothes.vue

@@ -291,7 +291,8 @@ export default {
           ellipsis: true,
           width: 120,
           // fixed: 'left',
-          className: 'replacecolor'
+          className: 'replacecolor',
+          
         },
         {
           title: '订单号',

src/views/advance-packingList/addAdpackingDrawer.vue

@@ -393,14 +393,16 @@ export default {
           dataIndex: 'acSetNo',
           width: 120,
           // fixed: 'left',
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '成衣工厂',
           dataIndex: 'garmentFactory',
           width: 120,
           // fixed: 'left',
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: 'HOD',
@@ -410,19 +412,22 @@ export default {
           className: 'replacecolor',
            customRender: text => {
             return moment(text).format('YYYY-MM-DD')
-          }
+          },
+          ellipsis: true,
         },
         {
           title: 'STYLE NO.',
           dataIndex: 'styleNo',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: 'PO NO.',
           dataIndex: 'poNo',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
          {
           title: 'ITEM NO./SKU NO./UPC NO./PACKS CODE',
@@ -437,6 +442,7 @@ export default {
           dataIndex: 'distributionPoint',
           width: 180,
           className: 'replacecolor',
+          ellipsis: true,
         },
 
         {
@@ -480,37 +486,43 @@ export default {
           dataIndex: 'withCode',
           width: 240,
           className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '计划尺码数量',
           dataIndex: 'planSize',
           width: 240,
           className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '计划装箱数量',
           dataIndex: 'planQuantity',
           width: 240,
           className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '件数/箱',
           dataIndex: 'piecesBox',
           width: 90,
           className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '箱数',
           dataIndex: 'boxNumber',
           width: 140,
           className: 'replacecolor',
+          ellipsis: true,
         },
 
         {
           title: '总件数',
           dataIndex: 'total',          
           width: 140,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           // title: '净重/箱',
@@ -524,7 +536,8 @@ export default {
           title: '总净重',
           dataIndex: 'totalNetWeight',
           width: 140,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
 
         {
@@ -539,7 +552,8 @@ export default {
           title: '总毛重',
           dataIndex: 'totalGrossWeight',
           width: 140,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           // title: '外箱长度',
@@ -572,6 +586,7 @@ export default {
           dataIndex: 'totalVolume',
           className: 'replacecolor',
           width: 140,
+          ellipsis: true,
           
         },
         {
@@ -585,13 +600,15 @@ export default {
           title: '单价',
           dataIndex: 'unitPrice',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '总价',
           dataIndex: 'totalPrice',          
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         //    validateRules: [{ required: true, message: '${title}不能为空' },
         //     {pattern: /^\d+(\.\d{1,2})?$/, message: '小数点位数不能超过2位' }],
         },
@@ -599,7 +616,8 @@ export default {
           title: '备注',
           dataIndex: 'memo',          
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         //    validateRules: [{ required: true, message: '${title}不能为空' },
         //     {pattern: /^\d+(\.\d{1,2})?$/, message: '小数点位数不能超过2位' }],
         },
@@ -1096,4 +1114,11 @@ export default {
 /deep/ .ant-drawer-body {
   padding: 10px;
 }
+/deep/.ant-table-row-cell-break-word >.ant-form-item{
+  margin-bottom: 0px !important;
+}
+/deep/.ant-table-tbody .ant-table-row td{
+      padding-top: 8px !important;
+    padding-bottom: 8px !important;
+}
 </style>

src/views/book/addBookDrawer.vue

@@ -943,4 +943,11 @@ export default {
   border: none;
   padding: 0;
 }
+/deep/.ant-table-row-cell-break-word >.ant-form-item{
+  margin-bottom: 0px !important;
+}
+/deep/.ant-table-tbody .ant-table-row td{
+      padding-top: 8px !important;
+    padding-bottom: 8px !important;
+}
 </style>

src/views/order/orderDetailDrawer.vue

@@ -37,7 +37,7 @@
 
             <a-col :md="6" :sm="8">
               <a-form-model-item label="客户简称" prop="customerAbbreviation">
-                {{ orderDetail.customerAbbreviation }}
+                {{orderDetail.customerAbbreviation }}  
               </a-form-model-item>
             </a-col>
 
@@ -170,11 +170,11 @@ export default {
   mixins: [JeecgListMixin],
   components: { JEllipsis, moment },
   data() {
-    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
+    // let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
     return {
       orderDetail: [], // 主表信息
       childColumns: [
-        { title: '款号', width: 100, dataIndex: 'itemNumber', fixed: 'left', className: 'replacecolor' },
+        { title: '款号', width: 100, dataIndex: 'itemNumber', fixed: 'left', className: 'replacecolor',ellipsis: true },
         {
           title: '预发货日期',
           width: 120,
@@ -194,31 +194,32 @@ export default {
           },
           className: 'replacecolor'
         },
-        { title: 'Pack Id', width: 120, dataIndex: 'packId', className: 'replacecolor' },
-        { title: '小po', width: 120, dataIndex: 'smallPo', className: 'replacecolor' },
-        { title: '分销点', width: 150, dataIndex: 'distributionPoint', className: 'replacecolor' },
-        { title: '存货编码', width: 120, dataIndex: 'inventoryCode', className: 'replacecolor' },
-        { title: '存货名称', width: 320, dataIndex: 'inventoryName', align: 'left', className: 'replacecolor' },
-        { title: '规格型号', width: 100, dataIndex: 'specificationAndModel', className: 'replacecolor' },
-        { title: '颜色', width: 160, dataIndex: 'colour', className: 'replacecolor' },
+        { title: 'Pack Id', width: 120, dataIndex: 'packId', className: 'replacecolor' ,ellipsis: true},
+        { title: '小po', width: 120, dataIndex: 'smallPo', className: 'replacecolor' ,ellipsis: true},
+        { title: '分销点', width: 150, dataIndex: 'distributionPoint', className: 'replacecolor',ellipsis: true },
+        { title: '存货编码', width: 120, dataIndex: 'inventoryCode', className: 'replacecolor',ellipsis: true },
+        { title: '存货名称', width: 320, dataIndex: 'inventoryName', align: 'left', className: 'replacecolor',ellipsis: true },
+        { title: '规格型号', width: 100, dataIndex: 'specificationAndModel', className: 'replacecolor',ellipsis: true },
+        { title: '颜色', width: 160, dataIndex: 'colour', className: 'replacecolor',ellipsis: true },
         // { title: '尺码', width: 100, dataIndex: 'size', className: 'replacecolor' },
-        { title: '配码规则', width: 160, dataIndex: 'codingRules', className: 'replacecolor' },
-        { title: '光坯毛门幅CM', width: 140, dataIndex: 'guangpeiGateWidth', className: 'replacecolor' },
-        { title: '箱数', width: 100, dataIndex: 'boxNumber', className: 'replacecolor' },
-        { title: '数量', width: 100, dataIndex: 'quantity', className: 'replacecolor' },
-        { title: '主计量', width: 100, dataIndex: 'masterMetering', className: 'replacecolor' },
-        { title: '含税单价', width: 100, dataIndex: 'unitPriceIncludingTax', className: 'replacecolor' },
-        { title: '价税合计', width: 100, dataIndex: 'totalPriceAndTax', className: 'replacecolor' },
-        { title: '税率(%)', width: 100, dataIndex: 'taxRate', className: 'replacecolor' },
+        { title: '配码规则', width: 160, dataIndex: 'codingRules', className: 'replacecolor',ellipsis: true },
+        { title: '光坯毛门幅CM', width: 140, dataIndex: 'guangpeiGateWidth', className: 'replacecolor',ellipsis: true },
+        { title: '箱数', width: 100, dataIndex: 'boxNumber', className: 'replacecolor',ellipsis: true },
+        { title: '数量', width: 100, dataIndex: 'quantity', className: 'replacecolor',ellipsis: true },
+        { title: '主计量', width: 100, dataIndex: 'masterMetering', className: 'replacecolor',ellipsis: true},
+        { title: '含税单价', width: 100, dataIndex: 'unitPriceIncludingTax', className: 'replacecolor',ellipsis: true },
+        { title: '价税合计', width: 100, dataIndex: 'totalPriceAndTax', className: 'replacecolor',ellipsis: true },
+        { title: '税率(%)', width: 100, dataIndex: 'taxRate', className: 'replacecolor',ellipsis: true },
         {
           title: '备注',
           width: 150,
           dataIndex: 'remarks',
-          customRender: t => ellipsis(t),
+          // customRender: t => ellipsis(t),
           className: 'replacecolor',
-          scopedSlots: { customRender: 'remarks' }
+          scopedSlots: { customRender: 'remarks' },
+          ellipsis: true
         },
-        { title: '行关闭人', width: 100, dataIndex: 'bankClosedBy', className: 'replacecolor' }
+        { title: '行关闭人', width: 100, dataIndex: 'bankClosedBy', className: 'replacecolor',ellipsis: true }
       ],
       childData: [], // 子表数据
 
@@ -234,7 +235,6 @@ export default {
       record: {} // 点击的订单对象
     }
   },
-
   created() {
     this.getOrderChild()
   },

src/views/order/orderList.vue

@@ -140,7 +140,7 @@ export default {
   components: { JEllipsis, moment, OrderDetailDrawer },
 
   data() {
-    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
+    // let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
     // sorter: true, table表头排序
     return {
       // 表头
@@ -153,6 +153,7 @@ export default {
           fixed: 'left',
           className: 'replacecolor',
           align: 'center',
+          ellipsis: true
         },
         {
           title: '订单号',
@@ -162,7 +163,8 @@ export default {
           className: 'replacecolor',
           align: 'left',
           customCell: this.showDrawer,
-          scopedSlots: { customRender: 'orderNumber' }
+          scopedSlots: { customRender: 'orderNumber' },
+          ellipsis: true
         },
 
         {
@@ -173,46 +175,48 @@ export default {
           customRender: text => {
             return moment(text).format('YYYY-MM-DD')
           },
-          className: 'replacecolor'
+          className: 'replacecolor',
         },
-        { title: '业务类型', width: 100, dataIndex: 'businessTypeValue', className: 'replacecolor' },
-        { title: '客户订单号', width: 120, dataIndex: 'customerOrderNumber', className: 'replacecolor' },
+        { title: '业务类型', width: 100, dataIndex: 'businessTypeValue', className: 'replacecolor' ,ellipsis: true},
+        { title: '客户订单号', width: 120, dataIndex: 'customerOrderNumber', className: 'replacecolor',ellipsis: true },
         {
           title: '销售类型',
           width: 100,
           dataIndex: 'salesTypeText',
           className: 'replacecolor'
         },
-        { title: '客户简称', width: 220, dataIndex: 'customerAbbreviation', align: 'left', className: 'replacecolor' },
-        { title: '客户名称', width: 220, dataIndex: 'customerName', align: 'left', className: 'replacecolor' },
-        { title: '供应商', width: 120, dataIndex: 'supplier', className: 'replacecolor' },
-        { title: '汇率', width: 90, dataIndex: 'exchangeRate', className: 'replacecolor' },
-        { title: '整单合计', width: 120, dataIndex: 'wholeOrderTotal', className: 'replacecolor' },
-        { title: '销售部门', width: 100, dataIndex: 'salesDepartment', className: 'replacecolor' },
-        { title: '业务员', width: 140, dataIndex: 'salesman', className: 'replacecolor' },
-        { title: '币种', width: 90, dataIndex: 'currencyText', className: 'replacecolor' },
-        { title: '品牌方', width: 220, dataIndex: 'brandSide', align: 'left', className: 'replacecolor' },
-        { title: '第三方', width: 220, dataIndex: 'thirdParty', align: 'left', className: 'replacecolor' },
-        { title: '定金比例(%)', width: 120, dataIndex: 'depositRatio', className: 'replacecolor' },
-        { title: '定金', width: 100, dataIndex: 'deposit', className: 'replacecolor' },
-        { title: '协同路线', width: 160, dataIndex: 'collaborativeRoute', className: 'replacecolor' },
-        { title: '付款条件', width: 180, dataIndex: 'termOfPayment', className: 'replacecolor' },
-        { title: '最终客户', width: 120, dataIndex: 'endCustomer', className: 'replacecolor' },
+        { title: '客户简称', width: 220, dataIndex: 'customerAbbreviation', align: 'left', className: 'replacecolor',ellipsis: true },
+        { title: '客户名称', width: 220, dataIndex: 'customerName', align: 'left', className: 'replacecolor', ellipsis: true, },
+        { title: '供应商', width: 120, dataIndex: 'supplier', className: 'replacecolor' ,ellipsis: true},
+        { title: '汇率', width: 90, dataIndex: 'exchangeRate', className: 'replacecolor' ,ellipsis: true},
+        { title: '整单合计', width: 120, dataIndex: 'wholeOrderTotal', className: 'replacecolor' ,ellipsis: true},
+        { title: '销售部门', width: 100, dataIndex: 'salesDepartment', className: 'replacecolor' ,ellipsis: true},
+        { title: '业务员', width: 140, dataIndex: 'salesman', className: 'replacecolor' ,ellipsis: true},
+        { title: '币种', width: 90, dataIndex: 'currencyText', className: 'replacecolor',ellipsis: true },
+        { title: '品牌方', width: 220, dataIndex: 'brandSide', align: 'left', className: 'replacecolor',ellipsis: true },
+        { title: '第三方', width: 220, dataIndex: 'thirdParty', align: 'left', className: 'replacecolor',ellipsis: true },
+        { title: '定金比例(%)', width: 120, dataIndex: 'depositRatio', className: 'replacecolor',ellipsis: true },
+        { title: '定金', width: 100, dataIndex: 'deposit', className: 'replacecolor',ellipsis: true },
+        { title: '协同路线', width: 160, dataIndex: 'collaborativeRoute', className: 'replacecolor',ellipsis: true },
+        { title: '付款条件', width: 180, dataIndex: 'termOfPayment', className: 'replacecolor' ,ellipsis: true},
+        { title: '最终客户', width: 120, dataIndex: 'endCustomer', className: 'replacecolor', ellipsis: true, },
         {
           title: '订单备注',
           width: 220,
           dataIndex: 'orderRemarks',
-          customRender: t => ellipsis(t),
+          // customRender: t => ellipsis(t),
           className: 'replacecolor',
-          scopedSlots: { customRender: 'orderRemarks' }
+          scopedSlots: { customRender: 'orderRemarks' },
+          ellipsis: true
         },
         {
           title: '价格备注',
           width: 120,
           dataIndex: 'priceRemarks',
-          customRender: t => ellipsis(t),
+          // customRender: t => ellipsis(t),
           className: 'replacecolor',
-          scopedSlots: { customRender: 'priceRemarks' }
+          scopedSlots: { customRender: 'priceRemarks' },
+          ellipsis: true
         },
 
         {
@@ -220,9 +224,10 @@ export default {
           width: 220,
           dataIndex: 'orderChangeDescription',
           fixed: 'right',
-          customRender: t => ellipsis(t),
+          // customRender: t => ellipsis(t),
           className: 'replacecolor',
-          scopedSlots: { customRender: 'orderChangeDescription' }
+          scopedSlots: { customRender: 'orderChangeDescription' },
+          ellipsis: true
         }
       ],
       orderListData: [], // 主表信息

src/views/packing-list/clothes-list.vue

@@ -247,7 +247,7 @@ export default {
   mixins: [JeecgListMixin],
   components: { JEllipsis, clothesAddDrawer, detailsClothesDrawer, editClothesDrawer },
   data() {
-    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} /> // 省略
+    // let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} /> // 省略
 
     return {
       // 表头
@@ -396,7 +396,7 @@ export default {
           dataIndex: 'garmentFactory',
           width: 140,
           ellipsis: true,
-          customRender: t => ellipsis(t),
+          // customRender: t => ellipsis(t),
           className: 'replacecolor'
         },
         // {

src/views/packing-list/packinglist-clothes/clothesAddDrawer.vue

@@ -382,39 +382,45 @@ export default {
           dataIndex: 'acSetNo',
           width: 160,
           // fixed: 'left',
-            className: 'replacecolor'
+            className: 'replacecolor',
+            ellipsis: true,
         },
         {
           title: '成衣工厂',
           dataIndex: 'garmentFactory',
           width: 120,
           // fixed: 'left',
-            className: 'replacecolor'
+            className: 'replacecolor',
+            ellipsis: true,
         },
         {
           title: 'HOD',
           dataIndex: 'hod',
           width: 120,
-           className: 'replacecolor'
+           className: 'replacecolor',
+           ellipsis: true,
         },
         {
           title: 'STYLE NO.',
           dataIndex: 'styleNo',
           width: 120,
-           className: 'replacecolor'
+           className: 'replacecolor',
+           ellipsis: true,
         },
         {
           title: 'PO NO.',
           dataIndex: 'poNo',
           width: 90,
-            className: 'replacecolor'
+            className: 'replacecolor',
+            ellipsis: true,
         },
 
         {
           title: 'ITEM NO./SKU NO./UPC NO./PACKS CODE',
           dataIndex: 'itemCode',
           width: 340,
-           className: 'replacecolor'
+           className: 'replacecolor',
+           ellipsis: true,
         },
          {
           title: 'PREPACK SKU',
@@ -422,6 +428,7 @@ export default {
           width: 200,
           className: 'replacecolor',
           scopedSlots: { customRender: 'prepackSku' },
+          ellipsis: true,
         },
         {
           title: '分销点/DC/LABEL',
@@ -429,6 +436,7 @@ export default {
           width: 200,
            className: 'replacecolor',
           insertAfter:true,
+          ellipsis: true,
         },
         {
           // title: '起始箱号',
@@ -437,6 +445,7 @@ export default {
           scopedSlots: { customRender: 'startingBoxNumber' }  ,    
           slots:{title:'startingBoxNumberTitle'} ,   
           width: 120,
+          ellipsis: true,
         },
 
         {
@@ -445,26 +454,29 @@ export default {
           width: 120,
            className: 'replacecolor',
            scopedSlots: { customRender: 'endCaseNumber' }  ,
-          slots:{title:'endCaseNumberTitle'}
+          slots:{title:'endCaseNumberTitle'},
+          ellipsis: true,
         },
 
         {
           title: '颜色（中英文）',
           dataIndex: 'colour',
           width: 140,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '配码',
           dataIndex: 'withCode',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '件数/箱',
           dataIndex: 'piecesBox',
           width: 120,
-          type: JVXETypes.normal 
+          // type: JVXETypes.normal 
         },
         {
           // title: '箱数',
@@ -477,8 +489,9 @@ export default {
         {
           title: '计划尺码数量',
           dataIndex: 'planSize',
-          width: 240,
-           className: 'replacecolor'
+           width: 240,
+           className: 'replacecolor',
+           customRender: t => ellipsis(t),
         },
         {
           title: '计划装箱数量',
@@ -579,6 +592,7 @@ export default {
           // fixed: 'right',
           className: 'replacecolor',
           scopedSlots: { customRender: 'remarks' }  , 
+          ellipsis: true,
         },
         {
           title: '操作',
@@ -987,39 +1001,45 @@ export default {
           dataIndex       : 'acSetNo',
           width: 160,
           // fixed: 'left',
-            className: 'replacecolor'
+            className: 'replacecolor',
+             ellipsis: true,
         },
         {
           title: '成衣工厂',
           dataIndex       : 'garmentFactory',
           width: 120,
           // fixed: 'left',
-            className: 'replacecolor'
+            className: 'replacecolor',
+             ellipsis: true,
         },
         {
           title: 'HOD',
           dataIndex       : 'hod',
           width: 120,
-           className: 'replacecolor'
+           className: 'replacecolor',
+            ellipsis: true,
         },
         {
           title: 'STYLE NO.',
           dataIndex       : 'styleNo',
           width: 120,
-           className: 'replacecolor'
+           className: 'replacecolor',
+            ellipsis: true,
         },
         {
           title: 'PO NO.',
           dataIndex       : 'poNo',
           width: 90,
-            className: 'replacecolor'
+            className: 'replacecolor',
+             ellipsis: true,
         },
 
         {
           title: 'ITEM NO./SKU NO./UPC NO./PACKS CODE',
           dataIndex       : 'itemCode',
           width: 340,
-           className: 'replacecolor'
+           className: 'replacecolor',
+            ellipsis: true,
         },
           {
           title: 'PREPACK SKU',
@@ -1034,6 +1054,7 @@ export default {
           width: 200,
            className: 'replacecolor',
           insertAfter:true,
+           ellipsis: true,
         },
         {
           // title: '起始箱号',
@@ -1057,19 +1078,22 @@ export default {
           title: '颜色（中英文）',
           dataIndex       : 'colour',
           width: 140,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         {
           title: '配码',
           dataIndex       : 'withCode',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         {
           title: '件数/箱',
           dataIndex       : 'piecesBox',
           width: 120,
-          type: JVXETypes.normal 
+          // type: JVXETypes.normal 
+           ellipsis: true,
         },
         {
           title: '箱数',
@@ -1083,19 +1107,22 @@ export default {
           title: '计划尺码数量',
           dataIndex       : 'planSize',
           width: 240,
-           className: 'replacecolor'
+           className: 'replacecolor',
+            ellipsis: true,
         },
         {
           title: '计划装箱数量',
           dataIndex       : 'planQuantity',
           width: 240,
-           className: 'replacecolor'
+           className: 'replacecolor',
+            ellipsis: true,
         },
         {
           title: '总件数',
           dataIndex       : 'total',
           width: 90,
-           className: 'replacecolor'
+           className: 'replacecolor',
+            ellipsis: true,
         },
         {
           // title: '净重/箱',
@@ -1109,7 +1136,8 @@ export default {
           title: '总净重',
           dataIndex       : 'totalNetWeight',
           width: 90,
-           className: 'replacecolor'
+           className: 'replacecolor',
+            ellipsis: true,
         },
         {
           // title: '毛重/箱',
@@ -1123,7 +1151,8 @@ export default {
           title: '总毛重',
           dataIndex       : 'totalGrossWeight',
           width: 90,
-           className: 'replacecolor'
+           className: 'replacecolor',
+            ellipsis: true,
         },
         {
           // title: '外箱长度',
@@ -1157,7 +1186,8 @@ export default {
           title: '总体积',
           dataIndex       : 'totalVolume',
           width: 120,
-           className: 'replacecolor'
+           className: 'replacecolor',
+            ellipsis: true,
         },
         {
           // title: '净净重',
@@ -1223,4 +1253,11 @@ export default {
 /deep/ .ant-drawer-body {
   padding: 10px;
 }
+/deep/.ant-table-row-cell-break-word >.ant-form-item{
+  margin-bottom: 0px !important;
+}
+/deep/.ant-table-tbody .ant-table-row td{
+      padding-top: 8px !important;
+    padding-bottom: 8px !important;
+}
 </style>

src/views/packing-list/packinglist-clothes/referencePrePacklist.vue

@@ -143,14 +143,16 @@ export default {
           width: 120,
           ellipsis: true,
           // fixed: 'left',
-          className: 'replacecolor'
+          className: 'replacecolor',
+          
         },
         {
           title: '客户简称',
           dataIndex: 'customerAbbreviation',
           width: 120,
           // fixed: 'left',
-          customRender: t => ellipsis(t),
+          // customRender: t => ellipsis(t),
+          ellipsis: true,
           className: 'replacecolor'
         },
         {
@@ -164,7 +166,8 @@ export default {
           title: '小PO',
           dataIndex: 'smallPo',
           width: 120,
-          customRender: t => ellipsis(t),
+          // customRender: t => ellipsis(t),
+          ellipsis: true,
           className: 'replacecolor'
         },
         //  {
@@ -182,7 +185,7 @@ export default {
           dataIndex: 'distributionPoint',
           width: 120,
           ellipsis: true,
-          customRender: t => ellipsis(t),
+          // customRender: t => ellipsis(t),
           className: 'replacecolor'
         },
 
@@ -199,7 +202,7 @@ export default {
           dataIndex: 'inventoryName',
           width: 150,
           ellipsis: true,
-          customRender: t => ellipsis(t),
+          // customRender: t => ellipsis(t),
           className: 'replacecolor'
         },
         {
@@ -207,7 +210,7 @@ export default {
           dataIndex: 'colour',
           width: 120,
           ellipsis: true,
-          customRender: t => ellipsis(t),
+          // customRender: t => ellipsis(t),
           className: 'replacecolor'
         },
         {
@@ -215,7 +218,7 @@ export default {
           dataIndex: 'spurOrSubOrder',
           width: 200,
           ellipsis: true,
-          customRender: t => ellipsis(t),
+          // customRender: t => ellipsis(t),
           className: 'replacecolor'
         },
 
@@ -238,7 +241,8 @@ export default {
           title: '数量（按合并规则累计）',
           dataIndex: 'total',
           width: 200,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         // {
         //   title: '订单类型',
@@ -301,7 +305,8 @@ export default {
           title: '备注',
           dataIndex: 'u8Remarks',
           width: 150,
-          customRender: t => ellipsis(t),
+          // customRender: t => ellipsis(t),
+          ellipsis: true,
           className: 'replacecolor'
         }
         // {

src/views/packing-list/packinglist-fabrics/addFabricDrawer.vue

@@ -346,20 +346,23 @@ export default {
           dataIndex: 'salesman',
           width: 120,
           // fixed: 'left',
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '计划单号',
           dataIndex: 'planLotNumber',
           width: 160,
           // fixed: 'left',
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '款号/Kimball',
           dataIndex: 'itemNumber',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           // title: '缸号/Batch no.',
@@ -373,27 +376,31 @@ export default {
           title: '颜色/Color',
           dataIndex: 'colour',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
 
         {
           title: '项目/Item(存货编码)',
           dataIndex: 'inventoryCode',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '存货名称(辅料名称)',
           dataIndex: 'inventoryName',
           width: 160,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
 
         {
           title: '报关品名',
           dataIndex: 'declarationName',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
 
         {
@@ -409,7 +416,8 @@ export default {
           dataIndex: 'width',
           // scopedSlots: { customRender: 'width' },
           width: 140,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '匹数/Rolls',
@@ -453,7 +461,8 @@ export default {
           title: '米数/Length/m',
           dataIndex: 'meter',
           width: 130,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
           {
           // title: '实际报关数量',
@@ -473,35 +482,40 @@ export default {
           title: '克重/G',
           dataIndex: 'gramWeight',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '供应商编码(染厂)',
           dataIndex: 'supplierCodeDyeingPlant',
           // scopedSlots: { customRender: 'supplierCodeDyeingPlant' },
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '供应商(染厂)',
           dataIndex: 'supplierDyeingPlant',
           // scopedSlots: { customRender: 'supplierDyeingPlant' },
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '供应商编码(印厂)',
           // scopedSlots: { customRender: 'supplierCodePrintingPlant' },
           dataIndex: 'supplierCodePrintingPlant',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '供应商(印厂)',
           dataIndex: 'supplierPrintingPlant',
           // scopedSlots: { customRender: 'supplierPrintingPlant' },
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '包装方式',
@@ -564,20 +578,23 @@ export default {
           title: '规格型号',
           dataIndex: 'specificationAndModel',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
       
         {
           title: '超发',
           dataIndex: 'excessQuantity',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '单位',
           dataIndex: 'masterMetering',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '备注(U8)',
@@ -955,4 +972,11 @@ export default {
 /deep/ .ant-drawer-body {
   padding: 10px;
 }
+/deep/.ant-table-row-cell-break-word >.ant-form-item{
+  margin-bottom: 0px !important;
+}
+/deep/.ant-table-tbody .ant-table-row td{
+      padding-top: 8px !important;
+    padding-bottom: 8px !important;
+}
 </style>

src/views/packing-list/packinglist-fabrics/detailsFabricDrawer.vue

@@ -144,53 +144,61 @@ export default {
           dataIndex: 'salesman',
           width: 120,
           // fixed: 'left',
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '计划单号',
           dataIndex: 'planLotNumber',
           width: 160,
           // fixed: 'left',
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '款号/Kimball',
           dataIndex: 'itemNumber',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '缸号/Batch no.',
           dataIndex: 'dyelotNumber',
           // scopedSlots: { customRender: 'dyelotNumber' },
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '颜色/Color',
           dataIndex: 'colour',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
 
         {
           title: '项目/Item(存货编码)',
           dataIndex: 'inventoryCode',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '存货名称(辅料名称)',
           dataIndex: 'inventoryName',
           width: 160,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
 
         {
           title: '报关品名',
           dataIndex: 'declarationName',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
 
         {
@@ -198,7 +206,8 @@ export default {
           dataIndex: 'composition',
           // scopedSlots: { customRender: 'composition' },
           width: 150,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
 
         {
@@ -206,28 +215,32 @@ export default {
           dataIndex: 'width',
           // scopedSlots: { customRender: 'width' },
           width: 140,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '匹数/Rolls',
           dataIndex: 'rolls',
           // scopedSlots: { customRender: 'rolls' },
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '毛重/GW/kg',
           dataIndex: 'grossWeight',
           // scopedSlots: { customRender: 'grossWeight' },
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '净重/NW/kg',
           // scopedSlots: { customRender: 'netWeight' },
           dataIndex: 'netWeight',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
 
         {
@@ -235,20 +248,23 @@ export default {
           dataIndex: 'afterHeavy',
           // scopedSlots: { customRender: 'afterHeavy' },
           width: 90,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '拷布重',
           dataIndex: 'kaoClothWeight',
           // scopedSlots: { customRender: 'kaoClothWeight' },
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '米数/Length/m',
           dataIndex: 'meter',
           width: 130,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         // {
         //   title: '价格',
@@ -260,108 +276,124 @@ export default {
           title: '克重/G',
           dataIndex: 'gramWeight',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '供应商编码(染厂)',
           dataIndex: 'supplierCodeDyeingPlant',
           // scopedSlots: { customRender: 'supplierCodeDyeingPlant' },
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '供应商(染厂)',
           dataIndex: 'supplierDyeingPlant',
           // scopedSlots: { customRender: 'supplierDyeingPlant' },
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '供应商编码(印厂)',
           // scopedSlots: { customRender: 'supplierCodePrintingPlant' },
           dataIndex: 'supplierCodePrintingPlant',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '供应商(印厂)',
           dataIndex: 'supplierPrintingPlant',
           // scopedSlots: { customRender: 'supplierPrintingPlant' },
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '包装方式',
           dataIndex: 'mannerOfPacking',
           // scopedSlots: { customRender: 'mannerOfPacking' },
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '处理方式',
           // scopedSlots: { customRender: 'treatmentMethod' },
           dataIndex: 'treatmentMethod',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '是否手册纱',
           dataIndex: 'manualYarnFlag',
           // scopedSlots: { customRender: 'manualYarnFlag' },
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '手册纱单价',
           dataIndex: 'manualYarnUnitPrice',
           // scopedSlots: { customRender: 'manualYarnUnitPrice' },
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '手册纱占比%',
           dataIndex: 'manualYarnProportion',
           // scopedSlots: { customRender: 'manualYarnProportion' },
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '柜号',
           dataIndex: 'containerNumber',
           // scopedSlots: { customRender: 'containerNumber' },
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
 
         {
           title: '规格型号',
           dataIndex: 'specificationAndModel',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '实际报关数量',
           dataIndex: 'actualDeclaredQuantity',
           // scopedSlots: { customRender: 'actualDeclaredQuantity' },
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '超发',
           dataIndex: 'excessQuantity',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '单位',
           dataIndex: 'masterMetering',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '备注(U8)',
           dataIndex: 'remarks2',
           width: 160,
+          ellipsis: true,
           // fixed: 'right',
           // scopedSlots: { customRender: 'remarks2' },          
           className: 'replacecolor'

src/views/packing-list/packinglist-fabrics/referShipDetailsModal.vue

@@ -143,7 +143,7 @@ export default {
           width: 140,
           // fixed: 'left',
           ellipsis: true,
-          customRender: t => ellipsis(t),
+          // customRender: t => ellipsis(t),
           className: 'replacecolor'
         },
         {
@@ -152,7 +152,7 @@ export default {
           width: 140,
           // fixed: 'left',
           ellipsis: true,
-          customRender: t => ellipsis(t),
+          // customRender: t => ellipsis(t),
           className: 'replacecolor'
         },
          {
@@ -173,7 +173,7 @@ export default {
         {
           title: '客户简称',
           dataIndex: 'customerAbbreviation',
-          customRender: t => ellipsis(t),
+          // customRender: t => ellipsis(t),
           width: 130,
           ellipsis: true,
           className: 'replacecolor'

src/views/pre-book/detailsPreBookDrawer.vue

@@ -283,7 +283,7 @@ export default {
           title: '采购/委外订单号',
           dataIndex: 'spurOrSubOrder',
           width: 160,
-
+           ellipsis: true,
           className: 'replacecolor'
         },
 

src/views/pre-book/preBookList.vue

@@ -166,33 +166,37 @@ export default {
           dataIndex: 'depositaryReceiptNo',
           // fixed: 'left',
           align: 'left',
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         // { title: '订单号', width: 120, dataIndex: 'orderNumber', fixed: 'left', className: 'replacecolor' },
         // { title: '外销发票号码', dataIndex: 'exportInvoiceNo', width: 220, align: 'left', className: 'replacecolor' },
-        { title: '客户简称', dataIndex: 'clientAbbreviation', width: 120, className: 'replacecolor' },
+        { title: '客户简称', dataIndex: 'clientAbbreviation', width: 120, className: 'replacecolor', ellipsis: true, },
         {
           title: '分销点',
           dataIndex: 'distributionPoint',
           width: 120,
-          customRender: t => ellipsis(t),
-          className: 'replacecolor'
+          // customRender: t => ellipsis(t),
+          className: 'replacecolor',
+           ellipsis: true,
         },
         {
           title: '经营单位',
           dataIndex: 'unitInOperation',
           width: 150,
-          customRender: t => ellipsis(t),
+          // customRender: t => ellipsis(t),
+           ellipsis: true,
           className: 'replacecolor'
         },
-        { title: '总箱数', dataIndex: 'boxNumber', width: 120, className: 'replacecolor' },
-        { title: '总毛重', dataIndex: 'totalGrossWeight', width: 120, className: 'replacecolor' },
-        { title: '总体积', dataIndex: 'totalVolume', width: 150, className: 'replacecolor' },
+        { title: '总箱数', dataIndex: 'boxNumber', width: 120, className: 'replacecolor', ellipsis: true, },
+        { title: '总毛重', dataIndex: 'totalGrossWeight', width: 120, className: 'replacecolor', ellipsis: true, },
+        { title: '总体积', dataIndex: 'totalVolume', width: 150, className: 'replacecolor', ellipsis: true, },
         {
           title: '金额',
           dataIndex: 'money',
           width: 140,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         //  {
         //   title: '创建时间',
@@ -226,9 +230,9 @@ export default {
         //   customRender: t => ellipsis(t),
         //   className: 'replacecolor'
         // },
-        { title: '贸易国别', dataIndex: 'tradeCountry', width: 100, className: 'replacecolor' },
-        { title: '运抵国别', dataIndex: 'arriveInCountry', width: 100, className: 'replacecolor' },
-        { title: '出口口岸', dataIndex: 'exportPort', width: 100, className: 'replacecolor' },
+        { title: '贸易国别', dataIndex: 'tradeCountry', width: 100, className: 'replacecolor' , ellipsis: true,},
+        { title: '运抵国别', dataIndex: 'arriveInCountry', width: 100, className: 'replacecolor', ellipsis: true, },
+        { title: '出口口岸', dataIndex: 'exportPort', width: 100, className: 'replacecolor', ellipsis: true, },
         // {
         //   title: '通知人',
         //   dataIndex: 'notifier',
@@ -237,7 +241,7 @@ export default {
         //   className: 'replacecolor'
         // },
         // { title: 'nottfy', dataIndex: 'nottfy', width: 150, className: 'replacecolor' },
-        { title: '目的港', dataIndex: 'destinationPort', width: 100, className: 'replacecolor' },
+        { title: '目的港', dataIndex: 'destinationPort', width: 100, className: 'replacecolor', ellipsis: true, },
         // { title: '装运期限', dataIndex: 'latestDateOfShipment', width: 120, className: 'replacecolor' },
         {
           title: '单据状态',

src/views/shipment-details/detailsShipDetDrawer.vue

@@ -76,7 +76,7 @@ export default {
   mixins: [JeecgListMixin],
   components: { JEllipsis, moment },
   data() {
-    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
+    // let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
     return {
       id: '',
       detailsShipDet: [], // 主表信息
@@ -87,69 +87,80 @@ export default {
           dataIndex: 'account',
           width: 80,
           // fixed: 'left',
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '订单号',
           dataIndex: 'orderNumber',
           width: 120,
           // fixed: 'left',
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '款号',
           dataIndex: 'itemNumber',
           // fixed: 'left',
           width: 180,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '小po',
           dataIndex: 'smallPo',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: 'Pack Id',
           dataIndex: 'packId',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '分销点',
           dataIndex: 'distributionPoint',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
          {
           title: '存货编码',
           dataIndex: 'inventoryCode',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
          {
           title: '存货名称',
           dataIndex: 'inventoryName',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '颜色',
           dataIndex: 'colour',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
          {
           title: '尺码',
           dataIndex: 'size',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '配码规格',
           dataIndex: 'codingRules',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
 
 
@@ -157,7 +168,8 @@ export default {
           title: '订单数量',
           dataIndex: 'orderQuantity',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
       
         {
@@ -165,6 +177,7 @@ export default {
           dataIndex: 'shipmentQuantity',
           scopedSlots: { customRender: 'shipmentQuantity' },
           width: 120,
+          ellipsis: true,
         },
 
       ],

src/views/shipment-details/editShipDetDrawer.vue

@@ -232,7 +232,7 @@ export default {
   components: { JEllipsis, ReferOrderDataModal, moment }, // 参照订单数据 弹框
 
   data() {
-    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
+    // let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
     return {
       id: '',
       validatorRules:{
@@ -252,21 +252,24 @@ export default {
           dataIndex: 'account',
           width: 80,
           // fixed: 'left',
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         {
           title: '订单号',
           dataIndex: 'orderNumber',
           width: 120,
           // fixed: 'left',
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         {
           title: '款号',
           dataIndex: 'itemNumber',
           // fixed: 'left',
           width: 180,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         {
           title: '订单日期',
@@ -275,7 +278,8 @@ export default {
           className: 'replacecolor',
           customRender: text => {
             return moment(text).format('YYYY-MM-DD')
-          }
+          },
+           ellipsis: true,
         },
         
          {
@@ -283,7 +287,7 @@ export default {
           dataIndex: 'preDeliveryDate',
           width: 100,
           className: 'replacecolor',
-        
+           ellipsis: true,
         },
         //  {
         //   title: '预完工日期',
@@ -298,13 +302,14 @@ export default {
           scopedSlots: { customRender: 'garmentFactory' },
           validateRules:[{ required: true, message: '${title}不能为空' }],
           width: 100,
-          className: 'replacecolor'
+          className: 'replacecolor',
         },
         {
           title: '业务类型',
           dataIndex: 'businessTypeText',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         // {
         //   title: '客户订单',
@@ -317,19 +322,22 @@ export default {
           title: '小po',
           dataIndex: 'smallPo',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         {
           title: 'Pack Id',
           dataIndex: 'packId',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         {
           title: '分销点',
           dataIndex: 'distributionPoint',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         {
           title: '采购/委外订单号',
@@ -337,21 +345,23 @@ export default {
           scopedSlots: { customRender: 'purOrSubOrder' },
           // fixed: 'left',
           width: 180,
-          className: 'replacecolor'
+          className: 'replacecolor',
         },
         {
           title: '单价(销售)',
           // scopedSlots: { customRender: 'salesUnitPrice' },
           dataIndex: 'salesUnitPrice',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
           {
           title: '佣金',
           // scopedSlots: { customRender: 'ymoney' },
           dataIndex: 'ymoney',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
 
         {
@@ -360,27 +370,31 @@ export default {
           // scopedSlots: { customRender: 'customsDeclarationUnitPrice' },
           // fixed: 'left',
           width: 180,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
          {
           title: '工厂单价',
           dataIndex: 'factoryUnitPrice',
           width: 120,
           // scopedSlots: { customRender: 'factoryUnitPrice' },
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
 
         {
           title: '订单数量',
           dataIndex: 'orderQuantity',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         {
           title: '订单剩余数量',
           dataIndex: 'orderRemainingQuantity',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
 
         {
@@ -395,7 +409,7 @@ export default {
           dataIndex: 'numberOfSets',
           scopedSlots: { customRender: 'numberOfSets' },
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
         },
         // {
         //   title: '是否TC功能',
@@ -423,7 +437,8 @@ export default {
           dataIndex: 'customerAbbreviation',
           width: 220,
           align: 'left',
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         {
           title: '客户名称',
@@ -431,7 +446,8 @@ export default {
           width: 300,
           align: 'left',
           className: 'replacecolor',
-           customRender: t => ellipsis(t),
+          //  customRender: t => ellipsis(t),
+           ellipsis: true,
         },
         // {
         //   title: '汇率',
@@ -444,33 +460,38 @@ export default {
           title: '销售部门',
           dataIndex: 'salesDepartment',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         {
           title: '业务员',
           dataIndex: 'salesman',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         {
           title: '币种',
           dataIndex: 'currencyText',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
 
         {
           title: '品牌方',
           dataIndex: 'brandSide',
           width: 180,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         {
           title: '第三方',
           dataIndex: 'thirdParty',
           width: 220,
           align: 'left',
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         // {
         //   title: '定金比例(%)',
@@ -510,8 +531,9 @@ export default {
           title: '订单备注',
           dataIndex: 'orderRemarks',
           width: 200,
-          customRender: t => ellipsis(t),
-          className: 'replacecolor'
+          // customRender: t => ellipsis(t),
+          className: 'replacecolor',
+           ellipsis: true,
         },
         // {
         //   title: '价格备注',
@@ -533,14 +555,14 @@ export default {
           dataIndex: 'treatmentMethod',
           width: 160,
           scopedSlots: { customRender: 'treatmentMethod' },
-          className: 'replacecolor'
+          className: 'replacecolor',
         },
         {
           title: '是否手册纱',
           dataIndex: 'manualYarnFlag',
           width: 140,
           scopedSlots: { customRender: 'manualYarnFlag' },
-          className: 'replacecolor'
+          className: 'replacecolor', 
         },
         {
           title: '手册纱单价',
@@ -879,4 +901,11 @@ export default {
 /deep/ .ant-drawer-body {
   padding: 0px;
 }
+/deep/.ant-table-row-cell-break-word >.ant-form-item{
+  margin-bottom: 0px !important;
+}
+/deep/.ant-table-tbody .ant-table-row td{
+      padding-top: 8px !important;
+    padding-bottom: 8px !important;
+}
 </style>

src/views/shipment-details/shipmentList.vue

@@ -351,8 +351,9 @@ export default {
           title: '销售订单号',
           dataIndex: 'orderNumber',
           // fixed: 'left',
-          customRender: t => ellipsis(t,17),
+          // customRender: t => ellipsis(t,17),
           width: 200,
+           ellipsis: true,
           className: 'replacecolor'
         },
 
@@ -457,20 +458,23 @@ export default {
           title: 'HScode',
           dataIndex: 'hsCode',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         {
           title: '报关品名',
           dataIndex: 'declarationName',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         {
           title: '英文品名',
           dataIndex: 'englishProductName',
           width: 120,
           className: 'replacecolor',
-          customRender: t => ellipsis(t),
+          // customRender: t => ellipsis(t),
+           ellipsis: true,
         },
         // {
         //   title: '单价（销售）',
@@ -484,7 +488,8 @@ export default {
           title: '采购/委外订单号',
           dataIndex: 'purOrSubOrder',
           width: 180,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         // {
         //   title: '订单类型',
@@ -510,7 +515,8 @@ export default {
           title: '套装件数',
           dataIndex: 'numberOfSets',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         {
           title: '是否TC',
@@ -532,13 +538,15 @@ export default {
           title: '成衣工厂',
           dataIndex: 'garmentFactory',
           width: 120,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          ellipsis: true,
         },
         {
           title: '报关单价',
           dataIndex: 'customsDeclarationUnitPrice',
           width: 90,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         {
           title: '推送结果',
@@ -546,7 +554,8 @@ export default {
           scopedSlots: { customRender: 'pushState' },
           fixed: 'right',
           width: 90,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         {
           title: '单据状态',
@@ -554,7 +563,8 @@ export default {
           scopedSlots: { customRender: 'state' },
           fixed: 'right',
           width: 90,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         {
           title: '操作',
@@ -562,7 +572,8 @@ export default {
           scopedSlots: { customRender: 'operationSlot' },
           fixed: 'right',
           width: 250,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         }
       ],
       shipmentListData: [], // 发运明细数据