From 3a0f0191b4ece00f315844f598808dff56086e56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?=
<852955+jishenghua@users.noreply.gitee.com>
Date: Sat, 9 Mar 2019 14:11:34 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E9=87=8D=E6=9E=84-=E7=B3=BB=E7=BB=9F?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
erp_web/js/print/print.js | 8 +-
erp_web/pages/manage/systemConfig.html | 514 ++++++++++++++----
sql/jsh_erp.sql | 18 +
sql/华夏ERP数据库设计汇总.xlsx | Bin 80741 -> 81385 bytes
.../erp/datasource/entities/SystemConfig.java | 144 +++--
.../entities/SystemConfigExample.java | 364 +++++++++----
.../mappers/SystemConfigMapperEx.java | 4 +-
.../systemConfig/SystemConfigComponent.java | 8 +-
.../systemConfig/SystemConfigService.java | 10 +-
.../mapper_xml/SystemConfigMapper.xml | 130 +++--
.../mapper_xml/SystemConfigMapperEx.xml | 6 +
src/test/resources/generatorConfig.xml | 10 +-
12 files changed, 885 insertions(+), 331 deletions(-)
diff --git a/erp_web/js/print/print.js b/erp_web/js/print/print.js
index e2bb9064..2465b50d 100644
--- a/erp_web/js/print/print.js
+++ b/erp_web/js/print/print.js
@@ -21,11 +21,9 @@ function CreateFormPage(strPrintName, printDatagrid) {
if (res && res.code === 200) {
if(res.data && res.data.page) {
var array = res.data.page.rows;
- for (var i = 0; i < array.length; i++) {
- var name = array[i].name;
- if (name === "company_name") {
- companyName = array[i].value;
- }
+ if(array.length > 0) {
+ var info = array[0];
+ companyName = info.companyName;
}
}
}
diff --git a/erp_web/pages/manage/systemConfig.html b/erp_web/pages/manage/systemConfig.html
index df8e36df..d9da5789 100644
--- a/erp_web/pages/manage/systemConfig.html
+++ b/erp_web/pages/manage/systemConfig.html
@@ -16,128 +16,418 @@
-
-