页面整体调整

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

@@ -335,15 +335,6 @@ export default {
       handleOkButton:false,
       // 表头
       adPaListClothesColumns: [
-        {
-          title: '单据号',
-          dataIndex: 'documentNo',
-          ellipsis: true,
-          width: 160,
-          fixed: 'left',
-          className: 'replacecolor',
-          
-        },
         {
           title: '订单号',
           dataIndex: 'orderNumber',
@@ -397,7 +388,7 @@ export default {
         {
           title: '存货名称',
           dataIndex: 'inventoryName',
-          width: 120,
+          width: 220,
           ellipsis: true,
           className: 'replacecolor'
         },
@@ -409,12 +400,13 @@ export default {
           className: 'replacecolor'
         },
         {
-          title: '采购/委外订单号',
-          dataIndex: 'spurOrSubOrder',
-          width: 200,
+          title: '成衣工厂',
+          dataIndex: 'garmentFactory',
+          width: 100,
           ellipsis: true,
           className: 'replacecolor'
         },
+        
         // {
         //   title: '订单类型',
         //   dataIndex: 'orderType',
@@ -430,9 +422,9 @@ export default {
         //   className: 'replacecolor'
         // },
         {
-          title: '数量(按合并规则累计)',
+          title: '数量',
           dataIndex: 'total',
-          width: 180,
+          width: 80,
           ellipsis: true,
           className: 'replacecolor'
         },
@@ -493,12 +485,21 @@ export default {
           className: 'replacecolor'
         },
         {
-          title: '成衣工厂',
-          dataIndex: 'garmentFactory',
-          width: 100,
+          title: '采购/委外订单号',
+          dataIndex: 'spurOrSubOrder',
+          width: 200,
           ellipsis: true,
           className: 'replacecolor'
         },
+        {
+          title: '单据号',
+          dataIndex: 'documentNo',
+          ellipsis: true,
+          width: 160,
+          // fixed: 'left',
+          className: 'replacecolor',
+          
+        },
         {
           title: '推送状态',
           dataIndex: 'pushStatus',

src/views/book/book-list.vue

@@ -100,7 +100,7 @@
         :columns="bookListColumns"
         :data-source="bookListData"
         :loading="loading"
-        :scroll="{x: 1500 , y: 600 }"
+        :scroll="{x: 1200 , y: 600 }"
         :pagination="pagination"
         :row-key="record => record.id"
         :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -187,9 +187,9 @@ export default {
     return {
       // 表头
       bookListColumns: [
-        { title: '托书号', width: 120, dataIndex: 'shippingOrderNumber',  className: 'replacecolor' , ellipsis: true,fixed: 'left'},
-        { title: '成衣工厂', width: 110, dataIndex: 'garmentFactory', className: 'replacecolor', ellipsis: true, },
-        { title: '外销发票号码', dataIndex: 'exportInvoiceNo', width: 120, className: 'replacecolor', ellipsis: true, },
+        { title: '托书号', width: 150, dataIndex: 'shippingOrderNumber',  className: 'replacecolor' , ellipsis: true,fixed: 'left'},
+        { title: '成衣工厂', width: 150, dataIndex: 'garmentFactory', className: 'replacecolor', ellipsis: true, },
+        
         { title: '客户简称', dataIndex: 'clientAbbreviation', width: 120, className: 'replacecolor' , ellipsis: true,},
         {
           title: '分销点',
@@ -227,11 +227,12 @@ export default {
           // },
           className: 'replacecolor'
         },
+        { title: '外销发票号码', dataIndex: 'exportInvoiceNo', width: 120, className: 'replacecolor', ellipsis: true, },
         {
           title: '状态',
           dataIndex: 'theDocumentsState',
           scopedSlots: { customRender: 'documentStateSlot' },
-          width: 140,
+          width: 80,
            ellipsis: true,
            fixed: 'right',
           className: 'replacecolor'

src/views/book/detailsBookDrawer.vue

@@ -34,7 +34,7 @@
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="经营单位地址" prop="unitInOperationAddress">
-                  {{addBook.unitInOperationAddress}}
+                  {{addBook.unitInOperationAddress | ellipsis}}
                 </a-form-model-item>
               </a-col>
 
@@ -274,7 +274,7 @@ export default {
   mixins: [JeecgListMixin],
   components: {  JEllipsis, moment }, // 参照装箱单 弹框
   data() {
-    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
+    let ellipsis = (v, l = 15) => <j-ellipsis value={v} length={l} />
     return {
       disabled:true,
       // 表头
@@ -459,7 +459,7 @@ export default {
                 ellipsis(value) {
                     if (!value) return ''
                     if (value.length > 20) {
-                        return value.slice(0, 20) + '...'
+                        return value.slice(0, 30) + '...'
                     }
                     return value
                 }

src/views/order/manualModal.vue

@@ -118,36 +118,36 @@
         manualData:[ ],
         manualColumns:[
         {
-          title: '销售订单账套号',
-          width: 110,
+          title: '账套号',
+          width: 70,
           dataIndex: 'account',
           className: 'replacecolor',
           ellipsis: true
         },
         {
           title: '销售订单号',
-          width: 110,
+          width: 180,
           dataIndex: 'orderNumber',
           className: 'replacecolor',
           ellipsis: true
         },
         {
-          title: '销售订单行信息',
-          width: 110,
+          title: '行信息',
+          width: 70,
           dataIndex: 'irowNo',
           className: 'replacecolor',
           ellipsis: true
         },
         {
           title: '存货编码',
-          width: 120,
+          width: 100,
           dataIndex: 'inventoryCode',
           className: 'replacecolor',
           ellipsis: true
         },
         {
           title: '存货名称',
-          width: 190,
+          width: 220,
           dataIndex: 'inventoryName',
           className: 'replacecolor',
         },
@@ -174,7 +174,7 @@
         },
         {
           title: '委外订单行号',
-          width: 120,
+          width: 90,
           dataIndex: 'ivouchRowNo',
           className: 'replacecolor',
           ellipsis: true

src/views/order/orderList.vue

@@ -174,7 +174,7 @@ export default {
 
         {
           title: '账套',
-          width: 80,
+          width: 70,
           dataIndex: 'account',
           fixed: 'left',
           className: 'replacecolor',
@@ -195,7 +195,7 @@ export default {
 
         {
           title: '订单日期',
-          width: 120,
+          width: 110,
           dataIndex: 'orderDate',
           fixed: 'left',
           customRender: text => {
@@ -203,29 +203,30 @@ export default {
           },
           className: 'replacecolor',
         },
-        { title: '业务类型', width: 100, dataIndex: 'businessTypeValue', className: 'replacecolor' ,ellipsis: true},
+        // { 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: 100,
+        //   dataIndex: 'salesTypeText',
+        //   className: 'replacecolor'
+        // },
+        { title: '最终客户', width: 120, dataIndex: 'endCustomer', className: 'replacecolor', ellipsis: true, },
         { title: '客户简称', width: 220, dataIndex: 'customerAbbreviation', align: 'left', className: 'replacecolor',ellipsis: true },
-        { title: '客户名称', width: 220, dataIndex: 'customerName', 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: 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: 90, dataIndex: 'currencyText', 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: 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,
@@ -247,7 +248,7 @@ export default {
 
         {
           title: '订单变更说明',
-          width: 220,
+          width: 120,
           dataIndex: 'orderChangeDescription',
           fixed: 'right',
           // customRender: t => ellipsis(t),

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

@@ -299,7 +299,7 @@ export default {
          {
           title: '预托书号',
           dataIndex: 'depositaryReceiptNo',
-          width: 100,
+          width: 150,
           ellipsis: true,
           fixed:'left',
           // scopedSlots: { customRender: 'preBookNum' },
@@ -308,7 +308,7 @@ export default {
           {
           title: '托书号',
           dataIndex: 'shippingOrderNumber',
-          width: 100,
+          width: 150,
           ellipsis: true,
           fixed:'left',
           className: 'replacecolor'
@@ -328,13 +328,7 @@ export default {
           // scopedSlots: { customRender: 'containerNo' },
           className: 'replacecolor'
         },
-        {
-          title: '单据号',
-          dataIndex: 'documentNo',
-          width: 140,
-          ellipsis: true,
-          className: 'replacecolor'
-        },
+       
          {
           title: '订单号',
           dataIndex: 'orderNumber',
@@ -369,7 +363,7 @@ export default {
         {
           title: '小po',
           dataIndex: 'smallPo',
-          width: 100,
+          width: 120,
           ellipsis: true,
           className: 'replacecolor'
         },
@@ -381,9 +375,9 @@ export default {
           className: 'replacecolor'
         },
           {
-          title: '数量（按合并规则累计）',
+          title: '数量',
           dataIndex: 'total',
-          width: 190,
+          width: 80,
           ellipsis: true,
           className: 'replacecolor'
         },
@@ -497,6 +491,13 @@ export default {
           ellipsis: true,
           className: 'replacecolor'
         },
+        {
+          title: '单据号',
+          dataIndex: 'documentNo',
+          width: 140,
+          ellipsis: true,
+          className: 'replacecolor'
+        },
         {
           title: '推送状态',
           dataIndex: 'pushState',
@@ -506,9 +507,9 @@ export default {
           className: 'replacecolor'
         },
         {
-          title: '云工厂推送',
+          title: '云工厂',
           dataIndex: 'whetherCloudFactoryPush ',
-          width: 110,
+          width: 90,
           fixed: 'right',
           scopedSlots: { customRender: 'whetherCloudFactoryPush' },
           className: 'replacecolor'

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

@@ -225,20 +225,21 @@ export default {
     return {
       // 表头
       fabricListColumns: [
-        {
-          title: '单据号',
-          dataIndex: 'documentNo',
-          width: 160,
-          ellipsis: true,
-          fixed:'left',
-          className: 'replacecolor'
-        },
+        
         // {
         //   title: '订单号',
         //   dataIndex: 'orderNumber',
         //   width: 160,
         //   className: 'replacecolor'
         // },
+        {
+          title: '外销发票号',
+          dataIndex: 'exportInvoiceNo',
+          width: 150,
+           ellipsis: true,
+           fixed:'left',
+          className: 'replacecolor'
+        },
          {
           title: '集装箱号',
           dataIndex: 'containerNumber',
@@ -255,13 +256,7 @@ export default {
         //    ellipsis: true,
         //   className: 'replacecolor'
         // },
-        {
-          title: '外销发票号',
-          dataIndex: 'exportInvoiceNo',
-          width: 130,
-           ellipsis: true,
-          className: 'replacecolor'
-        },
+       
        
         {
           title: '装柜日期',
@@ -304,6 +299,13 @@ export default {
            ellipsis: true,
           className: 'replacecolor'
         },
+        {
+          title: '单据号',
+          dataIndex: 'documentNo',
+          width: 160,
+          ellipsis: true,
+          className: 'replacecolor'
+        },
         {
           title: '推送状态',
           dataIndex: 'pushState',
@@ -313,9 +315,9 @@ export default {
           className: 'replacecolor'
         },
         {
-          title: '云工厂推送',
+          title: '云工厂',
           dataIndex: 'whetherCloudFactoryPush ',
-          width: 110,
+          width: 80,
           fixed: 'right',
           scopedSlots: { customRender: 'whetherCloudFactoryPush' },
           className: 'replacecolor'

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

@@ -247,9 +247,9 @@ export default {
           className: 'replacecolor'
         },
         {
-          title: '数量（按合并规则累计）',
+          title: '数量',
           dataIndex: 'total',
-          width: 180,
+          width: 80,
           className: 'replacecolor',
           ellipsis: true,
         },

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

@@ -394,25 +394,12 @@ export default {
           ellipsis: true,
         },
 
-        {
-          title: '项目/Item(存货编码)',
-          dataIndex: 'inventoryCode',
-          width: 120,
-          className: 'replacecolor',
-          ellipsis: true,
-        },
-        {
-          title: '存货名称(辅料名称)',
-          dataIndex: 'inventoryName',
-          width: 160,
-          className: 'replacecolor',
-          ellipsis: true,
-        },
+       
 
         {
           title: '报关品名',
           dataIndex: 'declarationName',
-          width: 120,
+          width: 150,
           className: 'replacecolor',
           ellipsis: true,
         },
@@ -632,6 +619,20 @@ export default {
           scopedSlots: { customRender: 'remarks2' },          
           className: 'replacecolor'
         },
+        {
+          title: '项目/Item(存货编码)',
+          dataIndex: 'inventoryCode',
+          width: 120,
+          className: 'replacecolor',
+          ellipsis: true,
+        },
+        {
+          title: '存货名称(辅料名称)',
+          dataIndex: 'inventoryName',
+          width: 160,
+          className: 'replacecolor',
+          ellipsis: true,
+        },
 
         {
           title: '操作',

src/views/pre-book/preBookList.vue

@@ -173,7 +173,7 @@ export default {
       preBookListColumns: [
         {
           title: '预托书号',
-          width: 130,
+          width: 150,
           dataIndex: 'depositaryReceiptNo',
           // fixed: 'left',
           align: 'left',
@@ -186,7 +186,7 @@ export default {
         {
           title: '分销点',
           dataIndex: 'distributionPoint',
-          width: 110,
+          width: 130,
           // customRender: t => ellipsis(t),
           className: 'replacecolor',
            ellipsis: true,
@@ -194,12 +194,12 @@ export default {
         {
           title: '经营单位',
           dataIndex: 'unitInOperation',
-          width: 170,
+          width: 120,
           // customRender: t => ellipsis(t),
            ellipsis: true,
           className: 'replacecolor'
         },
-        { title: '总箱数', dataIndex: 'boxNumber', width: 90, className: 'replacecolor', ellipsis: true, },
+        { title: '总箱数', dataIndex: 'boxNumber', width: 80, className: 'replacecolor', ellipsis: true, },
         { title: '总毛重', dataIndex: 'totalGrossWeight', width: 90, className: 'replacecolor', ellipsis: true, },
         { title: '总体积', dataIndex: 'totalVolume', width: 90, className: 'replacecolor', ellipsis: true, },
         {

src/views/shipment-details/shipmentList.vue

@@ -417,7 +417,7 @@ export default {
         {
           title: '存货名称',
           dataIndex: 'inventoryName',
-          width: 240,
+          width: 220,
           className: 'replacecolor',
           ellipsis: true,
         },