Score
0
Watch 929 Star 3K Fork 1.5K

GVP季圣华 / 华夏ERPJavaGPL-3.0

Closed
!60 修改注册页面版本显示问题

乾坤平台:master季圣华:master

乾坤平台 Created on: 2019-11-08 20:40
Reviewer: 852955_jishenghua_1578933912

No description.

0 comments, 1 participants

Show action logs Hide action logs
乾坤平台 closed Pull Request 2019-11-08 20:45
乾坤平台 assigned reviewer 季圣华 2019-11-08 20:40

Sign in to comment

For performance reasons, we only show 100 commits.

2019-11-08

(3)
乾坤平台 committed 2019-11-08 16:23
乾坤平台 committed 2019-11-08 16:14

2019-11-06

(1)

2019-11-05

(1)

2019-11-04

(3)
qiankunpingtai committed 2019-11-04 14:18

2019-11-01

(2)
caijulong committed 2019-11-01 15:55

2019-07-29

(3)
乾坤平台 committed 2019-07-29 11:12
乾坤平台 committed 2019-07-29 10:20

2019-06-14

(5)

2019-06-13

(5)
乾坤平台 committed 2019-06-13 09:23

2019-06-12

(2)

2019-06-11

(4)
乾坤平台 committed 2019-06-11 15:03

2019-06-10

(6)
乾坤平台 committed 2019-06-10 10:48
乾坤平台 committed 2019-06-10 09:42
乾坤平台 committed 2019-06-10 09:41

2019-06-06

(1)
乾坤平台 committed 2019-06-06 18:13

2019-05-24

(3)

2019-05-23

(1)

2019-05-22

(3)

2019-05-21

(14)

2019-05-17

(1)

2019-05-16

(1)

2019-05-14

(9)
乾坤平台 committed 2019-05-14 16:34

2019-05-13

(2)

2019-05-10

(4)

2019-05-09

(7)

2019-05-08

(11)
乾坤平台 committed 2019-05-08 15:48

2019-05-07

(6)
乾坤平台 committed 2019-05-07 15:05

2019-05-06

(2)

The number of file changes has exceeded 84, please pull this diffs

84 changed files
# 项目总述
* 很多人说华夏ERP(英文名:jshERP)是目前唯一完整开源的进销存系统
* 虽然目前只有进销存+财务的功能,但后面将会推出ERP的全部功能,大家一起努力吧
* 部署如有问题请联系QQ:960596000,
* 欢迎加入乾坤平台-华夏ERP群,群号码:693725296
扫码加群:
![乾坤平台-华夏ERP群二维码.png](https://qkpt.top/mnt/upload/2019/04/乾坤平台-华夏ERP群二维码-5ca242ee.png)
* [交流社区](https://qiankunpingtai.cn/domain/%E8%BF%9B%E9%94%80%E5%AD%98)
* 联系方式二:QQ:752718920,交流群二,群号码:120725710
* 商务合作-请联系QQ:514869858,技术交流-请联系QQ:752718920
* 欢迎加入华夏ERP交流QQ群,群1:120725710(满)、群2:732152262
* 系统的默认超管账户:admin,默认租户账号:jsh,默认密码均为:123456
* 部署如遇到困难请参考Wiki文档 **https://gitee.com/jishenghua/JSH_ERP/wikis/pages**
* 官网地址:[http://www.huaxiaerp.com](https://www.huaxiaerp.com),测试账号:jsh,密码:123456,**(如需长期使用,欢迎注册)**
* **[本系统演示地址一](http://erp.qkpt.top/login.html) 账号:jsh,密码:123456,欢迎登录(如需试用,欢迎注册)**
* **[本系统演示地址二](http://www.huaxiaerp.com)**
# 定制服务
* 如有ERP **私人定制** 需求,请将需求整理成文档,发给邮箱: **514869858@qq.com** ,我会及时回复哒
# 开发初衷
* 华夏ERP立志为中小企业提供开源好用的ERP软件,降低企业的信息化成本
* 个人开发者也可以使用华夏ERP进行二次开发,加快完成开发任务
* 初学JAVA的小伙伴可以下载源代码来进行学习交流
@@ -42,22 +48,22 @@
# 系统美图
* 首页
![输入图片说明](https://images.gitee.com/uploads/images/2019/1102/090743_f2f048e8_852955.png "首页.png")
![首页](https://images.gitee.com/uploads/images/2019/0914/113956_ce9b6518_852955.png "首页.png")
* 零售管理
![输入图片说明](https://images.gitee.com/uploads/images/2019/0914/113648_9334e6cb_852955.png "零售管理.png")
![零售管理](https://images.gitee.com/uploads/images/2019/0914/113648_9334e6cb_852955.png "零售管理.png")
* 采购管理
![输入图片说明](https://images.gitee.com/uploads/images/2019/0914/113805_c746f34d_852955.png "采购管理.png")
![采购管理](https://images.gitee.com/uploads/images/2019/0914/113805_c746f34d_852955.png "采购管理.png")
* 销售管理
![输入图片说明](https://images.gitee.com/uploads/images/2019/0914/113820_e979394b_852955.png "销售管理.png")
![销售管理](https://images.gitee.com/uploads/images/2019/0914/113820_e979394b_852955.png "销售管理.png")
* 仓库管理
![输入图片说明](https://images.gitee.com/uploads/images/2019/0914/113830_88ea05d3_852955.png "仓库管理.png")
![仓库管理](https://images.gitee.com/uploads/images/2019/0914/113830_88ea05d3_852955.png "仓库管理.png")
* 财务管理
![输入图片说明](https://images.gitee.com/uploads/images/2019/0914/113842_a8b7be72_852955.png "财务管理.png")
![财务管理](https://images.gitee.com/uploads/images/2019/0914/113842_a8b7be72_852955.png "财务管理.png")
* 报表查询
![输入图片说明](https://images.gitee.com/uploads/images/2019/0914/113853_88a7b751_852955.png "报表查询.png")
![报表查询](https://images.gitee.com/uploads/images/2019/0914/113853_88a7b751_852955.png "报表查询.png")
* 商品管理
![输入图片说明](https://images.gitee.com/uploads/images/2019/0914/113916_0a5af74f_852955.png "商品管理.png")
![商品管理](https://images.gitee.com/uploads/images/2019/0914/113916_0a5af74f_852955.png "商品管理.png")
* 基本资料
![输入图片说明](https://images.gitee.com/uploads/images/2019/0914/113926_d0798aeb_852955.png "基本资料.png")
![基本资料](https://images.gitee.com/uploads/images/2019/0914/113926_d0798aeb_852955.png "基本资料.png")
* 系统管理
![输入图片说明](https://images.gitee.com/uploads/images/2019/0914/113942_e17989f5_852955.png "系统管理.png")
\ No newline at end of file
![系统管理](https://images.gitee.com/uploads/images/2019/0914/113942_e17989f5_852955.png "系统管理.png")
\ No newline at end of file
docs/华夏ERP数据库设计汇总.xlsx 100644 → 0
File previewing is not supported
docs/数据库更新记录-方便升级.txt 100644 → 0
erp_web/js/pages/financial/advance_in.js 0 → 100644
erp_web/js/pages/financial/giro.js 0 → 100644
erp_web/js/pages/financial/item_in.js 0 → 100644
erp_web/js/pages/financial/item_out.js 0 → 100644
erp_web/js/pages/financial/money_in.js 0 → 100644
erp_web/js/pages/financial/money_out.js 0 → 100644
erp_web/js/pages/manage/customer.js 0 → 100644
erp_web/js/pages/manage/member.js 0 → 100644
erp_web/js/pages/manage/vendor.js 0 → 100644
erp_web/pages/financial/advance_in.html
@@ -14,7 +14,7 @@
<script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/financial/financial_base.js"></script>
<script src="/js/pages/financial/advance_in.js"></script>
</head>
<body>
<!-- 数据显示table -->
erp_web/pages/financial/giro.html
@@ -14,7 +14,7 @@
<script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/financial/financial_base.js"></script>
<script src="/js/pages/financial/giro.js"></script>
</head>
<body>
<!-- 数据显示table -->
erp_web/pages/financial/item_in.html
@@ -14,7 +14,7 @@
<script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/financial/financial_base.js"></script>
<script src="/js/pages/financial/item_in.js"></script>
</head>
<body>
<!-- 数据显示table -->
erp_web/pages/financial/item_out.html
@@ -14,7 +14,7 @@
<script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/financial/financial_base.js"></script>
<script src="/js/pages/financial/item_out.js"></script>
</head>
<body>
<!-- 数据显示table -->
erp_web/pages/financial/money_in.html
@@ -14,7 +14,7 @@
<script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/financial/financial_base.js"></script>
<script src="/js/pages/financial/money_in.js"></script>
</head>
<body>
<!-- 数据显示table -->
erp_web/pages/financial/money_out.html
@@ -14,7 +14,7 @@
<script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/financial/financial_base.js"></script>
<script src="/js/pages/financial/money_out.js"></script>
</head>
<body>
<!-- 数据显示table -->
erp_web/pages/manage/account.html
@@ -129,12 +129,18 @@
},
{title: '备注', field: 'remark', width: 100},
{
title: '操作', field: 'op', align: "center", width: 210, formatter: function (value, rec) {
title: '操作', field: 'op', align: "center", width: 210, formatter: function (value, rec,index) {
/**
* create by: qiankunpingtai
* create time: 2019/5/5 10:30
* website:https://qiankunpingtai.cn
* description:
* 修改效率低下的js实现
*/
var str = '';
var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.serialno + 'AaBb' + rec.initialamount + 'AaBb' + rec.currentamount + 'AaBb' + rec.remark;
str += '<img src="/js/easyui-1.3.5/themes/icons/list.png" style="cursor: pointer;" onclick="showAccountInOutList(\'' + rowInfo + '\');"/>&nbsp;<a onclick="showAccountInOutList(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">流水</a>&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editAccount(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editAccount(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteAccount(\'' + rowInfo + '\');"/>&nbsp;<a onclick="deleteAccount(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/list.png" style="cursor: pointer;" onclick="showAccountInOutList(\'' + index + '\');"/>&nbsp;<a onclick="showAccountInOutList(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">流水</a>&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editAccount(\'' + index + '\');"/>&nbsp;<a onclick="editAccount(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteAccount(\'' + rec.id + '\');"/>&nbsp;<a onclick="deleteAccount(\'' + rec.id + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
return str;
}
}
@@ -215,16 +221,16 @@
}
//删除结算账户
function deleteAccount(accountInfo) {
function deleteAccount(id) {
$.messager.confirm('删除确认', '确定要删除此结算账户吗?', function (r) {
if (r) {
var accountTotalInfo = accountInfo.split("AaBb");
// var accountTotalInfo = accountInfo.split("AaBb");
$.ajax({
type: "post",
url: "/account/batchDeleteAccountByIds",
dataType: "json",
data: ({
ids: accountTotalInfo[0]
ids: id
}),
success: function (res) {
if(res && res.code == 200) {
@@ -232,7 +238,7 @@
} else {
if(res && res.code == 601){
var jsondata={};
jsondata.ids=accountTotalInfo[0];
jsondata.ids=id;
jsondata.deleteType='2';
var type='single';
batDeleteAccountForceConfirm(res,"/account/batchDeleteAccountByIds",jsondata,type);
@@ -437,23 +443,22 @@
});
//编辑结算账户
function editAccount(accountTotalInfo) {
var accountInfo = accountTotalInfo.split("AaBb");
function editAccount(index) {
var rowsdata = $("#tableData").datagrid("getRows")[index];
var row = {
name: accountInfo[1],
serialNo: accountInfo[2],
initialAmount: accountInfo[3],
currentAmount: accountInfo[4],
remark: accountInfo[5]
name: rowsdata.name,
serialNo: rowsdata.serialNo,
initialAmount: rowsdata.initialamount,
currentAmount: rowsdata.currentamount,
remark: rowsdata.remark
};
oldAccount = accountInfo[1];
oldAccount = rowsdata.name;
$('#accountDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑结算账户');
$(".window-mask").css({width: webW, height: webH});
$('#accountFM').form('load', row);
accountID = accountInfo[0];
//焦点在名称输入框==定焦在输入文字后面
$("#account").val("").focus().val(accountInfo[1]);
url = '/account/update?id=' + accountInfo[0];
$("#account").val("").focus().val(rowsdata.name);
url = '/account/update?id=' + rowsdata.id;
}
//检查结算账户 名称是否存在 ++ 重名无法提示问题需要跟进
@@ -540,10 +545,11 @@
});
}
function showAccountInOutList(accountInfo) {
var info = accountInfo.split("AaBb");
var accountId = info[0];
var initialAmount = info[3];
function showAccountInOutList(index) {
//获取当前行
var rowsdata = $("#tableData").datagrid("getRows")[index];
var accountId = rowsdata.id;
var initialAmount = rowsdata.serialno;
$('#accountDetailListDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;查看账户流水');
$(".window-mask").css({width: webW, height: webH});
initAccountDetailData(accountId);
erp_web/pages/manage/app.html 0 → 100644
erp_web/pages/manage/customer.html
@@ -13,7 +13,7 @@
<script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.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/common.js"></script>
<script src="/js/pages/manage/supplier.js"></script>
<script src="/js/pages/manage/customer.js"></script>
</head>
<body>
<!-- 数据显示table -->
erp_web/pages/manage/depot.html
@@ -483,25 +483,26 @@
});
//编辑信息
function editDepot(depotTotalInfo) {
var depotInfo = depotTotalInfo.split("AaBb");
function editDepot(index) {
// var depotInfo = depotTotalInfo.split("AaBb");
var rowsdata = $("#tableData").datagrid("getRows")[index];
$("#name").focus().val(depotInfo[1]);
$("#sort").val(depotInfo[2]);
$("#remark").val(depotInfo[3]);
$("#address").val(depotInfo[4]);
$("#warehousing").val(depotInfo[5].replace("undefined",""));
$("#truckage").val(depotInfo[6].replace("undefined",""));
$("#principalName").val(depotInfo[7]);
$("#principal").val(depotInfo[8]);
$("#name").focus().val(rowsdata.name);
$("#sort").val(rowsdata.sort);
$("#remark").val(rowsdata.remark);
$("#address").val(rowsdata.address);
$("#warehousing").val(rowsdata.warehousing);
$("#truckage").val(rowsdata.truckage);
$("#principalName").val(transferUndefined(rowsdata.principalName));
$("#principal").val(transferUndefined(rowsdata.principal));
$("#selectType").val("principal");
oldDepot = depotInfo[1];
oldDepot = rowsdata.name;
$('#depotDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑仓库信息');
$(".window-mask").css({width: webW, height: webH});
depotID = depotInfo[0];
depotID = rowsdata.id;
//焦点在名称输入框==定焦在输入文字后面
$("#name").val("").focus().val(depotInfo[1]);
url = '/depot/update?id=' + depotInfo[0];
$("#name").val("").focus().val(rowsdata.name);
url = '/depot/update?id=' + rowsdata.id;
}
//检查名称是否存在 ++ 重名无法提示问题需要跟进
erp_web/pages/manage/functions.html
@@ -167,11 +167,11 @@
},
{title: '类型', field: 'type', width: 50},
{
title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec) {
title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec,index) {
var str = '';
var rowInfo = rec.id + 'AaBb' + rec.number + 'AaBb' + rec.name + 'AaBb' + rec.pnumber + 'AaBb' + rec.url
+ 'AaBb' + rec.state + 'AaBb' + rec.sort + 'AaBb' + rec.enabled + 'AaBb' + rec.type + 'AaBb' + rec.pushbtn;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editFunctions(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editFunctions(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
// var rowInfo = rec.id + 'AaBb' + rec.number + 'AaBb' + rec.name + 'AaBb' + rec.pnumber + 'AaBb' + rec.url
// + 'AaBb' + rec.state + 'AaBb' + rec.sort + 'AaBb' + rec.enabled + 'AaBb' + rec.type + 'AaBb' + rec.pushbtn;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editFunctions(\'' + index + '\');"/>&nbsp;<a onclick="editFunctions(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteFunctions(' + rec.id + ');"/>&nbsp;<a onclick="deleteFunctions(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
return str;
}
@@ -381,19 +381,20 @@
});
//编辑信息
function editFunctions(functionsTotalInfo) {
var functionsInfo = functionsTotalInfo.split("AaBb");
$("#Number").focus().val(functionsInfo[1]);
$("#Name").focus().val(functionsInfo[2]);
$("#PNumber").focus().val(functionsInfo[3]);
$("#URL").focus().val(functionsInfo[4]);
$("#State").attr("checked", functionsInfo[5] == 'true' ? true : false);
$("#Sort").focus().val(functionsInfo[6]);
$("#Enabled").attr("checked", functionsInfo[7] == 'true' ? true : false);
$("#Type").focus().val(functionsInfo[8]);
if (functionsInfo[9] !== "undefined" && functionsInfo[9] !== "") {
var arr = functionsInfo[9].split(",");
function editFunctions(index) {
// var functionsInfo = functionsTotalInfo.split("AaBb");
var rowsdata = $("#tableData").datagrid("getRows")[index];
$("#Number").focus().val(rowsdata.number);
$("#Name").focus().val(rowsdata.name);
$("#PNumber").focus().val(rowsdata.pnumber);
$("#URL").focus().val(rowsdata.url);
$("#State").attr("checked", rowsdata.state === true ? true : false);
$("#Sort").focus().val(rowsdata.sort);
$("#Enabled").attr("checked", rowsdata.enabled === true ? true : false);
$("#Type").focus().val(rowsdata.type);
var pushbtn=rowsdata.pushbtn;
if (pushbtn) {
var arr = pushbtn.split(",");
var pushBtnArray = [];
for (var i = 0; i < arr.length; i++) {
if (arr[i]) {
@@ -408,13 +409,13 @@
$("#PushBtn").combobox('setValues', '');
}
oldFunctions = functionsInfo[2];
oldFunctions = rowsdata.name;
$('#functionsDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑功能信息');
$(".window-mask").css({width: webW, height: webH});
functionsID = functionsInfo[0];
functionsID = rowsdata.id;
//焦点在名称输入框==定焦在输入文字后面
$("#Name").val("").focus().val(functionsInfo[2]);
url = '/functions/update?id=' + functionsInfo[0];
$("#Name").val("").focus().val(rowsdata.name);
url = '/functions/update?id=' + rowsdata.id;
}
//检查名称是否存在 ++ 重名无法提示问题需要跟进
erp_web/pages/manage/inOutItem.html
@@ -136,11 +136,18 @@
{title: '类型', field: 'type', width: 100, align: "center"},
{title: '描述', field: 'remark', width: 200},
{
title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec) {
title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec,index) {
/**
* create by: qiankunpingtai
* create time: 2019/5/5 10:30
* website:https://qiankunpingtai.cn
* description:
* 修改效率低下的js实现
*/
var str = '';
var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.type + 'AaBb' + rec.remark;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editInOutItem(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editInOutItem(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteInOutItem(\'' + rowInfo + '\');"/>&nbsp;<a onclick="deleteInOutItem(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
// var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.type + 'AaBb' + rec.remark;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editInOutItem(\'' + index + '\');"/>&nbsp;<a onclick="editInOutItem(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteInOutItem(\'' + rec.id + '\');"/>&nbsp;<a onclick="deleteInOutItem(\'' + rec.id + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
return str;
}
}
@@ -214,16 +221,16 @@
}
//删除收支项目
function deleteInOutItem(inOutItemInfo) {
function deleteInOutItem(id) {
$.messager.confirm('删除确认', '确定要删除此收支项目吗?', function (r) {
if (r) {
var inOutItemTotalInfo = inOutItemInfo.split("AaBb");
// var inOutItemTotalInfo = inOutItemInfo.split("AaBb");
$.ajax({
type: "post",
url: "/inOutItem/batchDeleteInOutItemByIds",
dataType: "json",
data: ({
ids: inOutItemTotalInfo[0]
ids: id
}),
success: function (res) {
if(res && res.code == 200) {
@@ -231,7 +238,7 @@
} else {
if(res && res.code == 601){
var jsondata={};
jsondata.ids=inOutItemTotalInfo[0];
jsondata.ids=id;
jsondata.deleteType='2';
var type='single';
batDeleteInOutItemForceConfirm(res,"/inOutItem/batchDeleteInOutItemByIds",jsondata,type);
@@ -393,21 +400,23 @@
});
//编辑收支项目
function editInOutItem(inOutItemTotalInfo) {
var inOutItemInfo = inOutItemTotalInfo.split("AaBb");
function editInOutItem(index) {
// var inOutItemInfo = inOutItemTotalInfo.split("AaBb");
//获取当前行
var rowsdata = $("#tableData").datagrid("getRows")[index];
var row = {
name: inOutItemInfo[1],
type: inOutItemInfo[2],
remark: inOutItemInfo[3]
name: rowsdata.name,
type: rowsdata.type,
remark: rowsdata.remark
};
oldInOutItem = inOutItemInfo[1];
oldInOutItem = rowsdata.name;
$('#inOutItemDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑收支项目');
$(".window-mask").css({width: webW, height: webH});
$('#inOutItemFM').form('load', row);
inOutItemID = inOutItemInfo[0];
inOutItemID = rowsdata.id;
//焦点在名称输入框==定焦在输入文字后面
$("#inOutItem").val("").focus().val(inOutItemInfo[1]);
url = '/inOutItem/update?id=' + inOutItemInfo[0];
$("#inOutItem").val("").focus().val(rowsdata.name);
url = '/inOutItem/update?id=' + rowsdata.id;
}
//检查收支项目 名称是否存在 ++ 重名无法提示问题需要跟进
erp_web/pages/manage/member.html
@@ -13,7 +13,7 @@
<script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.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/common.js"></script>
<script src="/js/pages/manage/supplier.js"></script>
<script src="/js/pages/manage/member.js"></script>
</head>
<body>
<!-- 数据显示table -->
erp_web/pages/manage/role.html
@@ -117,10 +117,17 @@
{field: 'id', width: 35, align: "center", checkbox: true},
{title: '角色名称', field: 'name', width: 200},
{
title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec) {
title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec,index) {
/**
* create by: qiankunpingtai
* create time: 2019/5/5 10:30
* website:https://qiankunpingtai.cn
* description:
* 修改效率低下的js实现
*/
var str = '';
var rowInfo = rec.id + 'AaBb' + rec.name;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editRole(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editRole(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
// var rowInfo = rec.id + 'AaBb' + rec.name;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editRole(\'' + index + '\');"/>&nbsp;<a onclick="editRole(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteRole(' + rec.id + ');"/>&nbsp;<a onclick="deleteRole(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
return str;
}
@@ -313,18 +320,18 @@
});
//编辑信息
function editRole(roleTotalInfo) {
var roleInfo = roleTotalInfo.split("AaBb");
function editRole(index) {
// var roleInfo = roleTotalInfo.split("AaBb");
var rowsdata = $("#tableData").datagrid("getRows")[index];
$("#name").focus().val(rowsdata.name);
$("#name").focus().val(roleInfo[1]);
oldName = roleInfo[1];
oldName = rowsdata.name;
$('#roleDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑角色信息');
$(".window-mask").css({width: webW, height: webH});
roleID = roleInfo[0];
roleID = rowsdata.id;
//焦点在名称输入框==定焦在输入文字后面
$("#name").val("").focus().val(roleInfo[1]);
url = '/role/update?id=' + roleInfo[0];
$("#name").val("").focus().val(rowsdata.name);
url = '/role/update?id=' + rowsdata.id;
}
//检查名称是否存在 ++ 重名无法提示问题需要跟进
@@ -386,9 +393,7 @@
url: "/role/list",
dataType: "json",
data: ({
search: JSON.stringify({
name: searchName
}),
name: searchName,
currentPage: pageNo,
pageSize: pageSize
}),
erp_web/pages/manage/roleFunctions.html
@@ -48,16 +48,17 @@
}
}
//cnodes = cnodes.substring(0, cnodes.length - 1);
pnodes = pnodes.substring(0, pnodes.length - 1);
// pnodes = pnodes.substring(0, pnodes.length - 1);
if (ctype == 'child') {
return cnodes;
}
else {
return pnodes
else if("all"){
return cnodes+pnodes;
}else{
return pnodes;
}
;
};
}
$(function () {
@@ -84,7 +85,7 @@
info: JSON.stringify({
type: type,
keyid: url_id,
value: GetNode('child')
value: GetNode('all')
})
},
dataType: "json",
erp_web/pages/manage/systemConfig.html
@@ -133,12 +133,18 @@
}
},
{
title: '操作', field: 'op', width: 160, formatter: function (value, rec) {
title: '操作', field: 'op', width: 160, formatter: function (value, rec,index) {
/**
* create by: qiankunpingtai
* create time: 2019/5/6 9:33
* website:https://qiankunpingtai.cn
* description:
* 修改效率低下的js实现
*/
var str = '';
var rowInfo = rec.id + 'AaBb' + rec.companyName + 'AaBb' + rec.companyContacts + 'AaBb' + rec.companyAddress
+ 'AaBb' + rec.companyTel + 'AaBb' + rec.companyFax + 'AaBb' + rec.companyPostCode
+ 'AaBb' + rec.depotFlag + 'AaBb' + rec.customerFlag;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editSystemConfig(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editSystemConfig(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
// var rowInfo = rec.id + 'AaBb' + rec.companyName + 'AaBb' + rec.companyContacts + 'AaBb' + rec.companyAddress
// + 'AaBb' + rec.companyTel + 'AaBb' + rec.companyFax + 'AaBb' + rec.companyPostCode;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editSystemConfig(\'' + index + '\');"/>&nbsp;<a onclick="editSystemConfig(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteSystemConfig(' + rec.id + ');"/>&nbsp;<a onclick="deleteSystemConfig(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
return str;
}
@@ -351,26 +357,26 @@
});
//编辑系统配置信息
function editSystemConfig(systemConfigTotalInfo) {
var systemConfigInfo = systemConfigTotalInfo.split("AaBb");
function editSystemConfig(index) {
// var systemConfigInfo = systemConfigTotalInfo.split("AaBb");
//获取当前行
var rowsdata = $("#tableData").datagrid("getRows")[index];
var row = {
companyName: systemConfigInfo[1],
companyContacts: systemConfigInfo[2],
companyAddress: systemConfigInfo[3],
companyTel: systemConfigInfo[4],
companyFax: systemConfigInfo[5],
companyPostCode: systemConfigInfo[6]
companyName: rowsdata.companyName,
companyContacts: rowsdata.companyContacts,
companyAddress: rowsdata.companyAddress,
companyTel: rowsdata.companyTel,
companyFax: rowsdata.companyFax,
companyPostCode: rowsdata.companyPostCode
};
oldCompanyName = systemConfigInfo[1];
oldCompanyName = rowsdata.companyName;
$('#systemConfigDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑系统配置信息');
$(".window-mask").css({width: webW, height: webH});
$('#systemConfigFM').form('load', row);
systemConfigId = systemConfigInfo[0];
systemConfigId = rowsdata.id;
//焦点在名称输入框==定焦在输入文字后面
$("#companyName").val("").focus().val(systemConfigInfo[1]);
$("#depotFlag").attr("checked", systemConfigInfo[7] == '1' ? true : false);
$("#customerFlag").attr("checked", systemConfigInfo[8] == '1' ? true : false);
url = '/systemConfig/update?id=' + systemConfigInfo[0];
$("#companyName").val("").focus().val(rowsdata.companyName);
url = '/systemConfig/update?id=' + rowsdata.id;
}
//检查系统配置 名称是否存在 ++ 重名无法提示问题需要跟进
erp_web/pages/manage/unit.html
@@ -110,10 +110,17 @@
</