diff --git a/erp_web/js/common/common.js b/erp_web/js/common/common.js
index 154b7d89..cd866865 100644
--- a/erp_web/js/common/common.js
+++ b/erp_web/js/common/common.js
@@ -330,4 +330,8 @@
} else {
return false;
}
- }
\ No newline at end of file
+ }
+
+ function turnBillDetailPage(number, type) {
+ js.addTabPage(null, "单据明细", "/pages/materials/bill_detail.html?n="+ number + "&type=" + type);
+ }
\ No newline at end of file
diff --git a/erp_web/pages/manage/account.html b/erp_web/pages/manage/account.html
index c600be36..6a1166c5 100644
--- a/erp_web/pages/manage/account.html
+++ b/erp_web/pages/manage/account.html
@@ -14,6 +14,7 @@
+
@@ -573,8 +574,7 @@
{
title: '单据编号', field: 'number', width: 150,
formatter: function (value, row) {
- return ""
- + row.number + "";
+ return '' + row.number + '';
}
},
{title: '类型', field: 'type', width: 100},
diff --git a/erp_web/pages/manage/serialNumber.html b/erp_web/pages/manage/serialNumber.html
index b5f0c249..e25a9eba 100644
--- a/erp_web/pages/manage/serialNumber.html
+++ b/erp_web/pages/manage/serialNumber.html
@@ -15,6 +15,7 @@
+
@@ -214,11 +215,10 @@
{title: '单据编号', align: "center", field: 'depotHeadNumber', width: 140,
formatter: function (value, row) {
if(row.depotHeadNumber){
-
- return ""
- + row.depotHeadNumber + "";
+ return '' + row.depotHeadNumber + '';
+ } else {
+ return '';
}
- return '';
}
},
{title: '已卖出', align: "center", field: 'isSell', width: 60 , formatter: function (value) {
diff --git a/erp_web/pages/materials/material.html b/erp_web/pages/materials/material.html
index 816b1726..db1d02d8 100644
--- a/erp_web/pages/materials/material.html
+++ b/erp_web/pages/materials/material.html
@@ -15,6 +15,7 @@
+
@@ -665,8 +666,7 @@
{
title: '单据编号', field: 'Number', width: 150,
formatter: function (value, row) {
- return ""
- + row.Number + "";
+ return '' + row.Number + '';
}
},
{title: '类型', field: 'Type', width: 100},
diff --git a/erp_web/pages/reports/account_report.html b/erp_web/pages/reports/account_report.html
index 796ab693..9cebd80f 100644
--- a/erp_web/pages/reports/account_report.html
+++ b/erp_web/pages/reports/account_report.html
@@ -16,6 +16,7 @@
+
@@ -233,8 +234,7 @@
{
title: '单据编号', field: 'number', width: 150,
formatter: function (value, row) {
- return ""
- + row.number + "";
+ return '' + row.number + '';
}
},
{title: '类型', field: 'type', width: 100},
diff --git a/erp_web/pages/reports/customer_account.html b/erp_web/pages/reports/customer_account.html
index a3a5b98f..d56ce854 100644
--- a/erp_web/pages/reports/customer_account.html
+++ b/erp_web/pages/reports/customer_account.html
@@ -16,6 +16,7 @@
+
@@ -102,8 +103,7 @@
{
title: '单据编号', field: 'number', width: 140,
formatter: function (value, row) {
- return ""
- + row.number + "";
+ return '' + row.number + '';
}
},
{title: '类型', field: 'type', width: 100},
diff --git a/erp_web/pages/reports/in_detail.html b/erp_web/pages/reports/in_detail.html
index 16c9ed81..58323fe4 100644
--- a/erp_web/pages/reports/in_detail.html
+++ b/erp_web/pages/reports/in_detail.html
@@ -16,6 +16,7 @@
+
@@ -189,8 +190,7 @@
{
title: '单据编号', field: 'number', width: 140,
formatter: function (value, row) {
- return ""
- + row.number + "";
+ return '' + row.number + '';
}
},
{title: '商品名称', field: 'mname', width: 120},
diff --git a/erp_web/pages/reports/out_detail.html b/erp_web/pages/reports/out_detail.html
index fadba6dc..d77cf093 100644
--- a/erp_web/pages/reports/out_detail.html
+++ b/erp_web/pages/reports/out_detail.html
@@ -16,6 +16,7 @@
+
@@ -189,8 +190,7 @@
{
title: '单据编号', field: 'number', width: 140,
formatter: function (value, row) {
- return ""
- + row.number + "";
+ return '' + row.number + '';
}
},
{title: '商品名称', field: 'mname', width: 120},
diff --git a/erp_web/pages/reports/vendor_account.html b/erp_web/pages/reports/vendor_account.html
index e2f6061a..a84ae8cc 100644
--- a/erp_web/pages/reports/vendor_account.html
+++ b/erp_web/pages/reports/vendor_account.html
@@ -16,6 +16,7 @@
+
@@ -101,8 +102,7 @@
{
title: '单据编号', field: 'number', width: 140,
formatter: function (value, row) {
- return ""
- + row.number + "";
+ return '' + row.number + '';
}
},
{title: '类型', field: 'type', width: 100},
diff --git a/src/main/java/com/jsh/erp/controller/MaterialController.java b/src/main/java/com/jsh/erp/controller/MaterialController.java
index 1a8b1f71..366824bb 100644
--- a/src/main/java/com/jsh/erp/controller/MaterialController.java
+++ b/src/main/java/com/jsh/erp/controller/MaterialController.java
@@ -257,7 +257,6 @@ public class MaterialController {
info.code = 400;
info.data = data;
}
- //读取所有的摄像机编码
//每行中数据顺序 "品名","类型","型号","安全存量","单位","零售价","最低售价","预计采购价","批发价","备注","状态"
List mList = new ArrayList();
for (int i = 1; i < src.getRows(); i++) {
diff --git a/src/main/java/com/jsh/erp/controller/SupplierController.java b/src/main/java/com/jsh/erp/controller/SupplierController.java
index 0058d6b6..ce34977d 100644
--- a/src/main/java/com/jsh/erp/controller/SupplierController.java
+++ b/src/main/java/com/jsh/erp/controller/SupplierController.java
@@ -397,7 +397,6 @@ public class SupplierController {
info.code = 400;
info.data = data;
}
- //读取所有的摄像机编码
//每行中数据顺序 "名称","类型","联系人","电话","电子邮箱","预收款","期初应收","期初应付","备注","传真","手机","地址","纳税人识别号","开户行","账号","税率","状态"
List sList = new ArrayList();
for (int i = 1; i < src.getRows(); i++) {