purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给报表里面增加规格展示

Browse Source
This commit is contained in:
季圣华
2020-12-26 00:20:00 +08:00
parent 56bc53c235
commit 3f2a592efa
30 changed files with 89 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erp_web/pages/manage/organization.html
View File

@@ -271,8 +271,6 @@
/**
* create by: qiankunpingtai
* create time: 2019/3/21 14:56
* website：https://qiankunpingtai.cn
* description:
* 提交时需要对表格内容进行校验，校验通过后提交后台处理
*/
var isValid = $("#organizationFM").form('validate');

1
erp_web/pages/reports/buy_in_report.html
View File

@@ -132,6 +132,7 @@
pageList: [10, 50, 100],
columns: [[
{title: '名称', field: 'MaterialName', width: 160},
{title: '规格', field: 'MaterialStandard', width: 80},
{title: '型号', field: 'MaterialModel', width: 80},
{title: '扩展信息', field: 'MaterialOther', width: 150},
{title: '单位', field: 'MaterialUnit', width: 80,

5
erp_web/pages/reports/in_detail.html
View File

@@ -191,8 +191,9 @@
return '<a class="n-link" onclick="turnBillDetailPage(\'' + row.number + '\''+',\'' + row.newType + '\');">' + row.number + '</a>';
}
},
{title: '商品名称', field: 'mname', width: 120},
{title: '商品型号', field: 'model', width: 100},
{title: '名称', field: 'mname', width: 120},
{title: '规格', field: 'standard', width: 100},
{title: '型号', field: 'model', width: 100},
{title: '单价', field: 'unitPrice', width: 60},
{title: '入库数量', field: 'operNumber', width: 80},
{title: '金额', field: 'allPrice', width: 60},

7
erp_web/pages/reports/in_material_count.html
View File

@@ -183,9 +183,10 @@
pageSize: 10,
pageList: [10, 50, 100],
columns: [[
{title: '商品名称', field: 'mName', width: 150},
{title: '商品型号', field: 'model', width: 150},
{title: '商品类型', field: 'categoryName', width: 120},
{title: '名称', field: 'mName', width: 150},
{title: '规格', field: 'standard', width: 100},
{title: '型号', field: 'model', width: 100},
{title: '类型', field: 'categoryName', width: 120},
{title: '入库数量', field: 'numSum', width: 120},
{title: '入库金额', field: 'priceSum', width: 120}
]],

3
erp_web/pages/reports/in_out_stock_report.html
View File

@@ -235,6 +235,7 @@
pageList: [10, 50, 100],
columns: [[
{title: '名称', field: 'MaterialName', width: 160},
{title: '规格', field: 'MaterialStandard', width: 80},
{title: '型号', field: 'MaterialModel', width: 80},
{title: '扩展信息', field: 'MaterialOther', width: 120},
{title: '单位', field: 'unitName', width: 80},
@@ -370,7 +371,7 @@
if (count.lastIndexOf('.') > -1) {
count = count.substring(0, count.lastIndexOf('.') + 3);
}
$("#tablePanel .total-count").text("本月合计金额:" + count + "元");//本月合计金额
$("#tablePanel .total-count").text("本月合计金额：" + count + "元");//本月合计金额
}
}
},

5
erp_web/pages/reports/out_detail.html
View File

@@ -191,8 +191,9 @@
return '<a class="n-link" onclick="turnBillDetailPage(\'' + row.number + '\''+',\'' + row.newType + '\');">' + row.number + '</a>';
}
},
{title: '商品名称', field: 'mname', width: 120},
{title: '商品型号', field: 'model', width: 100},
{title: '名称', field: 'mname', width: 120},
{title: '规格', field: 'standard', width: 100},
{title: '型号', field: 'model', width: 100},
{title: '单价', field: 'unitPrice', width: 60},
{title: '出库数量', field: 'operNumber', width: 80},
{title: '金额', field: 'allPrice', width: 60},

7
erp_web/pages/reports/out_material_count.html
View File

@@ -183,9 +183,10 @@
pageSize: 10,
pageList: [10, 50, 100],
columns: [[
{title: '商品名称', field: 'mName', width: 150},
{title: '商品型号', field: 'model', width: 150},
{title: '商品类型', field: 'categoryName', width: 120},
{title: '名称', field: 'mName', width: 150},
{title: '规格', field: 'standard', width: 100},
{title: '型号', field: 'model', width: 100},
{title: '类型', field: 'categoryName', width: 120},
{title: '出库数量', field: 'numSum', width: 120},
{title: '出库金额', field: 'priceSum', width: 120}
]],

1
erp_web/pages/reports/sale_out_report.html
View File

@@ -136,6 +136,7 @@
pageList: [10, 50, 100],
columns: [[
{title: '名称', field: 'MaterialName', width: 160},
{title: '规格', field: 'MaterialStandard', width: 80},
{title: '型号', field: 'MaterialModel', width: 80},
{title: '扩展信息', field: 'MaterialOther', width: 150},
{title: '单位', field: 'MaterialUnit', width: 80,

1
erp_web/pages/reports/stock_warning_report.html
View File

@@ -203,6 +203,7 @@
pageList: [10, 50, 100],
columns: [[
{title: '名称', field: 'materialName', width: 160},
{title: '规格', field: 'materialStandard', width: 80},
{title: '型号', field: 'materialModel', width: 80},
{title: '扩展信息', field: 'materialOther', width: 150},
{title: '单位', field: 'materialUnit', width: 80},