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

解决单据明细点击不能弹出的bug

Browse Source
This commit is contained in:
季圣华
2019-10-03 17:18:28 +08:00
parent 7c49adbac9
commit 5e560832f0
11 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erp_web/js/common/common.js
View File

@@ -330,4 +330,8 @@
} else { } else {
return false; return false;
} }
} }
function turnBillDetailPage(number, type) {
js.addTabPage(null, "单据明细", "/pages/materials/bill_detail.html?n="+ number + "&type=" + type);
}

4
erp_web/pages/manage/account.html
View File

@@ -14,6 +14,7 @@
<script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script> <script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script type="text/javascript" src="/js/common/outlook_in.js"></script> <script type="text/javascript" src="/js/common/outlook_in.js"></script>
<script type="text/javascript" src="/js/common/common.js"></script> <script type="text/javascript" src="/js/common/common.js"></script>
<script src="/js/common/jsherp.js"></script>
</head> </head>
<body> <body>
<!-- 数据显示table --> <!-- 数据显示table -->
@@ -573,8 +574,7 @@
{ {
title: '单据编号', field: 'number', width: 150, title: '单据编号', field: 'number', width: 150,
formatter: function (value, row) { formatter: function (value, row) {
return "<a class='n-link' onclick=\"newTab('" + row.number + "','../materials/bill_detail.html?n=" + row.number + "&type=" + row.type + "','')\">" return '<a class="n-link" onclick="turnBillDetailPage(\'' + row.number + '\''+',\'' + row.type + '\');">' + row.number + '</a>';
+ row.number + "</a>";
} }
}, },
{title: '类型', field: 'type', width: 100}, {title: '类型', field: 'type', width: 100},

8
erp_web/pages/manage/serialNumber.html
View File

@@ -15,6 +15,7 @@
<script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script> <script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script type="text/javascript" src="/js/common/outlook_in.js"></script> <script type="text/javascript" src="/js/common/outlook_in.js"></script>
<script type="text/javascript" src="/js/common/common.js"></script> <script type="text/javascript" src="/js/common/common.js"></script>
<script src="/js/common/jsherp.js"></script>
</head> </head>
<body> <body>
<!-- 数据显示table --> <!-- 数据显示table -->
@@ -214,11 +215,10 @@
{title: '单据编号', align: "center", field: 'depotHeadNumber', width: 140, {title: '单据编号', align: "center", field: 'depotHeadNumber', width: 140,
formatter: function (value, row) { formatter: function (value, row) {
if(row.depotHeadNumber){ if(row.depotHeadNumber){
return '<a class="n-link" onclick="turnBillDetailPage(\'' + row.depotHeadNumber + '\''+',\'' + row.depotHeadType + '\');">' + row.depotHeadNumber + '</a>';
return "<a class='n-link' onclick=\"newTab('" + row.depotHeadNumber + "','../materials/bill_detail.html?n=" + row.depotHeadNumber + "&type=" + row.depotHeadType + "','')\">" } else {
+ row.depotHeadNumber + "</a>"; return '';
} }
return '';
} }
}, },
{title: '已卖出', align: "center", field: 'isSell', width: 60 , formatter: function (value) { {title: '已卖出', align: "center", field: 'isSell', width: 60 , formatter: function (value) {

4
erp_web/pages/materials/material.html
View File

@@ -15,6 +15,7 @@
<script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script> <script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script type="text/javascript" src="/js/common/outlook_in.js"></script> <script type="text/javascript" src="/js/common/outlook_in.js"></script>
<script type="text/javascript" src="/js/common/common.js"></script> <script type="text/javascript" src="/js/common/common.js"></script>
<script src="/js/common/jsherp.js"></script>
</head> </head>
<body> <body>
<!-- 数据显示table --> <!-- 数据显示table -->
@@ -665,8 +666,7 @@
{ {
title: '单据编号', field: 'Number', width: 150, title: '单据编号', field: 'Number', width: 150,
formatter: function (value, row) { formatter: function (value, row) {
return "<a class='n-link' onclick=\"newTab('" + row.Number + "','../materials/bill_detail.html?n=" + row.Number + "&type=" + row.Type + "','')\">" return '<a class="n-link" onclick="turnBillDetailPage(\'' + row.Number + '\''+',\'' + row.Type + '\');">' + row.Number + '</a>';
+ row.Number + "</a>";
} }
}, },
{title: '类型', field: 'Type', width: 100}, {title: '类型', field: 'Type', width: 100},

4
erp_web/pages/reports/account_report.html
View File

@@ -16,6 +16,7 @@
<script type="text/javascript" src="/js/common/outlook_in.js"></script> <script type="text/javascript" src="/js/common/outlook_in.js"></script>
<script type="text/javascript" src="/js/My97DatePicker/WdatePicker.js"></script> <script type="text/javascript" src="/js/My97DatePicker/WdatePicker.js"></script>
<script type="text/javascript" src="/js/common/common.js"></script> <script type="text/javascript" src="/js/common/common.js"></script>
<script src="/js/common/jsherp.js"></script>
</head> </head>
<body> <body>
<!-- 数据显示table --> <!-- 数据显示table -->
@@ -233,8 +234,7 @@
{ {
title: '单据编号', field: 'number', width: 150, title: '单据编号', field: 'number', width: 150,
formatter: function (value, row) { formatter: function (value, row) {
return "<a class='n-link' onclick=\"newTab('" + row.number + "','../materials/bill_detail.html?n=" + row.number + "&type=" + row.type + "','')\">" return '<a class="n-link" onclick="turnBillDetailPage(\'' + row.number + '\''+',\'' + row.type + '\');">' + row.number + '</a>';
+ row.number + "</a>";
} }
}, },
{title: '类型', field: 'type', width: 100}, {title: '类型', field: 'type', width: 100},

4
erp_web/pages/reports/customer_account.html
View File

@@ -16,6 +16,7 @@
<script type="text/javascript" src="/js/common/outlook_in.js"></script> <script type="text/javascript" src="/js/common/outlook_in.js"></script>
<script type="text/javascript" src="/js/My97DatePicker/WdatePicker.js"></script> <script type="text/javascript" src="/js/My97DatePicker/WdatePicker.js"></script>
<script type="text/javascript" src="/js/common/common.js"></script> <script type="text/javascript" src="/js/common/common.js"></script>
<script src="/js/common/jsherp.js"></script>
</head> </head>
<body> <body>
<!-- 数据显示table --> <!-- 数据显示table -->
@@ -102,8 +103,7 @@
{ {
title: '单据编号', field: 'number', width: 140, title: '单据编号', field: 'number', width: 140,
formatter: function (value, row) { formatter: function (value, row) {
return "<a class='n-link' onclick=\"newTab('" + row.number + "','../materials/bill_detail.html?n=" + row.number + "&type=" + row.type + "','')\">" return '<a class="n-link" onclick="turnBillDetailPage(\'' + row.number + '\''+',\'' + row.type + '\');">' + row.number + '</a>';
+ row.number + "</a>";
} }
}, },
{title: '类型', field: 'type', width: 100}, {title: '类型', field: 'type', width: 100},

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

@@ -16,6 +16,7 @@
<script type="text/javascript" src="/js/common/outlook_in.js"></script> <script type="text/javascript" src="/js/common/outlook_in.js"></script>
<script type="text/javascript" src="/js/My97DatePicker/WdatePicker.js"></script> <script type="text/javascript" src="/js/My97DatePicker/WdatePicker.js"></script>
<script type="text/javascript" src="/js/common/common.js"></script> <script type="text/javascript" src="/js/common/common.js"></script>
<script src="/js/common/jsherp.js"></script>
</head> </head>
<body> <body>
<!-- 数据显示table --> <!-- 数据显示table -->
@@ -189,8 +190,7 @@
{ {
title: '单据编号', field: 'number', width: 140, title: '单据编号', field: 'number', width: 140,
formatter: function (value, row) { formatter: function (value, row) {
return "<a class='n-link' onclick=\"newTab('" + row.number + "','../materials/bill_detail.html?n=" + row.number + "&type=" + row.newType + "','')\">" return '<a class="n-link" onclick="turnBillDetailPage(\'' + row.number + '\''+',\'' + row.newType + '\');">' + row.number + '</a>';
+ row.number + "</a>";
} }
}, },
{title: '商品名称', field: 'mname', width: 120}, {title: '商品名称', field: 'mname', width: 120},

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

@@ -16,6 +16,7 @@
<script type="text/javascript" src="/js/common/outlook_in.js"></script> <script type="text/javascript" src="/js/common/outlook_in.js"></script>
<script type="text/javascript" src="/js/My97DatePicker/WdatePicker.js"></script> <script type="text/javascript" src="/js/My97DatePicker/WdatePicker.js"></script>
<script type="text/javascript" src="/js/common/common.js"></script> <script type="text/javascript" src="/js/common/common.js"></script>
<script src="/js/common/jsherp.js"></script>
</head> </head>
<body> <body>
<!-- 数据显示table --> <!-- 数据显示table -->
@@ -189,8 +190,7 @@
{ {
title: '单据编号', field: 'number', width: 140, title: '单据编号', field: 'number', width: 140,
formatter: function (value, row) { formatter: function (value, row) {
return "<a class='n-link' onclick=\"newTab('" + row.number + "','../materials/bill_detail.html?n=" + row.number + "&type=" + row.newType + "','')\">" return '<a class="n-link" onclick="turnBillDetailPage(\'' + row.number + '\''+',\'' + row.newType + '\');">' + row.number + '</a>';
+ row.number + "</a>";
} }
}, },
{title: '商品名称', field: 'mname', width: 120}, {title: '商品名称', field: 'mname', width: 120},

4
erp_web/pages/reports/vendor_account.html
View File

@@ -16,6 +16,7 @@
<script type="text/javascript" src="/js/common/outlook_in.js"></script> <script type="text/javascript" src="/js/common/outlook_in.js"></script>
<script type="text/javascript" src="/js/My97DatePicker/WdatePicker.js"></script> <script type="text/javascript" src="/js/My97DatePicker/WdatePicker.js"></script>
<script type="text/javascript" src="/js/common/common.js"></script> <script type="text/javascript" src="/js/common/common.js"></script>
<script src="/js/common/jsherp.js"></script>
</head> </head>
<body> <body>
<!-- 数据显示table --> <!-- 数据显示table -->
@@ -101,8 +102,7 @@
{ {
title: '单据编号', field: 'number', width: 140, title: '单据编号', field: 'number', width: 140,
formatter: function (value, row) { formatter: function (value, row) {
return "<a class='n-link' onclick=\"newTab('" + row.number + "','../materials/bill_detail.html?n=" + row.number + "&type=" + row.type + "','')\">" return '<a class="n-link" onclick="turnBillDetailPage(\'' + row.number + '\''+',\'' + row.type + '\');">' + row.number + '</a>';
+ row.number + "</a>";
} }
}, },
{title: '类型', field: 'type', width: 100}, {title: '类型', field: 'type', width: 100},

1
src/main/java/com/jsh/erp/controller/MaterialController.java
View File

@@ -257,7 +257,6 @@ public class MaterialController {
info.code = 400; info.code = 400;
info.data = data; info.data = data;
} }
//读取所有的摄像机编码
//每行中数据顺序 "品名","类型","型号","安全存量","单位","零售价","最低售价","预计采购价","批发价","备注","状态" //每行中数据顺序 "品名","类型","型号","安全存量","单位","零售价","最低售价","预计采购价","批发价","备注","状态"
List<Material> mList = new ArrayList<Material>(); List<Material> mList = new ArrayList<Material>();
for (int i = 1; i < src.getRows(); i++) { for (int i = 1; i < src.getRows(); i++) {

1
src/main/java/com/jsh/erp/controller/SupplierController.java
View File

@@ -397,7 +397,6 @@ public class SupplierController {
info.code = 400; info.code = 400;
info.data = data; info.data = data;
} }
//读取所有的摄像机编码
//每行中数据顺序 "名称","类型","联系人","电话","电子邮箱","预收款","期初应收","期初应付","备注","传真","手机","地址","纳税人识别号","开户行","账号","税率","状态" //每行中数据顺序 "名称","类型","联系人","电话","电子邮箱","预收款","期初应收","期初应付","备注","传真","手机","地址","纳税人识别号","开户行","账号","税率","状态"
List<Supplier> sList = new ArrayList<Supplier>(); List<Supplier> sList = new ArrayList<Supplier>();
for (int i = 1; i < src.getRows(); i++) { for (int i = 1; i < src.getRows(); i++) {