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

升级easyUI到1.9.4版本

Browse Source
This commit is contained in:
季圣华
2020-02-15 00:37:43 +08:00
parent 0527b980ea
commit ab2872c1ed
1197 changed files with 96263 additions and 40643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,12 +6,12 @@
<!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
<link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
<link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
<link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css"/>
<link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css"/>
<link type="text/css" rel="stylesheet" href="/css/common.css"/>
<script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
<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/easyui/jquery.easyui.min.js"></script>
<script type="text/javascript" src="/js/easyui/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/common.js"></script>
<script src="/js/common/jsherp.js"></script>
@@ -21,24 +21,20 @@
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="结算账户" iconCls="icon-list">
<table id="searchTable">
<tr>
<td>名&nbsp;&nbsp;&nbsp;&nbsp;称：</td>
<td>名称：</td>
<td>
<input type="text" name="searchName" id="searchName" style="width:70px;"/>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td id="searchSerialNoLabel">编&nbsp;&nbsp;&nbsp;&nbsp;号：</td>
<td>
<input type="text" name="searchSerialNo" id="searchSerialNo" style="width:70px;"/>
<input type="text" name="searchName" id="searchName" class="easyui-textbox" style="width:100px;"/>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td id="searchRemarkLabel">备&nbsp;&nbsp;&nbsp;&nbsp;注：</td>
<td id="searchSerialNoLabel">编号：</td>
<td>
<input type="text" name="searchRemark" id="searchRemark" style="width:70px;"/>
<input type="text" name="searchSerialNo" id="searchSerialNo" class="easyui-textbox" style="width:100px;"/>
</td>
<td>&nbsp;</td>
<td id="searchRemarkLabel">备注：</td>
<td>
<input type="text" name="searchRemark" id="searchRemark" class="easyui-textbox" style="width:100px;"/>
</td>
<td>&nbsp;</td>
<td>
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;&nbsp;
@@ -48,33 +44,45 @@
</table>
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="accountDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
<div id="accountDlg" class="easyui-dialog" style="width:400px;padding:10px 20px"
closed="true" buttons="#dlg-buttons" modal="true" collapsible="false" closable="true">
<form id="accountFM" method="post" novalidate>
<div class="fitem" style="padding:5px">
<label id="nameLabel">名称</label>
<input name="name" id="name" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/>
</div>
<div class="fitem" style="padding:5px">
<label id="serialNoLabel">编号</label>
<input name="serialNo" id="serialNo" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/>
</div>
<div class="fitem" style="padding:5px">
<label id="initialAmountLabel">期初金额</label>
<input name="initialAmount" id="initialAmount" type="text" class="easyui-numberbox"
data-options="min:0,precision:2" style="width: 230px;height: 20px"></input>
</div>
<div class="fitem" style="padding:5px">
<label id="currentAmountLabel">当前余额</label>
<input name="currentAmount" id="currentAmount" type="text" disabled="disabled" class="easyui-numberbox"
data-options="min:0,precision:2" style="width: 230px;height: 20px"></input>
</div>
<div class="fitem" style="padding:5px">
<label id="remarkLabel">备注</label>
<textarea name="remark" id="remark" rows="2" cols="2" style="width: 230px;"></textarea>
</div>
<table>
<tr>
<td>名称</td>
<td style="padding:5px">
<input name="name" id="name" class="easyui-textbox"
data-options="required:true,validType:'length[2,30]'" style="width: 230px;"/>
</td>
</tr>
<tr>
<td>编号</td>
<td style="padding:5px">
<input name="serialNo" id="serialNo" class="easyui-textbox"
data-options="required:true,validType:'length[2,30]'" style="width: 230px;"/>
</td>
</tr>
<tr>
<td>期初金额</td>
<td style="padding:5px">
<input name="initialAmount" id="initialAmount" type="text" class="easyui-numberbox"
data-options="min:0,precision:2" style="width: 230px;"/>
</td>
</tr>
<tr>
<td>当前余额</td>
<td style="padding:5px">
<input name="currentAmount" id="currentAmount" type="text" class="easyui-numberbox"
data-options="min:0,precision:2" readonly="readonly" style="width: 230px;"/>
</td>
</tr>
<tr>
<td>备注</td>
<td style="padding:5px">
<input name="remark" id="remark" class="easyui-textbox" data-options="multiline:true" style="width: 230px;height: 40px;"/>
</td>
</tr>
</table>
</form>
</div>
<div id="dlg-buttons">
@@ -129,12 +137,12 @@
},
{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) {
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/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/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/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;
}
}
@@ -147,7 +155,7 @@
handler: function () {
addAccount();
}
},
},'-',
{
id: 'deleteAccount',
text: '删除',
@@ -155,7 +163,7 @@
handler: function () {
batDeleteAccount();
}
},
},'-',
{
id: 'setAccountIsDefault',
text: '设为默认',
@@ -215,16 +223,15 @@
}
//删除结算账户
function deleteAccount(accountInfo) {
function deleteAccount(id) {
$.messager.confirm('删除确认', '确定要删除此结算账户吗？', function (r) {
if (r) {
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 +239,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);
@@ -350,7 +357,7 @@
if(checkPower()){
return;
}
$('#accountDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加结算账户');
$('#accountDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;增加结算账户');
$(".window-mask").css({width: webW, height: webH});
$('#accountFM').form('clear');
@@ -440,23 +447,21 @@
});
//编辑结算账户
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];
$('#accountDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑结算账户');
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 = accountInfo[0];
//焦点在名称输入框==定焦在输入文字后面
$("#account").val("").focus().val(accountInfo[1]);
url = '/account/update?id=' + accountInfo[0];
accountID = rowsdata.id;
url = '/account/update?id=' + rowsdata.id;
}
//检查结算账户 名称是否存在 ++ 重名无法提示问题需要跟进
@@ -543,11 +548,11 @@
});
}
function showAccountInOutList(accountInfo) {
var info = accountInfo.split("AaBb");
var accountId = info[0];
var initialAmount = info[3];
$('#accountDetailListDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;查看账户流水');
function showAccountInOutList(index) {
var rowsdata = $("#tableData").datagrid("getRows")[index];
var accountId = rowsdata.id;
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);
getAccountInOutList(accountId, initialAmount, 1, initPageSize);
@@ -660,9 +665,9 @@
//重置按钮
$("#searchResetBtn").unbind().bind({
click: function () {
$("#searchName").val("");
$("#searchSerialNo").val("");
$("#searchRemark").val("");
$("#searchName").textbox("setValue","");
$("#searchSerialNo").textbox("setValue","");
$("#searchRemark").textbox("setValue","");
//加载完以后重新初始化
$("#searchBtn").click();
}