升级easyUI到1.9.4版本

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

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/common.js"></script>
</head>
<body>
@@ -21,12 +21,12 @@
<tr>
<td>仓库名称:</td>
<td>
<input type="text" name="searchName" id="searchName" style="width:100px;"/>
<input type="text" name="searchName" id="searchName" class="easyui-textbox" style="width:100px;"/>
</td>
<td>&nbsp;</td>
<td id="searchRemarkLabel">描述:</td>
<td>
<input type="text" name="searchRemark" id="searchRemark" style="width:100px;"/>
<input type="text" name="searchRemark" id="searchRemark" class="easyui-textbox" style="width:100px;"/>
</td>
<td>&nbsp;</td>
<td>
@@ -39,44 +39,44 @@
</div>
<div id="depotDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
closed="true" buttons="#dlg-buttons" modal="true" collapsible="false" closable="true">
<form id="depotFM" method="post" novalidate>
<table>
<tr>
<td>仓库名称</td>
<td style="padding:5px">
<input name="name" id="name" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/>
<input name="name" id="name" type="text" 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="address" id="address" class="easyui-validatebox"
data-options="validType:'length[2,30]'" style="width: 230px;height: 20px"/>
<input name="address" id="address" class="easyui-textbox"
data-options="validType:'length[2,30]'" style="width: 230px;"/>
</td>
</tr>
<tr>
<td>仓储费</td>
<td style="padding:5px">
<input name="warehousing" id="warehousing" class="easyui-numberbox" data-options="min:0,precision:2"
style="width: 175px;height: 20px"/>&nbsp;元/天/KG
style="width: 175px;"/>&nbsp;元/天/KG
</td>
</tr>
<tr>
<td>搬运费</td>
<td style="padding:5px">
<input name="truckage" id="truckage" class="easyui-numberbox" placeholder="如上下搬运20元,则填写10元"
data-options="min:0,precision:2" style="width: 215px;height: 20px"/>&nbsp;元
data-options="min:0,precision:2" style="width: 200px;"/>&nbsp;元
</td>
</tr>
<tr>
<td>负责人</td>
<td style="padding:5px">
<input name="principalName" id="principalName"
style="width: 175px;height: 20px" readonly="readonly"/>
<input name="principalName" id="principalName" class="easyui-textbox"
style="width: 200px;" readonly="readonly"/>
<a href="javascript:void(0)" class="l-btn l-btn-plain" group="" id="lookForSelectUser">
<span class="l-btn-left"><span class="l-btn-text icon-search l-btn-icon-left"></span></span></a>
<span class="l-btn-left"><span class="l-btn-text icon-search l-btn-icon-left" style="height: 20px;"></span></span></a>
<input name="principal" id="principal" type="hidden"/>
<input name="selectType" id="selectType" type="hidden"/>
</td>
@@ -84,13 +84,13 @@
<tr>
<td>排序</td>
<td style="padding:5px">
<input name="sort" id="sort" class="easyui-textbox" style="width: 230px;height: 20px"/>
<input name="sort" id="sort" class="easyui-textbox" style="width: 230px;"/>
</td>
</tr>
<tr>
<td>描述</td>
<td style="padding:5px">
<textarea name="remark" id="remark" rows="2" cols="2" style="width: 230px;"></textarea>
<input name="remark" id="remark" class="easyui-textbox" data-options="multiline:true" style="width: 230px;height: 40px;"/>
</td>
</tr>
</table>
@@ -161,12 +161,10 @@
{field: 'id', width: 35, align: "center", checkbox: true},
{
title: '操作', field: 'op', align: "center", width: 60,
formatter: function (value, rec) {
formatter: function (value, rec, index) {
var str = '';
var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.sort + 'AaBb' + rec.remark + 'AaBb'
+ rec.address + 'AaBb' + rec.warehousing + 'AaBb' + rec.truckage+'AaBb'+ transferUndefined(rec.principalName)+'AaBb'+transferUndefined(rec.principal);
str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepot(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
str += '<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteDepot(' + rec.id + ');"/>';
str += '<img title="编辑" src="/js/easyui/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepot(\'' + index + '\');"/>&nbsp;&nbsp;&nbsp;';
str += '<img title="删除" src="/js/easyui/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteDepot(' + rec.id + ');"/>';
return str;
}
},
@@ -198,7 +196,7 @@
handler: function () {
addDepot();
}
}, '-',
},'-',
{
id: 'deleteDepot',
text: '删除',
@@ -206,7 +204,7 @@
handler: function () {
batDeleteDepot();
}
},
},'-',
{
id: 'setDepotIsDefault',
text: '设为默认',
@@ -445,7 +443,7 @@
if(checkPower()){
return;
}
$('#depotDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加仓库信息');
$('#depotDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;增加仓库信息');
$(".window-mask").css({width: webW, height: webH});
$('#depotFM').form('clear');
$("#name").focus();
@@ -486,25 +484,22 @@
});
//编辑信息
function editDepot(depotTotalInfo) {
var depotInfo = depotTotalInfo.split("AaBb");
$("#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]);
function editDepot(index) {
var rowsdata = $("#tableData").datagrid("getRows")[index];
$("#name").textbox("setValue", rowsdata.name);
$("#sort").textbox("setValue", rowsdata.sort);
$("#remark").textbox("setValue", rowsdata.remark);
$("#address").textbox("setValue", rowsdata.address);
$("#warehousing").textbox("setValue", rowsdata.warehousing);
$("#truckage").textbox("setValue", rowsdata.truckage);
$("#principalName").textbox("setValue", rowsdata.principalName);
$("#principal").val(rowsdata.principal);
$("#selectType").val("principal");
oldDepot = depotInfo[1];
$('#depotDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑仓库信息');
oldDepot = rowsdata.name;
$('#depotDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/pencil.png"/>&nbsp;编辑仓库信息');
$(".window-mask").css({width: webW, height: webH});
depotID = depotInfo[0];
//焦点在名称输入框==定焦在输入文字后面
$("#name").val("").focus().val(depotInfo[1]);
url = '/depot/update?id=' + depotInfo[0];
depotID = rowsdata.id;
url = '/depot/update?id=' + rowsdata.id;
}
//检查名称是否存在 ++ 重名无法提示问题需要跟进
@@ -595,9 +590,8 @@
//重置按钮
$("#searchResetBtn").unbind().bind({
click: function () {
$("#searchName").val("");
$("#searchRemark").val("");
$("#searchName").textbox("setValue","");
$("#searchRemark").textbox("setValue","");
//加载完以后重新初始化
$("#searchBtn").click();
}