优化报表中列的宽度，防止换行

jshERP-web/src/views/report/AllocationDetail.vue

@@ -183,17 +183,17 @@
             scopedSlots: { customRender: 'numberCustomRender' },
           },
           {title: '条码', dataIndex: 'barCode', width: 80},
-          {title: '名称', dataIndex: 'mname', width: 120},
-          {title: '规格', dataIndex: 'standard', width: 60},
-          {title: '型号', dataIndex: 'model', width: 60},
-          {title: '单位', dataIndex: 'mUnit', width: 60},
+          {title: '名称', dataIndex: 'mname', width: 120, ellipsis:true},
+          {title: '规格', dataIndex: 'standard', width: 60, ellipsis:true},
+          {title: '型号', dataIndex: 'model', width: 60, ellipsis:true},
+          {title: '单位', dataIndex: 'mUnit', width: 60, ellipsis:true},
           {title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber, width: 60},
           {title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.unitPrice - b.unitPrice, width: 60},
           {title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice, width: 60},
           {title: '调出仓库', dataIndex: 'dname', width: 80},
           {title: '调入仓库', dataIndex: 'sname', width: 80},
           {title: '调拨日期', dataIndex: 'operTime', width: 80},
-          {title: '备注', dataIndex: 'newRemark', width: 100}
+          {title: '备注', dataIndex: 'newRemark', width: 100, ellipsis:true}
         ],
         url: {
           list: "/depotHead/findAllocationDetail",

jshERP-web/src/views/report/BuyInReport.vue

@@ -108,11 +108,11 @@
             }
           },
           {title: '条码', dataIndex: 'barCode', width: 160},
-          {title: '名称', dataIndex: 'materialName', width: 160},
-          {title: '规格', dataIndex: 'materialStandard', width: 80},
-          {title: '型号', dataIndex: 'materialModel', width: 80},
-          {title: '扩展信息', dataIndex: 'materialOther', width: 150},
-          {title: '单位', dataIndex: 'materialUnit', width: 80},
+          {title: '名称', dataIndex: 'materialName', width: 160, ellipsis:true},
+          {title: '规格', dataIndex: 'materialStandard', width: 80, ellipsis:true},
+          {title: '型号', dataIndex: 'materialModel', width: 80, ellipsis:true},
+          {title: '扩展信息', dataIndex: 'materialOther', width: 150, ellipsis:true},
+          {title: '单位', dataIndex: 'materialUnit', width: 80, ellipsis:true},
           {title: '采购数量', dataIndex: 'inSum', sorter: (a, b) => a.inSum - b.inSum, width: 80},
           {title: '采购金额', dataIndex: 'inSumPrice', sorter: (a, b) => a.inSumPrice - b.inSumPrice, width: 80},
           {title: '退货数量', dataIndex: 'outSum', sorter: (a, b) => a.outSum - b.outSum, width: 80},

jshERP-web/src/views/report/InDetail.vue

@@ -174,17 +174,17 @@
             scopedSlots: { customRender: 'numberCustomRender' },
           },
           {title: '条码', dataIndex: 'barCode', width: 80},
-          {title: '名称', dataIndex: 'mname', width: 120},
-          {title: '规格', dataIndex: 'standard', width: 60},
-          {title: '型号', dataIndex: 'model', width: 60},
-          {title: '单位', dataIndex: 'mUnit', width: 60},
+          {title: '名称', dataIndex: 'mname', width: 120, ellipsis:true},
+          {title: '规格', dataIndex: 'standard', width: 60, ellipsis:true},
+          {title: '型号', dataIndex: 'model', width: 60, ellipsis:true},
+          {title: '单位', dataIndex: 'mUnit', width: 60, ellipsis:true},
           {title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber, width: 60},
           {title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.unitPrice - b.unitPrice, width: 60},
           {title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice, width: 60},
-          {title: '供应商', dataIndex: 'sname', width: 80},
-          {title: '仓库', dataIndex: 'dname', width: 80},
+          {title: '供应商', dataIndex: 'sname', width: 80, ellipsis:true},
+          {title: '仓库', dataIndex: 'dname', width: 80, ellipsis:true},
           {title: '入库日期', dataIndex: 'operTime', width: 80},
-          {title: '备注', dataIndex: 'newRemark', width: 100}
+          {title: '备注', dataIndex: 'newRemark', width: 100, ellipsis:true}
         ],
         url: {
           list: "/depotHead/findInDetail",

jshERP-web/src/views/report/InMaterialCount.vue

@@ -150,11 +150,11 @@
             }
           },
           {title: '条码', dataIndex: 'barCode', width: 120},
-          {title: '名称', dataIndex: 'mName', width: 120},
-          {title: '规格', dataIndex: 'standard', width: 100},
-          {title: '型号', dataIndex: 'model', width: 100},
-          {title: '类型', dataIndex: 'categoryName', width: 120},
-          {title: '单位', dataIndex: 'materialUnit', width: 120},
+          {title: '名称', dataIndex: 'mName', width: 120, ellipsis:true},
+          {title: '规格', dataIndex: 'standard', width: 100, ellipsis:true},
+          {title: '型号', dataIndex: 'model', width: 100, ellipsis:true},
+          {title: '类型', dataIndex: 'categoryName', width: 120, ellipsis:true},
+          {title: '单位', dataIndex: 'materialUnit', width: 120, ellipsis:true},
           {title: '入库数量', dataIndex: 'numSum', sorter: (a, b) => a.numSum - b.numSum, width: 120},
           {title: '入库金额', dataIndex: 'priceSum', sorter: (a, b) => a.priceSum - b.priceSum, width: 120}
         ],

jshERP-web/src/views/report/InOutStockReport.vue

@@ -131,11 +131,11 @@
             }
           },
           {title: '条码', dataIndex: 'barCode', width: 100},
-          {title: '名称', dataIndex: 'materialName', width: 120},
-          {title: '规格', dataIndex: 'materialStandard', width: 80},
-          {title: '型号', dataIndex: 'materialModel', width: 80},
-          {title: '扩展信息', dataIndex: 'materialOther', width: 80},
-          {title: '单位', dataIndex: 'unitName', width: 60},
+          {title: '名称', dataIndex: 'materialName', width: 120, ellipsis:true},
+          {title: '规格', dataIndex: 'materialStandard', width: 80, ellipsis:true},
+          {title: '型号', dataIndex: 'materialModel', width: 80, ellipsis:true},
+          {title: '扩展信息', dataIndex: 'materialOther', width: 80, ellipsis:true},
+          {title: '单位', dataIndex: 'unitName', width: 60, ellipsis:true},
           {title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.unitPrice - b.unitPrice, width: 60},
           {title: '上月结存数量', dataIndex: 'prevSum', sorter: (a, b) => a.prevSum - b.prevSum, width: 80},
           {title: '入库数量', dataIndex: 'inSum', sorter: (a, b) => a.inSum - b.inSum, width: 60},

jshERP-web/src/views/report/MaterialStock.vue

@@ -147,17 +147,17 @@
             }
           },
           {title: '条码', dataIndex: 'mBarCode', width: 80},
-          {title: '名称', dataIndex: 'name', width: 140},
-          {title: '规格', dataIndex: 'standard', width: 80},
-          {title: '型号', dataIndex: 'model', width: 80},
-          {title: '颜色', dataIndex: 'color', width: 80},
-          {title: '类别', dataIndex: 'categoryName', width: 80},
-          {title: '单位', dataIndex: 'unitName', width: 60},
+          {title: '名称', dataIndex: 'name', width: 140, ellipsis:true},
+          {title: '规格', dataIndex: 'standard', width: 80, ellipsis:true},
+          {title: '型号', dataIndex: 'model', width: 80, ellipsis:true},
+          {title: '颜色', dataIndex: 'color', width: 80, ellipsis:true},
+          {title: '类别', dataIndex: 'categoryName', width: 80, ellipsis:true},
+          {title: '单位', dataIndex: 'unitName', width: 60, ellipsis:true},
           {title: '单价', dataIndex: 'purchaseDecimal', sorter: (a, b) => a.purchaseDecimal - b.purchaseDecimal, width: 60},
           {title: '初始库存', dataIndex: 'initialStock', sorter: (a, b) => a.initialStock - b.initialStock, width: 60},
           {title: '库存', dataIndex: 'currentStock', sorter: (a, b) => a.currentStock - b.currentStock, width: 60},
           {title: '库存金额', dataIndex: 'currentStockPrice', sorter: (a, b) => a.currentStockPrice - b.currentStockPrice, width: 80},
-          { title: '库存流水', dataIndex: 'action', align:"center", width: 100,
+          {title: '库存流水', dataIndex: 'action', align:"center", width: 100,
             scopedSlots: { customRender: 'action' }
           }
         ],

jshERP-web/src/views/report/OutDetail.vue

@@ -174,17 +174,17 @@
             scopedSlots: { customRender: 'numberCustomRender' },
           },
           {title: '条码', dataIndex: 'barCode', width: 80},
-          {title: '名称', dataIndex: 'mname', width: 120},
-          {title: '规格', dataIndex: 'standard', width: 60},
-          {title: '型号', dataIndex: 'model', width: 60},
-          {title: '单位', dataIndex: 'mUnit', width: 60},
+          {title: '名称', dataIndex: 'mname', width: 120, ellipsis:true},
+          {title: '规格', dataIndex: 'standard', width: 60, ellipsis:true},
+          {title: '型号', dataIndex: 'model', width: 60, ellipsis:true},
+          {title: '单位', dataIndex: 'mUnit', width: 60, ellipsis:true},
           {title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber, width: 60},
           {title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.operNumber - b.operNumber, width: 60},
           {title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.operNumber - b.operNumber, width: 60},
-          {title: '客户', dataIndex: 'sname', width: 80},
-          {title: '仓库', dataIndex: 'dname', width: 80},
+          {title: '客户', dataIndex: 'sname', width: 80, ellipsis:true},
+          {title: '仓库', dataIndex: 'dname', width: 80, ellipsis:true},
           {title: '出库日期', dataIndex: 'operTime', width: 80},
-          {title: '备注', dataIndex: 'newRemark', width: 100}
+          {title: '备注', dataIndex: 'newRemark', width: 100, ellipsis:true}
         ],
         url: {
           list: "/depotHead/findInDetail",

jshERP-web/src/views/report/OutMaterialCount.vue

@@ -150,11 +150,11 @@
             }
           },
           {title: '条码', dataIndex: 'barCode', width: 120},
-          {title: '名称', dataIndex: 'mName', width: 120},
-          {title: '规格', dataIndex: 'standard', width: 100},
-          {title: '型号', dataIndex: 'model', width: 100},
-          {title: '类型', dataIndex: 'categoryName', width: 120},
-          {title: '单位', dataIndex: 'materialUnit', width: 120},
+          {title: '名称', dataIndex: 'mName', width: 120, ellipsis:true},
+          {title: '规格', dataIndex: 'standard', width: 100, ellipsis:true},
+          {title: '型号', dataIndex: 'model', width: 100, ellipsis:true},
+          {title: '类型', dataIndex: 'categoryName', width: 120, ellipsis:true},
+          {title: '单位', dataIndex: 'materialUnit', width: 120, ellipsis:true},
           {title: '出库数量', dataIndex: 'numSum', sorter: (a, b) => a.numSum - b.numSum, width: 120},
           {title: '出库金额', dataIndex: 'priceSum', sorter: (a, b) => a.priceSum - b.priceSum, width: 120}
         ],

jshERP-web/src/views/report/SaleOutReport.vue

@@ -113,11 +113,11 @@
             }
           },
           {title: '条码', dataIndex: 'barCode', width: 160},
-          {title: '名称', dataIndex: 'materialName', width: 160},
-          {title: '规格', dataIndex: 'materialStandard', width: 80},
-          {title: '型号', dataIndex: 'materialModel', width: 80},
-          {title: '扩展信息', dataIndex: 'materialOther', width: 150},
-          {title: '单位', dataIndex: 'materialUnit', width: 80},
+          {title: '名称', dataIndex: 'materialName', width: 160, ellipsis:true},
+          {title: '规格', dataIndex: 'materialStandard', width: 80, ellipsis:true},
+          {title: '型号', dataIndex: 'materialModel', width: 80, ellipsis:true},
+          {title: '扩展信息', dataIndex: 'materialOther', width: 150, ellipsis:true},
+          {title: '单位', dataIndex: 'materialUnit', width: 80, ellipsis:true},
           {title: '销售数量', dataIndex: 'outSum', sorter: (a, b) => a.outSum - b.outSum, width: 80},
           {title: '销售金额', dataIndex: 'outSumPrice', sorter: (a, b) => a.outSumPrice - b.outSumPrice, width: 80},
           {title: '退货数量', dataIndex: 'inSum', sorter: (a, b) => a.inSum - b.inSum, width: 80},

jshERP-web/src/views/report/StockWarningReport.vue

@@ -113,13 +113,13 @@
               return (t !== '合计') ? (parseInt(index) + 1) : t
             }
           },
-          {title: '仓库', dataIndex: 'depotName', width: 100},
+          {title: '仓库', dataIndex: 'depotName', width: 100, ellipsis:true},
           {title: '条码', dataIndex: 'barCode', width: 100},
-          {title: '名称', dataIndex: 'mname', width: 100},
-          {title: '规格', dataIndex: 'mstandard', width: 80},
-          {title: '型号', dataIndex: 'mmodel', width: 80},
-          {title: '扩展信息', dataIndex: 'materialOther', width: 100},
-          {title: '单位', dataIndex: 'materialUnit', width: 60},
+          {title: '名称', dataIndex: 'mname', width: 100, ellipsis:true},
+          {title: '规格', dataIndex: 'mstandard', width: 80, ellipsis:true},
+          {title: '型号', dataIndex: 'mmodel', width: 80, ellipsis:true},
+          {title: '扩展信息', dataIndex: 'materialOther', width: 100, ellipsis:true},
+          {title: '单位', dataIndex: 'materialUnit', width: 60, ellipsis:true},
           {title: '库存', dataIndex: 'currentNumber', sorter: (a, b) => a.currentNumber - b.currentNumber, width: 80},
           {title: '最低安全库存', dataIndex: 'lowSafeStock', sorter: (a, b) => a.lowSafeStock - b.lowSafeStock, width: 100},
           {title: '最高安全库存', dataIndex: 'highSafeStock', sorter: (a, b) => a.highSafeStock - b.highSafeStock, width: 100},