diff --git a/jshERP-web/src/views/report/AccountReport.vue b/jshERP-web/src/views/report/AccountReport.vue index 93e2f7c56..8cb5bfd62 100644 --- a/jshERP-web/src/views/report/AccountReport.vue +++ b/jshERP-web/src/views/report/AccountReport.vue @@ -112,19 +112,19 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:60, align:"center", + title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, - { title: '账户流水', dataIndex: 'action', align:"center", width: 120, + { title: '账户流水', dataIndex: 'action', align:"center", width: 200, fixed: 'left', scopedSlots: { customRender: 'action' } }, - { title: '名称', dataIndex: 'name', width: 150}, - { title: '编号', dataIndex: 'serialNo', width: 150}, - { title: '期初金额', dataIndex: 'initialAmount', sorter: (a, b) => a.initialAmount - b.initialAmount, width: 100}, - { title: '本月发生额', dataIndex: 'thisMonthAmount', sorter: (a, b) => a.thisMonthAmount - b.thisMonthAmount, width: 100}, - { title: '当前余额', dataIndex: 'currentAmount', sorter: (a, b) => a.currentAmount - b.currentAmount, width: 100} + { title: '名称', dataIndex: 'name', width: 200, fixed: 'left'}, + { title: '编号', dataIndex: 'serialNo'}, + { title: '期初金额', dataIndex: 'initialAmount', sorter: (a, b) => a.initialAmount - b.initialAmount}, + { title: '本月发生额', dataIndex: 'thisMonthAmount', sorter: (a, b) => a.thisMonthAmount - b.thisMonthAmount}, + { title: '当前余额', dataIndex: 'currentAmount', sorter: (a, b) => a.currentAmount - b.currentAmount} ], url: { list: "/account/list", diff --git a/jshERP-web/src/views/report/AllocationDetail.vue b/jshERP-web/src/views/report/AllocationDetail.vue index eeb56f0c0..de6f4ac54 100644 --- a/jshERP-web/src/views/report/AllocationDetail.vue +++ b/jshERP-web/src/views/report/AllocationDetail.vue @@ -175,27 +175,27 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:40, align:"center", + title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, { - title: '单据编号', dataIndex: 'number', width: 100, + title: '单据编号', dataIndex: 'number', width: 150, fixed: 'left', scopedSlots: { customRender: 'numberCustomRender' }, }, - {title: '条码', dataIndex: 'barCode', width: 80}, - {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, ellipsis:true} + {title: '条码', dataIndex: 'barCode', width: 150, fixed: 'left'}, + {title: '名称', dataIndex: 'mname', width: 150, fixed: 'left'}, + {title: '规格', dataIndex: 'standard'}, + {title: '型号', dataIndex: 'model'}, + {title: '单位', dataIndex: 'mUnit'}, + {title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber}, + {title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.unitPrice - b.unitPrice}, + {title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice}, + {title: '调出仓库', dataIndex: 'dname'}, + {title: '调入仓库', dataIndex: 'sname'}, + {title: '调拨日期', dataIndex: 'operTime'}, + {title: '备注', dataIndex: 'newRemark'} ], url: { list: "/depotHead/findAllocationDetail", @@ -207,6 +207,9 @@ this.initSupplier() this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] }, + mounted () { + this.scroll.x = 2500 + }, methods: { moment, getQueryParams() { diff --git a/jshERP-web/src/views/report/BuyInReport.vue b/jshERP-web/src/views/report/BuyInReport.vue index aeaf4d514..17dea39c3 100644 --- a/jshERP-web/src/views/report/BuyInReport.vue +++ b/jshERP-web/src/views/report/BuyInReport.vue @@ -110,22 +110,22 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:40, align:"center", + title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {title: '条码', dataIndex: 'barCode', width: 160}, - {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}, - {title: '退货金额', dataIndex: 'outSumPrice', sorter: (a, b) => a.outSumPrice - b.outSumPrice, width: 80}, - {title: '实际采购金额', dataIndex: 'inOutSumPrice', sorter: (a, b) => a.inOutSumPrice - b.inOutSumPrice, width: 100} + {title: '条码', dataIndex: 'barCode', width: 160, fixed: 'left'}, + {title: '名称', dataIndex: 'materialName', width: 160, fixed: 'left'}, + {title: '规格', dataIndex: 'materialStandard'}, + {title: '型号', dataIndex: 'materialModel'}, + {title: '扩展信息', dataIndex: 'materialOther', ellipsis:true}, + {title: '单位', dataIndex: 'materialUnit', ellipsis:true}, + {title: '采购数量', dataIndex: 'inSum', sorter: (a, b) => a.inSum - b.inSum}, + {title: '采购金额', dataIndex: 'inSumPrice', sorter: (a, b) => a.inSumPrice - b.inSumPrice}, + {title: '退货数量', dataIndex: 'outSum', sorter: (a, b) => a.outSum - b.outSum}, + {title: '退货金额', dataIndex: 'outSumPrice', sorter: (a, b) => a.outSumPrice - b.outSumPrice}, + {title: '实际采购金额', dataIndex: 'inOutSumPrice', sorter: (a, b) => a.inOutSumPrice - b.inOutSumPrice} ], url: { list: "/depotItem/buyIn" @@ -135,6 +135,9 @@ created () { this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] }, + mounted () { + this.scroll.x = 2500 + }, methods: { moment, getQueryParams() { diff --git a/jshERP-web/src/views/report/CustomerAccount.vue b/jshERP-web/src/views/report/CustomerAccount.vue index cdfff0fa9..ab81f672d 100644 --- a/jshERP-web/src/views/report/CustomerAccount.vue +++ b/jshERP-web/src/views/report/CustomerAccount.vue @@ -137,25 +137,23 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:40, align:"center", + title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {title: '欠款详情', dataIndex: 'action', align:"center", width: 80, + {title: '欠款详情', dataIndex: 'action', align:"center", width: 150, fixed: 'left', scopedSlots: { customRender: 'action' } }, - {title: '客户', dataIndex: 'supplier', width: 150, ellipsis:true}, - {title: '联系人', dataIndex: 'contacts', width: 100, ellipsis:true}, - {title: '手机号码', dataIndex: 'telephone', width: 100}, - {title: '联系电话', dataIndex: 'phoneNum', width: 100}, - {title: '电子邮箱', dataIndex: 'email', width: 100}, - {title: '期初应收', dataIndex: 'preNeed', width: 80}, - {title: '本期欠款', dataIndex: 'debtMoney', width: 80}, - {title: '本期收款', dataIndex: 'backMoney', width: 80}, - {dataIndex: 'allNeed', width: 80, - slots: { title: 'customTitle' } - } + {title: '客户', dataIndex: 'supplier', width: 200, fixed: 'left'}, + {title: '联系人', dataIndex: 'contacts'}, + {title: '手机号码', dataIndex: 'telephone'}, + {title: '联系电话', dataIndex: 'phoneNum'}, + {title: '电子邮箱', dataIndex: 'email'}, + {title: '期初应收', dataIndex: 'preNeed'}, + {title: '本期欠款', dataIndex: 'debtMoney'}, + {title: '本期收款', dataIndex: 'backMoney'}, + {dataIndex: 'allNeed', slots: { title: 'customTitle' } } ], url: { list: "/depotHead/getStatementAccount", @@ -166,6 +164,9 @@ this.initSupplier() this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] }, + mounted () { + this.scroll.x = 1620 + }, methods: { getQueryParams() { let param = Object.assign({}, this.queryParam, this.isorter); diff --git a/jshERP-web/src/views/report/InDetail.vue b/jshERP-web/src/views/report/InDetail.vue index 48bcbc677..853d47f10 100644 --- a/jshERP-web/src/views/report/InDetail.vue +++ b/jshERP-web/src/views/report/InDetail.vue @@ -166,29 +166,29 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:40, align:"center", + title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, { - title: '单据编号', dataIndex: 'number', width: 100, + title: '单据编号', dataIndex: 'number', width: 150, fixed: 'left', scopedSlots: { customRender: 'numberCustomRender' }, }, - {title: '条码', dataIndex: 'barCode', width: 80}, - {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: 50, 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: 'taxRate', width: 60}, - {title: '税额', dataIndex: 'taxMoney', sorter: (a, b) => a.taxMoney - b.taxMoney, width: 60}, - {title: '往来单位', dataIndex: 'sname', width: 80, ellipsis:true}, - {title: '仓库', dataIndex: 'dname', width: 80, ellipsis:true}, - {title: '入库日期', dataIndex: 'operTime', width: 70}, - {title: '备注', dataIndex: 'newRemark', width: 100, ellipsis:true} + {title: '条码', dataIndex: 'barCode', width: 150, fixed: 'left'}, + {title: '名称', dataIndex: 'mname', width: 150, fixed: 'left'}, + {title: '规格', dataIndex: 'standard'}, + {title: '型号', dataIndex: 'model'}, + {title: '单位', dataIndex: 'mUnit'}, + {title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber}, + {title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.unitPrice - b.unitPrice}, + {title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice}, + {title: '税率(%)', dataIndex: 'taxRate'}, + {title: '税额', dataIndex: 'taxMoney', sorter: (a, b) => a.taxMoney - b.taxMoney}, + {title: '往来单位', dataIndex: 'sname'}, + {title: '仓库', dataIndex: 'dname'}, + {title: '入库日期', dataIndex: 'operTime'}, + {title: '备注', dataIndex: 'newRemark'} ], url: { list: "/depotHead/findInOutDetail", @@ -200,6 +200,9 @@ this.initSupplier() this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] }, + mounted () { + this.scroll.x = 2500 + }, methods: { moment, getQueryParams() { diff --git a/jshERP-web/src/views/report/InMaterialCount.vue b/jshERP-web/src/views/report/InMaterialCount.vue index 653906122..f16601c1f 100644 --- a/jshERP-web/src/views/report/InMaterialCount.vue +++ b/jshERP-web/src/views/report/InMaterialCount.vue @@ -146,19 +146,19 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:40, align:"center", + title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {title: '条码', dataIndex: 'barCode', 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} + {title: '条码', dataIndex: 'barCode', width: 200, fixed: 'left'}, + {title: '名称', dataIndex: 'mName', width: 200, fixed: 'left'}, + {title: '规格', dataIndex: 'standard'}, + {title: '型号', dataIndex: 'model'}, + {title: '类别', dataIndex: 'categoryName'}, + {title: '单位', dataIndex: 'materialUnit'}, + {title: '入库数量', dataIndex: 'numSum', sorter: (a, b) => a.numSum - b.numSum}, + {title: '入库金额', dataIndex: 'priceSum', sorter: (a, b) => a.priceSum - b.priceSum} ], url: { list: "/depotHead/findInOutMaterialCount", diff --git a/jshERP-web/src/views/report/InOutStockReport.vue b/jshERP-web/src/views/report/InOutStockReport.vue index 054c3cfa7..c6fc1baaa 100644 --- a/jshERP-web/src/views/report/InOutStockReport.vue +++ b/jshERP-web/src/views/report/InOutStockReport.vue @@ -130,25 +130,25 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:40, align:"center", + title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {title: '条码', dataIndex: 'barCode', width: 100}, - {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}, - {title: '出库数量', dataIndex: 'outSum', sorter: (a, b) => a.outSum - b.outSum, width: 60}, - {title: '本月结存数量', dataIndex: 'thisSum', sorter: (a, b) => a.thisSum - b.thisSum, width: 80, + {title: '条码', dataIndex: 'barCode', width: 150, fixed: 'left'}, + {title: '名称', dataIndex: 'materialName', width: 150, fixed: 'left'}, + {title: '规格', dataIndex: 'materialStandard'}, + {title: '型号', dataIndex: 'materialModel'}, + {title: '扩展信息', dataIndex: 'materialOther'}, + {title: '单位', dataIndex: 'unitName'}, + {title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.unitPrice - b.unitPrice}, + {title: '上月结存数量', dataIndex: 'prevSum', sorter: (a, b) => a.prevSum - b.prevSum}, + {title: '入库数量', dataIndex: 'inSum', sorter: (a, b) => a.inSum - b.inSum}, + {title: '出库数量', dataIndex: 'outSum', sorter: (a, b) => a.outSum - b.outSum}, + {title: '本月结存数量', dataIndex: 'thisSum', sorter: (a, b) => a.thisSum - b.thisSum, scopedSlots: { customRender: 'customRenderStock' } }, - {title: '结存金额', dataIndex: 'thisAllPrice', sorter: (a, b) => a.thisAllPrice - b.thisAllPrice, width: 60} + {title: '结存金额', dataIndex: 'thisAllPrice', sorter: (a, b) => a.thisAllPrice - b.thisAllPrice} ], url: { list: "/depotItem/findByAll", @@ -161,6 +161,9 @@ this.getDepotData() this.getTotalCountMoney() }, + mounted () { + this.scroll.x = 2500 + }, methods: { moment, getQueryParams() { diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue index b04da5038..a0ff04b74 100644 --- a/jshERP-web/src/views/report/MaterialStock.vue +++ b/jshERP-web/src/views/report/MaterialStock.vue @@ -146,27 +146,27 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:40, align:"center", + title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {title: '库存流水', dataIndex: 'action', align:"center", width: 60, + {title: '库存流水', dataIndex: 'action', align:"center", width: 150, fixed: 'left', scopedSlots: { customRender: 'action' } }, - {title: '条码', dataIndex: 'mBarCode', width: 80}, - {title: '名称', dataIndex: 'name', width: 140, ellipsis:true}, - {title: '规格', dataIndex: 'standard', width: 100, ellipsis:true}, - {title: '型号', dataIndex: 'model', width: 100, 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: 'mBarCode', width: 150, fixed: 'left'}, + {title: '名称', dataIndex: 'name', width: 150, fixed: 'left'}, + {title: '规格', dataIndex: 'standard'}, + {title: '型号', dataIndex: 'model'}, + {title: '颜色', dataIndex: 'color'}, + {title: '类别', dataIndex: 'categoryName'}, + {title: '单位', dataIndex: 'unitName'}, + {title: '单价', dataIndex: 'purchaseDecimal', sorter: (a, b) => a.purchaseDecimal - b.purchaseDecimal}, + {title: '初始库存', dataIndex: 'initialStock', sorter: (a, b) => a.initialStock - b.initialStock}, + {title: '库存', dataIndex: 'currentStock', sorter: (a, b) => a.currentStock - b.currentStock, scopedSlots: { customRender: 'customRenderStock' } }, - {title: '库存金额', dataIndex: 'currentStockPrice', sorter: (a, b) => a.currentStockPrice - b.currentStockPrice, width: 80} + {title: '库存金额', dataIndex: 'currentStockPrice', sorter: (a, b) => a.currentStockPrice - b.currentStockPrice} ], url: { list: "/material/getListWithStock" @@ -177,6 +177,9 @@ this.getDepotData() this.loadTreeData() }, + mounted () { + this.scroll.x = 2500 + }, methods: { moment, getQueryParams() { diff --git a/jshERP-web/src/views/report/OutDetail.vue b/jshERP-web/src/views/report/OutDetail.vue index 21bb49456..5af47fb50 100644 --- a/jshERP-web/src/views/report/OutDetail.vue +++ b/jshERP-web/src/views/report/OutDetail.vue @@ -166,29 +166,29 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:40, align:"center", + title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, { - title: '单据编号', dataIndex: 'number', width: 100, + title: '单据编号', dataIndex: 'number', width: 150, fixed: 'left', scopedSlots: { customRender: 'numberCustomRender' }, }, - {title: '条码', dataIndex: 'barCode', width: 80}, - {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: 50, 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: 'taxRate', width: 60}, - {title: '税额', dataIndex: 'taxMoney', sorter: (a, b) => a.taxMoney - b.taxMoney, width: 60}, - {title: '往来单位', dataIndex: 'sname', width: 80, ellipsis:true}, - {title: '仓库', dataIndex: 'dname', width: 80, ellipsis:true}, - {title: '出库日期', dataIndex: 'operTime', width: 70}, - {title: '备注', dataIndex: 'newRemark', width: 100, ellipsis:true} + {title: '条码', dataIndex: 'barCode', width: 150, fixed: 'left'}, + {title: '名称', dataIndex: 'mname', width: 150, fixed: 'left'}, + {title: '规格', dataIndex: 'standard'}, + {title: '型号', dataIndex: 'model'}, + {title: '单位', dataIndex: 'mUnit'}, + {title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber}, + {title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.unitPrice - b.unitPrice}, + {title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice}, + {title: '税率(%)', dataIndex: 'taxRate'}, + {title: '税额', dataIndex: 'taxMoney', sorter: (a, b) => a.taxMoney - b.taxMoney}, + {title: '往来单位', dataIndex: 'sname'}, + {title: '仓库', dataIndex: 'dname'}, + {title: '出库日期', dataIndex: 'operTime'}, + {title: '备注', dataIndex: 'newRemark'} ], url: { list: "/depotHead/findInOutDetail", @@ -200,6 +200,9 @@ this.initSupplier() this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] }, + mounted () { + this.scroll.x = 2500 + }, methods: { moment, getQueryParams() { diff --git a/jshERP-web/src/views/report/OutMaterialCount.vue b/jshERP-web/src/views/report/OutMaterialCount.vue index ca573ed3d..7627dc93c 100644 --- a/jshERP-web/src/views/report/OutMaterialCount.vue +++ b/jshERP-web/src/views/report/OutMaterialCount.vue @@ -146,19 +146,19 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:40, align:"center", + title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {title: '条码', dataIndex: 'barCode', 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} + {title: '条码', dataIndex: 'barCode', width: 200, fixed: 'left'}, + {title: '名称', dataIndex: 'mName', width: 200, fixed: 'left'}, + {title: '规格', dataIndex: 'standard'}, + {title: '型号', dataIndex: 'model'}, + {title: '类别', dataIndex: 'categoryName'}, + {title: '单位', dataIndex: 'materialUnit'}, + {title: '出库数量', dataIndex: 'numSum', sorter: (a, b) => a.numSum - b.numSum}, + {title: '出库金额', dataIndex: 'priceSum', sorter: (a, b) => a.priceSum - b.priceSum} ], url: { list: "/depotHead/findInOutMaterialCount", diff --git a/jshERP-web/src/views/report/SaleOutReport.vue b/jshERP-web/src/views/report/SaleOutReport.vue index 3ad7dcb11..9eaa8e407 100644 --- a/jshERP-web/src/views/report/SaleOutReport.vue +++ b/jshERP-web/src/views/report/SaleOutReport.vue @@ -115,22 +115,22 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:60, align:"center", + title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {title: '条码', dataIndex: 'barCode', width: 160}, - {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}, - {title: '退货金额', dataIndex: 'inSumPrice', sorter: (a, b) => a.inSumPrice - b.inSumPrice, width: 80}, - {title: '实际销售金额', dataIndex: 'outInSumPrice', sorter: (a, b) => a.outInSumPrice - b.outInSumPrice, width: 100} + {title: '条码', dataIndex: 'barCode', width: 160, fixed: 'left'}, + {title: '名称', dataIndex: 'materialName', width: 160, fixed: 'left'}, + {title: '规格', dataIndex: 'materialStandard'}, + {title: '型号', dataIndex: 'materialModel'}, + {title: '扩展信息', dataIndex: 'materialOther'}, + {title: '单位', dataIndex: 'materialUnit'}, + {title: '销售数量', dataIndex: 'outSum', sorter: (a, b) => a.outSum - b.outSum}, + {title: '销售金额', dataIndex: 'outSumPrice', sorter: (a, b) => a.outSumPrice - b.outSumPrice}, + {title: '退货数量', dataIndex: 'inSum', sorter: (a, b) => a.inSum - b.inSum}, + {title: '退货金额', dataIndex: 'inSumPrice', sorter: (a, b) => a.inSumPrice - b.inSumPrice}, + {title: '实际销售金额', dataIndex: 'outInSumPrice', sorter: (a, b) => a.outInSumPrice - b.outInSumPrice} ], url: { list: "/depotItem/saleOut" @@ -140,6 +140,9 @@ created () { this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] }, + mounted () { + this.scroll.x = 2500 + }, methods: { moment, create(){ diff --git a/jshERP-web/src/views/report/StockWarningReport.vue b/jshERP-web/src/views/report/StockWarningReport.vue index 302d7d92f..022f7a2df 100644 --- a/jshERP-web/src/views/report/StockWarningReport.vue +++ b/jshERP-web/src/views/report/StockWarningReport.vue @@ -108,23 +108,23 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:40, align:"center", + title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {title: '仓库', dataIndex: 'depotName', width: 100, ellipsis:true}, - {title: '条码', dataIndex: 'barCode', width: 100}, - {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}, - {title: '建议入库量', dataIndex: 'lowCritical', sorter: (a, b) => a.lowCritical - b.lowCritical, width: 80}, - {title: '建议出库量', dataIndex: 'highCritical', sorter: (a, b) => a.highCritical - b.highCritical, width: 80} + {title: '仓库', dataIndex: 'depotName', width: 150, fixed: 'left'}, + {title: '条码', dataIndex: 'barCode', width: 150, fixed: 'left'}, + {title: '名称', dataIndex: 'mname', width: 150, fixed: 'left'}, + {title: '规格', dataIndex: 'mstandard'}, + {title: '型号', dataIndex: 'mmodel'}, + {title: '扩展信息', dataIndex: 'materialOther'}, + {title: '单位', dataIndex: 'materialUnit'}, + {title: '库存', dataIndex: 'currentNumber', sorter: (a, b) => a.currentNumber - b.currentNumber}, + {title: '最低安全库存', dataIndex: 'lowSafeStock', sorter: (a, b) => a.lowSafeStock - b.lowSafeStock}, + {title: '最高安全库存', dataIndex: 'highSafeStock', sorter: (a, b) => a.highSafeStock - b.highSafeStock}, + {title: '建议入库量', dataIndex: 'lowCritical', sorter: (a, b) => a.lowCritical - b.lowCritical}, + {title: '建议出库量', dataIndex: 'highCritical', sorter: (a, b) => a.highCritical - b.highCritical} ], url: { list: "/depotItem/findStockWarningCount" diff --git a/jshERP-web/src/views/report/VendorAccount.vue b/jshERP-web/src/views/report/VendorAccount.vue index 014150f81..1e49bafc1 100644 --- a/jshERP-web/src/views/report/VendorAccount.vue +++ b/jshERP-web/src/views/report/VendorAccount.vue @@ -137,25 +137,23 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:40, align:"center", + title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {title: '欠款详情', dataIndex: 'action', align:"center", width: 80, + {title: '欠款详情', dataIndex: 'action', align:"center", width: 150, fixed: 'left', scopedSlots: { customRender: 'action' } }, - {title: '供应商', dataIndex: 'supplier', width: 150, ellipsis:true}, - {title: '联系人', dataIndex: 'contacts', width: 100, ellipsis:true}, - {title: '手机号码', dataIndex: 'telephone', width: 100}, - {title: '联系电话', dataIndex: 'phoneNum', width: 100}, - {title: '电子邮箱', dataIndex: 'email', width: 100}, - {title: '期初应付', dataIndex: 'preNeed', width: 80}, - {title: '本期欠款', dataIndex: 'debtMoney', width: 80}, - {title: '本期付款', dataIndex: 'backMoney', width: 80}, - {dataIndex: 'allNeed', width: 80, - slots: { title: 'customTitle' } - } + {title: '供应商', dataIndex: 'supplier', width: 200, fixed: 'left'}, + {title: '联系人', dataIndex: 'contacts'}, + {title: '手机号码', dataIndex: 'telephone'}, + {title: '联系电话', dataIndex: 'phoneNum'}, + {title: '电子邮箱', dataIndex: 'email'}, + {title: '期初应付', dataIndex: 'preNeed'}, + {title: '本期欠款', dataIndex: 'debtMoney'}, + {title: '本期付款', dataIndex: 'backMoney'}, + {dataIndex: 'allNeed', slots: { title: 'customTitle' } } ], url: { list: "/depotHead/getStatementAccount", @@ -166,6 +164,9 @@ this.initSupplier() this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] }, + mounted () { + this.scroll.x = 1620 + }, methods: { getQueryParams() { let param = Object.assign({}, this.queryParam, this.isorter);