Skip to content
GitLab
"vscode:/vscode.git/clone" did not exist on "6d8e9177f77f72ec67b4b3039a5dd2ba23ee161b"
Commit 227cf3b2 authored by 季圣华's avatar 季圣华
Browse files

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

parent c8f80894
Show whitespace changes
Inline Side-by-side
WebRoot/WEB-INF/classes/hibernate/hibernate.cfg.xml
View file @ 227cf3b2
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
<mapping resource="com/jsh/model/po/Role.hbm.xml" /> <mapping resource="com/jsh/model/po/Role.hbm.xml" />
<mapping resource="com/jsh/model/po/Functions.hbm.xml" /> <mapping resource="com/jsh/model/po/Functions.hbm.xml" />
<mapping resource="com/jsh/model/po/UserBusiness.hbm.xml" /> <mapping resource="com/jsh/model/po/UserBusiness.hbm.xml" />
<mapping resource="com/jsh/model/po/VisitAccount.hbm.xml" />
<mapping resource="com/jsh/model/po/Person.hbm.xml" /> <mapping resource="com/jsh/model/po/Person.hbm.xml" />
<mapping resource="com/jsh/model/po/MaterialCategory.hbm.xml" /> <mapping resource="com/jsh/model/po/MaterialCategory.hbm.xml" />
<mapping resource="com/jsh/model/po/Material.hbm.xml" /> <mapping resource="com/jsh/model/po/Material.hbm.xml" />
......
WebRoot/WEB-INF/classes/spring/basic-applicationContext.xml
View file @ 227cf3b2
...@@ -238,18 +238,6 @@ ...@@ -238,18 +238,6 @@
</bean> </bean>
<!--资产报表配置结束 --> <!--资产报表配置结束 -->
<!--回访台帐配置开始 -->
<bean id="visitAccountService" class="com.jsh.service.basic.VisitAccountService">
<property name="baseDao" ref="baseDao"/>
<property name="visitAccountDao" ref="visitAccountDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="visitAccountAction" class="com.jsh.action.basic.VisitAccountAction" scope="prototype">
<property name="visitAccountService" ref="visitAccountService"/>
<property name="logService" ref="logService"/>
</bean>
<!--回访台帐配置结束 -->
<!--经手人配置开始 --> <!--经手人配置开始 -->
<bean id="personService" class="com.jsh.service.materials.PersonService"> <bean id="personService" class="com.jsh.service.materials.PersonService">
<property name="baseDao" ref="baseDao"/> <property name="baseDao" ref="baseDao"/>
...@@ -262,7 +250,7 @@ ...@@ -262,7 +250,7 @@
</bean> </bean>
<!--经手人配置结束 --> <!--经手人配置结束 -->
<!--物料类别配置开始 --> <!--商品类别配置开始 -->
<bean id="materialCategoryService" class="com.jsh.service.materials.MaterialCategoryService"> <bean id="materialCategoryService" class="com.jsh.service.materials.MaterialCategoryService">
<property name="baseDao" ref="baseDao"/> <property name="baseDao" ref="baseDao"/>
<property name="materialCategoryDao" ref="materialCategoryDao"/> <property name="materialCategoryDao" ref="materialCategoryDao"/>
...@@ -272,9 +260,9 @@ ...@@ -272,9 +260,9 @@
<property name="materialCategoryService" ref="materialCategoryService"/> <property name="materialCategoryService" ref="materialCategoryService"/>
<property name="logService" ref="logService"/> <property name="logService" ref="logService"/>
</bean> </bean>
<!--物料类别配置结束 --> <!--商品类别配置结束 -->
<!--物料配置开始 --> <!--商品配置开始 -->
<bean id="materialService" class="com.jsh.service.materials.MaterialService"> <bean id="materialService" class="com.jsh.service.materials.MaterialService">
<property name="baseDao" ref="baseDao"/> <property name="baseDao" ref="baseDao"/>
<property name="materialDao" ref="materialDao"/> <property name="materialDao" ref="materialDao"/>
...@@ -284,7 +272,7 @@ ...@@ -284,7 +272,7 @@
<property name="materialService" ref="materialService"/> <property name="materialService" ref="materialService"/>
<property name="logService" ref="logService"/> <property name="logService" ref="logService"/>
</bean> </bean>
<!--物料配置结束 --> <!--商品配置结束 -->
<!--单元配置开始 --> <!--单元配置开始 -->
<bean id="buildingService" class="com.jsh.service.materials.BuildingService"> <bean id="buildingService" class="com.jsh.service.materials.BuildingService">
......
WebRoot/WEB-INF/classes/spring/dao-applicationContext.xml
View file @ 227cf3b2
...@@ -34,8 +34,6 @@ ...@@ -34,8 +34,6 @@
<bean id="functionsDao" parent="daoTemplate" class="com.jsh.dao.basic.FunctionsDAO"/> <bean id="functionsDao" parent="daoTemplate" class="com.jsh.dao.basic.FunctionsDAO"/>
<!-- 配置userBusinessDao组件 --> <!-- 配置userBusinessDao组件 -->
<bean id="userBusinessDao" parent="daoTemplate" class="com.jsh.dao.basic.UserBusinessDAO"/> <bean id="userBusinessDao" parent="daoTemplate" class="com.jsh.dao.basic.UserBusinessDAO"/>
<!-- 配置visitAccountDao组件 -->
<bean id="visitAccountDao" parent="daoTemplate" class="com.jsh.dao.basic.VisitAccountDAO"/>
<!-- 配置personDao组件 --> <!-- 配置personDao组件 -->
<bean id="personDao" parent="daoTemplate" class="com.jsh.dao.materials.PersonDAO"/> <bean id="personDao" parent="daoTemplate" class="com.jsh.dao.materials.PersonDAO"/>
<!-- 配置materialCategoryDao组件 --> <!-- 配置materialCategoryDao组件 -->
......
WebRoot/WEB-INF/classes/struts2/visitAccount-struts.xml deleted 100644 → 0
View file @ c8f80894
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
"http://struts.apache.org/dtds/struts-2.1.7.dtd">
<struts>
<package name="visitAccount" namespace="/visitAccount" extends="json-default">
<action name="*" class="visitAccountAction" method="{1}">
<result type="json"/>
</action>
</package>
</struts>
\ No newline at end of file
WebRoot/pages/log/home.jsp deleted 100644 → 0
View file @ c8f80894
<%@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>
\ No newline at end of file
WebRoot/pages/log/operatelog.jsp
View file @ 227cf3b2
...@@ -28,26 +28,26 @@ ...@@ -28,26 +28,26 @@
<tr> <tr>
<td>操作模块：</td> <td>操作模块：</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>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>操作人员：</td> <td>操作人员：</td>
<td> <td>
<select name="searchUsernameID" id="searchUsernameID" style="width:150px;"/> <select name="searchUsernameID" id="searchUsernameID" style="width:90px;" />
</td> </td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>操作IP：</td> <td>操作IP：</td>
<td> <td>
<input type="text" name="searchIP" id="searchIP" style="width:150px;"/> <input type="text" name="searchIP" id="searchIP" style="width:90px;"/>
</td> </td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>操作状态：</td> <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="">请选择</option>
<option value="0">成功</option> <option value="0">成功</option>
<option value="1">失败</option> <option value="1">失败</option>
...@@ -57,24 +57,22 @@ ...@@ -57,24 +57,22 @@
<tr> <tr>
<td>开始时间：</td> <td>开始时间：</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>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>结束时间：</td> <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>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>操作详情：</td> <td>操作详情：</td>
<td> <td>
<input type="text" name="searchDesc" id="searchDesc" style="width:150px;"/> <input type="text" name="searchDesc" id="searchDesc" style="width:90px;"/>
</td> </td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>&nbsp;</td> <td colspan="3">
<td>&nbsp;</td>
<td>
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a> <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> <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
</td> </td>
......
WebRoot/pages/manage/app.jsp
View file @ 227cf3b2
...@@ -28,13 +28,13 @@ ...@@ -28,13 +28,13 @@
<tr> <tr>
<td>名称：</td> <td>名称：</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>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>种类：</td> <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>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>&nbsp;</td> <td>&nbsp;</td>
......
WebRoot/pages/manage/functions.jsp
View file @ 227cf3b2
...@@ -28,16 +28,19 @@ ...@@ -28,16 +28,19 @@
<tr> <tr>
<td>名称：</td> <td>名称：</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>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>类型: </td> <td>类型: </td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td><select name="searchType" id="searchType" style="width: 230px;height: 20px"> <td>
<select name="searchType" id="searchType" style="width:100px; height:20px">
<option value="">全部</option> <option value="">全部</option>
<option value="电脑版">电脑版</option> <option value="电脑版">电脑版</option>
<option value="手机版">手机版</option></select></td> <option value="手机版">手机版</option>
</select>
</td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td> <td>
...@@ -128,7 +131,6 @@ ...@@ -128,7 +131,6 @@
//iconCls:'icon-save', //iconCls:'icon-save',
//width:700, //width:700,
height:heightInfo, height:heightInfo,
nowrap: false,
rownumbers: false, rownumbers: false,
//动画效果 //动画效果
animate:false, animate:false,
...@@ -148,14 +150,14 @@ ...@@ -148,14 +150,14 @@
pageList: initPageNum, pageList: initPageNum,
columns:[[ columns:[[
{ field: 'Id',width:35,align:"center",checkbox:true}, { field: 'Id',width:35,align:"center",checkbox:true},
{ title: '编号 ',field: 'Number',width:100}, { title: '编号 ',field: 'Number',width:60},
{ title: '名称',field: 'Name',width:200}, { title: '名称',field: 'Name',width:80},
{ title: '上级编号',field: 'PNumber',width:100}, { title: '上级编号',field: 'PNumber',width:60},
{ title: '链接',field: 'URL',width:200}, { title: '链接',field: 'URL',width:120},
{ title: '排序',field: 'Sort',width:50}, { title: '排序',field: 'Sort',width:50},
{ title: '收缩',field: 'State',width:50}, { title: '收缩',field: 'State',width:50},
{ title: '启用',field: 'Enabled',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) { title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec)
{ {
var str = ''; var str = '';
......
WebRoot/pages/manage/vendor.jsp
View file @ 227cf3b2
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!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"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>供应商信息</title> <title>单位信息</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<!-- 指定以IE8的方式来渲染 --> <!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/> <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
</div> </div>
<!-- 数据显示table --> <!-- 数据显示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> <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div> </div>
<div id="supplierDlg" class="easyui-dialog" style="width:380px;padding:10px 20px" <div id="supplierDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
...@@ -100,6 +100,23 @@ ...@@ -100,6 +100,23 @@
<label id="emailLabel">电子邮箱&nbsp;&nbsp;</label> <label id="emailLabel">电子邮箱&nbsp;&nbsp;</label>
<input name="email" id="email" class="easyui-validatebox" validType="email" style="width: 230px;height: 20px"/> <input name="email" id="email" class="easyui-validatebox" validType="email" style="width: 230px;height: 20px"/>
</div> </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"> <div class="fitem" style="padding:5px">
<label id="descriptionLabel">描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;&nbsp;</label> <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> <textarea name="description" id="description" rows="2" cols="2" style="width: 230px;"></textarea>
...@@ -154,7 +171,7 @@ ...@@ -154,7 +171,7 @@
function initTableData() function initTableData()
{ {
$('#tableData').datagrid({ $('#tableData').datagrid({
//title:'供应商列表', //title:'单位列表',
//iconCls:'icon-save', //iconCls:'icon-save',
//width:700, //width:700,
height:heightInfo, height:heightInfo,
...@@ -180,18 +197,18 @@ ...@@ -180,18 +197,18 @@
pageList: initPageNum, pageList: initPageNum,
columns:[[ columns:[[
{ field: 'id',width:35,align:"center",checkbox:true}, { field: 'id',width:35,align:"center",checkbox:true},
{ title: '名称',field: 'supplier',width:200}, { title: '名称',field: 'supplier',width:120},
{ title: '联系人', field: 'contacts',width:100,align:"center"}, { title: '联系人', field: 'contacts',width:50,align:"center"},
{ title: '联系电话', field: 'phonenum',width:115,align:"center"}, { title: '联系电话', field: 'phonenum',width:60,align:"center"},
{ title: '电子邮箱',field: 'email',width:180,align:"center"}, { title: '电子邮箱',field: 'email',width:80,align:"center"},
//{ title: '是否系统',field: 'isystem',width:70,align:"center"}, { title: '累计应收',field: 'AllNeedGet',width:70,align:"center"},
{ title: '描述',field: 'description',width:100}, { title: '累计应付',field: 'AllNeedPay',width:70,align:"center"},
{ title: '类型',field: 'type',width:100}, { title: '类型',field: 'type',width:50},
{ title: '启动',field: 'enabled',width:100}, { title: '启动',field: 'enabled',width:40},
{ title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec) { title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec)
{ {
var str = ''; 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) 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;'; 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 @@ ...@@ -278,10 +295,10 @@
} }
} }
//删除供应商信息 //删除单位信息
function deleteSupplier(supplierInfo) function deleteSupplier(supplierInfo)
{ {
$.messager.confirm('删除确认','确定要删除此供应商信息吗？',function(r) $.messager.confirm('删除确认','确定要删除此单位信息吗？',function(r)
{ {
if (r) if (r)
{ {
...@@ -302,12 +319,12 @@ ...@@ -302,12 +319,12 @@
//加载完以后重新初始化 //加载完以后重新初始化
$("#searchBtn").click(); $("#searchBtn").click();
else else
$.messager.alert('删除提示','删除供应商信息失败，请稍后再试！','error'); $.messager.alert('删除提示','删除单位信息失败，请稍后再试！','error');
}, },
//此处添加错误处理 //此处添加错误处理
error:function() error:function()
{ {
$.messager.alert('删除提示','删除供应商信息异常，请稍后再试！','error'); $.messager.alert('删除提示','删除单位信息异常，请稍后再试！','error');
return; return;
} }
}); });
...@@ -315,7 +332,7 @@ ...@@ -315,7 +332,7 @@
}); });
} }
//批量删除供应商 //批量删除单位
function batDeleteSupplier() function batDeleteSupplier()
{ {
var row = $('#tableData').datagrid('getChecked'); var row = $('#tableData').datagrid('getChecked');
...@@ -326,7 +343,7 @@ ...@@ -326,7 +343,7 @@
} }
if(row.length > 0) if(row.length > 0)
{ {
$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条供应商信息吗？',function(r) $.messager.confirm('删除确认','确定要删除选中的' + row.length + '条单位信息吗？',function(r)
{ {
if (r) if (r)
{ {
...@@ -359,12 +376,12 @@ ...@@ -359,12 +376,12 @@
$(":checkbox").attr("checked",false); $(":checkbox").attr("checked",false);
} }
else else
$.messager.alert('删除提示','删除供应商信息失败，请稍后再试！','error'); $.messager.alert('删除提示','删除单位信息失败，请稍后再试！','error');
}, },
//此处添加错误处理 //此处添加错误处理
error:function() error:function()
{ {
$.messager.alert('删除提示','删除供应商信息异常，请稍后再试！','error'); $.messager.alert('删除提示','删除单位信息异常，请稍后再试！','error');
return; return;
} }
}); });
...@@ -373,7 +390,7 @@ ...@@ -373,7 +390,7 @@
} }
} }
//增加供应商 //增加单位
var url; var url;
var supplierID = 0; var supplierID = 0;
//保存编辑前的名称 //保存编辑前的名称
...@@ -381,7 +398,7 @@ ...@@ -381,7 +398,7 @@
function addSuppler() 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}); $(".window-mask").css({ width: webW ,height: webH});
$('#supplierFM').form('clear'); $('#supplierFM').form('clear');
...@@ -396,7 +413,7 @@ ...@@ -396,7 +413,7 @@
url = '<%=path %>/supplier/create.action'; url = '<%=path %>/supplier/create.action';
} }
//保存供应商信息 //保存单位信息
$("#saveSupplier").unbind().bind({ $("#saveSupplier").unbind().bind({
click:function() click:function()
{ {
...@@ -425,15 +442,12 @@ ...@@ -425,15 +442,12 @@
{ {
$.messager.show({ $.messager.show({
title: '错误提示', title: '错误提示',
msg: '保存供应商信息失败，请稍后重试!' msg: '保存单位信息失败，请稍后重试!'
}); });
} }
else else
{ {
$('#supplierDlg').dialog('close'); $('#supplierDlg').dialog('close');
//$('#tableData').datagrid('reload');
//加载完以后重新初始化
//$("#searchBtn").click();
var opts = $("#tableData").datagrid('options'); var opts = $("#tableData").datagrid('options');
showSupplierDetails(opts.pageNumber,opts.pageSize); showSupplierDetails(opts.pageNumber,opts.pageSize);
} }
...@@ -442,7 +456,7 @@ ...@@ -442,7 +456,7 @@
} }
}); });
//编辑供应商信息 //编辑单位信息
function editSupplier(supplierTotalInfo) function editSupplier(supplierTotalInfo)
{ {
var supplierInfo = supplierTotalInfo.split("AaBb"); var supplierInfo = supplierTotalInfo.split("AaBb");
...@@ -451,13 +465,17 @@ ...@@ -451,13 +465,17 @@
contacts : supplierInfo[2], contacts : supplierInfo[2],
phonenum : supplierInfo[3], phonenum : supplierInfo[3],
email : supplierInfo[4], email : supplierInfo[4],
description : supplierInfo[6], BeginNeedGet : supplierInfo[5],
type : supplierInfo[7], BeginNeedPay : supplierInfo[6],
enabled : supplierInfo[8], AllNeedGet : supplierInfo[7],
AllNeedPay : supplierInfo[8],
description : supplierInfo[10],
type : supplierInfo[11],
enabled : supplierInfo[12],
clientIp:'<%=clientIp %>' clientIp:'<%=clientIp %>'
}; };
orgSupplier = supplierInfo[1]; 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}); $(".window-mask").css({ width: webW ,height: webH});
$('#supplierFM').form('load',row); $('#supplierFM').form('load',row);
supplierID = supplierInfo[0]; supplierID = supplierInfo[0];
...@@ -466,11 +484,8 @@ ...@@ -466,11 +484,8 @@
url = '<%=path %>/supplier/update.action?supplierID=' + supplierInfo[0]; url = '<%=path %>/supplier/update.action?supplierID=' + supplierInfo[0];
} }
//$("#supplier").unbind().bind({
//blur:checkSupplierName
//});
//检查供应商 名称是否存在 ++ 重名无法提示问题需要跟进 //检查单位名称是否存在 ++ 重名无法提示问题需要跟进
function checkSupplierName() function checkSupplierName()
{ {
var supplierName = $.trim($("#supplier").val()); var supplierName = $.trim($("#supplier").val());
...@@ -493,16 +508,14 @@ ...@@ -493,16 +508,14 @@
flag = tipInfo; flag = tipInfo;
if(tipInfo) if(tipInfo)
{ {
$.messager.alert('提示','供应商名称已经存在','info'); $.messager.alert('提示','单位名称已经存在','info');
//alert("供应商名称已经存在");
//$("#supplier").val("");
return; return;
} }
}, },
//此处添加错误处理 //此处添加错误处理
error:function() error:function()
{ {
$.messager.alert('提示','检查供应商名称是否存在异常，请稍后再试！','error'); $.messager.alert('提示','检查单位名称是否存在异常，请稍后再试！','error');
return; return;
} }
}); });
......
WebRoot/pages/materials/allocation_in_list.jsp
View file @ 227cf3b2
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false"> <div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable"> <table id="searchTable">
<tr> <tr>
<td>店面：</td> <td>仓库：</td>
<td> <td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select> <select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td> </td>
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<td style="padding:5px"> <td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/> <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>
<td style="padding:5px"> <td style="padding:5px">
<select name="AllocationProjectId" id="AllocationProjectId" style="width:120px;"></select> <select name="AllocationProjectId" id="AllocationProjectId" style="width:120px;"></select>
</td> </td>
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;">
<span id="OperTimeShow"></span> <span id="OperTimeShow"></span>
</td> </td>
<td>对方店面：</td> <td>对方仓库：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;">
<span id="AllocationProjectIdShow"></span> <span id="AllocationProjectIdShow"></span>
</td> </td>
...@@ -828,7 +828,7 @@ ...@@ -828,7 +828,7 @@
{ {
if($("#searchProjectId").val()=="") if($("#searchProjectId").val()=="")
{ {
$.messager.alert('查询提示','请选择一个店面！','info'); $.messager.alert('查询提示','请选择一个仓库！','info');
} }
else else
{ {
......
WebRoot/pages/materials/allocation_out_list.jsp
View file @ 227cf3b2
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false"> <div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable"> <table id="searchTable">
<tr> <tr>
<td>店面：</td> <td>仓库：</td>
<td> <td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select> <select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td> </td>
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<td style="padding:5px"> <td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/> <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>
<td style="padding:5px"> <td style="padding:5px">
<select name="AllocationProjectId" id="AllocationProjectId" style="width:120px;"></select> <select name="AllocationProjectId" id="AllocationProjectId" style="width:120px;"></select>
</td> </td>
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;">
<span id="OperTimeShow"></span> <span id="OperTimeShow"></span>
</td> </td>
<td>对方店面：</td> <td>对方仓库：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;">
<span id="AllocationProjectIdShow"></span> <span id="AllocationProjectIdShow"></span>
</td> </td>
...@@ -872,7 +872,7 @@ ...@@ -872,7 +872,7 @@
{ {
if($("#searchProjectId").val()=="") if($("#searchProjectId").val()=="")
{ {
$.messager.alert('查询提示','请选择一个店面！','info'); $.messager.alert('查询提示','请选择一个仓库！','info');
} }
else else
{ {
......
WebRoot/pages/materials/audit_allocation_out_list.jsp
View file @ 227cf3b2
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false"> <div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable"> <table id="searchTable">
<tr> <tr>
<td>店面：</td> <td>仓库：</td>
<td> <td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select> <select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td> </td>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<td style="padding:5px"> <td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/> <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>
<td style="padding:5px"> <td style="padding:5px">
<select name="AllocationProjectId" id="AllocationProjectId" style="width:120px;"></select> <select name="AllocationProjectId" id="AllocationProjectId" style="width:120px;"></select>
</td> </td>
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;">
<span id="OperTimeShow"></span> <span id="OperTimeShow"></span>
</td> </td>
<td>对方店面：</td> <td>对方仓库：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;">
<span id="AllocationProjectIdShow"></span> <span id="AllocationProjectIdShow"></span>
</td> </td>
...@@ -912,7 +912,7 @@ ...@@ -912,7 +912,7 @@
{ {
if($("#searchProjectId").val()=="") if($("#searchProjectId").val()=="")
{ {
$.messager.alert('查询提示','请选择一个店面！','info'); $.messager.alert('查询提示','请选择一个仓库！','info');
} }
else else
{ {
......
WebRoot/pages/materials/audit_consuming_out_list.jsp
View file @ 227cf3b2
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false"> <div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable"> <table id="searchTable">
<tr> <tr>
<td>店面：</td> <td>仓库：</td>
<td> <td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select> <select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td> </td>
...@@ -963,7 +963,7 @@ ...@@ -963,7 +963,7 @@
{ {
if($("#searchProjectId").val()=="") if($("#searchProjectId").val()=="")
{ {
$.messager.alert('查询提示','请选择一个店面！','info'); $.messager.alert('查询提示','请选择一个仓库！','info');
} }
else else
{ {
......
WebRoot/pages/materials/audit_lease_in_list.jsp
View file @ 227cf3b2
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false"> <div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable"> <table id="searchTable">
<tr> <tr>
<td>店面：</td> <td>仓库：</td>
<td> <td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select> <select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td> </td>
...@@ -913,7 +913,7 @@ ...@@ -913,7 +913,7 @@
{ {
if($("#searchProjectId").val()=="") if($("#searchProjectId").val()=="")
{ {
$.messager.alert('查询提示','请选择一个店面！','info'); $.messager.alert('查询提示','请选择一个仓库！','info');
} }
else else
{ {
......
WebRoot/pages/materials/audit_purchase_in_list.jsp
View file @ 227cf3b2
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false"> <div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable"> <table id="searchTable">
<tr> <tr>
<td>店面：</td> <td>仓库：</td>
<td> <td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select> <select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td> </td>
...@@ -923,7 +923,7 @@ ...@@ -923,7 +923,7 @@
{ {
if($("#searchProjectId").val()=="") if($("#searchProjectId").val()=="")
{ {
$.messager.alert('查询提示','请选择一个店面！','info'); $.messager.alert('查询提示','请选择一个仓库！','info');
} }
else else
{ {
......
WebRoot/pages/materials/audit_return_out_list.jsp
View file @ 227cf3b2
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false"> <div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable"> <table id="searchTable">
<tr> <tr>
<td>店面：</td> <td>仓库：</td>
<td> <td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select> <select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td> </td>
...@@ -909,7 +909,7 @@ ...@@ -909,7 +909,7 @@
{ {
if($("#searchProjectId").val()=="") if($("#searchProjectId").val()=="")
{ {
$.messager.alert('查询提示','请选择一个店面！','info'); $.messager.alert('查询提示','请选择一个仓库！','info');
} }
else else
{ {
......
WebRoot/pages/materials/audit_sale_out_list.jsp
View file @ 227cf3b2
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false"> <div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable"> <table id="searchTable">
<tr> <tr>
<td>店面：</td> <td>仓库：</td>
<td> <td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select> <select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td> </td>
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
closed="true" modal="true" cache="false" collapsible="false" closable="true"> closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table> <table>
<tr> <tr>
<td>店面：</td> <td>仓库：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;">
<span id="ProjectIdShow"></span> <span id="ProjectIdShow"></span>
</td> </td>
...@@ -963,7 +963,7 @@ ...@@ -963,7 +963,7 @@
{ {
if($("#searchProjectId").val()=="") if($("#searchProjectId").val()=="")
{ {
$.messager.alert('查询提示','请选择一个店面！','info'); $.messager.alert('查询提示','请选择一个仓库！','info');
} }
else else
{ {
......
WebRoot/pages/materials/audit_supply_in_list.jsp
View file @ 227cf3b2
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false"> <div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable"> <table id="searchTable">
<tr> <tr>
<td>店面：</td> <td>仓库：</td>
<td> <td>
<select name="searchProjectId" id="searchProjectId" style="width:100px;"></select> <select name="searchProjectId" id="searchProjectId" style="width:100px;"></select>
</td> </td>
...@@ -906,7 +906,7 @@ ...@@ -906,7 +906,7 @@
{ {
if($("#searchProjectId").val()=="") if($("#searchProjectId").val()=="")
{ {
$.messager.alert('查询提示','请选择一个店面！','info'); $.messager.alert('查询提示','请选择一个仓库！','info');
} }
else else
{ {
......
WebRoot/pages/materials/building.jsp
View file @ 227cf3b2
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
var depotID = getUrlParam('ProjectId'); //获取传值ProjectId（店面ProjectId） var depotID = getUrlParam('ProjectId'); //获取传值ProjectId（仓库ProjectId）
//初始化界面 //初始化界面
$(function() $(function()
{ {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment