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

优化表结构

Browse Source
This commit is contained in:
季圣华
2020-07-21 01:36:26 +08:00
parent 1393244160
commit 70f0dae473
104 changed files with 5005 additions and 9006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,13 +124,13 @@
columns: [[
{field: 'id', width: 35, align: "center", checkbox: true},
{title: '名称', field: 'name', width: 100},
{title: '编号', field: 'serialno', width: 150, align: "center"},
{title: '期初金额', field: 'initialamount', width: 100, align: "center"},
{title: '当前余额', field: 'currentamount', width: 100, align: "center"},
{title: '编号', field: 'serialNo', width: 150, align: "center"},
{title: '期初金额', field: 'initialAmount', width: 100, align: "center"},
{title: '当前余额', field: 'currentAmount', width: 100, align: "center"},
{
title: '是否默认', field: 'isdefault', width: 100, align: "center",
title: '是否默认', field: 'isDefault', width: 100, align: "center",
formatter: function (value, rec) {
if (rec.isdefault) {
if (rec.isDefault) {
return "<span style='color:green'>是</span>";
}
else {
@@ -456,17 +456,14 @@
//编辑结算账户
function editAccount(index) {
var rowsdata = $("#tableData").datagrid("getRows")[index];
var row = {
name: rowsdata.name,
serialNo: rowsdata.serialno,
initialAmount: rowsdata.initialamount,
currentAmount: rowsdata.currentamount,
remark: rowsdata.remark
};
$("#name").textbox("setValue", rowsdata.name);
$("#serialNo").textbox("setValue", rowsdata.serialNo);
$("#initialAmount").textbox("setValue", rowsdata.initialAmount);
$("#currentAmount").textbox("setValue", rowsdata.currentAmount);
$("#remark").textbox("setValue", rowsdata.remark);
oldAccount = rowsdata.name;
$('#accountDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/pencil.png"/>&nbsp;编辑结算账户');
$(".window-mask").css({width: webW, height: webH});
$('#accountFM').form('load', row);
accountID = rowsdata.id;
url = '/account/update?id=' + rowsdata.id;
}
@@ -558,7 +555,7 @@
function showAccountInOutList(index) {
var rowsdata = $("#tableData").datagrid("getRows")[index];
var accountId = rowsdata.id;
var initialAmount = rowsdata.initialamount;
var initialAmount = rowsdata.initialAmount;
$('#accountDetailListDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/pencil.png"/>&nbsp;查看账户流水');
$(".window-mask").css({width: webW, height: webH});
initAccountDetailData(accountId);

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

@@ -172,10 +172,10 @@
},
{title: '仓库名称', field: 'name', width: 200},
{title: '仓库地址', field: 'address', width: 200},
{title: '仓储费', field: 'warehousing', width: 60},
{title: '搬运费', field: 'truckage', width: 60},
{title: '负责人', field: 'principalName', width: 60},
{title: '排序', field: 'sort', width: 60},
{title: '仓储费', field: 'warehousing', width: 100},
{title: '搬运费', field: 'truckage', width: 100},
{title: '负责人', field: 'principalName', width: 100},
{title: '排序', field: 'sort', width: 80},
{
title: '是否默认', field: 'isDefault', width: 100, align: "center",
formatter: function (value, rec) {

20
erp_web/pages/manage/functions.html
View File

@@ -153,7 +153,7 @@
{field: 'id', width: 35, align: "center", checkbox: true},
{title: '编号 ', field: 'number', width: 80},
{title: '名称', field: 'name', width: 100},
{title: '上级编号', field: 'pnumber', width: 80},
{title: '上级编号', field: 'parentNumber', width: 80},
{title: '链接', field: 'url', width: 250},
{title: '排序', field: 'sort', width: 60},
{
@@ -257,7 +257,7 @@
if (r) {
$.ajax({
type: "post",
url: "/functions/batchDeleteFunctionsByIds",
url: "/function/batchDeleteFunctionsByIds",
dataType: "json",
data: ({
ids: functionsID
@@ -299,7 +299,7 @@
}
$.ajax({
type: "post",
url: "/functions/batchDeleteFunctionsByIds",
url: "/function/batchDeleteFunctionsByIds",
dataType: "json",
async: false,
data: ({
@@ -339,7 +339,7 @@
iconBtnFun();
oldFunctions = "";
functionsID = 0;
url = '/functions/add';
url = '/function/add';
}
//保存信息
@@ -380,7 +380,7 @@
var rowsdata = $("#tableData").datagrid("getRows")[index];
$("#Number").textbox("setValue", rowsdata.number);
$("#Name").focus().textbox("setValue", rowsdata.name);
$("#PNumber").textbox("setValue", rowsdata.pnumber);
$("#PNumber").textbox("setValue", rowsdata.parentNumber);
$("#URL").textbox("setValue", rowsdata.url);
$("#State").attr("checked", rowsdata.state);
$("#Sort").textbox("setValue", rowsdata.sort);
@@ -389,8 +389,8 @@
$("#Type").textbox("setValue", rowsdata.type);
//点击icon图标弹出页面
iconBtnFun();
if (rowsdata.pushbtn) {
var arr = rowsdata.pushbtn.split(",");
if (rowsdata.pushBtn) {
var arr = rowsdata.pushBtn.split(",");
var pushBtnArray = [];
for (var i = 0; i < arr.length; i++) {
if (arr[i]) {
@@ -411,7 +411,7 @@
functionsID = rowsdata.id;
//焦点在名称输入框==定焦在输入文字后面
$("#Name").val("").focus().val(rowsdata.name);
url = '/functions/update?id=' + rowsdata.id;
url = '/function/update?id=' + rowsdata.id;
}
//点击icon图标弹出页面
@@ -432,7 +432,7 @@
if (name.length > 0 && (oldFunctions.length == 0 || name != oldFunctions)) {
$.ajax({
type: "get",
url: "/functions/checkIsNameExist",
url: "/function/checkIsNameExist",
dataType: "json",
async: false,
data: ({
@@ -480,7 +480,7 @@
var type = $.trim($("#searchType").val());
$.ajax({
type: "get",
url: "/functions/list",
url: "/function/list",
dataType: "json",
data: ({
search: JSON.stringify({

24
erp_web/pages/manage/log.html
View File

@@ -114,12 +114,12 @@
pageList: initPageNum,
columns: [[
{title: '操作模块', field: 'operation', width: 120},
{title: '操作详情', field: 'contentdetails', width: 350},
{title: '操作人员', field: 'username', width: 100, align: "center"},
{title: '操作详情', field: 'content', width: 350},
{title: '操作人员', field: 'userName', width: 100, align: "center"},
{title: '操作状态',field: 'status',width:80,align:"center",formatter:function(value){
return value? "失败":"成功";
}},
{title: '操作IP', field: 'clientip', width: 100, align: "center"},
{title: '操作IP', field: 'clientIp', width: 100, align: "center"},
{title: '操作时间', field: 'createTimeStr', width: 150, align: "center"}
]],
onLoadError: function () {
@@ -222,25 +222,25 @@
function showLogDetails(pageNo, pageSize) {
var operation = $.trim($("#searchOperation").val());
var usernameID = $.trim($("#searchUsernameID").val());
var userId = $.trim($("#searchUsernameID").val());
var clientIp = $.trim($("#searchIP").val());
var status = $.trim($("#searchStatus").val());
var beginTime = $.trim($("#searchBeginTime").datebox("getValue"));
var endTime = $.trim($("#searchEndTime").datebox("getValue"));
var contentdetails = $.trim($("#searchDesc").val());
var content = $.trim($("#searchDesc").val());
$.ajax({
type: "get",
url: "/log/list",
dataType: "json",
data: ({
search: JSON.stringify({
operation: operation,
usernameID: usernameID,
clientIp: clientIp,
status: status,
beginTime: beginTime,
endTime: endTime,
contentdetails: contentdetails
operation: operation,
userId: userId,
clientIp: clientIp,
status: status,
beginTime: beginTime,
endTime: endTime,
content: content
}),
currentPage: pageNo,
pageSize: pageSize

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

@@ -64,7 +64,7 @@
$(function () {
$('#tt').tree({
url: '/functions/findRoleFunctions?UBType=' + type + '&UBKeyId=' + url_id,
url: '/function/findRoleFunction?UBType=' + type + '&UBKeyId=' + url_id,
animate: true,
checkbox: true
});

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

@@ -145,7 +145,7 @@
var arr = getValue.split("][");
arr = arr.toString();
$.ajax({
url: "/functions/findByIds",
url: "/function/findByIds",
type: "get",
data: {
functionsIds: arr

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

@@ -118,7 +118,7 @@
return str;
}
},
{title: '计量单位', field: 'uname', width: 200}
{title: '计量单位', field: 'name', width: 200}
]],
toolbar: [
{
@@ -356,7 +356,7 @@
dataType: "json",
data: ({
info: JSON.stringify({
uname: name,
name: name,
basicUnit: basicName,
otherUnit: otherName,
ratio: otherNum