diff --git a/jshERP-web/src/views/report/AccountReport.vue b/jshERP-web/src/views/report/AccountReport.vue index 8cb5bfd62..2d6a88449 100644 --- a/jshERP-web/src/views/report/AccountReport.vue +++ b/jshERP-web/src/views/report/AccountReport.vue @@ -41,6 +41,7 @@ rowKey="id" :columns="columns" :dataSource="dataSource" + :components="handleDrag(columns)" :pagination="false" :scroll="scroll" :loading="loading" @@ -112,19 +113,19 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', + title: '#', dataIndex: 'rowIndex', width:60, align:"center", customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, - { title: '账户流水', dataIndex: 'action', align:"center", width: 200, fixed: 'left', + { title: '账户流水', dataIndex: 'action', align:"center", width: 120, scopedSlots: { customRender: 'action' } }, - { 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} + { 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} ], url: { list: "/account/list", diff --git a/jshERP-web/src/views/report/AllocationDetail.vue b/jshERP-web/src/views/report/AllocationDetail.vue index 8ddf76017..3380959dd 100644 --- a/jshERP-web/src/views/report/AllocationDetail.vue +++ b/jshERP-web/src/views/report/AllocationDetail.vue @@ -91,6 +91,7 @@ rowKey="id" :columns="columns" :dataSource="dataSource" + :components="handleDrag(columns)" :pagination="false" :scroll="scroll" :loading="loading" @@ -175,27 +176,27 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', + title: '#', dataIndex: 'rowIndex', width:40, align:"center", customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, { - title: '单据编号', dataIndex: 'number', width: 150, fixed: 'left', + title: '单据编号', dataIndex: 'number', width: 100, scopedSlots: { customRender: 'numberCustomRender' }, }, - {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'} + {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} ], url: { list: "/depotHead/findAllocationDetail", @@ -208,7 +209,7 @@ this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] }, mounted () { - this.scroll.x = 2100 + this.scroll.x = 1620 }, methods: { moment, diff --git a/jshERP-web/src/views/report/BuyInReport.vue b/jshERP-web/src/views/report/BuyInReport.vue index 8f8678012..36110c057 100644 --- a/jshERP-web/src/views/report/BuyInReport.vue +++ b/jshERP-web/src/views/report/BuyInReport.vue @@ -43,6 +43,7 @@ rowKey="id" :columns="columns" :dataSource="dataSource" + :components="handleDrag(columns)" :pagination="false" :scroll="scroll" :loading="loading" @@ -110,22 +111,22 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', + title: '#', dataIndex: 'rowIndex', width:40, align:"center", customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {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} + {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} ], url: { list: "/depotItem/buyIn" @@ -136,7 +137,7 @@ this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] }, mounted () { - this.scroll.x = 2100 + this.scroll.x = 1620 }, methods: { moment, diff --git a/jshERP-web/src/views/report/CustomerAccount.vue b/jshERP-web/src/views/report/CustomerAccount.vue index ab81f672d..9d117da47 100644 --- a/jshERP-web/src/views/report/CustomerAccount.vue +++ b/jshERP-web/src/views/report/CustomerAccount.vue @@ -53,6 +53,7 @@ rowKey="id" :columns="columns" :dataSource="dataSource" + :components="handleDrag(columns)" :pagination="false" :scroll="scroll" :loading="loading" @@ -137,23 +138,25 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', + title: '#', dataIndex: 'rowIndex', width:40, align:"center", customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {title: '欠款详情', dataIndex: 'action', align:"center", width: 150, fixed: 'left', + {title: '欠款详情', dataIndex: 'action', align:"center", width: 80, scopedSlots: { customRender: 'action' } }, - {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' } } + {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' } + } ], url: { list: "/depotHead/getStatementAccount", diff --git a/jshERP-web/src/views/report/InDetail.vue b/jshERP-web/src/views/report/InDetail.vue index 665940336..8564286f8 100644 --- a/jshERP-web/src/views/report/InDetail.vue +++ b/jshERP-web/src/views/report/InDetail.vue @@ -83,6 +83,7 @@ rowKey="id" :columns="columns" :dataSource="dataSource" + :components="handleDrag(columns)" :pagination="false" :scroll="scroll" :loading="loading" @@ -166,29 +167,29 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', + title: '#', dataIndex: 'rowIndex', width:40, align:"center", customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, { - title: '单据编号', dataIndex: 'number', width: 150, fixed: 'left', + title: '单据编号', dataIndex: 'number', width: 100, scopedSlots: { customRender: 'numberCustomRender' }, }, - {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'} + {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} ], url: { list: "/depotHead/findInOutDetail", @@ -201,7 +202,7 @@ this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] }, mounted () { - this.scroll.x = 2300 + this.scroll.x = 1620 }, methods: { moment, diff --git a/jshERP-web/src/views/report/InMaterialCount.vue b/jshERP-web/src/views/report/InMaterialCount.vue index f16601c1f..aaabaab0a 100644 --- a/jshERP-web/src/views/report/InMaterialCount.vue +++ b/jshERP-web/src/views/report/InMaterialCount.vue @@ -72,6 +72,7 @@ rowKey="id" :columns="columns" :dataSource="dataSource" + :components="handleDrag(columns)" :pagination="false" :scroll="scroll" :loading="loading" @@ -146,19 +147,19 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', + title: '#', dataIndex: 'rowIndex', width:40, align:"center", customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {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} + {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} ], url: { list: "/depotHead/findInOutMaterialCount", diff --git a/jshERP-web/src/views/report/InOutStockReport.vue b/jshERP-web/src/views/report/InOutStockReport.vue index bb773f4d0..53fc39df9 100644 --- a/jshERP-web/src/views/report/InOutStockReport.vue +++ b/jshERP-web/src/views/report/InOutStockReport.vue @@ -56,6 +56,7 @@ rowKey="id" :columns="columns" :dataSource="dataSource" + :components="handleDrag(columns)" :pagination="false" :scroll="scroll" :loading="loading" @@ -130,25 +131,25 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', + title: '#', dataIndex: 'rowIndex', width:40, align:"center", customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {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, + {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, scopedSlots: { customRender: 'customRenderStock' } }, - {title: '结存金额', dataIndex: 'thisAllPrice', sorter: (a, b) => a.thisAllPrice - b.thisAllPrice} + {title: '结存金额', dataIndex: 'thisAllPrice', sorter: (a, b) => a.thisAllPrice - b.thisAllPrice, width: 60} ], url: { list: "/depotItem/findByAll", @@ -162,7 +163,7 @@ this.getTotalCountMoney() }, mounted () { - this.scroll.x = 2100 + this.scroll.x = 1620 }, methods: { moment, diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue index aea1df916..b90ec909d 100644 --- a/jshERP-web/src/views/report/MaterialStock.vue +++ b/jshERP-web/src/views/report/MaterialStock.vue @@ -65,6 +65,7 @@ rowKey="id" :columns="columns" :dataSource="dataSource" + :components="handleDrag(columns)" :pagination="false" :scroll="scroll" :loading="loading" @@ -146,27 +147,27 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', + title: '#', dataIndex: 'rowIndex', width:40, align:"center", customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {title: '库存流水', dataIndex: 'action', align:"center", width: 100, fixed: 'left', + {title: '库存流水', dataIndex: 'action', align:"center", width: 60, scopedSlots: { customRender: 'action' } }, - {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, + {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, scopedSlots: { customRender: 'customRenderStock' } }, - {title: '库存金额', dataIndex: 'currentStockPrice', sorter: (a, b) => a.currentStockPrice - b.currentStockPrice} + {title: '库存金额', dataIndex: 'currentStockPrice', sorter: (a, b) => a.currentStockPrice - b.currentStockPrice, width: 80} ], url: { list: "/material/getListWithStock" @@ -178,7 +179,7 @@ this.loadTreeData() }, mounted () { - this.scroll.x = 2100 + this.scroll.x = 1620 }, methods: { moment, diff --git a/jshERP-web/src/views/report/OutDetail.vue b/jshERP-web/src/views/report/OutDetail.vue index ecfca31e1..4eedcdb54 100644 --- a/jshERP-web/src/views/report/OutDetail.vue +++ b/jshERP-web/src/views/report/OutDetail.vue @@ -83,6 +83,7 @@ rowKey="id" :columns="columns" :dataSource="dataSource" + :components="handleDrag(columns)" :pagination="false" :scroll="scroll" :loading="loading" @@ -166,29 +167,29 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', + title: '#', dataIndex: 'rowIndex', width:40, align:"center", customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, { - title: '单据编号', dataIndex: 'number', width: 150, fixed: 'left', + title: '单据编号', dataIndex: 'number', width: 100, scopedSlots: { customRender: 'numberCustomRender' }, }, - {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'} + {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} ], url: { list: "/depotHead/findInOutDetail", @@ -201,7 +202,7 @@ this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] }, mounted () { - this.scroll.x = 2300 + this.scroll.x = 1620 }, methods: { moment, diff --git a/jshERP-web/src/views/report/OutMaterialCount.vue b/jshERP-web/src/views/report/OutMaterialCount.vue index 7627dc93c..382e2f52d 100644 --- a/jshERP-web/src/views/report/OutMaterialCount.vue +++ b/jshERP-web/src/views/report/OutMaterialCount.vue @@ -72,6 +72,7 @@ rowKey="id" :columns="columns" :dataSource="dataSource" + :components="handleDrag(columns)" :pagination="false" :scroll="scroll" :loading="loading" @@ -146,19 +147,19 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', + title: '#', dataIndex: 'rowIndex', width:40, align:"center", customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {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} + {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} ], url: { list: "/depotHead/findInOutMaterialCount", diff --git a/jshERP-web/src/views/report/SaleOutReport.vue b/jshERP-web/src/views/report/SaleOutReport.vue index 858731db8..719c88c0d 100644 --- a/jshERP-web/src/views/report/SaleOutReport.vue +++ b/jshERP-web/src/views/report/SaleOutReport.vue @@ -48,6 +48,7 @@ rowKey="id" :columns="columns" :dataSource="dataSource" + :components="handleDrag(columns)" :pagination="false" :scroll="scroll" :loading="loading" @@ -115,22 +116,22 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', + title: '#', dataIndex: 'rowIndex', width:60, align:"center", customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {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} + {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} ], url: { list: "/depotItem/saleOut" @@ -141,7 +142,7 @@ this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] }, mounted () { - this.scroll.x = 2100 + this.scroll.x = 1620 }, methods: { moment, diff --git a/jshERP-web/src/views/report/StockWarningReport.vue b/jshERP-web/src/views/report/StockWarningReport.vue index 022f7a2df..4f73bdef7 100644 --- a/jshERP-web/src/views/report/StockWarningReport.vue +++ b/jshERP-web/src/views/report/StockWarningReport.vue @@ -44,6 +44,7 @@ rowKey="id" :columns="columns" :dataSource="dataSource" + :components="handleDrag(columns)" :pagination="false" :scroll="scroll" :loading="loading" @@ -108,23 +109,23 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', + title: '#', dataIndex: 'rowIndex', width:40, align:"center", customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {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} + {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} ], url: { list: "/depotItem/findStockWarningCount" diff --git a/jshERP-web/src/views/report/VendorAccount.vue b/jshERP-web/src/views/report/VendorAccount.vue index 1e49bafc1..6c52a8812 100644 --- a/jshERP-web/src/views/report/VendorAccount.vue +++ b/jshERP-web/src/views/report/VendorAccount.vue @@ -53,6 +53,7 @@ rowKey="id" :columns="columns" :dataSource="dataSource" + :components="handleDrag(columns)" :pagination="false" :scroll="scroll" :loading="loading" @@ -137,23 +138,25 @@ // 表头 columns: [ { - title: '#', dataIndex: 'rowIndex', width:60, align:"center", fixed: 'left', + title: '#', dataIndex: 'rowIndex', width:40, align:"center", customRender:function (t,r,index) { return (t !== '合计') ? (parseInt(index) + 1) : t } }, - {title: '欠款详情', dataIndex: 'action', align:"center", width: 150, fixed: 'left', + {title: '欠款详情', dataIndex: 'action', align:"center", width: 80, scopedSlots: { customRender: 'action' } }, - {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' } } + {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' } + } ], url: { list: "/depotHead/getStatementAccount",