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

优化界面，给商品和单位模块增加了部分字段

Browse Source
This commit is contained in:
季圣华
2016-12-04 22:32:35 +08:00
parent c8f80894f1
commit 227cf3b2de
93 changed files with 2140 additions and 3177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
WebRoot/pages/log/home.jsp
View File

@@ -1,76 +0,0 @@
<%@page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
<%
String path = request.getContextPath();
String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
%>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<meta http-equiv=Content-Type content="text/html; charset=utf-8">
<!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
<link rel="shortcut icon" href="<%=path%>/images/favicon.ico" type="image/x-icon" />
<link href="css/admin.css" type="text/css" rel="stylesheet">
<title>首页说明</title>
<style type="text/css">
<!--
body {
margin-left: 0px;
margin-top: 0px;
margin-right: 0px;
margin-bottom: 0px;
background-color: #EAF2FD;
}
.STYLE1 {font-size: 12px}
.STYLE4 {
font-size: 12px;
color: #1F4A65;
font-weight: bold;
}
a:link {
font-size: 12px;
color: #06482a;
text-decoration: none;
}
a:visited {
font-size: 12px;
color: #06482a;
text-decoration: none;
}
a:hover {
font-size: 12px;
color: #FF0000;
text-decoration: underline;
}
a:active {
font-size: 12px;
color: #FF0000;
text-decoration: none;
}
.STYLE7 {font-size: 12}
-->
</style>
</head>
<body>
<table cellSpacing=0 cellPadding=0 width="100%" align=center border=0>
<tr height=28>
<td width="1101" class="STYLE4">
&nbsp;&nbsp;<img src="<%=path%>/images/blogging.png" width="16" height="16" />
<span >日志管理</span>
</td>
</tr>
<tr>
<td bgColor=#b1ceef height=1></td>
</tr>
<tr height="5px">
<td background=images/shadow_bg.jpg></td>
</tr>
</table>
<p style="font-size: 12px;color: #1F4A65;padding: 10px">
&nbsp;&nbsp;&nbsp;&nbsp;
日志管理是记录资产管理系统增删改查操作明细，包括资产管理、系统管理等操作信息，通过日志管理，可以记录平时资产管理系统操作明细信息。日志管理主要以搜索操作信息为主。
</p>
</body>
</html>

22
WebRoot/pages/log/operatelog.jsp
View File

@@ -28,26 +28,26 @@
<tr>
<td>操作模块：</td>
<td>
<input type="text" name="searchOperation" id="searchOperation" style="width:150px;"/>
<input type="text" name="searchOperation" id="searchOperation" style="width:90px;"/>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>操作人员：</td>
<td>
<select name="searchUsernameID" id="searchUsernameID" style="width:150px;"/>
<select name="searchUsernameID" id="searchUsernameID" style="width:90px;" />
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>操作IP：</td>
<td>
<input type="text" name="searchIP" id="searchIP" style="width:150px;"/>
<input type="text" name="searchIP" id="searchIP" style="width:90px;"/>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>操作状态：</td>
<td>
<select name="searchStatus" id="searchStatus" style="width:150px;">
<select name="searchStatus" id="searchStatus" style="width:90px;">
<option value="">请选择</option>
<option value="0">成功</option>
<option value="1">失败</option>
@@ -57,27 +57,25 @@
<tr>
<td>开始时间：</td>
<td>
<input type="text" name="searchBeginTime" id="searchBeginTime" class="easyui-datebox" style="width:150px;"/>
<input type="text" name="searchBeginTime" id="searchBeginTime" class="easyui-datebox" style="width:90px;"/>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>结束时间：</td>
<td>
<input type="text" name="searchEndTime" id="searchEndTime" class="easyui-datebox" style="width:150px;"/>
<input type="text" name="searchEndTime" id="searchEndTime" class="easyui-datebox" style="width:90px;"/>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>操作详情：</td>
<td>
<input type="text" name="searchDesc" id="searchDesc" style="width:150px;"/>
</td>
<input type="text" name="searchDesc" id="searchDesc" style="width:90px;"/>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>
<td colspan="3">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
</td>
</td>
</tr>
</table>
</div>

4
WebRoot/pages/manage/app.jsp
View File

@@ -28,13 +28,13 @@
<tr>
<td>名称：</td>
<td>
<input type="text" name="searchName" id="searchName" style="width:230px;"/>
<input type="text" name="searchName" id="searchName" style="width:100px;"/>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>种类：</td>
<td>
<input type="text" name="searchType" id="searchType" style="width:230px;"/>
<input type="text" name="searchType" id="searchType" style="width:100px;"/>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>

24
WebRoot/pages/manage/functions.jsp
View File

@@ -28,16 +28,19 @@
<tr>
<td>名称：</td>
<td>
<input type="text" name="searchName" id="searchName" style="width:230px;"/>
<input type="text" name="searchName" id="searchName" style="width:100px;"/>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>类型: </td>
<td>&nbsp;</td>
<td><select name="searchType" id="searchType" style="width: 230px;height: 20px">
<option value="">全部</option>
<option value="电脑版">电脑版</option>
<option value="手机版">手机版</option></select></td>
<td>
<select name="searchType" id="searchType" style="width:100px; height:20px">
<option value="">全部</option>
<option value="电脑版">电脑版</option>
<option value="手机版">手机版</option>
</select>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>
@@ -128,7 +131,6 @@
//iconCls:'icon-save',
//width:700,
height:heightInfo,
nowrap: false,
rownumbers: false,
//动画效果
animate:false,
@@ -148,14 +150,14 @@
pageList: initPageNum,
columns:[[
{ field: 'Id',width:35,align:"center",checkbox:true},
{ title: '编号 ',field: 'Number',width:100},
{ title: '名称',field: 'Name',width:200},
{ title: '上级编号',field: 'PNumber',width:100},
{ title: '链接',field: 'URL',width:200},
{ title: '编号 ',field: 'Number',width:60},
{ title: '名称',field: 'Name',width:80},
{ title: '上级编号',field: 'PNumber',width:60},
{ title: '链接',field: 'URL',width:120},
{ title: '排序',field: 'Sort',width:50},
{ title: '收缩',field: 'State',width:50},
{ title: '启用',field: 'Enabled',width:50},
{ title: '类型',field: 'Type',width:100},
{ title: '类型',field: 'Type',width:50},
{ title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec)
{
var str = '';

93
WebRoot/pages/manage/vendor.jsp
View File

@@ -8,7 +8,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>供应商信息</title>
<title>单位信息</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
@@ -71,7 +71,7 @@
</div>
<!-- 数据显示table -->
<div id = "tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="供应商列表" iconCls="icon-list" collapsible="true" closable="false">
<div id = "tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="单位列表" iconCls="icon-list" collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="supplierDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
@@ -100,6 +100,23 @@
<label id="emailLabel">电子邮箱&nbsp;&nbsp;</label>
<input name="email" id="email" class="easyui-validatebox" validType="email" style="width: 230px;height: 20px"/>
</div>
<div class="fitem" style="padding:5px">
<label id="BeginNeedGetLabel">期初应收</label>
<input name="BeginNeedGet" id="BeginNeedGet" 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="BeginNeedPayLabel">期初应付</label>
<input name="BeginNeedPay" id="BeginNeedPay" 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="AllNeedGetLabel">累计应收</label>
<input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 230px;height: 20px" disabled="true"></input>
</div>
<div class="fitem" style="padding:5px">
<label id="AllNeedPayLabel">累计应付</label>
<input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 230px;height: 20px" disabled="true"></input>
</div>
<div class="fitem" style="padding:5px">
<label id="descriptionLabel">描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;&nbsp;</label>
<textarea name="description" id="description" rows="2" cols="2" style="width: 230px;"></textarea>
@@ -154,7 +171,7 @@
function initTableData()
{
$('#tableData').datagrid({
//title:'供应商列表',
//title:'单位列表',
//iconCls:'icon-save',
//width:700,
height:heightInfo,
@@ -180,18 +197,18 @@
pageList: initPageNum,
columns:[[
{ field: 'id',width:35,align:"center",checkbox:true},
{ title: '名称',field: 'supplier',width:200},
{ title: '联系人', field: 'contacts',width:100,align:"center"},
{ title: '联系电话', field: 'phonenum',width:115,align:"center"},
{ title: '电子邮箱',field: 'email',width:180,align:"center"},
//{ title: '是否系统',field: 'isystem',width:70,align:"center"},
{ title: '描述',field: 'description',width:100},
{ title: '类型',field: 'type',width:100},
{ title: '启动',field: 'enabled',width:100},
{ title: '名称',field: 'supplier',width:120},
{ title: '联系人', field: 'contacts',width:50,align:"center"},
{ title: '联系电话', field: 'phonenum',width:60,align:"center"},
{ title: '电子邮箱',field: 'email',width:80,align:"center"},
{ title: '累计应收',field: 'AllNeedGet',width:70,align:"center"},
{ title: '累计应付',field: 'AllNeedPay',width:70,align:"center"},
{ title: '类型',field: 'type',width:50},
{ title: '启动',field: 'enabled',width:40},
{ title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec)
{
var str = '';
var rowInfo = rec.id + 'AaBb' + rec.supplier +'AaBb' + rec.contacts + 'AaBb'+ rec.phonenum + 'AaBb'+ rec.email + 'AaBb' + rec.isystem + 'AaBb' + rec.description+ 'AaBb' + rec.type+ 'AaBb' + rec.enabled;
var rowInfo = rec.id + 'AaBb' + rec.supplier +'AaBb' + rec.contacts + 'AaBb'+ rec.phonenum + 'AaBb'+ rec.email + 'AaBb'+ rec.BeginNeedGet + 'AaBb'+ rec.BeginNeedPay + 'AaBb'+ rec.AllNeedGet + 'AaBb'+ rec.AllNeedPay + 'AaBb' + rec.isystem + 'AaBb' + rec.description+ 'AaBb' + rec.type+ 'AaBb' + rec.enabled;
if(1 == value)
{
str += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editSupplier(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editSupplier(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
@@ -278,10 +295,10 @@
}
}
//删除供应商信息
//删除单位信息
function deleteSupplier(supplierInfo)
{
$.messager.confirm('删除确认','确定要删除此供应商信息吗？',function(r)
$.messager.confirm('删除确认','确定要删除此单位信息吗？',function(r)
{
if (r)
{
@@ -302,12 +319,12 @@
//加载完以后重新初始化
$("#searchBtn").click();
else
$.messager.alert('删除提示','删除供应商信息失败，请稍后再试！','error');
$.messager.alert('删除提示','删除单位信息失败，请稍后再试！','error');
},
//此处添加错误处理
error:function()
{
$.messager.alert('删除提示','删除供应商信息异常，请稍后再试！','error');
$.messager.alert('删除提示','删除单位信息异常，请稍后再试！','error');
return;
}
});
@@ -315,7 +332,7 @@
});
}
//批量删除供应商
//批量删除单位
function batDeleteSupplier()
{
var row = $('#tableData').datagrid('getChecked');
@@ -326,7 +343,7 @@
}
if(row.length > 0)
{
$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条供应商信息吗？',function(r)
$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条单位信息吗？',function(r)
{
if (r)
{
@@ -359,12 +376,12 @@
$(":checkbox").attr("checked",false);
}
else
$.messager.alert('删除提示','删除供应商信息失败，请稍后再试！','error');
$.messager.alert('删除提示','删除单位信息失败，请稍后再试！','error');
},
//此处添加错误处理
error:function()
{
$.messager.alert('删除提示','删除供应商信息异常，请稍后再试！','error');
$.messager.alert('删除提示','删除单位信息异常，请稍后再试！','error');
return;
}
});
@@ -373,7 +390,7 @@
}
}
//增加供应商
//增加单位
var url;
var supplierID = 0;
//保存编辑前的名称
@@ -381,7 +398,7 @@
function addSuppler()
{
$('#supplierDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加供应商');
$('#supplierDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加单位信息');
$(".window-mask").css({ width: webW ,height: webH});
$('#supplierFM').form('clear');
@@ -396,7 +413,7 @@
url = '<%=path %>/supplier/create.action';
}
//保存供应商信息
//保存单位信息
$("#saveSupplier").unbind().bind({
click:function()
{
@@ -425,15 +442,12 @@
{
$.messager.show({
title: '错误提示',
msg: '保存供应商信息失败，请稍后重试!'
msg: '保存单位信息失败，请稍后重试!'
});
}
else
{
$('#supplierDlg').dialog('close');
//$('#tableData').datagrid('reload');
//加载完以后重新初始化
//$("#searchBtn").click();
var opts = $("#tableData").datagrid('options');
showSupplierDetails(opts.pageNumber,opts.pageSize);
}
@@ -442,7 +456,7 @@
}
});
//编辑供应商信息
//编辑单位信息
function editSupplier(supplierTotalInfo)
{
var supplierInfo = supplierTotalInfo.split("AaBb");
@@ -451,13 +465,17 @@
contacts : supplierInfo[2],
phonenum : supplierInfo[3],
email : supplierInfo[4],
description : supplierInfo[6],
type : supplierInfo[7],
enabled : supplierInfo[8],
BeginNeedGet : supplierInfo[5],
BeginNeedPay : supplierInfo[6],
AllNeedGet : supplierInfo[7],
AllNeedPay : supplierInfo[8],
description : supplierInfo[10],
type : supplierInfo[11],
enabled : supplierInfo[12],
clientIp:'<%=clientIp %>'
};
orgSupplier = supplierInfo[1];
$('#supplierDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑供应商信息');
$('#supplierDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑单位信息');
$(".window-mask").css({ width: webW ,height: webH});
$('#supplierFM').form('load',row);
supplierID = supplierInfo[0];
@@ -466,11 +484,8 @@
url = '<%=path %>/supplier/update.action?supplierID=' + supplierInfo[0];
}
//$("#supplier").unbind().bind({
//blur:checkSupplierName
//});
//检查供应商 名称是否存在 ++ 重名无法提示问题需要跟进
//检查单位名称是否存在 ++ 重名无法提示问题需要跟进
function checkSupplierName()
{
var supplierName = $.trim($("#supplier").val());
@@ -493,16 +508,14 @@
flag = tipInfo;
if(tipInfo)
{
$.messager.alert('提示','供应商名称已经存在','info');
//alert("供应商名称已经存在");
//$("#supplier").val("");
$.messager.alert('提示','单位名称已经存在','info');
return;
}
},
//此处添加错误处理
error:function()
{
$.messager.alert('提示','检查供应商名称是否存在异常，请稍后再试！','error');
$.messager.alert('提示','检查单位名称是否存在异常，请稍后再试！','error');
return;
}
});

8
WebRoot/pages/materials/allocation_in_list.jsp
View File

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td>
@@ -80,7 +80,7 @@
<td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
</td>
<td>对方店面：</td>
<td>对方仓库：</td>
<td style="padding:5px">
<select name="AllocationProjectId" id="AllocationProjectId" style="width:120px;"></select>
</td>
@@ -129,7 +129,7 @@
<td style="padding:5px;width:120px;">
<span id="OperTimeShow"></span>
</td>
<td>对方店面：</td>
<td>对方仓库：</td>
<td style="padding:5px;width:120px;">
<span id="AllocationProjectIdShow"></span>
</td>
@@ -828,7 +828,7 @@
{
if($("#searchProjectId").val()=="")
{
$.messager.alert('查询提示','请选择一个店面！','info');
$.messager.alert('查询提示','请选择一个仓库！','info');
}
else
{

8
WebRoot/pages/materials/allocation_out_list.jsp
View File

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td>
@@ -80,7 +80,7 @@
<td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
</td>
<td>对方店面：</td>
<td>对方仓库：</td>
<td style="padding:5px">
<select name="AllocationProjectId" id="AllocationProjectId" style="width:120px;"></select>
</td>
@@ -129,7 +129,7 @@
<td style="padding:5px;width:120px;">
<span id="OperTimeShow"></span>
</td>
<td>对方店面：</td>
<td>对方仓库：</td>
<td style="padding:5px;width:120px;">
<span id="AllocationProjectIdShow"></span>
</td>
@@ -872,7 +872,7 @@
{
if($("#searchProjectId").val()=="")
{
$.messager.alert('查询提示','请选择一个店面！','info');
$.messager.alert('查询提示','请选择一个仓库！','info');
}
else
{

8
WebRoot/pages/materials/audit_allocation_out_list.jsp
View File

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td>
@@ -78,7 +78,7 @@
<td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
</td>
<td>对方店面：</td>
<td>对方仓库：</td>
<td style="padding:5px">
<select name="AllocationProjectId" id="AllocationProjectId" style="width:120px;"></select>
</td>
@@ -127,7 +127,7 @@
<td style="padding:5px;width:120px;">
<span id="OperTimeShow"></span>
</td>
<td>对方店面：</td>
<td>对方仓库：</td>
<td style="padding:5px;width:120px;">
<span id="AllocationProjectIdShow"></span>
</td>
@@ -912,7 +912,7 @@
{
if($("#searchProjectId").val()=="")
{
$.messager.alert('查询提示','请选择一个店面！','info');
$.messager.alert('查询提示','请选择一个仓库！','info');
}
else
{

4
WebRoot/pages/materials/audit_consuming_out_list.jsp
View File

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td>
@@ -963,7 +963,7 @@
{
if($("#searchProjectId").val()=="")
{
$.messager.alert('查询提示','请选择一个店面！','info');
$.messager.alert('查询提示','请选择一个仓库！','info');
}
else
{

4
WebRoot/pages/materials/audit_lease_in_list.jsp
View File

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td>
@@ -913,7 +913,7 @@
{
if($("#searchProjectId").val()=="")
{
$.messager.alert('查询提示','请选择一个店面！','info');
$.messager.alert('查询提示','请选择一个仓库！','info');
}
else
{

4
WebRoot/pages/materials/audit_purchase_in_list.jsp
View File

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td>
@@ -923,7 +923,7 @@
{
if($("#searchProjectId").val()=="")
{
$.messager.alert('查询提示','请选择一个店面！','info');
$.messager.alert('查询提示','请选择一个仓库！','info');
}
else
{

4
WebRoot/pages/materials/audit_return_out_list.jsp
View File

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td>
@@ -909,7 +909,7 @@
{
if($("#searchProjectId").val()=="")
{
$.messager.alert('查询提示','请选择一个店面！','info');
$.messager.alert('查询提示','请选择一个仓库！','info');
}
else
{

6
WebRoot/pages/materials/audit_sale_out_list.jsp
View File

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td>
@@ -121,7 +121,7 @@
closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
<td>店面：</td>
<td>仓库：</td>
<td style="padding:5px;width:120px;">
<span id="ProjectIdShow"></span>
</td>
@@ -963,7 +963,7 @@
{
if($("#searchProjectId").val()=="")
{
$.messager.alert('查询提示','请选择一个店面！','info');
$.messager.alert('查询提示','请选择一个仓库！','info');
}
else
{

4
WebRoot/pages/materials/audit_supply_in_list.jsp
View File

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td>
@@ -906,7 +906,7 @@
{
if($("#searchProjectId").val()=="")
{
$.messager.alert('查询提示','请选择一个店面！','info');
$.messager.alert('查询提示','请选择一个仓库！','info');
}
else
{

2
WebRoot/pages/materials/building.jsp
View File

@@ -71,7 +71,7 @@
</div>
<script type="text/javascript">
var depotID = getUrlParam('ProjectId'); //获取传值ProjectId（店面ProjectId）
var depotID = getUrlParam('ProjectId'); //获取传值ProjectId（仓库ProjectId）
//初始化界面
$(function()
{

4
WebRoot/pages/materials/consuming_out_list.jsp
View File

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td>
@@ -923,7 +923,7 @@
{
if($("#searchProjectId").val()=="")
{
$.messager.alert('查询提示','请选择一个店面！','info');
$.messager.alert('查询提示','请选择一个仓库！','info');
}
else
{

6
WebRoot/pages/materials/fix_allocation_out_list.jsp
View File

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td>
@@ -125,7 +125,7 @@
<td style="padding:5px;width:120px;">
<span id="OperTimeShow"></span>
</td>
<td>对方店面：</td>
<td>对方仓库：</td>
<td style="padding:5px;width:120px;">
<span id="AllocationProjectIdShow"></span>
</td>
@@ -849,7 +849,7 @@
{
if($("#searchProjectId").val()=="")
{
$.messager.alert('查询提示','请选择一个店面！','info');
$.messager.alert('查询提示','请选择一个仓库！','info');
}
else
{

4
WebRoot/pages/materials/fix_lease_in_list.jsp
View File

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td>
@@ -848,7 +848,7 @@
{
if($("#searchProjectId").val()=="")
{
$.messager.alert('查询提示','请选择一个店面！','info');
$.messager.alert('查询提示','请选择一个仓库！','info');
}
else
{

4
WebRoot/pages/materials/fix_purchase_in_list.jsp
View File

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td>
@@ -852,7 +852,7 @@
{
if($("#searchProjectId").val()=="")
{
$.messager.alert('查询提示','请选择一个店面！','info');
$.messager.alert('查询提示','请选择一个仓库！','info');
}
else
{

4
WebRoot/pages/materials/fix_sale_out_list.jsp
View File

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td>
@@ -848,7 +848,7 @@
{
if($("#searchProjectId").val()=="")
{
$.messager.alert('查询提示','请选择一个店面！','info');
$.messager.alert('查询提示','请选择一个仓库！','info');
}
else
{

4
WebRoot/pages/materials/lease_in_list.jsp
View File

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td>
@@ -873,7 +873,7 @@
{
if($("#searchProjectId").val()=="")
{
$.messager.alert('查询提示','请选择一个店面！','info');
$.messager.alert('查询提示','请选择一个仓库！','info');
}
else
{

78
WebRoot/pages/materials/material.jsp
View File

@@ -8,7 +8,7 @@
<!DOCTYPE html>
<html>
<head>
<title>物料管理</title>
<title>商品信息</title>
<meta charset="utf-8">
<!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
@@ -44,7 +44,7 @@
</div>
<!-- 数据显示table -->
<div id = "tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="物料列表" iconCls="icon-list" collapsible="true" closable="false">
<div id = "tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="商品列表" iconCls="icon-list" collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -77,6 +77,22 @@
<td style="padding:5px"><input name="Unit" id="Unit" class="easyui-validatebox" data-options="required:true,validType:'length[1,30]'" style="width: 180px;height: 20px"/></td>
</tr>
<tr>
<td>零售价</td>
<td style="padding:5px"><input name="RetailPrice" id="RetailPrice" class="easyui-validatebox" data-options="required:true,validType:'length[1,30]'" style="width: 180px;height: 20px"/></td>
</tr>
<tr>
<td>最低售价</td>
<td style="padding:5px"><input name="LowPrice" id="LowPrice" class="easyui-validatebox" data-options="required:true,validType:'length[1,30]'" style="width: 180px;height: 20px"/></td>
</tr>
<tr>
<td>预设售价一</td>
<td style="padding:5px"><input name="PresetPriceOne" id="PresetPriceOne" class="easyui-validatebox" data-options="required:true,validType:'length[1,30]'" style="width: 180px;height: 20px"/></td>
</tr>
<tr>
<td>预设售价二</td>
<td style="padding:5px"><input name="PresetPriceTwo" id="PresetPriceTwo" class="easyui-validatebox" data-options="required:true,validType:'length[1,30]'" style="width: 180px;height: 20px"/></td>
</tr>
<tr>
<td>备注</td>
<td style="padding:5px"><input name="Remark" id="Remark" style="width: 180px;height: 20px"/></td>
</tr>
@@ -127,7 +143,7 @@
var msgTip = systemInfo.showModel.msgTip;
if(msgTip == "exceptoin")
{
$.messager.alert('提示','查找物料异常,请与管理员联系！','error');
$.messager.alert('提示','查找商品异常,请与管理员联系！','error');
return;
}
}
@@ -275,7 +291,7 @@
function initTableData()
{
$('#tableData').datagrid({
//title:'物料列表',
//title:'商品列表',
//iconCls:'icon-save',
//width:700,
height:heightInfo,
@@ -299,15 +315,19 @@
pageList: initPageNum,
columns:[[
{ field: 'Id',width:35,align:"center",checkbox:true},
{ title: '名称',field: 'Name',width:150},
{ title: '款号',field: 'Model',width:150},
{ title: '颜色',field: 'Color',width:150},
{ title: '单位',field: 'Unit',width:150},
{ title: '备注',field: 'Remark',width:150},
{ title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec)
{ title: '名称',field: 'Name',width:80},
{ title: '款号',field: 'Model',width:80},
{ title: '颜色',field: 'Color',width:40},
{ title: '单位',field: 'Unit',width:50},
{ title: '零售价',field: 'RetailPrice',width:50},
{ title: '最低售价',field: 'LowPrice',width:50},
{ title: '预设售价一',field: 'PresetPriceOne',width:80},
{ title: '预设售价二',field: 'PresetPriceTwo',width:80},
{ title: '备注',field: 'Remark',width:120},
{ title: '操作',field: 'op',align:"center",width:120,formatter:function(value,rec)
{
var str = '';
var rowInfo = rec.Id + 'AaBb' + rec.Name+ 'AaBb' + rec.Model+ 'AaBb' + rec.Color+ 'AaBb' + rec.Unit+ 'AaBb' + rec.Remark;
var rowInfo = rec.Id + 'AaBb' + rec.Name+ 'AaBb' + rec.Model + 'AaBb' + rec.Color + 'AaBb' + rec.Unit + 'AaBb' + rec.RetailPrice + 'AaBb' + rec.LowPrice + 'AaBb' + rec.PresetPriceOne + 'AaBb' + rec.PresetPriceTwo + 'AaBb' + rec.Remark;
if(1 == value)
{
str += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editMaterial(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editMaterial(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
@@ -391,10 +411,10 @@
}
}
//删除物料信息
//删除商品信息
function deleteMaterial(materialID)
{
$.messager.confirm('删除确认','确定要删除此物料信息吗？',function(r)
$.messager.confirm('删除确认','确定要删除此商品信息吗？',function(r)
{
if (r)
{
@@ -415,12 +435,12 @@
$("#searchBtn").click();
}
else
$.messager.alert('删除提示','删除物料信息失败，请稍后再试！','error');
$.messager.alert('删除提示','删除商品信息失败，请稍后再试！','error');
},
//此处添加错误处理
error:function()
{
$.messager.alert('删除提示','删除物料信息异常，请稍后再试！','error');
$.messager.alert('删除提示','删除商品信息异常，请稍后再试！','error');
return;
}
});
@@ -428,7 +448,7 @@
});
}
//批量删除物料
//批量删除商品
function batDeleteMaterial()
{
var row = $('#tableData').datagrid('getChecked');
@@ -439,7 +459,7 @@
}
if(row.length > 0)
{
$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条物料信息吗？',function(r)
$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条商品信息吗？',function(r)
{
if (r)
{
@@ -473,12 +493,12 @@
$(":checkbox").attr("checked",false);
}
else
$.messager.alert('删除提示','删除物料信息失败，请稍后再试！','error');
$.messager.alert('删除提示','删除商品信息失败，请稍后再试！','error');
},
//此处添加错误处理
error:function()
{
$.messager.alert('删除提示','删除物料信息异常，请稍后再试！','error');
$.messager.alert('删除提示','删除商品信息异常，请稍后再试！','error');
return;
}
});
@@ -497,7 +517,7 @@
{
$("#clientIp").val('<%=clientIp %>');
$('#materialFM').form('clear');
$('#materialDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加物料信息');
$('#materialDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加商品信息');
$(".window-mask").css({ width: webW ,height: webH});
$("#Name").val("").focus();
@@ -538,6 +558,10 @@
Model : $.trim($("#Model").val()),
Color : $.trim($("#Color").val()),
Unit : $.trim($("#Unit").val()),
RetailPrice : $.trim($("#RetailPrice").val()),
LowPrice : $.trim($("#LowPrice").val()),
PresetPriceOne : $.trim($("#PresetPriceOne").val()),
PresetPriceTwo : $.trim($("#PresetPriceTwo").val()),
Remark : $.trim($("#Remark").val()),
clientIp:'<%=clientIp %>'
}),
@@ -554,14 +578,14 @@
{
$.messager.show({
title: '错误提示',
msg: '保存物料信息失败，请稍后重试!'
msg: '保存商品信息失败，请稍后重试!'
});
}
},
//此处添加错误处理
error:function()
{
$.messager.alert('提示','保存物料信息异常，请稍后再试！','error');
$.messager.alert('提示','保存商品信息异常，请稍后再试！','error');
return;
}
});
@@ -579,10 +603,14 @@
$("#Model").val(materialInfo[2]);
$("#Color").val(materialInfo[3]);
$("#Unit").val(materialInfo[4]);
$("#Remark").val(materialInfo[5]);
$("#RetailPrice").val(materialInfo[5]);
$("#LowPrice").val(materialInfo[6]);
$("#PresetPriceOne").val(materialInfo[7]);
$("#PresetPriceTwo").val(materialInfo[8]);
$("#Remark").val(materialInfo[9]);
//orgMaterial = materialInfo[1];
$('#materialDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑物料信息');
$('#materialDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑商品信息');
$(".window-mask").css({ width: webW ,height: webH});
materialID = materialInfo[0];
//焦点在名称输入框==定焦在输入文字后面
@@ -648,4 +676,4 @@
</script>
</body>
</html>
</html>

32
WebRoot/pages/materials/materialcategory.jsp
View File

@@ -8,7 +8,7 @@
<!DOCTYPE html>
<html>
<head>
<title>物料类别管理</title>
<title>商品类别管理</title>
<meta charset="utf-8">
<!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
@@ -44,7 +44,7 @@
</div>
<!-- 数据显示table -->
<div id = "tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="物料类别列表" iconCls="icon-list" collapsible="true" closable="false">
<div id = "tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="商品类别列表" iconCls="icon-list" collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
@@ -116,7 +116,7 @@
var msgTip = systemInfo.showModel.msgTip;
if(msgTip == "exceptoin")
{
$.messager.alert('提示','查找物料类别异常,请与管理员联系！','error');
$.messager.alert('提示','查找商品类别异常,请与管理员联系！','error');
return;
}
}
@@ -229,7 +229,7 @@
function initTableData()
{
$('#tableData').datagrid({
//title:'物料类别列表',
//title:'商品类别列表',
//iconCls:'icon-save',
//width:700,
height:heightInfo,
@@ -341,10 +341,10 @@
}
}
//删除物料类别信息
//删除商品类别信息
function deleteMaterialCategory(materialCategoryID)
{
$.messager.confirm('删除确认','确定要删除此物料类别信息吗？',function(r)
$.messager.confirm('删除确认','确定要删除此商品类别信息吗？',function(r)
{
if (r)
{
@@ -365,12 +365,12 @@
$("#searchBtn").click();
}
else
$.messager.alert('删除提示','删除物料类别信息失败，请稍后再试！','error');
$.messager.alert('删除提示','删除商品类别信息失败，请稍后再试！','error');
},
//此处添加错误处理
error:function()
{
$.messager.alert('删除提示','删除物料类别信息异常，请稍后再试！','error');
$.messager.alert('删除提示','删除商品类别信息异常，请稍后再试！','error');
return;
}
});
@@ -378,7 +378,7 @@
});
}
//批量删除物料类别
//批量删除商品类别
function batDeleteMaterialCategory()
{
var row = $('#tableData').datagrid('getChecked');
@@ -389,7 +389,7 @@
}
if(row.length > 0)
{
$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条物料类别信息吗？',function(r)
$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条商品类别信息吗？',function(r)
{
if (r)
{
@@ -423,12 +423,12 @@
$(":checkbox").attr("checked",false);
}
else
$.messager.alert('删除提示','删除物料类别信息失败，请稍后再试！','error');
$.messager.alert('删除提示','删除商品类别信息失败，请稍后再试！','error');
},
//此处添加错误处理
error:function()
{
$.messager.alert('删除提示','删除物料类别信息异常，请稍后再试！','error');
$.messager.alert('删除提示','删除商品类别信息异常，请稍后再试！','error');
return;
}
});
@@ -447,7 +447,7 @@
{
$("#clientIp").val('<%=clientIp %>');
$('#materialCategoryFM').form('clear');
$('#materialCategoryDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加物料类别信息');
$('#materialCategoryDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加商品类别信息');
$(".window-mask").css({ width: webW ,height: webH});
$("#Name").val("").focus();
@@ -497,14 +497,14 @@
{
$.messager.show({
title: '错误提示',
msg: '保存物料类别信息失败，请稍后重试!'
msg: '保存商品类别信息失败，请稍后重试!'
});
}
},
//此处添加错误处理
error:function()
{
$.messager.alert('提示','保存物料类别信息异常，请稍后再试！','error');
$.messager.alert('提示','保存商品类别信息异常，请稍后再试！','error');
return;
}
});
@@ -523,7 +523,7 @@
$("#Name").val(materialCategoryInfo[3]);
//orgMaterialCategory = materialCategoryInfo[1];
$('#materialCategoryDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑物料类别信息');
$('#materialCategoryDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑商品类别信息');
$(".window-mask").css({ width: webW ,height: webH});
materialCategoryID = materialCategoryInfo[0];
//焦点在名称输入框==定焦在输入文字后面

4
WebRoot/pages/materials/other_out_list.jsp
View File

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td>
@@ -859,7 +859,7 @@
{
if($("#searchProjectId").val()=="")
{
$.messager.alert('查询提示','请选择一个店面！','info');
$.messager.alert('查询提示','请选择一个仓库！','info');
}
else
{

6
WebRoot/pages/materials/person.jsp
View File

@@ -26,7 +26,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:230px;"></select>
</td>
@@ -60,7 +60,7 @@
<form id="personFM" method="post" novalidate>
<table>
<tr>
<td>店面</td>
<td>仓库</td>
<td style="padding:5px">
<select name="ProjectId" id="ProjectId" style="width:230px;height: 20px"></select>
</td>
@@ -184,7 +184,7 @@
pageList: initPageNum,
columns:[[
{ field: 'Id',width:35,align:"center",checkbox:true},
{ title: '店面',field: 'ProjectName',width:180},
{ title: '仓库',field: 'ProjectName',width:180},
{ title: '类型',field: 'Type',width:180},
{ title: '经手人',field: 'Name',width:180},
{ title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec)

18
WebRoot/pages/materials/purchase_in_list.jsp
View File

@@ -27,25 +27,25 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
<select name="searchProjectId" id="searchProjectId" style="width:80px;"></select>
</td>
<td>单据号：</td>
<td>
<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
</td>
<td>入库时间：</td>
<td>
<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
</td>
<td>-</td>
<td>
<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
</td>
<td>状态：</td>
<td>
<select name="searchState" id="searchState" style="width:100px;">
<select name="searchState" id="searchState" style="width:60px;">
<option value="">全部</option>
<option value="草稿">草稿</option>
<option value="待审核">待审核</option>
@@ -408,8 +408,8 @@
{ title: '入库时间 ',field: 'OperTime',width:100},
{ title: '创建时间',field: 'CreateTime',width:100},
{ title: '操作员',field: 'OperPersonName',width:100},
{ title: '备注',field: 'Remark',width:200},
{ title: '状态',field: 'State',width:100},
{ title: '备注',field: 'Remark',width:100},
{ title: '状态',field: 'State',width:50},
{ title: '操作',field: 'op',align:"center",width:180,formatter:function(value,rec)
{
var str = '';
@@ -881,7 +881,7 @@
{
if($("#searchProjectId").val()=="")
{
$.messager.alert('查询提示','请选择一个店面！','info');
$.messager.alert('查询提示','请选择一个仓库！','info');
}
else
{

4
WebRoot/pages/materials/recover_in_list.jsp
View File

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td>
@@ -863,7 +863,7 @@
{
if($("#searchProjectId").val()=="")
{
$.messager.alert('查询提示','请选择一个店面！','info');
$.messager.alert('查询提示','请选择一个仓库！','info');
}
else
{

4
WebRoot/pages/materials/return_out_list.jsp
View File

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td>
@@ -869,7 +869,7 @@
{
if($("#searchProjectId").val()=="")
{
$.messager.alert('查询提示','请选择一个店面！','info');
$.messager.alert('查询提示','请选择一个仓库！','info');
}
else
{

4
WebRoot/pages/materials/sale_out_list.jsp
View File

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td>
@@ -868,7 +868,7 @@
{
if($("#searchProjectId").val()=="")
{
$.messager.alert('查询提示','请选择一个店面！','info');
$.messager.alert('查询提示','请选择一个仓库！','info');
}
else
{

4
WebRoot/pages/materials/supply_in_list.jsp
View File

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td>
@@ -866,7 +866,7 @@
{
if($("#searchProjectId").val()=="")
{
$.messager.alert('查询提示','请选择一个店面！','info');
$.messager.alert('查询提示','请选择一个仓库！','info');
}
else
{

0
WebRoot/pages/personnel/j.jsp
View File

7
WebRoot/pages/user/user.jsp
View File

@@ -31,14 +31,13 @@
<tr>
<td>用户名称：</td>
<td>
<input type="text" name="searchUsername" id="searchUsername" style="width:190px;"/>
</td>
<input type="text" name="searchUsername" id="searchUsername" style="width:100px;"/>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>登录名称：</td>
<td>
<input type="text" name="searchLoginame" id="searchLoginame" style="width:190px;"/>
<input type="text" name="searchLoginame" id="searchLoginame" style="width:100px;"/>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>

533
WebRoot/pages/visit/visitAccount.jsp
View File

@@ -1,533 +0,0 @@
<%@page import="com.jsh.util.common.Tools"%>
<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
<%
String path = request.getContextPath();
String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
String clientIp = Tools.getCurrentUserIP();
%>
<!DOCTYPE html>
<html>
<head>
<title>回访管理</title>
<meta charset="utf-8">
<!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
<link rel="shortcut icon" href="<%=path%>/images/favicon.ico" type="image/x-icon" />
<script type="text/javascript" src="<%=path %>/js/jquery-1.8.0.min.js"></script>
<script type="text/javascript" src="<%=path %>/js/colorbox/jquery.colorbox-min.js"></script>
<script type="text/javascript" src="<%=path %>/js/colorbox/colorboxSet.js"></script>
<link href="<%=path %>/js/colorbox/colorbox.css" rel="stylesheet" type="text/css" />
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/>
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/>
<link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" />
<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script type="text/javascript" src="<%=path %>/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id = "searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>店面：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:230px;"></select>
</td>
<td>楼号：</td>
<td>
<input type="text" name="searchLouHao" id="searchLouHao" style="width:230px;"/>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id = "tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="回访列表" iconCls="icon-list" collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="visitAccountDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="visitAccountFM" method="post" novalidate>
<table>
<tr>
<td>店面</td>
<td style="padding:5px">
<select name="ProjectId" id="ProjectId" style="width:230px;height: 20px"></select>
</td>
</tr>
<tr>
<td>楼号</td>
<td style="padding:5px"><input name="LouHao" id="LouHao" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/></td>
</tr>
<tr>
<td>户号</td>
<td style="padding:5px"><input name="HuHao" id="HuHao" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/></td>
</tr>
<tr>
<td>回访情况</td>
<td style="padding:5px"><input name="HuiFang" id="HuiFang" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/></td>
</tr>
<tr>
<td>落实情况</td>
<td style="padding:5px"><input name="LuoShi" id="LuoShi" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/></td>
</tr>
<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"/></td>
</tr>
<tr>
<td>电话</td>
<td style="padding:5px"><input name="Tel" id="Tel" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/></td>
</tr>
</table>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
</form>
</div>
<div id="dlg-buttons">
<a href="javascript:void(0)" id="saveVisitAccount" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelVisitAccount" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#visitAccountDlg').dialog('close')">取消</a>
</div>
<script type="text/javascript">
var depotList = null;
var depotID = null;
//初始化界面
$(function()
{
//初始化系统基础信息
initSystemData();
initSelectInfo();
initTableData();
ininPager();
initForm();
});
//初始化系统基础信息
function initSystemData()
{
$.ajax({
type:"post",
url: "<%=path%>/depot/getBasicData.action",
//设置为同步
async:false,
dataType: "json",
success: function (systemInfo)
{
depotList = systemInfo.showModel.map.depotList;
var msgTip = systemInfo.showModel.msgTip;
if(msgTip == "exceptoin")
{
$.messager.alert('提示','查找系统基础信息异常,请与管理员联系！','error');
return;
}
}
});
}
//初始化页面选项卡
function initSelectInfo()
{
var options = "";
if(depotList !=null)
{
options = "";
for(var i = 0 ;i < depotList.length;i ++)
{
var depot = depotList[i];
if(0 == i)
{
depotID = depot.id;
}
options += '<option value="' + depot.id + '">' + depot.name + '</option>';
}
$("#ProjectId").empty().append(options);
$("#searchProjectId").empty().append('<option value="">全部</option>').append(options);
}
}
//防止表单提交重复
function initForm()
{
$('#visitAccountFM').form({
onSubmit: function(){
return false;
}
});
}
//初始化表格数据
function initTableData()
{
$('#tableData').datagrid({
//title:'回访列表',
//iconCls:'icon-save',
//width:700,
height:heightInfo,
nowrap: false,
rownumbers: false,
//动画效果
animate:false,
//选中单行
singleSelect : true,
collapsible:false,
selectOnCheck:false,
//fitColumns:true,
//单击行是否选中
//checkOnSelect : false,
url:'<%=path %>/visitAccount/findBy.action?pageSize=' + initPageSize,
pagination: true,
//交替出现背景
striped : true,
//loadFilter: pagerFilter,
pageSize: initPageSize,
pageList: initPageNum,
columns:[[
{ field: 'Id',width:35,align:"center",checkbox:true},
{ title: '店面',field: 'ProjectName',width:80},
{ title: '楼号',field: 'LouHao',width:80},
{ title: '户号',field: 'HuHao',width:80},
{ title: '回访情况',field: 'HuiFang',width:150},
{ title: '落实情况',field: 'LuoShi',width:150},
{ title: '住户姓名',field: 'Name',width:150},
{ title: '电话',field: 'Tel',width:80},
{ title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec)
{
var str = '';
var rowInfo = rec.Id + 'AaBb' + rec.ProjectId+ 'AaBb' + rec.LouHao+ 'AaBb' + rec.HuHao
+ 'AaBb' + rec.HuiFang+ 'AaBb' + rec.LuoShi+ 'AaBb' + rec.Name+ 'AaBb' + rec.Tel;
if(1 == value)
{
str += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editVisitAccount(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editVisitAccount(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
str += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteVisitAccount('+ rec.Id +');"/>&nbsp;<a onclick="deleteVisitAccount('+ rec.Id +');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
}
return str;
}
}
]],
toolbar:[
{
id:'addVisitAccount',
text:'增加',
iconCls:'icon-add',
handler:function()
{
addVisitAccount();
}
},
{
id:'deleteVisitAccount',
text:'删除',
iconCls:'icon-remove',
handler:function()
{
batDeleteVisitAccount();
}
}
],
onLoadError:function()
{
$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
return;
}
});
}
//初始化键盘enter事件
$(document).keydown(function(event)
{
//兼容 IE和firefox 事件
var e = window.event || event;
var k = e.keyCode||e.which||e.charCode;
//兼容 IE,firefox 兼容
var obj = e.srcElement ? e.srcElement : e.target;
//绑定键盘事件为 id是指定的输入框才可以触发键盘事件 13键盘事件 ---遗留问题 enter键效验 对话框会关闭问题
if(k == "13"&&(obj.id=="LouHao"||obj.id=="HuHao"|| obj.id=="HuiFang"|| obj.id=="LuoShi"|| obj.id=="Name"|| obj.id=="Tel" ))
{
$("#saveVisitAccount").click();
}
//搜索按钮添加快捷键
if(k == "13"&&(obj.id=="searchLouHao"))
{
$("#searchBtn").click();
}
});
//分页信息处理
function ininPager()
{
try
{
var opts = $("#tableData").datagrid('options');
var pager = $("#tableData").datagrid('getPager');
pager.pagination({
onSelectPage:function(pageNum, pageSize)
{
opts.pageNumber = pageNum;
opts.pageSize = pageSize;
pager.pagination('refresh',
{
pageNumber:pageNum,
pageSize:pageSize
});
showVisitAccountDetails(pageNum,pageSize);
}
});
}
catch (e)
{
$.messager.alert('异常处理提示',"分页信息异常 : " + e.name + ": " + e.message,'error');
}
}
//删除回访信息
function deleteVisitAccount(visitAccountID)
{
$.messager.confirm('删除确认','确定要删除此回访信息吗？',function(r)
{
if (r)
{
$.ajax({
type:"post",
url: "<%=path %>/visitAccount/delete.action",
dataType: "json",
data: ({
visitAccountID : visitAccountID,
clientIp:'<%=clientIp %>'
}),
success: function (tipInfo)
{
var msg = tipInfo.showModel.msgTip;
if(msg == '成功')
{
//加载完以后重新初始化
$("#searchBtn").click();
}
else
$.messager.alert('删除提示','删除回访信息失败，请稍后再试！','error');
},
//此处添加错误处理
error:function()
{
$.messager.alert('删除提示','删除回访信息异常，请稍后再试！','error');
return;
}
});
}
});
}
//批量删除回访
function batDeleteVisitAccount()
{
var row = $('#tableData').datagrid('getChecked');
if(row.length == 0)
{
$.messager.alert('删除提示','没有记录被选中！','info');
return;
}
if(row.length > 0)
{
$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条回访信息吗？',function(r)
{
if (r)
{
var ids = "";
for(var i = 0;i < row.length; i ++)
{
if(i == row.length-1)
{
ids += row[i].Id;
break;
}
//alert(row[i].id);
ids += row[i].Id + ",";
}
$.ajax({
type:"post",
url: "<%=path %>/visitAccount/batchDelete.action",
dataType: "json",
async : false,
data: ({
visitAccountIDs : ids,
clientIp:'<%=clientIp %>'
}),
success: function (tipInfo)
{
var msg = tipInfo.showModel.msgTip;
if(msg == '成功')
{
//加载完以后重新初始化
$("#searchBtn").click();
$(":checkbox").attr("checked",false);
}
else
$.messager.alert('删除提示','删除回访信息失败，请稍后再试！','error');
},
//此处添加错误处理
error:function()
{
$.messager.alert('删除提示','删除回访信息异常，请稍后再试！','error');
return;
}
});
}
});
}
}
//增加
var url;
var visitAccountID = 0;
//保存编辑前的名称
var orgVisitAccount = "";
function addVisitAccount()
{
$("#clientIp").val('<%=clientIp %>');
$('#visitAccountFM').form('clear');
$('#visitAccountDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加回访信息');
$(".window-mask").css({ width: webW ,height: webH});
$("#name").val("").focus();
orgVisitAccount = "";
visitAccountID = 0;
url = '<%=path %>/visitAccount/create.action';
}
//保存信息
$("#saveVisitAccount").unbind().bind({
click:function()
{
if(!$('#visitAccountFM').form('validate'))
return;
else
{
$.ajax({
type:"post",
url: url,
dataType: "json",
async : false,
data: ({
ProjectId : $.trim($("#ProjectId").val()),
LouHao : $.trim($("#LouHao").val()),
HuHao : $.trim($("#HuHao").val()),
HuiFang : $.trim($("#HuiFang").val()),
LuoShi : $.trim($("#LuoShi").val()),
Name : $.trim($("#Name").val()),
Tel : $.trim($("#Tel").val()),
clientIp:'<%=clientIp %>'
}),
success: function (tipInfo)
{
if(tipInfo)
{
$('#visitAccountDlg').dialog('close');
var opts = $("#tableData").datagrid('options');
showVisitAccountDetails(opts.pageNumber,opts.pageSize);
}
else
{
$.messager.show({
title: '错误提示',
msg: '保存回访信息失败，请稍后重试!'
});
}
},
//此处添加错误处理
error:function()
{
$.messager.alert('提示','保存回访信息异常，请稍后再试！','error');
return;
}
});
}
}
});
//编辑信息
function editVisitAccount(visitAccountTotalInfo)
{
var visitAccountInfo = visitAccountTotalInfo.split("AaBb");
$("#clientIp").val('<%=clientIp %>');
$("#ProjectId").focus().val(visitAccountInfo[1]);
$("#LouHao").val(visitAccountInfo[2]);
$("#HuHao").val(visitAccountInfo[3]);
$("#HuiFang").val(visitAccountInfo[4]);
$("#LuoShi").val(visitAccountInfo[5]);
$("#Name").val(visitAccountInfo[6]);
$("#Tel").val(visitAccountInfo[7]);
//orgVisitAccount = visitAccountInfo[1];
$('#visitAccountDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑回访信息');
$(".window-mask").css({ width: webW ,height: webH});
visitAccountID = visitAccountInfo[0];
//焦点在名称输入框==定焦在输入文字后面
$("#name").val("").focus().val(visitAccountInfo[1]);
url = '<%=path %>/visitAccount/update.action?visitAccountID=' + visitAccountInfo[0];
}
//搜索处理
$("#searchBtn").unbind().bind({
click:function()
{
showVisitAccountDetails(1,initPageSize);
var opts = $("#tableData").datagrid('options');
var pager = $("#tableData").datagrid('getPager');
opts.pageNumber = 1;
opts.pageSize = initPageSize;
pager.pagination('refresh',
{
pageNumber:1,
pageSize:initPageSize
});
}
});
function showVisitAccountDetails(pageNo,pageSize)
{
$.ajax({
type:"post",
url: "<%=path %>/visitAccount/findBy.action",
dataType: "json",
data: ({
ProjectId:$.trim($("#searchProjectId").val()),
LouHao:$.trim($("#searchLouHao").val()),
pageNo:pageNo,
pageSize:pageSize
}),
success: function (data)
{
$("#tableData").datagrid('loadData',data);
},
//此处添加错误处理
error:function()
{
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
return;
}
});
}
//重置按钮
$("#searchResetBtn").unbind().bind({
click:function(){
$("#searchProjectId").val("");
$("#searchLouHao").val("");
//加载完以后重新初始化
$("#searchBtn").click();
}
});
</script>
</body>
</html>