no commit message

src/main/webapp/css/common.css

@@ -11,7 +11,6 @@
 
 #tablePanel .action-show {
 	background: url('../js/easyui-1.3.5/themes/icons/list.png') no-repeat left center;
-	padding: 0 8px 0 20px;
 }
 
 #tablePanel .action-edit {
@@ -24,28 +23,3 @@
 	padding-left: 20px;
 }
 
-#depotHeadFM .price-list {
-	width:110px;
-	float:left;
-	position:absolute;
-	border:1px solid #95B8E7;
-}
-
-#depotHeadFM .price-list ul{
-	padding: 0px;
-	margin: 0px;
-	background-color: #fff;
-}
-
-#depotHeadFM .price-list ul li{
-	list-style: none;
-	padding: 3px;
-}
-
-#depotHeadFM .price-list ul li:hover{
-	background-color: #e9f1fc;
-}
-
-
-
-

src/main/webapp/css/in_out.css

@@ -0,0 +1,107 @@
+/*价格*/
+#depotHeadFM .price-list {
+	width:110px;
+	float:left;
+	position:absolute;
+	border:1px solid #95B8E7;
+}
+
+#depotHeadFM .price-list ul{
+	padding: 0px;
+	margin: 0px;
+	background-color: #fff;
+}
+
+#depotHeadFM .price-list ul li{
+	list-style: none;
+	padding: 3px;
+}
+
+#depotHeadFM .price-list ul li:hover{
+	background-color: #e9f1fc;
+}
+
+/*零售*/
+#depotHeadFM .retail-amount tr td{
+	padding: 5px;
+}
+
+#depotHeadFM .retail-amount tr td input{
+	width: 225px;
+	height: 30px;
+	line-height: 30px;
+	font-size: 24px;
+	border-color: #878787;
+	border-style: solid;
+	border-top-width: 0px;
+	border-right-width: 0px;
+	border-bottom-width: 1px;
+	border-left-width: 0px
+}
+
+#depotHeadFM .retail-amount .change-amount{
+	color:purple;
+}
+
+#depotHeadFM .retail-amount .get-amount{
+	color:red;
+}
+
+#depotHeadFM .retail-amount .back-amount{
+	color: green;
+	text-align: right;
+}
+
+#depotHeadDlgShow .retail-amount-show tr td{
+	padding: 5px;
+}
+
+#depotHeadDlgShow .retail-amount-show .change-amount-show{
+	color:purple;
+	font-size: 24px;
+}
+
+#depotHeadDlgShow .retail-amount-show .get-amount-show{
+	color:red;
+	font-size: 24px;
+}
+
+#depotHeadDlgShow .retail-amount-show .back-amount-show{
+	color: green;
+	text-align: right;
+	font-size: 24px;
+}
+
+/*计量单位*/
+#depotHeadFM .unit-list {
+	width:68px;
+	float:left;
+	position:absolute;
+	border:1px solid #95B8E7;
+}
+
+#depotHeadFM .unit-list ul{
+	padding: 0px;
+	margin: 0px;
+	background-color: #fff;
+}
+
+#depotHeadFM .unit-list ul li{
+	list-style: none;
+	padding: 3px;
+}
+
+#depotHeadFM .unit-list ul li:hover{
+	background-color: #e9f1fc;
+}
+
+#depotHeadDlg .org-list{
+	float: left;
+	width:135px;
+}
+
+#depotHeadDlg .add-org-btn{
+	float: left;
+	width:30px;
+	padding: 2px;
+}

src/main/webapp/css/material.css

@@ -0,0 +1,11 @@
+.first-select-unit{
+	display: none;
+}
+
+.price-list {
+	display: none;
+}
+
+.price-list input{
+	width: 120px;
+}

src/main/webapp/js/HoorayOS_mini/js/templates.js

@@ -38,7 +38,7 @@ var windowTemp = template(
 					'<a class="ha-revert" btn="revert" href="javascript:;" title="还原" <% if(!isopenmax){ %>style="display:none"<% } %>><b class="revert-b"></b><b class="revert-t"></b></a>'+
 				'<% } %>'+
 				'<% if(istitlebarFullscreen){ %>'+
-					'<a class="ha-fullscreen" btn="fullscreen" href="javascript:;" title="全屏">+</a>'+
+					'<a class="ha-fullscreen" btn="fullscreen" href="javascript:;" title="全屏" style="display: none;">+</a>'+
 				'<% } %>'+
 				'<a class="ha-close" btn="close" href="javascript:;" title="关闭">×</a>'+
 			'</div>'+

src/main/webapp/js/common/common.js

@@ -84,6 +84,29 @@ function getUrlParam(name) {
     if (r != null) return unescape(r[2]); return null; //返回参数值
 }
 
+/**
+ * 获取按钮的权限
+ */
+function getBtnStr() {
+	var funId = window.parent.window.funId; //功能id
+	var btnStrList = window.parent.window.winBtnStrList; //按钮功能列表 JSON字符串
+	var btnEnableList =""; //按钮列表
+	if(funId && btnStrList) {
+		btnStrList = JSON.parse(btnStrList);
+		for(var i=0; i<btnStrList.length; i++){
+			if(btnStrList[i].funId ==funId){
+				if(btnStrList[i].btnStr) {
+					btnEnableList = btnEnableList + btnStrList[i].btnStr + ",";
+				}
+			}
+		}
+		if(btnEnableList) {
+			btnEnableList = btnEnableList.substring(0,btnEnableList.length-1);
+		}
+	}
+	return btnEnableList;
+}
+
 /**
  * js获取当前时间， 格式“yyyy-MM-dd HH:MM:SS”
  */
@@ -93,15 +116,27 @@ function getNowFormatDateTime() {
 	var seperator2 = ":";
 	var month = date.getMonth() + 1;
 	var strDate = date.getDate();
+	var strHours = date.getHours();
+	var strMinutes = date.getMinutes();
+	var strSeconds = date.getSeconds();
 	if (month >= 1 && month <= 9) {
 		month = "0" + month;
 	}
 	if (strDate >= 0 && strDate <= 9) {
 		strDate = "0" + strDate;
 	}
+	if (strHours >= 0 && strHours <= 9) {
+		strHours = "0" + strHours;
+	}
+	if (strMinutes >= 0 && strMinutes <= 9) {
+		strMinutes = "0" + strMinutes;
+	}
+	if (strSeconds >= 0 && strSeconds <= 9) {
+		strSeconds = "0" + strSeconds;
+	}
 	var currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate
-		+ " " + date.getHours() + seperator2 + date.getMinutes()
-		+ seperator2 + date.getSeconds();
+		+ " " + strHours + seperator2 + strMinutes
+		+ seperator2 + strSeconds;
 	return currentdate;
 }
 
@@ -138,6 +173,23 @@ function getNowFormatDate() {
 	return currentdate;
 }
 
+/**
+ * js获取当前时间， 格式“yyyyMMdd”
+ */
+function getNowFormatDateTwo() {
+	var date = new Date();
+	var month = date.getMonth() + 1;
+	var strDate = date.getDate();
+	if (month >= 1 && month <= 9) {
+		month = "0" + month;
+	}
+	if (strDate >= 0 && strDate <= 9) {
+		strDate = "0" + strDate;
+	}
+	var currentdate = date.getFullYear() + month + strDate;
+	return currentdate;
+}
+
 /**
  * js根据时间生成编号， 格式“yyyyMMddHHMMSS”
  */
@@ -157,3 +209,7 @@ function getNowFormatDateNum() {
 		+ date.getMinutes() + date.getSeconds();
 	return currentdate;
 }
+
+function encode(name){
+	return encodeURI(encodeURI(name));
+}

src/main/webapp/js/easyui-1.3.5/outlook.js

@@ -171,9 +171,9 @@ function tabCloseEven() {
         return false;
     });
 
-    //退出
-    $("#mm-exit").click(function () {
-        $('#mm').menu('hide');
+    //显示版权信息
+    $("#mm-version").click(function () {
+        window.open("https://gitee.com/jishenghua/JSH_ERP");
     })
 }
 

src/main/webapp/js/easyui-1.3.5/themes/icon.css

@@ -55,8 +55,6 @@
 .icon-filter{
 	background:url('icons/filter.png') no-repeat center center;
 }
-
-
 .icon-mini-add{
 	background:url('icons/mini_add.png') no-repeat center center;
 }
@@ -93,3 +91,9 @@
 .icon-excel{
 	background:url('icons/receipt-excel.png') no-repeat center center;
 }
+.icon-excel-new{
+	background:url('icons/excel1.png') no-repeat center center;
+}
+.icon-page-excel{
+	background:url('icons/page_excel.png') no-repeat center center;
+}

src/main/webapp/js/pages/financial/financial_base.js

@@ -222,13 +222,7 @@
 			pageList: initPageNum,
 			columns:[[
 				{ field: 'Id',width:35,align:"center",checkbox:true},
-			  {field: 'OrganId',width:5, hidden:true},
-	          { title: '单据编号',field: 'BillNo',width:140},
-	          { title: '单据时间 ',field: 'BillTime',width:100},
-	          { title: '合计',field: 'TotalPrice',width:80},
-	          { title: '备注',field: 'Remark',width:100},
-	          { title: '操作',field: 'op',align:"center",width:180,formatter:function(value,rec)
-	         	{
+				{ title: '操作',field: 'op',align:"center",width:90,formatter:function(value,rec) {
 						var str = '';
 						var rowInfo = rec.Id + 'AaBb' + rec.BillNo+ 'AaBb' + rec.BillTime+ 'AaBb' + rec.Remark
 							+ 'AaBb' + rec.AccountId+ 'AaBb' + rec.AccountName + 'AaBb' + rec.OrganId + 'AaBb' + rec.OrganName
@@ -236,13 +230,18 @@
 						if(1 == value)
 						{
 							var orgId =  rec.OrganId ?  rec.OrganId : 0;
-						str += '<a onclick="showAccountHead(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)"><span class="action-show">查看</span></a>';
-						str += '<a onclick="editAccountHead(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)"><span class="action-edit">编辑</span></a>';
-						str += '<a onclick="deleteAccountHead('+ rec.Id  +',' + orgId +',' + rec.TotalPrice +');" style="text-decoration:none;color:black;" href="javascript:void(0)"><span class="action-delete">删除</span></a>';
+							str += '<img title="查看" src=' + path + '"/js/easyui-1.3.5/themes/icons/list.png" style="cursor: pointer;" onclick="showAccountHead(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
+							str += '<img title="编辑" src=' + path + '"/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editAccountHead(\'' + rowInfo + '\''+',' + rec.Status + ');"/>&nbsp;&nbsp;&nbsp;';
+							str += '<img title="删除" src=' + path + '"/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteAccountHead('+ rec.Id +',' + orgId +',' + rec.TotalPrice + ');"/>';
 						}
 						return str;
 					}
-	          }
+				},
+				{ field: 'OrganId',width:5, hidden:true},
+				{ title: '单据编号',field: 'BillNo',width:140},
+				{ title: '单据时间 ',field: 'BillTime',width:100},
+				{ title: '合计',field: 'TotalPrice',width:80},
+				{ title: '备注',field: 'Remark',width:100}
 			]],
 			toolbar:[
 				{

src/main/webapp/js/pages/manage/pushBtn.json

@@ -0,0 +1,22 @@
+[
+  {
+    "id": 1,
+    "text": "导入导出"
+  },
+  {
+    "id": 2,
+    "text": "启用禁用"
+  },
+  {
+    "id": 3,
+    "text": "审核反审核"
+  },
+  {
+    "id": 4,
+    "text": "打印"
+  },
+  {
+    "id": 5,
+    "text": "作废"
+  }
+]

src/main/webapp/js/pages/manage/supplier.js

@@ -0,0 +1,746 @@
+    //初始化界面
+    $(function() {
+        var listTitle = ""; //单据标题
+        var listType = ""; //类型
+        var listTypeEn = ""; //英文类型
+        getType();
+        getPersonList(); //获取业务员
+        initTableData();
+        ininPager();
+        bindEvent();
+    });
+
+    //根据名称获取类型
+    function getType(){
+        listTitle = $("#tablePanel").prev().text();
+        if(listTitle === "供应商信息列表"){
+            listType = "供应商";
+            listTypeEn = "Vendor";
+        }
+        else if(listTitle === "客户信息列表"){
+            listType = "客户";
+            listTypeEn = "Customer";
+        }
+        else if(listTitle === "会员信息列表"){
+            listType = "会员";
+            listTypeEn = "Member";
+        }
+    }
+
+    //获取业务员
+    function getPersonList(){
+        $.ajax({
+            type:"post",
+            url: path + "/person/getBasicData.action",
+            dataType: "json",
+            success: function (systemInfo)
+            {
+                var msgTip = systemInfo.showModel.msgTip;
+                if(msgTip !== "exceptoin"){
+                    var personList = systemInfo.showModel.map.personList;
+                    var personID,options;
+                    if(personList !=null)
+                    {
+                        for(var i = 0 ;i < personList.length;i++)
+                        {
+                            var person = personList[i];
+                            if(0 == i)
+                            {
+                                personID = person.id;
+                            }
+                            if(person.type=="仓管员")
+                            {
+                                options += '<option value="' + person.id + '">' + person.name + '</option>';
+                            }
+                        }
+                        $("#personId").empty().append('<option>不关联业务员</option>').append(options);
+                    }
+                }
+                else {
+                    $.messager.alert('提示','查找系统基础信息异常,请与管理员联系！','error');
+                    return;
+                }
+            }
+        });
+    }
+
+    //初始化表格数据
+    function initTableData() {
+        //改变宽度和高度
+        $("#searchPanel").panel({width:webW-2});
+        $("#tablePanel").panel({width:webW-2});
+        $('#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,
+            //交替出现背景
+            striped : true,
+            pagination: true,
+            //自动截取数据
+            //nowrap : true,
+            //loadFilter: pagerFilter,
+            pageSize: initPageSize,
+            pageList: initPageNum,
+            columns:[[
+                { field: 'id',width:35,align:"center",checkbox:true},
+                { title: '操作',field: 'op',align:"center",width:60,formatter:function(value,rec)
+                    {
+                        var str = '';
+                        var rowInfo = rec.id + 'AaBb' + rec.supplier +'AaBb' + rec.contacts + 'AaBb'+ rec.phonenum + 'AaBb'+ rec.email + 'AaBb'+ rec.BeginNeedGet + 'AaBb'+ rec.BeginNeedPay + 'AaBb' + rec.isystem + 'AaBb' + rec.description+ 'AaBb' + rec.type
+                            + 'AaBb' + rec.fax + 'AaBb' + rec.telephone + 'AaBb' + rec.address + 'AaBb' + rec.taxNum + 'AaBb' + rec.bankName + 'AaBb' + rec.accountNumber + 'AaBb' + rec.taxRate;
+                        if(1 == value)
+                        {
+                            str += '<img title="编辑" src="' + path + '/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editSupplier(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
+                            str += '<img title="删除" src="' + path + '/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteSupplier(\'' + rowInfo + '\');"/>';
+                        }
+                        return str;
+                    }
+                },
+                { title: '名称',field: 'supplier',width:150},
+                { title: '联系人', field: 'contacts',width:50,align:"center"},
+                { title: '手机号码', field: 'telephone',width:100,align:"center"},
+                { title: '电子邮箱',field: 'email',width:80,align:"center"},
+                { title: '联系电话', field: 'phonenum',width:100,align:"center"},
+                { title: '传真', field: 'fax',width:100,align:"center"},
+                { title: '预付款',field: 'AdvanceIn',width:70,align:"center"},
+                { title: '期初应收',field: 'BeginNeedGet',width:70,align:"center"},
+                { title: '期初应付',field: 'BeginNeedPay',width:70,align:"center"},
+                { title: '税率', field: 'taxRate',width:50,align:"center"},
+                { title: '状态',field: 'enabled',width:70,align:"center",formatter:function(value){
+                    return value? "启用":"禁用";
+                }}
+            ]],
+            toolbar:[
+                {
+                    id:'addSupplier',
+                    text:'增加',
+                    iconCls:'icon-add',
+                    handler:function() {
+                        addSuppler();
+                    }
+                },'-',
+                {
+                    id:'deleteSupplier',
+                    text:'删除',
+                    iconCls:'icon-remove',
+                    handler:function() {
+                        batDeleteSupplier();
+                    }
+                },'-',
+                {
+                    id:'setEnable',
+                    text:'启用',
+                    iconCls:'icon-ok',
+                    handler:function() {
+                        setEnableFun();
+                    }
+                },'-',
+                {
+                    id:'setDisEnable',
+                    text:'禁用',
+                    iconCls:'icon-no',
+                    handler:function() {
+                        setDisEnableFun();
+                    }
+                },'-',
+                {
+                    id:'setInput',
+                    text:'导入',
+                    iconCls:'icon-excel',
+                    handler:function() {
+                        setInputFun();
+                    }
+                },'-',
+                {
+                    id:'setOutput',
+                    text:'导出',
+                    iconCls:'icon-excel',
+                    handler:function() {
+                        setOutputFun();
+                    }
+                }
+            ],
+            onLoadError:function()
+            {
+                $.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
+                return;
+            }
+        });
+    }
+
+
+    //分页信息处理
+    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
+                        });
+                    showSupplierDetails(pageNum,pageSize);
+                }
+            });
+        }
+        catch (e)
+        {
+            $.messager.alert('异常处理提示',"分页信息异常 :  " + e.name + ": " + e.message,'error');
+        }
+    }
+
+    //删除信息
+    function deleteSupplier(supplierInfo) {
+        $.messager.confirm('删除确认','确定要删除此条信息吗？',function(r)
+        {
+            if (r)
+            {
+                var supplierTotalInfo = supplierInfo.split("AaBb");
+                $.ajax({
+                    type:"post",
+                    url: path + "/supplier/delete.action",
+                    dataType: "json",
+                    data: ({
+                        supplierID : supplierTotalInfo[0],
+                        supplier:supplierTotalInfo[1],
+                        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 batDeleteSupplier() {
+        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;
+                        }
+                        ids += row[i].id + ",";
+                    }
+                    $.ajax({
+                        type:"post",
+                        url: path + "/supplier/batchDelete.action",
+                        dataType: "json",
+                        async :  false,
+                        data: ({
+                            supplierIDs : 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;
+                        }
+                    });
+                }
+            });
+        }
+    }
+
+    //批量启用
+    function setEnableFun() {
+        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;
+                        }
+                        ids += row[i].id + ",";
+                    }
+                    $.ajax({
+                        type:"post",
+                        url: path + "/supplier/batchSetEnable.action",
+                        dataType: "json",
+                        async :  false,
+                        data: ({
+                            enabled: true,
+                            supplierIDs : 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;
+                        }
+                    });
+                }
+            });
+        }
+    }
+
+    //批量禁用
+    function setDisEnableFun() {
+        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;
+                        }
+                        ids += row[i].id + ",";
+                    }
+                    $.ajax({
+                        type:"post",
+                        url: path + "/supplier/batchSetEnable.action",
+                        dataType: "json",
+                        async :  false,
+                        data: ({
+                            enabled: false,
+                            supplierIDs : 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;
+                        }
+                    });
+                }
+            });
+        }
+    }
+
+    //导入数据
+    function setInputFun(){
+        //IE下不允许编辑 input=file的值  解决思路：重新克隆input=file，把这个input元素复制一个，然后将原来的删除。
+        //在IE下复制元素的时候，其中的值是不会被复制的，所以就达到了清空文件域的目的了。
+        //而在Firefox下，其中的值也会被一同复制，清空一下就做到兼容
+        var fileUploadInput = $("#supplierFile");
+        fileUploadInput.after(fileUploadInput.clone().val(""));
+        fileUploadInput.remove();
+        $("#isCheck").val(1);
+        $('#importExcelDlg').dialog('open').dialog('setTitle','导入' + listType + '信息');
+        $(".window-mask").css({ width: webW-20 ,height: webH});
+        $("#supplierFile").focus();
+    }
+
+    //导出数据
+    function setOutputFun(){
+        window.location.href = path + "/supplier/exportExcel.action?browserType=" + getOs() + "&type=" + listTypeEn;
+    }
+
+    //增加单位
+    var url;
+    var supplierID = 0;
+    //保存编辑前的名称
+    var orgSupplier = "";
+
+    function addSuppler() {
+        $('#supplierDlg').dialog('open').dialog('setTitle','<img src="' + path + '/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加'+listType+"信息");
+        $(".window-mask").css({ width: webW ,height: webH});
+        $("#supplier").focus();
+        $('#supplierFM').form('clear');
+        orgSupplier = "";
+        supplierID = 0;
+        url = path + '/supplier/create.action';
+    }
+
+    function bindEvent(){
+        //导入excel对话框
+        $('#importExcelDlg').dialog({
+            width: 400,
+            closed: true,
+            cache: false,
+            modal: true,
+            collapsible:false,
+            closable: true,
+            buttons:'#dlg-buttons5'
+        });
+        //导入excel表格
+        $("#saveimport").unbind().bind({
+            click:function()
+            {
+                if($("#supplierFile").val().length == 0)
+                {
+                    $.messager.alert('提示','请选择文件！','info');
+                    return;
+                }
+                $("#importExcelFM").submit();
+                $('#importExcelDlg').dialog('close');
+
+                $.messager.progress({
+                    title:'请稍候',
+                    msg:'数据处理ing...'
+                });
+                setTimeout(function(){
+                    $.messager.progress('close');
+                    var opts = $("#tableData").datagrid('options');
+                    showSupplierDetails(opts.pageNumber,opts.pageSize);
+                },3300);
+            }
+        });
+        //保存信息
+        $("#saveSupplier").off("click").on("click",function() {
+            if(!$('#supplierFM').form('validate')){
+                return;
+            }
+            else if(checkSupplierName()){
+                return;
+            }
+            var reg = /^([0-9])+$/;
+            var phonenum = $.trim($("#phonenum").val());
+            if(phonenum.length>0 && !reg.test(phonenum)) {
+                $.messager.alert('提示','电话号码只能是数字','info');
+                $("#phonenum").val("").focus();
+                return;
+            }
+            var beginNeedGet = $.trim($("#BeginNeedGet").val());
+            var beginNeedPay = $.trim($("#BeginNeedPay").val());
+            if(beginNeedGet && beginNeedPay) {
+                $.messager.alert('提示','期初应收和期初应付不能同时输入','info');
+                return;
+            }
+
+            $.ajax({
+                url: url,
+                type:"post",
+                dataType: "json",
+                data:{
+                    supplier:$("#supplier").val(),
+                    type: listType,
+                    contacts:$("#contacts").val(),
+                    phonenum:$("#phonenum").val(),
+                    telephone:$("#telephone").val(),
+                    email:$("#email").val(),
+                    address:$("#address").val(),
+                    fax:$("#fax").val(),
+                    BeginNeedGet:$("#BeginNeedGet").val(),
+                    BeginNeedPay:$("#BeginNeedPay").val(),
+                    taxNum:$("#taxNum").val(),
+                    taxRate:$("#taxRate").val(),
+                    bankName:$("#bankName").val(),
+                    accountNumber:$("#accountNumber").val(),
+                    description:$("#description").val(),
+                    enabled:1,
+                    clientIp: clientIp
+                },
+                success: function(res) {
+                    if (res) {
+                        $('#supplierDlg').dialog('close');
+                        var opts = $("#tableData").datagrid('options');
+                        showSupplierDetails(opts.pageNumber,opts.pageSize);
+                    }
+                }
+            });
+        });
+
+        //初始化键盘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键盘事件
+            if(k == "13"&&(obj.id=="supplier" || obj.id=="contacts"|| obj.id=="phonenum"
+                || obj.id=="email" || obj.id=="description" ))
+            {
+                $("#saveSupplier").click();
+            }
+
+            //搜索按钮添加快捷键
+            if(k == "13"&&(obj.id=="searchSupplier" || obj.id=="searchContacts"|| obj.id=="searchPhonenum"
+                || obj.id=="searchEmail" || obj.id=="searchDesc" ))
+            {
+                $("#searchBtn").click();
+            }
+        });
+
+        //搜索处理
+        $("#searchBtn").unbind().bind({
+            click:function()
+            {
+                showSupplierDetails(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
+                    });
+            }
+        });
+
+        $("#searchBtn").click();
+
+        //重置按钮
+        $("#searchResetBtn").unbind().bind({
+            click:function(){
+                $("#searchSupplier").val("");
+                $("#searchType").val("");
+                $("#searchPhonenum").val("");
+                $("#searchTelephone").val("");
+                $("#searchDesc").val("");
+
+                //加载完以后重新初始化
+                $("#searchBtn").click();
+            }
+        });
+
+    }
+
+
+    //编辑信息
+    function editSupplier(supplierTotalInfo) {
+        var supplierInfo = supplierTotalInfo.split("AaBb");
+        var row = {
+            supplier : supplierInfo[1],
+            contacts : supplierInfo[2].replace("undefined",""),
+            phonenum : supplierInfo[3].replace("undefined",""),
+            email : supplierInfo[4].replace("undefined",""),
+            BeginNeedGet : supplierInfo[5],
+            BeginNeedPay : supplierInfo[6],
+            description : supplierInfo[8].replace("undefined",""),
+            type : supplierInfo[9],
+            fax : supplierInfo[10].replace("undefined",""),
+            telephone : supplierInfo[11].replace("undefined",""),
+            address : supplierInfo[12].replace("undefined",""),
+            taxNum : supplierInfo[13].replace("undefined",""),
+            bankName : supplierInfo[14].replace("undefined",""),
+            accountNumber : supplierInfo[15].replace("undefined",""),
+            taxRate : supplierInfo[16].replace("undefined",""),
+            clientIp: clientIp
+        };
+        orgSupplier = supplierInfo[1];
+        $('#supplierDlg').dialog('open').dialog('setTitle','<img src="' + path + '/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑'+listType +"信息");
+        $(".window-mask").css({ width: webW ,height: webH});
+        $('#supplierFM').form('load',row);
+        supplierID = supplierInfo[0];
+        //焦点在名称输入框==定焦在输入文字后面
+        $("#supplier").val("").focus().val(supplierInfo[1]);
+        url = path + '/supplier/update.action?supplierID=' + supplierInfo[0];
+
+        //显示累计应收和累计应付
+        $.ajax({
+            type:"post",
+            url: path + "/depotHead/findTotalPay.action",
+            dataType: "json",
+            async:  false,
+            data: ({
+                supplierId: supplierInfo[0]
+            }),
+            success: function(res){
+                if(res) {
+                    var moneyA = res.getAllMoney.toFixed(2)-0;
+                    $.ajax({
+                        type:"post",
+                        url: path +"/accountHead/findTotalPay.action",
+                        dataType: "json",
+                        async:  false,
+                        data: ({
+                            supplierId: supplierInfo[0]
+                        }),
+                        success: function(res){
+                            if(res) {
+                                var moneyB = res.getAllMoney.toFixed(2)-0;
+                                var money = moneyA+moneyB;
+                                var moneyBeginNeedGet = $("#BeginNeedGet").val()-0; //期初应收
+                                var moneyBeginNeedPay = $("#BeginNeedPay").val()-0; //期初应付
+                                money = money + moneyBeginNeedPay - moneyBeginNeedGet;
+                                if(money>0) {
+                                    $("#AllNeedPay").val(money); //累计应付
+                                }
+                                else {
+                                    $("#AllNeedGet").val(-money);  //累计应收
+                                }
+                            }
+                        },
+                        error: function(){
+                            $.messager.alert('提示','网络异常请稍后再试！','error');
+                            return;
+                        }
+                    });
+                }
+            },
+            error: function(){
+                $.messager.alert('提示','网络异常请稍后再试！','error');
+                return;
+            }
+        })
+    }
+
+
+    //检查单位名称是否存在 ++ 重名无法提示问题需要跟进
+    function checkSupplierName() {
+        var supplierName = $.trim($("#supplier").val());
+        //表示是否存在 true == 存在 false = 不存在
+        var flag = false;
+        //开始ajax名称检验，不能重名
+        if(supplierName.length > 0 &&( orgSupplier.length ==0 || supplierName != orgSupplier))
+        {
+            $.ajax({
+                type:"post",
+                url: path + "/supplier/checkIsNameExist.action",
+                dataType: "json",
+                async :  false,
+                data: ({
+                    supplierID : supplierID,
+                    supplier : supplierName
+                }),
+                success: function (tipInfo)
+                {
+                    flag = tipInfo;
+                    if(tipInfo)
+                    {
+                        $.messager.alert('提示','单位名称已经存在','info');
+                        return;
+                    }
+                },
+                //此处添加错误处理
+                error:function()
+                {
+                    $.messager.alert('提示','检查单位名称是否存在异常，请稍后再试！','error');
+                    return;
+                }
+            });
+        }
+        return flag;
+    }
+
+
+    function showSupplierDetails(pageNo,pageSize) {
+        $.ajax({
+            type:"post",
+            url: path + "/supplier/findBy.action",
+            dataType: "json",
+            data: ({
+                supplier:$.trim($("#searchSupplier").val()),
+                type: listType,
+                phonenum:$.trim($("#searchPhonenum").val()),
+                telephone:$.trim($("#searchTelephone").val()),
+                description:$.trim($("#searchDesc").val()),
+                pageNo:pageNo,
+                pageSize:pageSize
+            }),
+            success: function (data)
+            {
+                $("#tableData").datagrid('loadData',data);
+                //$('#tableData').datagrid('reload');
+            },
+            //此处添加错误处理
+            error:function()
+            {
+                $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
+                return;
+            }
+        });
+    }
+

src/main/webapp/pages/common/menu.jsp

@@ -20,7 +20,8 @@
 		<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/outlook.js"></script>
 		<script type="text/javascript" src="<%=path %>/js/common/common.js"></script>
     <script type="text/javascript">
-        function NewTab(name, url) {
+        function NewTab(name, url, funId) {
+			window.funId = funId;
             addTab(name, url, '');
         }
     </script>
@@ -39,6 +40,7 @@ var kid=null;
 var lei=null;
 var last="";
 var functions="";
+var btnStrList = []; //按钮权限列表
 
 //初始化界面
 $(function()
@@ -86,26 +88,31 @@ function initSystemData(kid,type)
 	
 }
 //初始化页面选项卡
-function initSelectInfo(lei)
-{
-	
-	if(userBusinessList !=null)
-	{
-		if(userBusinessList.length>0)
-		{
+function initSelectInfo(lei) {
+	if(userBusinessList !=null) {
+		if(userBusinessList.length>0) {
 			options =userBusinessList[0].value;
-			if(options!="")
-			{
+			if(options!="") {
 				options=options.substring(1,options.length-1);
 			}
-			if(lei==1)
-			{
+			//app内列表赋值
+			if(lei==1) {
 				last+=options+'][';
 			}
-			else if(lei==2)
-			{
+			//功能菜单列表
+			else if(lei==2) {
 				functions+=options+'][';
 			}
+			//按钮权限列表
+			else if(lei==3) {
+				var btnStr =userBusinessList[0].btnStr;
+				if(btnStr!=null){
+					btnStr = JSON.parse(btnStr);
+					for(var j=0; j<btnStr.length; j++){
+						btnStrList.push(btnStr[j]);
+					}
+				}
+			}
 		}
 	}
 }
@@ -115,12 +122,12 @@ function initSelect()
 {
 	var arr = options.split('][');
 	for(var i in arr){
-	     
 		initSystemData(arr[i],'RoleAPP'); //根据角色找app
-	     initSelectInfo(1);
+		initSelectInfo(1);//app内列表赋值
 
 		initSystemData(arr[i],'RoleFunctions'); //根据角色找functions
-	     initSelectInfo(2);
+		initSelectInfo(2); //功能菜单列表
+		initSelectInfo(3); //查询角色对应的按钮权限
 	}
 	if(last!="")
 	{
@@ -140,14 +147,15 @@ function initSelect()
 			$("div").remove();
 			$("<div style='width:100%;text-align:center;padding-top:20px'><b>抱歉，您没有该权限！</b></div>").appendTo("body");
 		}
-		  
 	}
 	if(functions!="")
 	{
 		functions="["+functions.substring(0,functions.length-1);
 		//alert(functions);
 	}
-	  
+	if(btnStrList.length>0){
+		window.winBtnStrList = JSON.stringify(btnStrList); //将按钮功能列表存为全局变量
+	}
 }
 
 //测试自定义hql
@@ -238,8 +246,8 @@ function ceshi()
         </div>
         <div class="menu-sep">
         </div>
-        <div id="mm-exit">
-                     退出
+        <div id="mm-version">
+                     jshERP官网
         </div>
     </div>
 </body>

src/main/webapp/pages/manage/customer.jsp

@@ -0,0 +1,185 @@
+<%@page import="com.jsh.util.Tools"%>
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
+<%
+	String path = request.getContextPath();
+	String clientIp = Tools.getCurrentUserIP();
+%>
+<!DOCTYPE html>
+<html>
+  	<head>
+    	<title>客户信息</title>
+    	<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 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/jquery-1.8.0.min.js"></script>
+		<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>
+		<script src="<%=path %>/js/pages/manage/supplier.js"></script>
+		<script>
+			var kid = ${sessionScope.user.id};
+			var path = "<%=path%>";
+			var clientIp = "<%=clientIp%>";
+		</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>名&nbsp;&nbsp;&nbsp;&nbsp;称：</td>
+					<td>
+						<input type="text" name="searchSupplier" id="searchSupplier"  style="width:100px;"/>
+					</td>
+					<td>&nbsp;</td>
+					<td>手机号码：</td>
+					<td>
+						<input type="text" name="searchTelephone" id="searchTelephone"  style="width:100px;"/>
+					</td>
+					<td>&nbsp;</td>
+					<td>联系电话：</td>
+					<td>
+						<input type="text" name="searchPhonenum" id="searchPhonenum"  style="width:100px;"/>
+					</td>
+					<td>&nbsp;</td>
+					<td id="searchDescLabel">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注：</td>
+					<td>
+						<input type="text" name="searchDesc" id="searchDesc"  style="width:100px;"/>
+					</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="supplierDlg" class="easyui-dialog" style="width:580px;padding:10px 20px"
+	            closed="true" buttons="#dlg-buttons" modal="true" collapsible="false" closable="true">
+			<form id="supplierFM">
+				<table>
+					<tr>
+						<td style="width: 80px;height: 20px">名称</td>
+						<td style="width: 180px;padding:1px">
+							<input name="supplier" id="supplier" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 160px;height: 20px"/>
+						</td>
+						<td style="width: 60px;height: 20px">联系人</td>
+						<td style="width:180px;padding:1px;">
+							<input name="contacts" id="contacts" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>手机号码</td>
+						<td style="padding:1px;">
+							<input name="telephone" id="telephone" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+						<td>电子邮箱</td>
+						<td style="padding:1px">
+							<input name="email" id="email" class="easyui-validatebox" validType="email" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>联系电话</td>
+						<td style="padding:1px;">
+							<input name="phonenum" id="phonenum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+						<td>传真</td>
+						<td style="padding:1px">
+							<input name="fax" id="fax" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>期初应收</td>
+						<td style="padding:1px">
+							<input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
+						</td>
+						<td>期初应付</td>
+						<td style="padding:1px">
+							<input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
+						</td>
+					</tr>
+					<tr>
+						<td>累计应收</td>
+						<td style="padding:1px">
+							<input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
+						</td>
+						<td>累计应付</td>
+						<td style="padding:1px">
+							<input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
+						</td>
+					</tr>
+					<tr>
+						<td>纳税人识别号</td>
+						<td style="padding:1px">
+							<input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+						<td>税率</td>
+						<td style="padding:1px">
+							<input name="taxRate" id="taxRate" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>开户行</td>
+						<td style="padding:1px">
+							<input name="bankName" id="bankName" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+						<td>账号</td>
+						<td style="padding:1px">
+							<input name="accountNumber" id="accountNumber" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>地址</td>
+						<td style="padding:1px" colspan="3">
+							<input name="address" id="address" class="easyui-validatebox" style="width: 408px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>备注</td>
+						<td style="padding:1px" colspan="3">
+							<textarea name="description" id="description" rows="2" cols="2" style="width: 408px;"></textarea>
+						</td>
+					</tr>
+				</table>
+			</form>
+	    </div>
+	    <div id="dlg-buttons">
+	        <a href="javascript:void(0)" id="saveSupplier" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+	        <a href="javascript:void(0)" id="cancelSupplier" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#supplierDlg').dialog('close')">取消</a>
+	    </div>
+
+		<!-- 导入excel表格 -->
+		<div id="importExcelDlg" style="padding:10px 20px">
+			<form id="importExcelFM" method="post" enctype="multipart/form-data" action="<%=path%>/supplier/importExcelCustomer.action">
+				<div class="fitem" style="padding:5px">
+					<label>文件名称&nbsp;&nbsp;</label>
+					<input name="supplierFile" id="supplierFile" type="file" style="width: 230px;height: 20px"/>
+				</div>
+				<div class="fitem" style="padding:5px">
+					<label><b>导入注意</b>&nbsp;&nbsp;</label><span>（预收款、期初应收、期初应付、税率均为数值且要大于0；另外期初应收、期初应付不能同时输入）</span>
+				</div>
+				<div class="fitem" style="padding:5px;display: none;">
+					<label>是否审查&nbsp;&nbsp;</label>
+					<select id ="isCheck" name="isCheck" style="width: 230px;height: 20px">
+						<option value="0">是</option>
+						<option value="1" selected="selected">否</option>
+					</select>
+				</div>
+				<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
+				<div id="dlg-buttons5">
+					<a href="javascript:void(0)" id="saveimport" class="easyui-linkbutton" iconCls="icon-ok">导入</a>
+					<a href="javascript:void(0)" id="cancelimport" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#importExcelDlg').dialog('close')">取消</a>
+				</div>
+			</form>
+		</div>
+	</body>
+</html>

src/main/webapp/pages/manage/depot.jsp

@@ -2,13 +2,12 @@
 <%@ 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>
+    	<title>仓库管理</title>
         <meta charset="utf-8">
 		<!-- 指定以IE8的方式来渲染 -->
 		<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
@@ -28,17 +27,14 @@
 				<tr>
 					<td>仓库名称：</td>
 					<td>
-						<input type="text" name="searchName" id="searchName"  style="width:150px;"/>
+						<input type="text" name="searchName" id="searchName"  style="width:100px;"/>
 					</td>
 					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-					<td id="searchRemarkLabel">描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述：</td>
+					<td id="searchRemarkLabel">描述：</td>
 					<td>
-						<input type="text" name="searchRemark" id="searchRemark"  style="width:150px;"/>
+						<input type="text" name="searchRemark" id="searchRemark"  style="width:100px;"/>
 					</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>
@@ -57,16 +53,40 @@
 	        <form id="depotFM" method="post"  novalidate>
 	            <table>
 	            <tr>
-	            <td><label id="nameLabel">仓库名称&nbsp;&nbsp;</label></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>
+					<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><label id="sortLabel">排&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;序&nbsp;&nbsp;</label></td>
-	            <td style="padding:5px"><input name="sort" id="sort" class="easyui-textbox" style="width: 230px;height: 20px"/></td>
+					<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"/>
+					</td>
 				</tr>
 				<tr>
-	            <td><label id="remarkLabel">描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;&nbsp;</label></td>
-	            <td style="padding:5px"><textarea name="remark" id="remark" rows="2" cols="2" style="width: 230px;"></textarea></td>
+					<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
+					</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;元
+					</td>
+				</tr>
+	            <tr>
+					<td>排序</td>
+					<td style="padding:5px">
+						<input name="sort" id="sort" class="easyui-textbox" style="width: 230px;height: 20px"/>
+					</td>
+	            </tr>
+	            <tr>
+					<td>描述</td>
+					<td style="padding:5px">
+						<textarea name="remark" id="remark" rows="2" cols="2" style="width: 230px;"></textarea>
+					</td>
 	            </tr>
 	            </table>
 	            <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
@@ -84,28 +104,8 @@
 				initTableData();
 				ininPager();
 				initForm();
-				browserFit();	
 			});
 			
-			//浏览器适配
-			function browserFit()
-			{
-				if(getOs()=='MSIE')
-				{
-					$("#searchRemarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述：");
-					$("#nameLabel").empty().append("仓库名称&nbsp;&nbsp;");
-					$("#sortLabel").empty().append("排&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;序&nbsp;&nbsp;");
-					$("#remarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;&nbsp;");
-				}
-				else
-				{
-					$("#searchRemarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;述：");
-					$("#nameLabel").empty().append("仓库名称&nbsp;");
-					$("#sortLabel").empty().append("排&nbsp;&nbsp;&nbsp;&nbsp;序&nbsp;");
-					$("#remarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;");
-				}
-			}
-			
 			//防止表单提交重复
 			function initForm()
 			{
@@ -117,8 +117,7 @@
 			}
 			
 			//初始化表格数据
-			function initTableData()
-			{
+			function initTableData() {
 				$('#tableData').datagrid({
 					//title:'仓库列表',
 					//iconCls:'icon-save',
@@ -144,44 +143,45 @@
 					pageList: initPageNum,
 					columns:[[
 						{ field: 'id',width:35,align:"center",checkbox:true},
-			          { title: '仓库名称',field: 'name',width:200},
-			          { title: '排序',field: 'sort',width:200},
-			          { title: '描述',field: 'remark',width:200},
-			          { title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec)
-			         	{
+						{ title: '操作',field: 'op',align:"center",width:60,
+							formatter:function(value,rec) {
 								var str = '';
-							var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.sort + 'AaBb' + rec.remark;
+								var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.sort + 'AaBb' + rec.remark + 'AaBb'
+										+ rec.address + 'AaBb' + rec.warehousing + 'AaBb' + rec.truckage;
 								if(1 == value)
 								{
-        						str += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepot(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editDepot(\'' + 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="deleteDepot('+ rec.id +');"/>&nbsp;<a onclick="deleteDepot('+ rec.id +');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
+									str += '<img title="编辑" src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepot(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
+									str += '<img title="删除" src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteDepot('+ rec.id +');"/>';
 								}
 								return str;
 							}
-			          }
+						},
+						{ title: '仓库名称',field: 'name',width:200},
+						{ title: '仓库地址',field: 'address',width:200},
+						{ title: '仓储费',field: 'warehousing',width:60},
+						{ title: '搬运费',field: 'truckage',width:60},
+						{ title: '排序',field: 'sort',width:60},
+						{ title: '描述',field: 'remark',width:120}
 					]],
 					toolbar:[
 						{
 							id:'addDepot',
 							text:'增加',
 							iconCls:'icon-add',
-							handler:function()
-							{
+							handler:function() {
 								addDepot();
 							}
-						},
+						},'-',
 						{
 							id:'deleteDepot',
 							text:'删除',
 							iconCls:'icon-remove',
-							handler:function()
-							{
+							handler:function() {
 								batDeleteDepot();	
 							}
 						}
 					],
-					onLoadError:function()
-					{
+					onLoadError:function() {
 						$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
 						return;
 					}    
@@ -189,38 +189,31 @@
 			}
 			
 			//初始化键盘enter事件
-			$(document).keydown(function(event)
-			{  
+			$(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=="name"||obj.id=="sort"|| obj.id=="remark" ))
-			    {  
+			    if(k == "13"&&(obj.id=="name"||obj.id=="sort"|| obj.id=="remark" )) {
 			        $("#saveDepot").click();
 			    }
 			    //搜索按钮添加快捷键
-			    if(k == "13"&&(obj.id=="searchName" || obj.id=="searchRemark" ))
-			    {  
+			    if(k == "13"&&(obj.id=="searchName" || obj.id=="searchRemark" )) {
 			        $("#searchBtn").click();
 			    }  
 			}); 
 			//分页信息处理
-			function ininPager()
-			{
-				try
-				{
+			function ininPager() {
+				try {
 					var opts = $("#tableData").datagrid('options');  
 					var pager = $("#tableData").datagrid('getPager'); 
 					pager.pagination({  
-						onSelectPage:function(pageNum, pageSize)
-						{  
+						onSelectPage:function(pageNum, pageSize) {
 							opts.pageNumber = pageNum;  
 							opts.pageSize = pageSize;  
-							pager.pagination('refresh',
-							{  
+							pager.pagination('refresh', {
 								pageNumber:pageNum,  
 								pageSize:pageSize  
 							});  
@@ -228,19 +221,15 @@
 						}  
 					}); 
 				}
-				catch (e) 
-				{
+				catch (e) {
 					$.messager.alert('异常处理提示',"分页信息异常 :  " + e.name + ": " + e.message,'error');
 				}
 			}
 			
 			//删除供应商信息
-			function deleteDepot(depotID)
-			{
-				$.messager.confirm('删除确认','确定要删除此仓库信息吗？',function(r)
-			 	{
-                    if (r)
-                    {
+			function deleteDepot(depotID) {
+				$.messager.confirm('删除确认','确定要删除此仓库信息吗？',function(r) {
+                    if (r) {
 						$.ajax({
 							type:"post",
 							url: "<%=path %>/depot/delete.action",
@@ -249,8 +238,7 @@
 								depotID : depotID,
 								clientIp:'<%=clientIp %>'
 							}),
-							success: function (tipInfo)
-							{
+							success: function (tipInfo) {
 								var msg = tipInfo.showModel.msgTip;
 								if(msg == '成功')
 								{
@@ -261,8 +249,7 @@
 									$.messager.alert('删除提示','删除仓库信息失败，请稍后再试！','error');
 							},
 							//此处添加错误处理
-				    		error:function()
-				    		{
+				    		error:function() {
 				    			$.messager.alert('删除提示','删除仓库信息异常，请稍后再试！','error');
 								return;
 							}
@@ -272,18 +259,14 @@
 			}
 			
 			//批量删除供应商
-			function batDeleteDepot()
-			{
+			function batDeleteDepot() {
 				var row = $('#tableData').datagrid('getChecked');	
-				if(row.length == 0)
-				{
+				if(row.length == 0) {
 					$.messager.alert('删除提示','没有记录被选中！','info');				
 					return;	
 				}
-				if(row.length > 0)
-				{
-					$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条仓库信息吗？',function(r)
-				 	{
+				if(row.length > 0) {
+					$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条仓库信息吗？',function(r) {
 	                    if (r)
 	                    {
 	                    	var ids = "";
@@ -339,12 +322,10 @@
 			function addDepot()
 			{
 				$("#clientIp").val('<%=clientIp %>');
-				$("#sort").val("");
-	            $("#remark").val("");
 				$('#depotDlg').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();
-	            //$('#depotFM').form('clear');
+	            $('#depotFM').form('clear');
+				$("#name").focus();
 	            
 	            orgDepot = "";
 	            depotID = 0;
@@ -352,9 +333,7 @@
 			}
 			
 			//保存信息
-			$("#saveDepot").unbind().bind({
-				click:function()
-				{
+			$("#saveDepot").off("click").on("click",function() {
 				if(!$('#depotFM').form('validate'))
 					return;
 				else if(checkDepotName())
@@ -368,6 +347,9 @@
 						async :  false,
 						data: ({
 							name : $.trim($("#name").val()),
+							address: $.trim($("#address").val()),
+							warehousing: $.trim($("#warehousing").val()),
+							truckage: $.trim($("#truckage").val()),
 							type : 0,
 							sort : $.trim($("#sort").val()),
 							remark : $.trim($("#remark").val()),
@@ -398,7 +380,6 @@
 						}
 					});
 				}
-				}
 			});
 			
 			//编辑信息
@@ -410,6 +391,9 @@
 	            $("#name").focus().val(depotInfo[1]);
 	            $("#sort").val(depotInfo[2]);
 	            $("#remark").val(depotInfo[3]);
+				$("#address").val(depotInfo[4]);
+				$("#warehousing").val(depotInfo[5]);
+				$("#truckage").val(depotInfo[6]);
 	            
 	            orgDepot = depotInfo[1];
                 $('#depotDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑仓库信息');

src/main/webapp/pages/manage/functions.jsp

@@ -61,36 +61,42 @@
 	        <form id="functionsFM" method="post"  novalidate>
 	            <table>
 					<tr>
-	            <td>编号</td>
-	            <td style="padding:1px"><input name="Number" id="Number" class="easyui-textbox" style="width: 230px;height: 20px"/></td>
+					<td style="width:65px;">编号</td>
+					<td style="padding:5px"><input name="Number" id="Number" class="easyui-textbox" style="width: 230px;height: 20px"/></td>
 					</tr>
 					<tr>
 					<td>名称</td>
-	            <td style="padding:1px"><input name="Name" id="Name" class="easyui-validatebox" data-options="required:true,validType:'length[2,20]'" style="width: 230px;height: 20px"/></td>
+					<td style="padding:5px"><input name="Name" id="Name" class="easyui-validatebox" data-options="required:true,validType:'length[2,20]'" style="width: 230px;height: 20px"/></td>
 					</tr>
 					<tr>
 					<td>上级编号</td>
-	            <td style="padding:1px"><input name="PNumber" id="PNumber" class="easyui-textbox" style="width: 230px;height: 20px"/></td>
+					<td style="padding:5px"><input name="PNumber" id="PNumber" class="easyui-textbox" style="width: 230px;height: 20px"/></td>
 					</tr>
 					<tr>
 					<td>链接</td>
-	            <td style="padding:1px"><input name="URL" id="URL" class="easyui-textbox" style="width: 230px;height: 20px"/></td>
-	            </tr>
-	            <tr>
-	            <td>收缩</td>
-	            <td style="padding:1px"><input name="State" id="State" type="checkbox" style="width: 230px;height: 20px"/></td>
+					<td style="padding:5px"><input name="URL" id="URL" class="easyui-textbox" style="width: 230px;height: 20px"/></td>
 					</tr>
 					<tr>
 					<td>排序</td>
-	            <td style="padding:1px"><input name="Sort" id="Sort" class="easyui-textbox" style="width: 230px;height: 20px"/></td>
+					<td style="padding:5px"><input name="Sort" id="Sort" class="easyui-textbox" style="width: 230px;height: 20px"/></td>
+					</tr>
+					<tr>
+						<td>功能按钮</td>
+						<td style="padding:5px">
+							<input id="PushBtn" name="PushBtn" style="width:230px;" />
+						</td>
+					</tr>
+					<tr>
+						<td>收缩</td>
+						<td style="padding:5px"><input name="State" id="State" type="checkbox" style="width: 230px;height: 20px"/></td>
 					</tr>
 					<tr>
 						<td>启用</td>
-	            <td style="padding:1px"><input name="Enabled" id="Enabled" type="checkbox" style="width: 230px;height: 20px"/></td>
+						<td style="padding:5px"><input name="Enabled" id="Enabled" type="checkbox" style="width: 230px;height: 20px"/></td>
 					</tr>
 					<tr>
 						<td>类型</td>
-	            <td style="padding:1px"><select name="Type" id="Type" style="width: 230px;height: 20px">
+						<td style="padding:5px"><select name="Type" id="Type" style="width: 230px;height: 20px">
 							<option value="电脑版">电脑版</option>
 							<option value="手机版">手机版</option></select>
 						</td>
@@ -111,6 +117,7 @@
 				initTableData();
 				ininPager();
 				initForm();
+				bindEvent();
 			});	
 			
 			//防止表单提交重复
@@ -166,7 +173,7 @@
 			         	{
 							var str = '';
 							var rowInfo = rec.Id + 'AaBb' + rec.Number+ 'AaBb' + rec.Name+ 'AaBb' + rec.PNumber+ 'AaBb' + rec.URL
-							+ 'AaBb' + rec.State+ 'AaBb' + rec.Sort+ 'AaBb' + rec.Enabled+ 'AaBb' + rec.Type;
+							+ 'AaBb' + rec.State+ 'AaBb' + rec.Sort+ 'AaBb' + rec.Enabled+ 'AaBb' + rec.Type + 'AaBb' + rec.PushBtn;
         					if(1 == value)
         					{
         						str += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editFunctions(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editFunctions(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
@@ -250,6 +257,17 @@
 				}
 			}
 
+			//绑定事件
+			function bindEvent(){
+				$('#PushBtn').combobox({
+					url: '<%=path %>/js/pages/manage/pushBtn.json',
+					valueField:'id',
+					textField:'text',
+					panelHeight:120,
+					multiple:true
+				});
+			}
+			
 			//删除供应商信息
 			function deleteFunctions(functionsID)
 			{
@@ -393,6 +411,7 @@
 								Sort : $.trim($("#Sort").val()),
 								Enabled : $("#Enabled").is(':checked'),
 								Type : $.trim($("#Type").val()),
+								PushBtn : $('#PushBtn').combobox('getValues').toString(), //功能按钮
 								clientIp:'<%=clientIp %>'
 							}),
 							success: function (tipInfo)
@@ -437,6 +456,21 @@
 	            $("#Sort").focus().val(functionsInfo[6]);
 	            $("#Enabled").attr("checked",functionsInfo[7]=='true'?true:false);
 	            $("#Type").focus().val(functionsInfo[8]);
+				if(functionsInfo[9] !== "undefined" && functionsInfo[9] !== ""){
+					var arr = functionsInfo[9].split(",");
+					var pushBtnArray = [];
+					for(var i=0;i<arr.length;i++){
+						if(arr[i]){
+							pushBtnArray.push(arr[i]);
+						}
+					}
+					if(pushBtnArray.length){
+						$("#PushBtn").combobox('setValues', pushBtnArray);
+					}
+				}
+				else {
+					$("#PushBtn").combobox('setValues', '');
+				}
 	            
 	            orgFunctions = functionsInfo[2];
                 $('#functionsDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑功能信息');

src/main/webapp/pages/manage/member.jsp

@@ -0,0 +1,185 @@
+<%@page import="com.jsh.util.Tools"%>
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
+<%
+	String path = request.getContextPath();
+	String clientIp = Tools.getCurrentUserIP();
+%>
+<!DOCTYPE html>
+<html>
+  	<head>
+    	<title>会员信息</title>
+    	<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 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/jquery-1.8.0.min.js"></script>
+		<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>
+		<script src="<%=path %>/js/pages/manage/supplier.js"></script>
+		<script>
+			var kid = ${sessionScope.user.id};
+			var path = "<%=path%>";
+			var clientIp = "<%=clientIp%>";
+		</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>名&nbsp;&nbsp;&nbsp;&nbsp;称：</td>
+					<td>
+						<input type="text" name="searchSupplier" id="searchSupplier"  style="width:100px;"/>
+					</td>
+					<td>&nbsp;</td>
+					<td>手机号码：</td>
+					<td>
+						<input type="text" name="searchTelephone" id="searchTelephone"  style="width:100px;"/>
+					</td>
+					<td>&nbsp;</td>
+					<td>联系电话：</td>
+					<td>
+						<input type="text" name="searchPhonenum" id="searchPhonenum"  style="width:100px;"/>
+					</td>
+					<td>&nbsp;</td>
+					<td id="searchDescLabel">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注：</td>
+					<td>
+						<input type="text" name="searchDesc" id="searchDesc"  style="width:100px;"/>
+					</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="supplierDlg" class="easyui-dialog" style="width:600px;padding:10px 20px"
+	            closed="true" buttons="#dlg-buttons" modal="true" collapsible="false" closable="true">
+			<form id="supplierFM">
+				<table>
+					<tr>
+						<td style="width: 80px;height: 20px">名称</td>
+						<td style="width: 180px;padding:1px">
+							<input name="supplier" id="supplier" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 160px;height: 20px"/>
+						</td>
+						<td style="width: 60px;height: 20px">联系人</td>
+						<td style="width:180px;padding:1px;">
+							<input name="contacts" id="contacts" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>手机号码</td>
+						<td style="padding:1px;">
+							<input name="telephone" id="telephone" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+						<td>电子邮箱</td>
+						<td style="padding:1px">
+							<input name="email" id="email" class="easyui-validatebox" validType="email" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>联系电话</td>
+						<td style="padding:1px;">
+							<input name="phonenum" id="phonenum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+						<td>传真</td>
+						<td style="padding:1px">
+							<input name="fax" id="fax" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>期初应收</td>
+						<td style="padding:1px">
+							<input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
+						</td>
+						<td>期初应付</td>
+						<td style="padding:1px">
+							<input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
+						</td>
+					</tr>
+					<tr>
+						<td>累计应收</td>
+						<td style="padding:1px">
+							<input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
+						</td>
+						<td>累计应付</td>
+						<td style="padding:1px">
+							<input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
+						</td>
+					</tr>
+					<tr>
+						<td>纳税人识别号</td>
+						<td style="padding:1px">
+							<input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+						<td>税率</td>
+						<td style="padding:1px">
+							<input name="taxRate" id="taxRate" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>开户行</td>
+						<td style="padding:1px">
+							<input name="bankName" id="bankName" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+						<td>账号</td>
+						<td style="padding:1px">
+							<input name="accountNumber" id="accountNumber" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>地址</td>
+						<td style="padding:1px" colspan="3">
+							<input name="address" id="address" class="easyui-validatebox" style="width: 408px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>备注</td>
+						<td style="padding:1px" colspan="3">
+							<textarea name="description" id="description" rows="2" cols="2" style="width: 408px;"></textarea>
+						</td>
+					</tr>
+				</table>
+			</form>
+	    </div>
+	    <div id="dlg-buttons">
+	        <a href="javascript:void(0)" id="saveSupplier" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+	        <a href="javascript:void(0)" id="cancelSupplier" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#supplierDlg').dialog('close')">取消</a>
+	    </div>
+
+		<!-- 导入excel表格 -->
+		<div id="importExcelDlg" style="padding:10px 20px">
+			<form id="importExcelFM" method="post" enctype="multipart/form-data" action="<%=path%>/supplier/importExcelMember.action">
+				<div class="fitem" style="padding:5px">
+					<label>文件名称&nbsp;&nbsp;</label>
+					<input name="supplierFile" id="supplierFile" type="file" style="width: 230px;height: 20px"/>
+				</div>
+				<div class="fitem" style="padding:5px">
+					<label><b>导入注意</b>&nbsp;&nbsp;</label><span>（预收款、期初应收、期初应付、税率均为数值且要大于0；另外期初应收、期初应付不能同时输入）</span>
+				</div>
+				<div class="fitem" style="padding:5px;display: none;">
+					<label>是否审查&nbsp;&nbsp;</label>
+					<select id ="isCheck" name="isCheck" style="width: 230px;height: 20px">
+						<option value="0">是</option>
+						<option value="1" selected="selected">否</option>
+					</select>
+				</div>
+				<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
+				<div id="dlg-buttons5">
+					<a href="javascript:void(0)" id="saveimport" class="easyui-linkbutton" iconCls="icon-ok">导入</a>
+					<a href="javascript:void(0)" id="cancelimport" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#importExcelDlg').dialog('close')">取消</a>
+				</div>
+			</form>
+		</div>
+	</body>
+</html>

src/main/webapp/pages/manage/role.jsp

@@ -31,7 +31,7 @@
 				<tr>
 					<td>角色名称：</td>
 					<td>
-						<input type="text" name="searchName" id="searchName"  style="width:230px;"/>
+						<input type="text" name="searchName" id="searchName"  style="width:150px;"/>
 					</td>
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>
@@ -40,7 +40,8 @@
 						<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>&nbsp;&nbsp;
 						<a id="btnSetApp" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配应用'>分配应用</a>&nbsp;&nbsp;
-						<a id="btnSetFunctions" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配功能'>分配功能</a>
+						<a id="btnSetFunctions" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配功能'>分配功能</a>&nbsp;&nbsp;
+						<a id="btnSetPushBtn" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配按钮'>分配按钮</a>
 					</td>
 				</tr>
 			</table>
@@ -509,6 +510,16 @@
 	                return false;
 	            }
 	            this.href = "<%=path %>/pages/manage/roleFunctions.jsp?id=" + currentRow.Id;
+            });
+
+			//分配按钮
+			$('#btnSetPushBtn').click(function () {
+				var currentRow = $("#tableData").datagrid("getSelected");
+				if (currentRow == null) {
+					alert("请选择一条数据再操作！");
+					return false;
+				}
+				this.href = "<%=path %>/pages/manage/rolePushBtn.jsp?id=" + currentRow.Id;
 			});
 		</script>
 	</body>

src/main/webapp/pages/manage/roleApp.jsp

@@ -23,8 +23,8 @@
 	</head>
 	<body>
 		<!-- 数据显示table -->
-		<div>
-			<a id="btnOK" class="easyui-linkbutton">保存</a>
+		<div style="padding-bottom: 10px;">
+			<a id="btnOK" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
 		</div>
 		<div>
 		<ul id="tt"></ul>

src/main/webapp/pages/manage/roleFunctions.jsp

@@ -23,8 +23,8 @@
 	</head>
 	<body>
 		<!-- 数据显示table -->
-		<div>
-			<a id="btnOK" class="easyui-linkbutton">保存</a>
+		<div style="padding-bottom: 10px;">
+			<a id="btnOK" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
 		</div>
 		<div>
 		<ul id="tt"></ul>
@@ -69,7 +69,6 @@
 			   checkbox:true
 			});
 
-			
 	        $("#btnOK").click(	        
 		        function() {
 			        if(!checkRoleFunctions())

src/main/webapp/pages/manage/rolePushBtn.jsp

@@ -0,0 +1,264 @@
+<%@page import="com.jsh.util.Tools"%>
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
+<%
+	String path = request.getContextPath();
+	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>
+		<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>
+		<!-- 数据显示table -->
+		<div style="padding-bottom: 10px;">
+			<a id="btnOK" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+		</div>
+		<div id="pushList">
+			<!-- 数据显示table -->
+			<div id = "tablePanel"	class="easyui-panel" style="padding:1px; top:300px;" title="功能列表-选择按钮权限" iconCls="icon-list" closable="false">
+				<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
+			</div>
+		</div>
+
+		<script type="text/javascript">
+			var keyId = getUrlParam('id');  //获取传值id（角色id）
+			var pushBtnJSON;
+			var userBusinessId = 0; //关系id
+			var roleBtnStr = ""; //角色按钮权限
+			//初始化界面
+			$(function() {
+				initJSON();
+				initTableData();
+				ininPager();
+				showDetails(1,initPageSize);
+				bindEvent();
+			});
+			//初始化JSON
+			function initJSON(){
+				var url = '<%=path %>/js/pages/manage/pushBtn.json';
+				$.ajax({
+					url: url,
+					type: "get",
+					async: false,
+					success: function(res){
+						if(res){
+							pushBtnJSON = res;
+						}
+					},
+					error: function(){
+
+					}
+				});
+			}
+			//初始化表格数据
+			function initTableData() {
+				$('#tableData').datagrid({
+					height:360,
+					rownumbers: true,
+					//动画效果
+					animate:false,
+					//交替出现背景
+					striped : true,
+					columns:[[
+						{ field: 'Id',align:"center",hidden:true},
+						{ title: '名称',field: 'Name',width:100},
+						{ title: '按钮列表',field: 'PushBtnList',width:400,formatter:function(value,rec) {
+								var btnStr = rec.PushBtn;
+								if(btnStr != undefined){
+									var arr = btnStr.split(",");
+									if(arr.length){
+										var str = "";
+										for(var i=0; i<arr.length; i++){
+											for(var j=0; j<pushBtnJSON.length; j++){
+												if(pushBtnJSON[j].id === arr[i]-0){
+													str += "<input type='checkbox' value='" + pushBtnJSON[j].id + "' />" +pushBtnJSON[j].text;
+												}
+											}
+										}
+										return str;
+
+									}
+								}
+								else {
+									return "";
+								}
+							}
+						}
+					]],
+					onLoadError:function()
+					{
+						$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
+						return;
+					}
+				});
+			}
+
+			//分页信息处理
+			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
+							});
+							showDetails(pageNum,pageSize);
+						}
+					});
+				}
+				catch (e)
+				{
+					$.messager.alert('异常处理提示',"分页信息异常 :  " + e.name + ": " + e.message,'error');
+				}
+			}
+
+			function showDetails(pageNo,pageSize){
+				$.ajax({
+					url: "<%=path%>/userBusiness/getBasicData.action",
+					type: "get",
+					data: {
+						Type: 'RoleFunctions',
+						KeyId: keyId
+					},
+					success: function(res){
+						if(res && res.showModel && res.showModel.map && res.showModel.map.userBusinessList && res.showModel.map.userBusinessList[0]){
+							userBusinessId = res.showModel.map.userBusinessList[0].id;
+							roleBtnStr = res.showModel.map.userBusinessList[0].btnStr;
+							var getValue = res.showModel.map.userBusinessList[0].value;
+							getValue = getValue.substring(1,getValue.length-1);
+							if(getValue.indexOf("][")){
+								var arr = getValue.split("][");
+								arr = arr.toString();
+								$.ajax({
+									url: "<%=path%>/functions/findByIds.action",
+									type: "get",
+									data: {
+										FunctionsIDs: arr
+									},
+									success: function(rec){
+										$("#tableData").datagrid('loadData',JSON.parse(rec));
+									},
+									error: function(){
+										$.messager.alert('提示','查询数据异常，请稍后再试！','error');
+										return;
+									}
+								});
+							}
+						}
+					},
+					error: function(){
+						$.messager.alert('提示','查询数据异常，请稍后再试！','error');
+						return;
+					}
+				});
+			}
+			function bindEvent() {
+				setTimeout(function(){
+					var bindBody = $("#pushList .datagrid-view2 .datagrid-body");
+
+					//加载按钮信息到缓存中
+					if(roleBtnStr){
+						var roleBtnStrArr = JSON.parse(roleBtnStr);
+						bindBody.find(".datagrid-row").each(function() {
+							for(var i= 0; i<roleBtnStrArr.length; i++){
+								if(roleBtnStrArr[i] && roleBtnStrArr[i].funId){
+									var thisId = $(this).find("[field='Id']").text()-0;
+									if(roleBtnStrArr[i].funId == thisId){
+										$(this).find("[field='Id']").attr("data-btn", roleBtnStrArr[i].btnStr);
+										//加载勾选状态
+										$(this).find("[field='PushBtnList']").find("input").each(function () {
+											var thisValue = $(this).val(); //勾选的值
+											if(roleBtnStrArr[i].btnStr.indexOf(thisValue)>-1){
+												$(this).prop("checked","checked");
+											}
+										});
+									}
+								}
+							}
+						});
+					}
+
+					//按钮勾选事件
+					bindBody.find("[field='PushBtnList']").find("input").off("click").on("click", function () {
+						var checkStr = "";
+						$(this).closest(".datagrid-cell").find("input").each(function () {
+							var thisValue = $(this).val(); //勾选的值
+							var isChecked = $(this).prop("checked");
+							if (isChecked) {
+								checkStr = checkStr + thisValue + ",";
+							}
+						});
+						if (checkStr) {
+							checkStr = checkStr.substring(0, checkStr.length - 1);
+						}
+						$(this).closest(".datagrid-row").find("[field='Id']").attr("data-btn", checkStr);
+					});
+				}, 500);
+
+				$("#btnOK").off("click").on("click", function() {
+					if (confirm("您确定要保存吗？")) {
+						var bindList = $("#pushList .datagrid-view2 .datagrid-body .datagrid-row");
+						var bindArr = [];
+						var btnStr = "";
+						bindList.each(function () {
+							var funId = $(this).find("[field='Id']").text();
+							var btnStr = $(this).find("[field='Id']").attr("data-btn");
+							if (btnStr !== undefined && btnStr !== "") {
+								var bindJSON = {};
+								bindJSON.funId = funId;
+								bindJSON.btnStr = btnStr;
+								bindArr.push(bindJSON);
+							}
+						});
+						if (bindArr.length) {
+							btnStr = JSON.stringify(bindArr);
+						}
+						$.ajax({
+							url: "<%=path%>/userBusiness/updateBtnStr.action",
+							type: "get",
+							data: {
+								UserBusinessID: userBusinessId,
+								BtnStr: btnStr
+							},
+							success: function (res) {
+								if (res) {
+									self.parent.$.colorbox.close();
+									alert("操作成功！");
+								}
+								else {
+									$.messager.show({
+										title: '错误提示',
+										msg: '保存按钮权限信息失败，请稍后重试!'
+									});
+								}
+							},
+							error: function () {
+								$.messager.alert('提示', '保存数据异常，请稍后再试！', 'error');
+								return;
+							}
+						});
+					}
+				});
+			}
+		</script>
+	</body>
+</html>

src/main/webapp/pages/manage/unit.jsp

@@ -0,0 +1,468 @@
+<%@page import="com.jsh.util.Tools"%>
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
+<%
+	String path = request.getContextPath();
+	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" />
+		<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/jquery-1.8.0.min.js"></script>
+		<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>
+						<input type="text" name="searchName" id="searchName"  style="width:100px;"/>
+					</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="unitDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
+	            closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
+	        <form id="unitFM" method="post"  novalidate>
+	            <table>
+	            <tr>
+					<td>基本单位</td>
+					<td style="padding:5px">
+						<input name="basicName" id="basicName" class="easyui-validatebox" data-options="required:true,validType:'length[1,10]'" style="width: 100px;height: 20px"/>
+						基本单位应为最小度量单位
+					</td>
+	            </tr>
+				<tr>
+					<td>副单位</td>
+					<td style="padding:5px">
+						<input name="otherName" id="otherName" class="easyui-validatebox" data-options="required:true,validType:'length[1,5]'" style="width: 100px;height: 20px"/>
+						=
+						<input name="otherNum" id="otherNum" class="easyui-validatebox" data-options="required:true,validType:'length[1,5]'" style="width: 50px;height: 20px"/>
+						<span id="unitName"></span>
+					</td>
+				</tr>
+	            </table>
+	            <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
+	        </form>
+	    </div>
+	    <div id="dlg-buttons">
+	        <a href="javascript:void(0)" id="saveUnit" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+	        <a href="javascript:void(0)" id="cancelUnit" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#unitDlg').dialog('close')">取消</a>
+	    </div>
+	    
+		<script type="text/javascript">
+			//初始化界面
+			$(function()
+			{
+				initTableData();
+				ininPager();
+				initForm();
+			});
+			
+			//防止表单提交重复
+			function initForm()
+			{
+				$('#unitFM').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 %>/unit/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: 'op',align:"center",width:60,
+							formatter:function(value,rec) {
+								var str = '';
+								var rowInfo = rec.id + 'AaBb' + rec.UName;
+								if(1 == value)
+								{
+									str += '<img title="编辑" src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editUnit(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
+									str += '<img title="删除" src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteUnit('+ rec.id +');"/>';
+								}
+								return str;
+							}
+						},
+						{ title: '计量单位',field: 'UName',width:200}
+					]],
+					toolbar:[
+						{
+							id:'addUnit',
+							text:'增加',
+							iconCls:'icon-add',
+							handler:function() {
+								addUnit();
+							}
+						},'-',
+						{
+							id:'deleteUnit',
+							text:'删除',
+							iconCls:'icon-remove',
+							handler:function() {
+								batDeleteUnit();
+							}
+						}
+					],
+					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=="name")) {
+			        $("#saveUnit").click();
+			    }
+			    //搜索按钮添加快捷键
+			    if(k == "13"&&(obj.id=="searchName")) {
+			        $("#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  
+							});  
+							showUnitDetails(pageNum,pageSize);
+						}  
+					}); 
+				}
+				catch (e) {
+					$.messager.alert('异常处理提示',"分页信息异常 :  " + e.name + ": " + e.message,'error');
+				}
+			}
+			
+			//删除计量单位
+			function deleteUnit(unitID) {
+				$.messager.confirm('删除确认','确定要删除此计量单位吗？',function(r) {
+                    if (r) {
+						$.ajax({
+							type:"post",
+							url: "<%=path %>/unit/delete.action",
+							dataType: "json",
+							data: ({
+								unitID : unitID,
+								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 batDeleteUnit() {
+				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 %>/unit/batchDelete.action",
+								dataType: "json",
+								async :  false,
+								data: ({
+									unitIDs : 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 unitID = 0;
+			//保存编辑前的名称
+			var orgUnit = "";
+			
+			function addUnit(){
+				$("#clientIp").val('<%=clientIp %>');
+				$('#unitDlg').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});
+	            $('#unitFM').form('clear');
+				$("#name").focus();
+	            $("#unitName").text("");
+	            orgUnit = "";
+	            unitID = 0;
+	            url = '<%=path %>/unit/create.action';
+			}
+			
+			//保存信息
+			$("#saveUnit").unbind().bind({
+				click:function()
+				{
+					if(!$('#unitFM').form('validate'))
+						return;
+					else if(checkUnitName())
+						return;
+					else 
+					{
+						var basicName = $.trim($("#basicName").val());
+						var otherName = $.trim($("#otherName").val());
+						var otherNum = $.trim($("#otherNum").val());
+						var name = basicName + "," + otherName + "(1:" + otherNum + ")";
+						$.ajax({
+							type:"post",
+							url: url,
+							dataType: "json",
+							async :  false,
+							data: ({
+								UName : name,
+								clientIp:'<%=clientIp %>'
+							}),
+							success: function (tipInfo)
+							{
+								if(tipInfo)
+								{
+									$('#unitDlg').dialog('close');
+			                        
+									var opts = $("#tableData").datagrid('options'); 
+									showUnitDetails(opts.pageNumber,opts.pageSize);
+								}
+								else
+								{
+									$.messager.show({
+			                            title: '错误提示',
+			                            msg: '保存计量单位失败，请稍后重试!'
+			                        });
+								}
+							},
+							//此处添加错误处理
+				    		error:function()
+				    		{
+				    			$.messager.alert('提示','保存计量单位异常，请稍后再试！','error');
+								return;
+							}
+						});	
+					}
+				}
+			});
+			
+			//编辑信息
+	        function editUnit(unitTotalInfo) {
+	        	var unitInfo = unitTotalInfo.split("AaBb");
+	            
+	            $("#clientIp").val('<%=clientIp %>');
+	            
+	            orgUnit = unitInfo[1];
+                $('#unitDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑计量单位');
+                $(".window-mask").css({ width: webW ,height: webH});
+                unitID = unitInfo[0];
+                //焦点在名称输入框==定焦在输入文字后面 
+                var name = unitInfo[1];
+				var basicName = name.substring(0, name.indexOf(",")); //基础单位
+				$("#basicName").val(basicName);
+				var otherItem = name.substring(name.indexOf(",")+1);
+				var otherName = otherItem.substring(0,otherItem.indexOf("("));
+				$("#otherName").val(otherName);
+				var lastNum =  otherItem.substring(otherItem.indexOf(":")+1);
+				lastNum = lastNum.replace(")","");
+				$("#otherNum").val(lastNum);
+				$("#unitName").text(basicName);
+                url = '<%=path %>/unit/update.action?unitID=' + unitInfo[0];
+	        }
+	        
+	        //检查名称是否存在 ++ 重名无法提示问题需要跟进
+	        function checkUnitName()
+	        {
+	        	var name = $.trim($("#name").val());
+	        	//表示是否存在 true == 存在 false = 不存在
+	        	var flag = false;
+        		//开始ajax名称检验，不能重名
+        		if(name.length > 0 &&( orgUnit.length ==0 || name != orgUnit))
+        		{
+        			$.ajax({
+						type:"post",
+						url: "<%=path %>/unit/checkIsNameExist.action",
+						dataType: "json",
+						async :  false,
+						data: ({
+							unitID : unitID,
+							UName : name
+						}),
+						success: function (tipInfo){
+							flag = tipInfo;
+							if(tipInfo)
+							{
+								$.messager.alert('提示','计量单位名称已经存在','info');
+								return;
+							}
+						},
+						//此处添加错误处理
+			    		error:function()
+			    		{
+			    			$.messager.alert('提示','检查计量单位名称是否存在异常，请稍后再试！','error');
+							return;
+						}
+					});	
+        		}
+        		return flag;
+	        }
+			
+			//搜索处理
+			$("#searchBtn").unbind().bind({
+				click:function()
+				{
+					showUnitDetails(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 showUnitDetails(pageNo,pageSize)
+			{
+				$.ajax({
+					type:"post",
+					url: "<%=path %>/unit/findBy.action",
+					dataType: "json",
+					data: ({
+						UName:$.trim($("#searchName").val()),
+						pageNo:pageNo,
+						pageSize:pageSize
+					}),
+					success: function (data)
+					{
+						$("#tableData").datagrid('loadData',data);
+					},
+					//此处添加错误处理
+		    		error:function()
+		    		{
+		    			$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
+						return;
+					}
+				});
+			}
+			
+			//重置按钮
+			$("#searchResetBtn").unbind().bind({
+				click:function(){
+					$("#searchName").val("");
+					//加载完以后重新初始化
+					$("#searchBtn").click();
+			    }	
+			});
+
+			//单位名称事件
+			$("#basicName").off("keyup").on("keyup", function(){
+				$("#unitName").text($(this).val());
+			});
+		</script>
+	</body>
+</html>

src/main/webapp/pages/manage/user.jsp

@@ -46,7 +46,8 @@
 						<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>&nbsp;&nbsp;
 						<a id="btnSetRole" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配角色'>分配角色</a>&nbsp;&nbsp;
-						<a id="btnSetDepart" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配仓库'>分配仓库</a>
+						<a id="btnSetDepart" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配仓库'>分配仓库</a>&nbsp;&nbsp;
+						<a id="btnSetCustomer" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配客户'>分配客户</a>
 					</td>
 				</tr>
 			</table>
@@ -92,32 +93,11 @@
 	            <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
 	        </form>
 	    </div>
-	    <!--
-	    <div id="userLoginDlg" class="easyui-dialog" style="width:400px;height:280px;padding:10px 20px"
-            closed="true" buttons="#logindlg-buttons" modal="true" iconCls="icon-save" collapsible="false" closable="true">
-            	<div class="fitem" style="padding:5px">
-	                <label>登录名称&nbsp;&nbsp;</label>
-	                <input name="loginname" id="loginname" rows="3" cols="3" style="width: 230px;height: 20px"/>
-	            </div>	
-            	<div class="fitem" style="padding:5px">
-	                <label>登录密码&nbsp;&nbsp;</label>
-	                <input name="loginpwd" id="loginpwd" rows="3" cols="3" style="width: 230px;height: 20px"/>
-	            </div>	
-            	<div class="fitem" style="padding:5px">
-	                <label>确定密码&nbsp;&nbsp;</label>
-	                <input name="confirmloginpwd" id="confirmloginpwd" rows="3" cols="3" style="width: 230px;height: 20px"/>
-	            </div>	
-       	</div>
-	    <div id="logindlg-buttons">
-	        <a href="javascript:void(0)" id="saveloginame" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
-	        <a href="javascript:void(0)" id="canceloginame" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#userLoginDlg').dialog('close')">取消</a>
-	    </div>
-	    -->
 	    <div id="dlg-buttons">
+			<a href="javascript:void(0)" id="resetPwd" class="easyui-linkbutton" iconCls="icon-redo">重置密码</a>
 	        <a href="javascript:void(0)" id="saveusername" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
 	        <a href="javascript:void(0)" id="cancelusername" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#userDlg').dialog('close')">取消</a>
 	    </div>
-	    
 		<script type="text/javascript">
 			//初始化界面
 			$(function()
@@ -411,6 +391,35 @@
 	            url = '<%=path %>/user/create.action';
 			}
 
+			//重置用户密码
+			$("#resetPwd").off("click").on("click",function() {
+				$.messager.confirm('重置用户密码', '确定重置该用户的密码为123456吗？', function (r) {
+					if (r) {
+						$.ajax({
+							type: "post",
+							url: "<%=path %>/user/resetPwd.action",
+							dataType: "json",
+							data: ({
+								userID: userID
+							}),
+							success: function (res) {
+								if (res) {
+									var flag = res - 0;
+									if (flag) {
+										$.messager.alert('提示', '重置密码成功', 'info');
+									}
+								}
+							},
+							//此处添加错误处理
+							error: function () {
+								$.messager.alert('提示', '重置密码失败，请稍后再试！', 'error');
+								return;
+							}
+						});
+					}
+				});
+			});
+			
 			//保存用户信息
 			$("#saveusername").unbind().bind({
 				click:function()
@@ -603,6 +612,16 @@
 	                return false;
 	            }
 	            this.href = "<%=path %>/pages/user/userDepot.jsp?id=" + currentRow.id;
+            });
+
+			//分配客户
+			$('#btnSetCustomer').click(function () {
+				var currentRow = $("#tableData").datagrid("getSelected");
+				if (currentRow == null) {
+					alert("请选择一条数据再操作！");
+					return false;
+				}
+				this.href = "<%=path %>/pages/user/userCustomer.jsp?id=" + currentRow.id;
 			});
 		</script>
 	</body>

src/main/webapp/pages/manage/vendor.jsp

@@ -2,13 +2,12 @@
 <%@ 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 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">
+<!DOCTYPE html>
+<html>
   	<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"/>
@@ -20,6 +19,12 @@
 		<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>
+		<script src="<%=path %>/js/pages/manage/supplier.js"></script>
+		<script>
+			var kid = ${sessionScope.user.id};
+			var path = "<%=path%>";
+			var clientIp = "<%=clientIp%>";
+		</script>
   	</head>
   	<body>
   		<!-- 查询 -->
@@ -28,41 +33,24 @@
 				<tr>
 					<td>名&nbsp;&nbsp;&nbsp;&nbsp;称：</td>
 					<td>
-						<input type="text" name="searchSupplier" id="searchSupplier"  style="width:150px;"/>
+						<input type="text" name="searchSupplier" id="searchSupplier"  style="width:100px;"/>
 					</td>
-				
 					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-					<td id="searchTypeLabel">类&nbsp;&nbsp;&nbsp;&nbsp;型：</td>
+					<td>手机号码：</td>
 					<td>
-					<select name="searchType" id="searchType"  style="width:150px;">
-					    <option value="">全部</option>
-						<option value="供应商">供应商</option>
-						<option value="客户">客户</option>
-						<option value="散户">散户</option>
-				    </select>
+						<input type="text" name="searchTelephone" id="searchTelephone"  style="width:100px;"/>
 					</td>
 					<td>&nbsp;</td>
-					<td>&nbsp;</td>
 					<td>联系电话：</td>
 					<td>
-						<input type="text" name="searchPhonenum" id="searchPhonenum"  style="width:150px;"/>
+						<input type="text" name="searchPhonenum" id="searchPhonenum"  style="width:100px;"/>
 					</td>
-				</tr>
-				<tr>
-					<td>电子邮箱：</td>
+					<td>&nbsp;</td>
+					<td id="searchDescLabel">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注：</td>
 					<td>
-						<input type="text" name="searchEmail" id="searchEmail"  style="width:150px;"/> 
+						<input type="text" name="searchDesc" id="searchDesc"  style="width:100px;"/>
 					</td>
 					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-					<td id="searchDescLabel">描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述：</td>
-					<td>
-						<input type="text" name="searchDesc" id="searchDesc"  style="width:150px;"/>
-					</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>
@@ -72,58 +60,96 @@
 		</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"
+	    <div id="supplierDlg" class="easyui-dialog" style="width:580px;padding:10px 20px"
 	            closed="true" buttons="#dlg-buttons" modal="true" collapsible="false" closable="true">
-	        <form id="supplierFM" method="post" novalidate>
-	            <div class="fitem" style="padding:5px">
-	                <label id="supplierLabel">名&nbsp;&nbsp;称</label>
-	                <input name="supplier" id="supplier" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/>
-	            </div>
-	            <div class="fitem" style="padding:5px">
-	                <label id="typeLabel">类&nbsp;&nbsp;&nbsp;&nbsp;型</label>
-	             <select name="type" id="type"  style="width:230px;">
-						<option value="供应商">供应商</option>
-						<option value="客户">客户</option>
-					 	<option value="散户">散户</option>
-				 </select>
-	            </div>
-	            <div class="fitem" style="padding:5px">
-	                <label id="contactsLabel">联&nbsp;&nbsp;系&nbsp;&nbsp;人&nbsp;&nbsp;</label>
-	                <input name="contacts" id="contacts" class="easyui-validatebox" style="width: 230px;height: 20px"/>
-	            </div>
-	            <div class="fitem" style="padding:5px">
-	                <label id="phonenumLabel">联系电话&nbsp;&nbsp;</label>
-	                <input name="phonenum" id="phonenum" class="easyui-numberbox" style="width: 230px;height: 20px"/>
-	            </div>
-	            <div class="fitem" style="padding:5px">
-	                <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>
-	            </div>
-	            <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
+			<form id="supplierFM">
+				<table>
+					<tr>
+						<td style="width: 80px;height: 20px">名称</td>
+						<td style="width: 180px;padding:1px">
+							<input name="supplier" id="supplier" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 160px;height: 20px"/>
+						</td>
+						<td style="width: 60px;height: 20px">联系人</td>
+						<td style="width:180px;padding:1px;">
+							<input name="contacts" id="contacts" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>手机号码</td>
+						<td style="padding:1px;">
+							<input name="telephone" id="telephone" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+						<td>电子邮箱</td>
+						<td style="padding:1px">
+							<input name="email" id="email" class="easyui-validatebox" validType="email" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>联系电话</td>
+						<td style="padding:1px;">
+							<input name="phonenum" id="phonenum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+						<td>传真</td>
+						<td style="padding:1px">
+							<input name="fax" id="fax" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>期初应收</td>
+						<td style="padding:1px">
+							<input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
+						</td>
+						<td>期初应付</td>
+						<td style="padding:1px">
+							<input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
+						</td>
+					</tr>
+					<tr>
+						<td>累计应收</td>
+						<td style="padding:1px">
+							<input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
+						</td>
+						<td>累计应付</td>
+						<td style="padding:1px">
+							<input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
+						</td>
+					</tr>
+					<tr>
+						<td>纳税人识别号</td>
+						<td style="padding:1px">
+							<input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+						<td>税率</td>
+						<td style="padding:1px">
+							<input name="taxRate" id="taxRate" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>开户行</td>
+						<td style="padding:1px">
+							<input name="bankName" id="bankName" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+						<td>账号</td>
+						<td style="padding:1px">
+							<input name="accountNumber" id="accountNumber" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>地址</td>
+						<td style="padding:1px" colspan="3">
+							<input name="address" id="address" class="easyui-validatebox" style="width: 408px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>备注</td>
+						<td style="padding:1px" colspan="3">
+							<textarea name="description" id="description" rows="2" cols="2" style="width: 408px;"></textarea>
+						</td>
+					</tr>
+				</table>
 			</form>
 	    </div>
 	    <div id="dlg-buttons">
@@ -131,513 +157,30 @@
 	        <a href="javascript:void(0)" id="cancelSupplier" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#supplierDlg').dialog('close')">取消</a>
 	    </div>
 
-		<script type="text/javascript">
-			//初始化界面
-			$(function()
-			{
-				initTableData();
-				ininPager();
-				browserFit();	
-			});	
+		<!-- 导入excel表格 -->
+		<div id="importExcelDlg" style="padding:10px 20px">
+			<form id="importExcelFM" method="post" enctype="multipart/form-data" action="<%=path%>/supplier/importExcelVendor.action">
+				<div class="fitem" style="padding:5px">
+					<label>文件名称&nbsp;&nbsp;</label>
+					<input name="supplierFile" id="supplierFile" type="file" style="width: 230px;height: 20px"/>
+				</div>
+				<div class="fitem" style="padding:5px">
+					<label><b>导入注意</b>&nbsp;&nbsp;</label><span>（预收款、期初应收、期初应付、税率均为数值且要大于0；另外期初应收、期初应付不能同时输入）</span>
+				</div>
+				<div class="fitem" style="padding:5px;display: none;">
+					<label>是否审查&nbsp;&nbsp;</label>
+					<select id ="isCheck" name="isCheck" style="width: 230px;height: 20px">
+						<option value="0">是</option>
+						<option value="1" selected="selected">否</option>
+					</select>
+				</div>
+				<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
+				<div id="dlg-buttons5">
+					<a href="javascript:void(0)" id="saveimport" class="easyui-linkbutton" iconCls="icon-ok">导入</a>
+					<a href="javascript:void(0)" id="cancelimport" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#importExcelDlg').dialog('close')">取消</a>
+				</div>
+			</form>
+		</div>
 
-			//浏览器适配
-			function browserFit()
-			{
-				if(getOs()=='MSIE')
-				{
-					$("#searchContactsLabel").empty().append("联&nbsp;&nbsp;系&nbsp;&nbsp;人：");
-					$("#searchDescLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述：");
-					$("#supplierLabel").empty().append("名&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;称");
-					$("#contactsLabel").empty().append("联&nbsp;&nbsp;系&nbsp;&nbsp;人&nbsp;&nbsp;");
-					$("#phonenumLabel").empty().append("联系电话&nbsp;&nbsp;");
-					$("#emailLabel").empty().append("电子邮箱&nbsp;&nbsp;");
-					$("#descriptionLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;&nbsp;");
-				}
-				else
-				{
-					$("#searchContactsLabel").empty().append("联&nbsp;系&nbsp;人：");
-					$("#searchDescLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;述：");
-					$("#supplierLabel").empty().append("名&nbsp;&nbsp;&nbsp;&nbsp;称");
-					$("#contactsLabel").empty().append("联&nbsp;系&nbsp;人");
-					$("#phonenumLabel").empty().append("联系电话");
-					$("#emailLabel").empty().append("电子邮箱");
-					$("#descriptionLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;述");
-				}
-			}
-			
-			//初始化表格数据
-			function initTableData()
-			{
-				//改变宽度和高度
-				$("#searchPanel").panel({width:webW-2});
-				$("#tablePanel").panel({width:webW-2});
-				$('#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,
-					//交替出现背景
-					striped : true,
-					url:'<%=path %>/supplier/findBy.action?pageSize=' + initPageSize,
-					pagination: true,
-					//自动截取数据
-					//nowrap : true,
-					//loadFilter: pagerFilter,
-					pageSize: initPageSize,
-					pageList: initPageNum,
-					columns:[[
-					  { field: 'id',width:35,align:"center",checkbox:true},
-			          { 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: 'AdvanceIn',width:70,align:"center"},
-			          { title: '期初应收',field: 'BeginNeedGet',width:70,align:"center"},
-			          { title: '期初应付',field: 'BeginNeedPay',width:70,align:"center"},
-			          { title: '类型',field: 'type',width:50},
-			          { 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.BeginNeedGet + 'AaBb'+ rec.BeginNeedPay + 'AaBb' + rec.isystem + 'AaBb' + rec.description+ 'AaBb' + rec.type;
-	       					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/edit_remove.png" style="cursor: pointer;" onclick="deleteSupplier(\'' + rowInfo + '\');"/>&nbsp;<a onclick="deleteSupplier(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
-	       					}
-	       					return str;
-						}
-			          }
-					]],
-					toolbar:[
-						{
-							id:'addSupplier',
-							text:'增加',
-							iconCls:'icon-add',
-							handler:function()
-							{
-								addSuppler();
-							}
-						},
-						{
-							id:'deleteSupplier',
-							text:'删除',
-							iconCls:'icon-remove',
-							handler:function()
-							{
-								batDeleteSupplier();	
-							}
-						}
-					],
-					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键盘事件
-			    if(k == "13"&&(obj.id=="supplier" || obj.id=="contacts"|| obj.id=="phonenum" 
-			    	|| obj.id=="email" || obj.id=="description" ))
-			    {  
-			        $("#saveSupplier").click();
-			    }  
-			    
-			    //搜索按钮添加快捷键
-			    if(k == "13"&&(obj.id=="searchSupplier" || obj.id=="searchContacts"|| obj.id=="searchPhonenum" 
-			    	|| obj.id=="searchEmail" || obj.id=="searchDesc" ))
-			    {  
-			        $("#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  
-							});  
-							showSupplierDetails(pageNum,pageSize);
-						}  
-					}); 
-				}
-				catch (e) 
-				{
-					$.messager.alert('异常处理提示',"分页信息异常 :  " + e.name + ": " + e.message,'error');
-				}
-			}
-			
-			//删除单位信息
-			function deleteSupplier(supplierInfo)
-			{
-				$.messager.confirm('删除确认','确定要删除此单位信息吗？',function(r)
-			 	{
-                    if (r)
-                    {
-                    	var supplierTotalInfo = supplierInfo.split("AaBb");
-						$.ajax({
-							type:"post",
-							url: "<%=path %>/supplier/delete.action",
-							dataType: "json",
-							data: ({
-								supplierID : supplierTotalInfo[0],
-								supplier:supplierTotalInfo[1],
-								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 batDeleteSupplier()
-			{
-				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;
-	                        	}
-	                        	ids += row[i].id + ",";
-	                        }
-	                        $.ajax({
-								type:"post",
-								url: "<%=path %>/supplier/batchDelete.action",
-								dataType: "json",
-								async :  false,
-								data: ({
-									supplierIDs : 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 supplierID = 0;
-			//保存编辑前的名称
-			var orgSupplier = "";
-			
-			function addSuppler()
-			{
-				$('#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');
-	            
-	            var row = {
-	            	clientIp:'<%=clientIp %>'
-	            };
-                $('#supplierFM').form('load',row);
-	            
-	            $("#supplier").focus();
-	            orgSupplier = "";
-	            supplierID = 0;
-	            url = '<%=path %>/supplier/create.action';
-			}
-			
-			//保存单位信息
-			$("#saveSupplier").unbind().bind({
-				click:function()
-				{
-					if(checkSupplierName())
-						return;
-
-					if(!$("#type").val()){
-						$.messager.alert('提示','请选择类型！','warning');
-						return;
-					}
-					var reg = /^([0-9])+$/;
-					var phonenum = $.trim($("#phonenum").val());
-					if(phonenum.length>0 && !reg.test(phonenum))
-					{
-						$.messager.alert('提示','电话号码只能是数字','info');
-						$("#phonenum").val("").focus();
-						return;
-					}
-					var beginNeedGet = $.trim($("#BeginNeedGet").val());
-					var beginNeedPay = $.trim($("#BeginNeedPay").val());
-					if(beginNeedGet && beginNeedPay) {
-						$.messager.alert('提示','期初应收和期初应付不能同时输入','info');
-						return;
-					}
-					
-					$('#supplierFM').form('submit',{
-		                url: url,
-		                onSubmit: function()
-		                {
-		                    return $(this).form('validate');
-		                },
-		                success: function(result)
-		                {
-		                    var result = eval('('+result+')');
-		                    if (!result)
-		                    {
-		                        $.messager.show({
-		                            title: '错误提示',
-		                            msg: '保存单位信息失败，请稍后重试!'
-		                        });
-		                    } 
-		                    else 
-		                    {
-		                        $('#supplierDlg').dialog('close');
-								var opts = $("#tableData").datagrid('options'); 
-								showSupplierDetails(opts.pageNumber,opts.pageSize);   
-		                    }
-		                }
-		            });	
-				}
-			});
-			
-			//编辑单位信息
-	        function editSupplier(supplierTotalInfo)
-	        {
-	        	var supplierInfo = supplierTotalInfo.split("AaBb");
-	            var row = {
-	            	supplier : supplierInfo[1],
-	            	contacts : supplierInfo[2],
-	            	phonenum : supplierInfo[3],
-	            	email : supplierInfo[4],
-	            	BeginNeedGet : supplierInfo[5],
-	            	BeginNeedPay : supplierInfo[6],
-	            	description : supplierInfo[8],
-	            	type : supplierInfo[9],
-	            	clientIp:'<%=clientIp %>'
-	            };
-	            orgSupplier = supplierInfo[1];
-                $('#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];
-                //焦点在名称输入框==定焦在输入文字后面 
-                $("#supplier").val("").focus().val(supplierInfo[1]);
-                url = '<%=path %>/supplier/update.action?supplierID=' + supplierInfo[0];
-                
-                //显示累计应收和累计应付
-                $.ajax({
-                	type:"post",
-					url: "<%=path %>/depotHead/findTotalPay.action",
-					dataType: "json",
-					async:  false,
-					data: ({
-						supplierId: supplierInfo[0]
-					}),
-					success: function(res){
-						if(res) {
-							var moneyA = res.getAllMoney.toFixed(2)-0;
-							$.ajax({
-			                	type:"post",
-								url: "<%=path %>/accountHead/findTotalPay.action",
-								dataType: "json",
-								async:  false,
-								data: ({
-									supplierId: supplierInfo[0]
-								}),
-								success: function(res){
-									if(res) {
-										var moneyB = res.getAllMoney.toFixed(2)-0; 
-										var money = moneyA+moneyB;
-										var moneyBeginNeedGet = $("#BeginNeedGet").val()-0; //期初应收
-										var moneyBeginNeedPay = $("#BeginNeedPay").val()-0; //期初应付
-										money = money + moneyBeginNeedPay - moneyBeginNeedGet;
-										if(money>0) {											
-											$("#AllNeedPay").val(money); //累计应付
-										}
-										else {
-											$("#AllNeedGet").val(-money);  //累计应收
-										}
-									}
-								},
-								error: function(){
-									$.messager.alert('提示','网络异常请稍后再试！','error');
-									return;
-								}
-							});
-						}
-					},
-					error: function(){
-						$.messager.alert('提示','网络异常请稍后再试！','error');
-						return;
-					}
-                })
-	        }
-	        
-	        
-	        //检查单位名称是否存在 ++ 重名无法提示问题需要跟进
-	        function checkSupplierName()
-	        {
-	        	var supplierName = $.trim($("#supplier").val());
-	        	//表示是否存在 true == 存在 false = 不存在
-	        	var flag = false;
-        		//开始ajax名称检验，不能重名
-        		if(supplierName.length > 0 &&( orgSupplier.length ==0 || supplierName != orgSupplier))
-        		{
-        			$.ajax({
-						type:"post",
-						url: "<%=path %>/supplier/checkIsNameExist.action",
-						dataType: "json",
-						async :  false,
-						data: ({
-							supplierID : supplierID,
-							supplier : supplierName
-						}),
-						success: function (tipInfo)
-						{
-							flag = tipInfo;
-							if(tipInfo)
-							{
-								$.messager.alert('提示','单位名称已经存在','info');
-								return;
-							}
-						},
-						//此处添加错误处理
-			    		error:function()
-			    		{
-			    			$.messager.alert('提示','检查单位名称是否存在异常，请稍后再试！','error');
-							return;
-						}
-					});	
-        		}
-        		return flag;
-	        }
-			
-			//搜索处理
-			$("#searchBtn").unbind().bind({
-				click:function()
-				{
-					showSupplierDetails(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 showSupplierDetails(pageNo,pageSize)
-			{
-				$.ajax({
-					type:"post",
-					url: "<%=path %>/supplier/findBy.action",
-					dataType: "json",
-					data: ({
-						supplier:$.trim($("#searchSupplier").val()),
-						type:$.trim($("#searchType").val()),
-						phonenum:$.trim($("#searchPhonenum").val()),
-						email:$.trim($("#searchEmail").val()),
-						description:$.trim($("#searchDesc").val()),
-						pageNo:pageNo,
-						pageSize:pageSize
-					}),
-					success: function (data)
-					{
-						$("#tableData").datagrid('loadData',data);
-						//$('#tableData').datagrid('reload');
-					},
-					//此处添加错误处理
-		    		error:function()
-		    		{
-		    			$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
-						return;
-					}
-				});
-			}
-			
-			//重置按钮
-			$("#searchResetBtn").unbind().bind({
-				click:function(){
-					$("#searchSupplier").val("");
-					$("#searchType").val("");
-					$("#searchPhonenum").val("");
-					$("#searchEmail").val("");
-					$("#searchDesc").val("");
-					
-					//加载完以后重新初始化
-					$("#searchBtn").click();
-			    }	
-			});
-		</script>
 	</body>
 </html>

src/main/webapp/pages/materials/allocation_out_list.jsp

@@ -15,6 +15,7 @@
 		<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" />
+		<link type="text/css" rel="stylesheet" href="<%=path %>/css/in_out.css" />
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
@@ -32,21 +33,17 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>发货仓库：</td>
-					<td>
-						<select name="searchProjectId" id="searchProjectId"  style="width:80px;"></select>
-					</td>
 					<td>单据编号：</td>
 					<td>
-						<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
+						<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
 					</td>
 					<td>单据日期：</td>
 					<td>
-						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
+						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
 					</td>
 					<td>-</td>
 					<td>
-						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
+						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
 					</td>
 					<td>&nbsp;</td>
 					<td>
@@ -62,48 +59,36 @@
 			<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 		</div>
 		
-	    <div id="depotHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	    <div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
 	            closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
 	        <form id="depotHeadFM" method="post"  novalidate>
 	            <table>
 					<tr>
-	            <td>发货仓库：</td>
-	            <td style="padding:5px">
-                <select name="ProjectId" id="ProjectId" style="width:120px;"></select>
+						<td style="width:60px;">单据日期：</td>
+						<td style="padding:5px;width:170px;">
+							<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate" style="width:140px;"/>
 						</td>
-                <td>单据日期：</td>
+						<td style="width:70px;">单据编号：</td>
 						<td style="padding:5px">
-                <input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
+							<input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width:140px;"/>
 						</td>
-                <td>经手人：</td>
-	            <td style="padding:5px">
-	            <select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
-	            </td>	            
-	            <td style="width:50px;"></td>
-	            <td style="padding:5px;width:120px;"></td>
+						<td style="width:80px;"></td>
+						<td style="padding:5px;width:170px;"></td>
+						<td style="width:70px;"></td>
+						<td style="padding:5px"></td>
+						<td style="width:100px;"></td>
 					</tr>
 					<tr>
-	            <td>收货仓库：</td>
-	            <td style="padding:5px">
-	            <select name="AllocationProjectId" id="AllocationProjectId" style="width:120px;"></select>
-	            </td>
-	            <td>单据编号：</td>
-	            <td style="padding:5px"><input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 120px;"/>
-	            </td>
-	            <td>单据备注：</td>
-	            <td style="padding:5px">
-	            <input name="Remark" id="Remark" class="easyui-validatebox" style="width: 120px;"/>
-	            </td>
-	            <td></td>
-				<td></td>
-	            </tr>
-	            <tr>
-	            <td>商品列表：</td>
-	            <td colspan="7">
+						<td colspan="9">
 							<!-- 商品列表table -->
 							<table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table>
 						</td>
 					</tr>
+					<tr>
+						<td colspan="9">
+							<textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息" style="width: 1130px; height:35px;"></textarea>
+						</td>
+					</tr>
 	            </table>
 	            <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
 	        </form>
@@ -112,49 +97,36 @@
 	        <a href="javascript:void(0)" id="saveDepotHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
 	        <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
 	    </div>
-	    <div id="depotHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	    <div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
 	            closed="true" modal="true" cache="false" collapsible="false" closable="true">
 			<table>
 				<tr>
-	            <td>发货仓库：</td>
-	            <td style="padding:5px;width:120px;">
-                <span id="ProjectIdShow"></span>
-                </td>
-                <td>单据日期：</td>
-                <td style="padding:5px;width:120px;">
+					<td style="width:60px;">单据日期：</td>
+					<td style="padding:5px;width:130px;">
 						<span id="OperTimeShow"></span>
 					</td>
-                <td>经手人：</td>
-	            <td style="padding:5px">
-	            <span id="HandsPersonIdShow"></span>
-	            </td>	            
-	            <td style="width:50px;"></td>
-	            <td style="padding:5px;width:120px;">
-	            </td>
-	            </tr>
-	            <tr>
-	            <td>收货仓库：</td>
-	            <td style="padding:5px;width:120px;">
-	            <span id="AllocationProjectIdShow"></span>
-	            </td>
-	            <td>单据编号：</td>
-	            <td style="padding:5px">
+					<td style="width:70px;">单据编号：</td>
+					<td style="padding:5px;width:130px;">
 						<span id="NumberShow"></span>
 					</td>
-	            <td>单据备注：</td>
-	            <td style="padding:5px">
-	            <span id="RemarkShow"></span>
-	            </td>	            
-	            <td></td>
-				<td></td>
+					<td style="width:80px;"></td>
+					<td style="padding:5px;width:140px;"></td>
+					<td style="width:70px;"></td>
+					<td style="padding:5px;width:140px;"></td>
+					<td style="width:100px;"></td>
 				</tr>
 				<tr>
-	            <td>商品列表：</td>
-	            <td colspan="7">
+					<td colspan="9" style="width: 1130px;">
 						<!-- 商品列表table -->
 						<table id="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
 					</td>
 				</tr>
+				<tr>
+					<td style="width:60px;">单据备注：</td>
+					<td colspan="8" style="height:35px;">
+						<span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+					</td>
+				</tr>
 			</table>
 	    </div>
 	</body>

src/main/webapp/pages/materials/gift_out_list.jsp

@@ -15,6 +15,7 @@
 		<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" />
+		<link type="text/css" rel="stylesheet" href="<%=path %>/css/in_out.css" />
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>

src/main/webapp/pages/materials/gift_recharge_list.jsp

@@ -15,6 +15,7 @@
 		<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" />
+		<link type="text/css" rel="stylesheet" href="<%=path %>/css/in_out.css" />
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>

src/main/webapp/pages/materials/materialcategory.jsp

@@ -26,6 +26,11 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
+					<td>名称：</td>
+					<td>
+						<input name="searchName" id="searchName" style="width:100px;"/>
+					</td>
+					<td>&nbsp;</td>
 			    	<td>类别：</td>
 					<td>
 						<select name="searchParentId_f" id="searchParentId_f"  style="width:100px;"></select>
@@ -33,8 +38,6 @@
 						<select name="searchParentId_t" id="searchParentId_t"  style="width:100px;"></select>
 					</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> 
@@ -277,6 +280,7 @@
 								addMaterialCategory();
 							}
 						},
+						'-',
 						{
 							id:'deleteMaterialCategory',
 							text:'删除',
@@ -309,7 +313,7 @@
 			        $("#saveMaterialCategory").click();
 			    }
 			    //搜索按钮添加快捷键
-			    if(k == "13"&&(obj.id=="searchParentId"))
+			    if(k == "13"&&(obj.id=="searchParentId"||(obj.id=="searchName")))
 			    {  
 			        $("#searchBtn").click();
 			    }  
@@ -570,6 +574,7 @@
 					url: "<%=path %>/materialCategory/findBy.action",
 					dataType: "json",
 					data: ({
+						Name: $.trim($("#searchName").val()),
 						ParentId:parent,
 						pageNo:pageNo,
 						pageSize:pageSize

src/main/webapp/pages/materials/other_in_list.jsp

@@ -15,6 +15,7 @@
 		<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" />
+		<link type="text/css" rel="stylesheet" href="<%=path %>/css/in_out.css" />
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
@@ -32,21 +33,17 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>收货仓库：</td>
-					<td>
-						<select name="searchProjectId" id="searchProjectId"  style="width:80px;"></select>
-					</td>
 					<td>单据编号：</td>
 					<td>
-						<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
+						<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
 					</td>
 					<td>单据日期：</td>
 					<td>
-						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
+						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
 					</td>
 					<td>-</td>
 					<td>
-						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
+						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
 					</td>
 					<td>&nbsp;</td>
 					<td>
@@ -62,49 +59,44 @@
 			<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 		</div>
 		
-	    <div id="depotHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	    <div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
 	            closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
 	        <form id="depotHeadFM" method="post"  novalidate>
 	            <table>
 					<tr>
-	            <td>收货仓库：</td>
-	            <td style="padding:5px">
-                <select name="ProjectId" id="ProjectId" style="width:120px;"></select>
+						<td style="width:60px;">供应商：</td>
+						<td style="padding:5px;width:170px;">
+							<div class="org-list">
+								<input id="OrganId" name="OrganId" style="width:130px;" />
+							</div>
+							<div class="add-org-btn">
+								<img id="addOrgan" src="<%=path %>/js/easyui-1.3.5/themes/icons/edit_add.png" style="cursor: pointer;" alt="增加供应商" title="增加供应商" />
+							</div>
 						</td>
-                <td>单据日期：</td>
+						<td style="width:70px;">单据日期：</td>
 						<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 HH:mm:ss'})" class="txt Wdate" style="width:140px;"/>
 						</td>
-	            <td>往来单位：</td>
+						<td style="width:80px;">单据编号：</td>
 						<td style="padding:5px">
-	            <input id="OrganId" name="OrganId" style="width:120px;" />  
+							<input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
 						</td>
-	            <td style="width:50px;"></td>
-	            <td style="padding:5px;width:120px;"></td>
+						<td style="width:70px;"></td>
+						<td style="padding:5px">
+						</td>
+						<td style="width:100px;"></td>
 					</tr>
 					<tr>
-	            <td>经手人：</td>
-	            <td style="padding:5px">
-	            <select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
-	            </td>
-	            <td>单据编号：</td>
-	            <td style="padding:5px">
-	            <input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 120px;"/>
-	            </td>
-	            <td>单据备注：</td>
-	            <td style="padding:5px">
-	            <input name="Remark" id="Remark" class="easyui-validatebox" style="width: 120px;"/>
-	            </td>
-	            <td></td>
-				<td></td>
-	            </tr>
-	            <tr>
-	            <td>商品列表：</td>
-	            <td colspan="7">
+						<td colspan="9">
 							<!-- 商品列表table -->
 							<table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table>
 						</td>
 					</tr>
+					<tr>
+						<td colspan="9">
+							<textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息" style="width: 1130px; height:35px;"></textarea>
+						</td>
+					</tr>
 	            </table>
 	            <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
 	        </form>
@@ -113,48 +105,38 @@
 	        <a href="javascript:void(0)" id="saveDepotHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
 	        <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
 	    </div>
-	    <div id="depotHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	    <div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
 	            closed="true" modal="true" cache="false" collapsible="false" closable="true">
 			<table>
 				<tr>
-	            <td>收货仓库：</td>
-	            <td style="padding:5px;width:120px;">
-                <span id="ProjectIdShow"></span>
-                </td>
-                <td>单据日期：</td>
-                <td style="padding:5px;width:120px;">
-                <span id="OperTimeShow"></span>
-                </td>
-	            <td>往来单位：</td>
-	            <td style="padding:5px;width:120px;">
+					<td style="width:60px;">供应商：</td>
+					<td style="padding:5px;width:130px;">
 						<span id="OrganIdShow"></span>
 					</td>
-	            <td style="width:50px;"></td>
-	            <td style="padding:5px;width:120px;"></td>
-	            </tr>
-	            <tr>
-	            <td>经手人：</td>
-	            <td style="padding:5px">
-	            <span id="HandsPersonIdShow"></span>
+					<td style="width:70px;">单据日期：</td>
+					<td style="padding:5px;width:130px;">
+						<span id="OperTimeShow"></span>
 					</td>
-	            <td>单据编号：</td>
-	            <td style="padding:5px">
+					<td style="width:80px;">单据编号：</td>
+					<td style="padding:5px;width:140px;">
 						<span id="NumberShow"></span>
 					</td>
-	            <td>单据备注：</td>
-	            <td style="padding:5px">
-	            <span id="RemarkShow"></span>
-	            </td>
-	            <td></td>
-				<td></td>
+					<td style="width:70px;"></td>
+					<td style="padding:5px;width:140px;"></td>
+					<td style="width:100px;"></td>
 				</tr>
 				<tr>
-	            <td>商品列表：</td>
-	            <td colspan="7">
+					<td colspan="9" style="width: 1130px;">
 						<!-- 商品列表table -->
 						<table id="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
 					</td>
 				</tr>
+				<tr>
+					<td style="width:60px;">单据备注：</td>
+					<td colspan="8" style="height:35px;">
+						<span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+					</td>
+				</tr>
 			</table>
 	    </div>
 	</body>

src/main/webapp/pages/materials/other_out_list.jsp

@@ -15,6 +15,7 @@
 		<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" />
+		<link type="text/css" rel="stylesheet" href="<%=path %>/css/in_out.css" />
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
@@ -32,21 +33,17 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>发货仓库：</td>
-					<td>
-						<select name="searchProjectId" id="searchProjectId"  style="width:80px;"></select>
-					</td>
 					<td>单据编号：</td>
 					<td>
-						<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
+						<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
 					</td>
 					<td>单据日期：</td>
 					<td>
-						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
+						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
 					</td>
 					<td>-</td>
 					<td>
-						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
+						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
 					</td>
 					<td>&nbsp;</td>
 					<td>
@@ -62,48 +59,39 @@
 			<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 		</div>
 		
-	    <div id="depotHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	    <div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
 	            closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
 	        <form id="depotHeadFM" method="post"  novalidate>
 	            <table>
 					<tr>
-	            <td>发货仓库：</td>
-	            <td style="padding:5px">
-                <select name="ProjectId" id="ProjectId" style="width:120px;"></select>
+						<td style="width:60px;">客户：</td>
+						<td style="padding:5px;width:170px;">
+							<input id="OrganId" name="OrganId" style="width:130px;" />
 						</td>
-                <td>单据日期：</td>
+						<td style="width:70px;">单据日期：</td>
 						<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 HH:mm:ss'})" class="txt Wdate" style="width:140px;"/>
 						</td>
-	            <td>往来单位：</td>
+						<td style="width:80px;">单据编号：</td>
 						<td style="padding:5px">
-	            <input id="OrganId" name="OrganId" style="width:120px;" />  
+							<input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
 						</td>
-	            <td style="width:50px;"></td>
-	            <td style="padding:5px;width:120px;"></td>
+						<td style="width:70px;"></td>
+						<td style="padding:5px">
+						</td>
+						<td style="width:100px;"></td>
 					</tr>
 					<tr>
-	            <td>经手人：</td>
-	            <td style="padding:5px">
-	            <select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
-	            </td>
-	            <td>单据编号：</td>
-	            <td style="padding:5px"><input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 120px;"/>
-	            </td>
-	            <td>单据备注：</td>
-	            <td style="padding:5px">
-	            <input name="Remark" id="Remark" class="easyui-validatebox" style="width: 120px;"/>
-	            </td>	            
-	            <td></td>
-				<td></td>
-	            </tr>
-	            <tr>
-	            <td>商品列表：</td>
-	            <td colspan="7">
+						<td colspan="9">
 							<!-- 商品列表table -->
 							<table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table>
 						</td>
 					</tr>
+					<tr>
+						<td colspan="9">
+							<textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息" style="width: 1130px; height:35px;"></textarea>
+						</td>
+					</tr>
 	            </table>
 	            <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
 	        </form>
@@ -112,49 +100,38 @@
 	        <a href="javascript:void(0)" id="saveDepotHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
 	        <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
 	    </div>
-	    <div id="depotHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	    <div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
 	            closed="true" modal="true" cache="false" collapsible="false" closable="true">
 	            <table>
 					<tr>
-	            <td>发货仓库：</td>
-	            <td style="padding:5px;width:120px;">
-                <span id="ProjectIdShow"></span>
-                </td>
-                <td>单据日期：</td>
-                <td style="padding:5px;width:120px;">
-                <span id="OperTimeShow"></span>
-                </td>
-	            <td>往来单位：</td>
-	            <td style="padding:5px;width:120px;">
+						<td style="width:60px;">客户：</td>
+						<td style="padding:5px;width:130px;">
 							<span id="OrganIdShow"></span>
 						</td>
-	            <td style="width:50px;"></td>
-	            <td style="padding:5px;width:120px;">
+						<td style="width:70px;">单据日期：</td>
+						<td style="padding:5px;width:130px;">
+							<span id="OperTimeShow"></span>
 						</td>
-	            </tr>
-	            <tr>
-	            <td>经手人：</td>
-	            <td style="padding:5px">
-	            <span id="HandsPersonIdShow"></span>
-	            </td>
-	            <td>单据编号：</td> 
-	            <td style="padding:5px">
+						<td style="width:80px;">单据编号：</td>
+						<td style="padding:5px;width:140px;">
 							<span id="NumberShow"></span>
 						</td>
-	            <td>单据备注：</td>
-	            <td style="padding:5px">
-	            <span id="RemarkShow"></span>
-	            </td>	            
-	            <td></td>
-				<td></td>
+						<td style="width:70px;"></td>
+						<td style="padding:5px;width:140px;"></td>
+						<td style="width:100px;"></td>
 					</tr>
 					<tr>
-	            <td>商品列表：</td>
-	            <td colspan="7">
+						<td colspan="9" style="width: 1130px;">
 							<!-- 商品列表table -->
 							<table id="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
 						</td>
 					</tr>
+					<tr>
+						<td style="width:60px;">单据备注：</td>
+						<td colspan="8" style="height:35px;">
+							<span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+						</td>
+					</tr>
 	            </table>
 	    </div>	    
 	</body>

src/main/webapp/pages/materials/person.jsp

@@ -34,6 +34,7 @@
 					<td>
 						<select name="searchType" id="searchType"  style="width:70px;">
 						<option value="">全部</option>
+						<option value="业务员">业务员</option>
 						<option value="仓管员">仓管员</option>
 						<option value="财务员">财务员</option>
 						</select>
@@ -63,6 +64,7 @@
 	            <td style="padding:5px">
 	            <select name="Type" id="Type"  style="width:230px;">
 						<option value="">请选择</option>
+						<option value="业务员">业务员</option>
 						<option value="仓管员">仓管员</option>
 						<option value="财务员">财务员</option>
 						</select>

src/main/webapp/pages/materials/purchase_back_list.jsp

@@ -15,6 +15,7 @@
 		<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" />
+		<link type="text/css" rel="stylesheet" href="<%=path %>/css/in_out.css" />
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
@@ -32,21 +33,17 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>发货仓库：</td>
-					<td>
-						<select name="searchProjectId" id="searchProjectId"  style="width:80px;"></select>
-					</td>
 					<td>单据编号：</td>
 					<td>
-						<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
+						<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
 					</td>
 					<td>单据日期：</td>
 					<td>
-						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
+						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
 					</td>
 					<td>-</td>
 					<td>
-						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
+						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
 					</td>
 					<td>&nbsp;</td>
 					<td>
@@ -62,53 +59,84 @@
 			<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 		</div>
 		
-	    <div id="depotHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	    <div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
 	            closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
 	        <form id="depotHeadFM" method="post"  novalidate>
 	            <table>
 					<tr>
-	            <td>发货仓库：</td>
-	            <td style="padding:5px">
-                <select name="ProjectId" id="ProjectId" style="width:110px;"></select>
+						<td style="width:60px;">供应商：</td>
+						<td style="padding:5px;width:170px;">
+							<div class="org-list">
+								<input id="OrganId" name="OrganId" style="width:130px;" />
+							</div>
+							<div class="add-org-btn">
+								<img id="addOrgan" src="<%=path %>/js/easyui-1.3.5/themes/icons/edit_add.png" style="cursor: pointer;" alt="增加供应商" title="增加供应商" />
+							</div>
 						</td>
-                <td>单据日期：</td>
+						<td style="width:70px;">单据日期：</td>
 						<td style="padding:5px">
-                <input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:110px;"/>
+							<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate" style="width:140px;"/>
 						</td>
-	            <td>收货单位：</td>
+						<td style="width:80px;">单据编号：</td>
 						<td style="padding:5px">
-	            <input id="OrganId" name="OrganId" style="width:110px;" />  
+							<input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
 						</td>
-	            <td>经手人：</td>
+						<td style="width:70px;"></td>
 						<td style="padding:5px">
-	            <select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
 						</td>
+						<td style="width:100px;"></td>
 					</tr>
 					<tr>
-	            <td>收款账户：</td>
-	            <td style="padding:5px">
-	            <select name="AccountId" id="AccountId" style="width:110px;"></select>
-	            </td>
-	            <td>收款金额：</td>
-				<td style="padding:5px">
-	            <input id="ChangeAmount" name="ChangeAmount" data-changeamount="0" style="width:110px;" />
-				</td>
-				<td>单据编号：</td>
-	            <td style="padding:5px">
-	            <input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 110px;"/>
-	            </td>
-	            <td>单据备注：</td>
-	            <td style="padding:5px">
-	            <input name="Remark" id="Remark" class="easyui-validatebox" style="width: 110px;"/>
-	            </td>
-	            </tr>
-	            <tr>
-	            <td>商品列表：</td>
-	            <td colspan="7">
+						<td colspan="9">
 						<!-- 商品列表table -->
 						<table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table>
 						</td>
 					</tr>
+					<tr>
+						<td colspan="9">
+							<textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息" style="width: 1130px; height:35px;"></textarea>
+						</td>
+					</tr>
+					<tr>
+						<td>优惠率：</td>
+						<td style="padding:5px">
+							<input id="Discount" name="Discount" style="width:110px;" />
+							%
+						</td>
+						<td>退款优惠：</td>
+						<td style="padding:5px">
+							<input id="DiscountMoney" name="DiscountMoney" style="width:120px;" />
+						</td>
+						<td>优惠后金额：</td>
+						<td style="padding:5px">
+							<input id="DiscountLastMoney" name="DiscountLastMoney" readonly="readonly" style="width:120px;" />
+						</td>
+						<td>本次退款：</td>
+						<td style="padding:5px">
+							<input id="ChangeAmount" name="ChangeAmount" data-changeamount="0" style="width:120px;" />
+						</td>
+						<td style="width:100px;"></td>
+					</tr>
+					<tr>
+						<td>结算账户：</td>
+						<td style="padding:5px">
+							<select name="AccountId" id="AccountId" style="width:110px;"></select>
+							<img class="many-account-ico" src="<%=path%>/js/easyui-1.3.5/themes/icons/filelist.jpg"  style="display: none;"/>
+						</td>
+						<td>本次欠款：</td>
+						<td style="padding:5px">
+							<input id="Debt" name="Debt" readonly="readonly" style="width:120px;" />
+						</td>
+						<td>采购费用：</td>
+						<td style="padding:5px">
+							<input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly" />
+							<img class="other-money-ico" src="<%=path%>/js/easyui-1.3.5/themes/icons/filelist.jpg" />
+						</td>
+						<td></td>
+						<td style="padding:5px">
+						</td>
+						<td style="width:100px;"></td>
+					</tr>
 	            </table>
 	            <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
 	        </form>
@@ -117,53 +145,222 @@
 	        <a href="javascript:void(0)" id="saveDepotHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
 	        <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
 	    </div>
-	    <div id="depotHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	    <div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
 	            closed="true" modal="true" cache="false" collapsible="false" closable="true">
 			<table>
 				<tr>
-	            <td>发货仓库：</td>
-	            <td style="padding:5px;width:110px;">
-                <span id="ProjectIdShow"></span>
-                </td>
-                <td>单据日期：</td>
-                <td style="padding:5px;width:110px;">
-                <span id="OperTimeShow"></span>
-                </td>
-	            <td>收货单位：</td>
-	            <td style="padding:5px;width:110px;">
+					<td style="width:60px;">供应商：</td>
+					<td style="padding:5px;width:130px;">
 						<span id="OrganIdShow"></span>
 					</td>
-	            <td>经手人：</td>
-	            <td style="padding:5px;width:110px;">
-	            <span id="HandsPersonIdShow"></span>
+					<td style="width:70px;">单据日期：</td>
+					<td style="padding:5px;width:130px;">
+						<span id="OperTimeShow"></span>
 					</td>
-	            </tr>
-	            <tr>
-	            <td>收款账户：</td>
-	            <td style="padding:5px">
-	            <span id="AccountIdShow"></span>
-	            </td>
-	            <td>收款金额：</td>
-				<td style="padding:5px">
-	            <span id="ChangeAmountShow"></span>
-				</td>
-				<td>单据编号：</td>	            
-	            <td style="padding:5px">
+					<td style="width:80px;">单据编号：</td>
+					<td style="padding:5px;width:140px;">
 						<span id="NumberShow"></span>
 					</td>
-	            <td>单据备注：</td>
-	            <td style="padding:5px">
-	            <span id="RemarkShow"></span>
-	            </td>
+					<td style="width:70px;"></td>
+					<td style="padding:5px;width:140px;"></td>
+					<td style="width:100px;"></td>
 				</tr>
 				<tr>
-	            <td>商品列表：</td>
-	            <td colspan="7">
+					<td colspan="9" style="width: 1130px;">
 						<!-- 商品列表table -->
 						<table id="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
 					</td>
 				</tr>
+				<tr>
+					<td style="width:60px;">单据备注：</td>
+					<td colspan="8" style="height:35px;">
+						<span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+					</td>
+				</tr>
+				<tr>
+					<td>优惠率：</td>
+					<td>
+						<span id="DiscountShow" style="width: 110px;"></span>
+						%
+					</td>
+					<td>付款优惠：</td>
+					<td>
+						<span id="DiscountMoneyShow" style="width: 120px;"></span>
+					</td>
+					<td>优惠后金额：</td>
+					<td>
+						<span id="DiscountLastMoneyShow" style="width: 120px;"></span>
+					</td>
+					<td>本次付款：</td>
+					<td style="padding:5px">
+						<span id="ChangeAmountShow"></span>
+					</td>
+					<td style="width:100px;"></td>
+				</tr>
+				<tr>
+					<td>结算账户：</td>
+					<td style="padding:5px">
+						<span id="AccountIdShow"></span>
+					</td>
+					<td>本次欠款：</td>
+					<td style="padding:5px">
+						<span id="DebtShow"></span>
+					</td>
+					<td>采购费用：</td>
+					<td style="padding:5px">
+						<span id="OtherMoneyShow"></span>
+					</td>
+					<td></td>
+					<td style="padding:5px">
+					</td>
+					<td style="width:100px;"></td>
+				</tr>
 			</table>
 	    </div>
+		<div id="depotHeadAccountDlg" class="easyui-dialog" style="width:380px;padding:10px 20px;top:80px"
+			 closed="true" modal="true" buttons="#accountDlgButtons" cache="false" collapsible="false" closable="true">
+			<table class="account-dlg">
+				<tr class="account-head-tmp">
+					<td style="width:30px;"></td>
+					<td style="width:140px; padding:5px;">结算账户</td>
+					<td style="width:100px; padding:5px;">金额</td>
+				</tr>
+				<tr>
+					<td style="width:30px;"></td>
+					<td style="width:140px;text-align: center;">合计：</td>
+					<td style="width:100px;"><span id="accountMoneyTotalDlg"></span></td>
+				</tr>
+			</table>
+			<table class="tabs-tmp">
+				<tr class="account-content-tmp">
+					<td style="width:30px;"></td>
+					<td style="width:140px; padding:3px;"><select class="account-id-dlg" style="width:140px;"></select></td>
+					<td style="width:100px; padding:3px;"><input class="account-money-dlg" style="width:100px;" /></td>
+				</tr>
+			</table>
+		</div>
+		<div id="accountDlgButtons">
+			<a href="javascript:void(0)" id="saveDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+			<a href="javascript:void(0)" id="cancelDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
+		</div>
+		<div id="otherMoneyDlg" class="easyui-dialog" style="width:380px;padding:10px 20px;top:80px"
+			 closed="true" modal="true" buttons="#otherMoneyDlgBtn" cache="false" collapsible="false" closable="true">
+			<table class="money-dlg">
+				<tr class="money-head-tmp">
+					<td style="width:30px;"></td>
+					<td style="width:140px; padding:5px;">结算账户</td>
+					<td style="width:100px; padding:5px;">金额</td>
+				</tr>
+				<tr>
+					<td style="width:30px;"></td>
+					<td style="width:140px;text-align: center;">合计：</td>
+					<td style="width:100px;"><span id="otherMoneyTotalDlg"></span></td>
+				</tr>
+			</table>
+			<table class="tabs-tmp">
+				<tr class="money-content-tmp">
+					<td style="width:30px;"></td>
+					<td style="width:140px; padding:3px;"><select class="money-id-dlg" style="width:140px;"></select></td>
+					<td style="width:100px; padding:3px;"><input class="other-money-dlg" style="width:100px;" /></td>
+				</tr>
+			</table>
+		</div>
+		<div id="otherMoneyDlgBtn">
+			<a href="javascript:void(0)" id="saveOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+			<a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
+		</div>
+		<div id="supplierDlg" class="easyui-dialog" style="width:580px;padding:10px 20px"
+			 closed="true" buttons="#supplierDlgBtn" modal="true" collapsible="false" closable="true">
+			<form id="supplierFM">
+				<table>
+					<tr>
+						<td style="width: 80px;height: 20px">名称</td>
+						<td style="width: 180px;padding:1px">
+							<input name="supplier" id="supplier" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 160px;height: 20px"/>
+						</td>
+						<td style="width: 60px;height: 20px">联系人</td>
+						<td style="width:180px;padding:1px;">
+							<input name="contacts" id="contacts" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>联系电话</td>
+						<td style="padding:1px;">
+							<input name="phonenum" id="phonenum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+						<td>手机</td>
+						<td style="padding:1px;">
+							<input name="telephone" id="telephone" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>电子邮箱</td>
+						<td style="padding:1px">
+							<input name="email" id="email" class="easyui-validatebox" validType="email" style="width: 160px;height: 20px"/>
+						</td>
+						<td>传真</td>
+						<td style="padding:1px">
+							<input name="fax" id="fax" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>期初应收</td>
+						<td style="padding:1px">
+							<input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
+						</td>
+						<td>期初应付</td>
+						<td style="padding:1px">
+							<input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
+						</td>
+					</tr>
+					<tr>
+						<td>累计应收</td>
+						<td style="padding:1px">
+							<input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
+						</td>
+						<td>累计应付</td>
+						<td style="padding:1px">
+							<input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
+						</td>
+					</tr>
+					<tr>
+						<td>纳税人识别号</td>
+						<td style="padding:1px">
+							<input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+						<td>税率</td>
+						<td style="padding:1px">
+							<input name="taxRate" id="taxRate" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>开户行</td>
+						<td style="padding:1px">
+							<input name="bankName" id="bankName" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+						<td>账号</td>
+						<td style="padding:1px">
+							<input name="accountNumber" id="accountNumber" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>地址</td>
+						<td style="padding:1px" colspan="3">
+							<input name="address" id="address" class="easyui-validatebox" style="width: 408px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>备注</td>
+						<td style="padding:1px" colspan="3">
+							<textarea name="description" id="description" rows="2" cols="2" style="width: 408px;"></textarea>
+						</td>
+					</tr>
+				</table>
+			</form>
+		</div>
+		<div id="supplierDlgBtn">
+			<a href="javascript:void(0)" id="saveSupplier" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+			<a href="javascript:void(0)" id="cancelSupplier" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#supplierDlg').dialog('close')">取消</a>
+		</div>
 	</body>
 </html>

src/main/webapp/pages/materials/purchase_in_list.jsp

@@ -15,6 +15,7 @@
 		<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" />
+		<link type="text/css" rel="stylesheet" href="<%=path %>/css/in_out.css" />
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
@@ -32,21 +33,17 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>收货仓库：</td>
-					<td>
-						<select name="searchProjectId" id="searchProjectId"  style="width:80px;"></select>
-					</td>
 					<td>单据编号：</td>
 					<td>
-						<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
+						<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
 					</td>
 					<td>单据日期：</td>
 					<td>
-						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
+						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
 					</td>
 					<td>-</td>
 					<td>
-						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
+						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
 					</td>
 					<td>&nbsp;</td>
 					<td>
@@ -62,53 +59,85 @@
 			<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 		</div>
 		
-	    <div id="depotHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	    <div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
 	            closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
 	        <form id="depotHeadFM" method="post"  novalidate>
 	            <table>
 					<tr>
-	            <td>收货仓库：</td>
-	            <td style="padding:5px">
-                <select name="ProjectId" id="ProjectId" style="width:110px;"></select>
+						<td style="width:60px;">供应商：</td>
+						<td style="padding:5px;width:170px;">
+							<div class="org-list">
+								<input id="OrganId" name="OrganId" style="width:130px;" />
+							</div>
+							<div class="add-org-btn">
+								<img id="addOrgan" src="<%=path %>/js/easyui-1.3.5/themes/icons/edit_add.png" style="cursor: pointer;" alt="增加供应商" title="增加供应商" />
+							</div>
 						</td>
-                <td>单据日期：</td>
+						<td style="width:70px;">单据日期：</td>
 						<td style="padding:5px">
-                <input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:110px;"/>
+							<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate" style="width:140px;"/>
 						</td>
-	            <td>供货单位：</td>
+						<td style="width:80px;">单据编号：</td>
 						<td style="padding:5px">
-	            <input id="OrganId" name="OrganId" style="width:110px;" />  
+							<input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
 						</td>
-	            <td>经手人：</td>
+						<td style="width:70px;"></td>
 						<td style="padding:5px">
-	            <select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
 						</td>
+						<td style="width:100px;"></td>
 					</tr>
 					<tr>
-	            <td>付款账户：</td>
-	            <td style="padding:5px">
-	            <select name="AccountId" id="AccountId" style="width:110px;"></select>
-	            </td>
-	            <td>付款金额：</td>
-				<td style="padding:5px">
-	            <input id="ChangeAmount" name="ChangeAmount" data-changeamount="0" style="width:110px;" />
-				</td>
-				<td>单据编号：</td>
-	            <td style="padding:5px">
-	            <input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 110px;"/>
-	            </td>
-	            <td>单据备注：</td>
-	            <td style="padding:5px">
-	            <input name="Remark" id="Remark" class="easyui-validatebox" style="width: 110px;"/>
-	            </td>	            
-	            </tr>
-	            <tr>
-	            <td>商品列表：</td>
-	            <td colspan="7">
+						<td colspan="9">
 							<!-- 商品列表table -->
 							<table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table>
 						</td>
 					</tr>
+					<tr>
+						<td colspan="9">
+							<textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息" style="width: 1130px; height:35px;"></textarea>
+						</td>
+					</tr>
+					<tr>
+						<td>优惠率：</td>
+						<td style="padding:5px">
+							<input id="Discount" name="Discount" style="width:110px;" />
+							%
+						</td>
+						<td>付款优惠：</td>
+						<td style="padding:5px">
+							<input id="DiscountMoney" name="DiscountMoney" style="width:120px;" />
+						</td>
+						<td>优惠后金额：</td>
+						<td style="padding:5px">
+							<input id="DiscountLastMoney" name="DiscountLastMoney" readonly="readonly" style="width:120px;" />
+						</td>
+						<td>本次付款：</td>
+						<td style="padding:5px">
+							<input id="ChangeAmount" name="ChangeAmount" data-changeamount="0" style="width:120px;" />
+						</td>
+						<td style="width:100px;"></td>
+					</tr>
+					<tr>
+						<td>结算账户：</td>
+						<td style="padding:5px">
+							<select name="AccountId" id="AccountId" style="width:110px;"></select>
+							<img class="many-account-ico" src="<%=path%>/js/easyui-1.3.5/themes/icons/filelist.jpg"  style="display: none;"/>
+						</td>
+						<td>本次欠款：</td>
+						<td style="padding:5px">
+							<input id="Debt" name="Debt" readonly="readonly" style="width:120px;" />
+						</td>
+						<td>采购费用：</td>
+						<td style="padding:5px">
+							<input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly" />
+							<img class="other-money-ico" src="<%=path%>/js/easyui-1.3.5/themes/icons/filelist.jpg" />
+						</td>
+						<td>结算天数：</td>
+						<td style="padding:5px">
+							<input id="AccountDay" name="AccountDay" class="easyui-validatebox" data-options="validType:'length[1,3]'" style="width:120px;" />
+						</td>
+						<td style="width:100px;"></td>
+					</tr>
 	            </table>
 	            <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
 	        </form>
@@ -117,53 +146,223 @@
 	        <a href="javascript:void(0)" id="saveDepotHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
 	        <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
 	    </div>
-	    <div id="depotHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	    <div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
 	            closed="true" modal="true" cache="false" collapsible="false" closable="true">
             <table>
 	            <tr>
-	            <td>收货仓库：</td>
-	            <td style="padding:5px;width:110px;">
-                <span id="ProjectIdShow"></span>
-                </td>
-                <td>单据日期：</td>
-                <td style="padding:5px;width:110px;">
-                <span id="OperTimeShow"></span>
-                </td>
-	            <td>供货单位：</td>
-	            <td style="padding:5px;width:110px;">
+					<td style="width:60px;">供应商：</td>
+					<td style="padding:5px;width:130px;">
 						<span id="OrganIdShow"></span>
 					</td>
-	            <td>经手人：</td>
-	            <td style="padding:5px;width:110px;">
-	            <span id="HandsPersonIdShow"></span>
+					<td style="width:70px;">单据日期：</td>
+					<td style="padding:5px;width:130px;">
+						<span id="OperTimeShow"></span>
 					</td>
-	            </tr>
-	            <tr>
-	            <td>付款账户：</td>
-	            <td style="padding:5px">
-	            <span id="AccountIdShow"></span>
-	            </td>
-	            <td>付款金额：</td>
-				<td style="padding:5px">
-	            <span id="ChangeAmountShow"></span>
-				</td>
-				<td>单据编号：</td>	            
-	            <td style="padding:5px">
+					<td style="width:80px;">单据编号：</td>
+					<td style="padding:5px;width:140px;">
 						<span id="NumberShow"></span>
 					</td>
-	            <td>单据备注：</td>
-	            <td style="padding:5px">
-	            <span id="RemarkShow"></span>
-	            </td>	            
+					<td style="width:70px;"></td>
+					<td style="padding:5px;width:140px;"></td>
+					<td style="width:100px;"></td>
 	            </tr>
 				<tr>
-	            <td>商品列表：</td>
-	            <td colspan="7">
+					<td colspan="9" style="width: 1130px;">
 						<!-- 商品列表table -->
 						<table id="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
 					</td>
 				</tr>
+				<tr>
+					<td style="width:60px;">单据备注：</td>
+					<td colspan="8" style="height:35px;">
+						<span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+					</td>
+				</tr>
+				<tr>
+					<td>优惠率：</td>
+					<td>
+						<span id="DiscountShow" style="width: 110px;"></span>
+						%
+					</td>
+					<td>付款优惠：</td>
+					<td>
+						<span id="DiscountMoneyShow" style="width: 120px;"></span>
+					</td>
+					<td>优惠后金额：</td>
+					<td>
+						<span id="DiscountLastMoneyShow" style="width: 120px;"></span>
+					</td>
+					<td>本次付款：</td>
+					<td style="padding:5px">
+						<span id="ChangeAmountShow"></span>
+					</td>
+					<td style="width:100px;"></td>
+				</tr>
+				<tr>
+					<td>结算账户：</td>
+					<td style="padding:5px">
+						<span id="AccountIdShow"></span>
+					</td>
+					<td>本次欠款：</td>
+					<td style="padding:5px">
+						<span id="DebtShow"></span>
+					</td>
+					<td>采购费用：</td>
+					<td style="padding:5px">
+						<span id="OtherMoneyShow"></span>
+					</td>
+					<td>结算天数：</td>
+					<td style="padding:5px">
+						<span id="AccountDayShow"></span>
+					</td>
+					<td style="width:100px;"></td>
+				</tr>
             </table>
 	    </div>
+		<div id="depotHeadAccountDlg" class="easyui-dialog" style="width:380px;padding:10px 20px;top:80px"
+			 closed="true" modal="true" buttons="#accountDlgButtons" cache="false" collapsible="false" closable="true">
+			<table class="account-dlg">
+				<tr class="account-head-tmp">
+					<td style="width:30px;"></td>
+					<td style="width:140px; padding:5px;">结算账户</td>
+					<td style="width:100px; padding:5px;">金额</td>
+				</tr>
+				<tr>
+					<td style="width:30px;"></td>
+					<td style="width:140px;text-align: center;">合计：</td>
+					<td style="width:100px;"><span id="accountMoneyTotalDlg"></span></td>
+				</tr>
+			</table>
+			<table class="tabs-tmp">
+				<tr class="account-content-tmp">
+					<td style="width:30px;"></td>
+					<td style="width:140px; padding:3px;"><select class="account-id-dlg" style="width:140px;"></select></td>
+					<td style="width:100px; padding:3px;"><input class="account-money-dlg" style="width:100px;" /></td>
+				</tr>
+			</table>
+		</div>
+		<div id="accountDlgButtons">
+			<a href="javascript:void(0)" id="saveDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+			<a href="javascript:void(0)" id="cancelDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
+		</div>
+		<div id="otherMoneyDlg" class="easyui-dialog" style="width:380px;padding:10px 20px;top:80px"
+			 closed="true" modal="true" buttons="#otherMoneyDlgBtn" cache="false" collapsible="false" closable="true">
+			<table class="money-dlg">
+				<tr class="money-head-tmp">
+					<td style="width:30px;"></td>
+					<td style="width:140px; padding:5px;">结算账户</td>
+					<td style="width:100px; padding:5px;">金额</td>
+				</tr>
+				<tr>
+					<td style="width:30px;"></td>
+					<td style="width:140px;text-align: center;">合计：</td>
+					<td style="width:100px;"><span id="otherMoneyTotalDlg"></span></td>
+				</tr>
+			</table>
+			<table class="tabs-tmp">
+				<tr class="money-content-tmp">
+					<td style="width:30px;"></td>
+					<td style="width:140px; padding:3px;"><select class="money-id-dlg" style="width:140px;"></select></td>
+					<td style="width:100px; padding:3px;"><input class="other-money-dlg" style="width:100px;" /></td>
+				</tr>
+			</table>
+		</div>
+		<div id="otherMoneyDlgBtn">
+			<a href="javascript:void(0)" id="saveOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+			<a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
+		</div>
+		<div id="supplierDlg" class="easyui-dialog" style="width:580px;padding:10px 20px"
+			 closed="true" buttons="#supplierDlgBtn" modal="true" collapsible="false" closable="true">
+			<form id="supplierFM">
+				<table>
+					<tr>
+						<td style="width: 80px;height: 20px">名称</td>
+						<td style="width: 180px;padding:1px">
+							<input name="supplier" id="supplier" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 160px;height: 20px"/>
+						</td>
+						<td style="width: 60px;height: 20px">联系人</td>
+						<td style="width:180px;padding:1px;">
+							<input name="contacts" id="contacts" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>联系电话</td>
+						<td style="padding:1px;">
+							<input name="phonenum" id="phonenum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+						<td>手机</td>
+						<td style="padding:1px;">
+							<input name="telephone" id="telephone" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>电子邮箱</td>
+						<td style="padding:1px">
+							<input name="email" id="email" class="easyui-validatebox" validType="email" style="width: 160px;height: 20px"/>
+						</td>
+						<td>传真</td>
+						<td style="padding:1px">
+							<input name="fax" id="fax" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>期初应收</td>
+						<td style="padding:1px">
+							<input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
+						</td>
+						<td>期初应付</td>
+						<td style="padding:1px">
+							<input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
+						</td>
+					</tr>
+					<tr>
+						<td>累计应收</td>
+						<td style="padding:1px">
+							<input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
+						</td>
+						<td>累计应付</td>
+						<td style="padding:1px">
+							<input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
+						</td>
+					</tr>
+					<tr>
+						<td>纳税人识别号</td>
+						<td style="padding:1px">
+							<input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+						<td>税率</td>
+						<td style="padding:1px">
+							<input name="taxRate" id="taxRate" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>开户行</td>
+						<td style="padding:1px">
+							<input name="bankName" id="bankName" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+						<td>账号</td>
+						<td style="padding:1px">
+							<input name="accountNumber" id="accountNumber" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>地址</td>
+						<td style="padding:1px" colspan="3">
+							<input name="address" id="address" class="easyui-validatebox" style="width: 408px;height: 20px"/>
+						</td>
+					</tr>
+					<tr>
+						<td>备注</td>
+						<td style="padding:1px" colspan="3">
+							<textarea name="description" id="description" rows="2" cols="2" style="width: 408px;"></textarea>
+						</td>
+					</tr>
+				</table>
+			</form>
+		</div>
+		<div id="supplierDlgBtn">
+			<a href="javascript:void(0)" id="saveSupplier" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+			<a href="javascript:void(0)" id="cancelSupplier" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#supplierDlg').dialog('close')">取消</a>
+		</div>
 	</body>
 </html>

src/main/webapp/pages/materials/retail_back_list.jsp

@@ -15,7 +15,7 @@
 	<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" />
-	<link type="text/css" rel="stylesheet" href="<%=path %>/css/retail_list.css" />
+	<link type="text/css" rel="stylesheet" href="<%=path %>/css/in_out.css" />
 	<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 	<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 	<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
@@ -33,21 +33,17 @@
 	<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 		<table id="searchTable">
 			<tr>
-			<td>发货仓库：</td>
-			<td>
-				<select name="searchProjectId" id="searchProjectId"  style="width:80px;"></select>
-			</td>
 				<td>单据编号：</td>
 				<td>
-				<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
+					<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
 				</td>
 				<td>单据日期：</td>
 				<td>
-				<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
+					<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
 				</td>
 				<td>-</td>
 				<td>
-				<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
+					<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
 				</td>
 				<td>&nbsp;</td>
 				<td>
@@ -63,36 +59,28 @@
 		<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 	</div>
 
-<div id="depotHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
 		 closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
 		<form id="depotHeadFM" method="post"  novalidate>
 			<table>
 				<tr>
-				<td>会员卡号：</td>
-				<td style="padding:5px">
-					<input id="OrganId" name="OrganId" style="width:110px;" />
+					<td style="width:60px;height:50px;">会员卡号：</td>
+					<td style="padding:5px;width:200px;">
+						<input id="OrganId" name="OrganId" style="width:130px;" />
 					</td>
-				<td>收货仓库：</td>
+					<td style="width:70px;">单据日期：</td>
 					<td style="padding:5px">
-					<select name="ProjectId" id="ProjectId" style="width:110px;"></select>
+						<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate" style="width: 140px;"/>
 					</td>
-				<td>单据编号：</td>
+					<td style="width:80px;">单据编号：</td>
 					<td style="padding:5px">
-					<input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 130px;"/>
-				</td>
-				<td>单据日期：</td>
-				<td style="padding:5px">
-					<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width: 125px;"/>
+						<input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
 					</td>
+					<td style="width:70px;"></td>
+					<td style="padding:5px;width:150px;"></td>
 				</tr>
 				<tr>
-				<td>单据备注：</td>
-				<td style="padding:5px" colspan="5">
-					<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 292px;"/>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="6">
+					<td colspan="6" valign="top">
 						<!-- 商品列表table -->
 						<table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table>
 					</td>
@@ -125,18 +113,18 @@
 							<tr>
 								<td>付款账户：</td>
 								<td>
-								<select name="AccountId" id="AccountId" style="width: 117px;"></select>
-							</td>
-						</tr>
-						<tr>
-							<td>经手人：</td>
-							<td>
-								<select name="HandsPersonId" id="HandsPersonId" style="width: 117px;"></select>
+									<select name="AccountId" id="AccountId" style="width:110px;"></select>
+									<img class="many-account-ico" src="<%=path%>/js/easyui-1.3.5/themes/icons/filelist.jpg"  style="display: none;"/>
 								</td>
 							</tr>
 						</table>
 					</td>
 				</tr>
+				<tr>
+					<td colspan="8">
+						<textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息" style="width: 1130px; height:35px;"></textarea>
+					</td>
+				</tr>
 			</table>
 			<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
 		</form>
@@ -145,31 +133,24 @@
 		<a href="javascript:void(0)" id="saveDepotHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
 		<a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
 	</div>
-<div id="depotHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
 		 closed="true" modal="true" cache="false" collapsible="false" closable="true">
 		<table>
 			<tr>
-			<td>会员卡号：</td>
-			<td style="padding:5px;width:110px;">
+				<td style="width:60px;height:50px;">会员卡号：</td>
+				<td style="padding:5px;width:200px;">
 					<span id="OrganIdShow"></span>
 				</td>
-			<td>发货仓库：</td>
-			<td style="padding:5px;width:110px;">
-				<span id="ProjectIdShow"></span>
-			</td>
-			<td>单据编号：</td>
-			<td style="padding:5px;width:130px;">
-				<span id="NumberShow"></span>
-			</td>
-			<td>单据日期：</td>
-			<td style="padding:5px;width:125px;">
+				<td style="width:70px;">单据日期：</td>
+				<td style="padding:5px;width:200px;">
 					<span id="OperTimeShow"></span>
 				</td>
-		</tr>
-		<tr>
-			<td>单据备注：</td>
-			<td style="padding:5px;width:292px;" colspan="5">
-				<span id="RemarkShow"></span>
+				<td style="width:80px;">单据编号：</td>
+				<td style="padding:5px;width:200px;">
+					<span id="NumberShow"></span>
+				</td>
+				<td style="width:70px;"></td>
+				<td style="padding:5px;width:150px;">
 				</td>
 			</tr>
 			<tr>
@@ -180,7 +161,7 @@
 				<td colspan="2" valign="top">
 					<table width="100%" class="retail-amount-show">
 						<tr>
-						<td colspan="2">实收金额</td>
+							<td colspan="2">实付金额</td>
 						</tr>
 						<tr>
 							<td colspan="2">
@@ -188,7 +169,7 @@
 							</td>
 						</tr>
 						<tr>
-						<td colspan="2">收款金额</td>
+							<td colspan="2">付款金额</td>
 						</tr>
 						<tr>
 							<td colspan="2">
@@ -204,18 +185,17 @@
 							</td>
 						</tr>
 						<tr>
-						<td>收款账户：</td>
+							<td>付款账户：</td>
 							<td align="left" style="width:110px;">
 								<span id="AccountIdShow"></span>
 							</td>
 						</tr>
-					<tr>
-						<td>经手人：</td>
-						<td align="left" style="width:110px;">
-							<span id="HandsPersonIdShow"></span>
+					</table>
 				</td>
 			</tr>
-				</table>
+			<tr>
+				<td colspan="8" style="width: 1130px; height:35px;">
+					<span id="RemarkShow"></span>
 				</td>
 			</tr>
 		</table>

src/main/webapp/pages/materials/retail_out_list.jsp

@@ -15,7 +15,7 @@
 		<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" />
-		<link type="text/css" rel="stylesheet" href="<%=path %>/css/retail_list.css" />
+		<link type="text/css" rel="stylesheet" href="<%=path %>/css/in_out.css" />
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
@@ -33,21 +33,17 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>发货仓库：</td>
-					<td>
-						<select name="searchProjectId" id="searchProjectId"  style="width:80px;"></select>
-					</td>
 					<td>单据编号：</td>
 					<td>
-						<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
+						<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
 					</td>
 					<td>单据日期：</td>
 					<td>
-						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
+						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
 					</td>
 					<td>-</td>
 					<td>
-						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
+						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
 					</td>
 					<td>&nbsp;</td>
 					<td>
@@ -63,42 +59,32 @@
 			<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 		</div>
 		
-	    <div id="depotHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	    <div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
 	            closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
 	        <form id="depotHeadFM" method="post"  novalidate>
 	            <table>
 	            <tr>
-					<td>会员卡号：</td>
-					<td style="padding:5px">
-	            		<input id="OrganId" name="OrganId" style="width:110px;" />
+					<td style="width:60px;height:50px;">会员卡号：</td>
+					<td style="padding:5px;width:200px;">
+	            		<input id="OrganId" name="OrganId" style="width:130px;" />
 	            	</td>
-					<td>发货仓库：</td>
+					<td style="width:70px;">单据日期：</td>
 					<td style="padding:5px">
-						<select name="ProjectId" id="ProjectId" style="width:110px;"></select>
+						<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate" style="width: 140px;"/>
 					</td>
-					<td>单据编号：</td>
+					<td style="width:80px;">单据编号：</td>
 					<td style="padding:5px">
-						<input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 130px;"/>
+						<input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
 					</td>
-					<td>单据日期：</td>
-					<td style="padding:5px">
-						<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width: 125px;"/>
-					</td>
-	            </tr>
-	            <tr>
-					<td>单据备注：</td>
-					<td style="padding:5px" colspan="3">
-						<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 292px;"/>
-					</td>
-					<td>付款类型：</td>
-					<td style="padding:5px">
-						<select name="payType" id="payType" style="width:130px;">
+					<td style="width:70px;">付款类型：</td>
+					<td style="padding:5px;width:150px;">
+						<select name="payType" id="payType" style="width:145px;">
 							<option value="现付">现付</option>
 						</select>
 					</td>
 	            </tr>
 	            <tr>
-					<td colspan="6">
+					<td colspan="6" valign="top">
 						<!-- 商品列表table -->
 						<table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table>
 					</td>
@@ -131,18 +117,18 @@
 							<tr>
 								<td>收款账户：</td>
 								<td>
-									<select name="AccountId" id="AccountId" style="width: 117px;"></select>
-								</td>
-							</tr>
-							<tr>
-								<td>经手人：</td>
-								<td>
-									<select name="HandsPersonId" id="HandsPersonId" style="width: 117px;"></select>
+									<select name="AccountId" id="AccountId" style="width:110px;"></select>
+									<img class="many-account-ico" src="<%=path%>/js/easyui-1.3.5/themes/icons/filelist.jpg"  style="display: none;"/>
 								</td>
 							</tr>
 						</table>
 					</td>
 	            </tr>
+				<tr>
+					<td colspan="8">
+						<textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息" style="width: 1130px; height:35px;"></textarea>
+					</td>
+				</tr>
 	            </table>
 	            <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
 	        </form>
@@ -151,34 +137,24 @@
 	        <a href="javascript:void(0)" id="saveDepotHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
 	        <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
 	    </div>
-	    <div id="depotHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	    <div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
 	            closed="true" modal="true" cache="false" collapsible="false" closable="true">
 	            <table>
 					<tr>
-					<td>会员卡号：</td>
-					<td style="padding:5px;width:110px;">
+						<td style="width:60px;height:50px;">会员卡号：</td>
+						<td style="padding:5px;width:200px;">
 							<span id="OrganIdShow"></span>
 						</td>
-					<td>发货仓库：</td>
-					<td style="padding:5px;width:110px;">
-						<span id="ProjectIdShow"></span>
-					</td>
-					<td>单据编号：</td>
-					<td style="padding:5px;width:130px;">
-						<span id="NumberShow"></span>
-					</td>
-					<td>单据日期：</td>
-					<td style="padding:5px;width:125px;">
+						<td style="width:70px;">单据日期：</td>
+						<td style="padding:5px;width:200px;">
 							<span id="OperTimeShow"></span>
 						</td>
-				</tr>
-				<tr>
-					<td>单据备注：</td>
-					<td style="padding:5px;width:292px;" colspan="3">
-						<span id="RemarkShow"></span>
+						<td style="width:80px;">单据编号：</td>
+						<td style="padding:5px;width:200px;">
+							<span id="NumberShow"></span>
 						</td>
-					<td>付款类型：</td>
-					<td style="padding:5px">
+						<td style="width:70px;">付款类型：</td>
+						<td style="padding:5px;width:150px;">
 							<span id="payTypeShow"></span>
 						</td>
 					</tr>
@@ -219,16 +195,41 @@
 										<span id="AccountIdShow"></span>
 									</td>
 								</tr>
-							<tr>
-								<td>经手人：</td>
-								<td align="left" style="width:110px;">
-									<span id="HandsPersonIdShow"></span>
+							</table>
 						</td>
 					</tr>
-						</table>
+					<tr>
+						<td colspan="8" style="width: 1130px; height:35px;">
+							<span id="RemarkShow"></span>
 						</td>
 					</tr>
 	            </table>
 	    </div>
+		<div id="depotHeadAccountDlg" class="easyui-dialog" style="width:380px;padding:10px 20px;top:80px"
+			 closed="true" modal="true" buttons="#accountDlgButtons" cache="false" collapsible="false" closable="true">
+			<table class="account-dlg">
+				<tr class="account-head-tmp">
+					<td style="width:30px;"></td>
+					<td style="width:140px; padding:5px;">结算账户</td>
+					<td style="width:100px; padding:5px;">金额</td>
+				</tr>
+				<tr>
+					<td style="width:30px;"></td>
+					<td style="width:140px;text-align: center;">合计：</td>
+					<td style="width:100px;"><span id="accountMoneyTotalDlg"></span></td>
+				</tr>
+			</table>
+			<table class="tabs-tmp">
+				<tr class="account-content-tmp">
+					<td style="width:30px;"></td>
+					<td style="width:140px; padding:3px;"><select class="account-id-dlg" style="width:140px;"></select></td>
+					<td style="width:100px; padding:3px;"><input class="account-money-dlg" style="width:100px;" /></td>
+				</tr>
+			</table>
+		</div>
+		<div id="accountDlgButtons">
+			<a href="javascript:void(0)" id="saveDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+			<a href="javascript:void(0)" id="cancelDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
+		</div>
 	</body>
 </html>

src/main/webapp/pages/materials/sale_back_list.jsp

@@ -15,6 +15,7 @@
 		<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" />
+		<link type="text/css" rel="stylesheet" href="<%=path %>/css/in_out.css" />
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
@@ -32,21 +33,17 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>收货仓库：</td>
-					<td>
-						<select name="searchProjectId" id="searchProjectId"  style="width:80px;"></select>
-					</td>
 					<td>单据编号：</td>
 					<td>
-						<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
+						<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
 					</td>
 					<td>单据日期：</td>
 					<td>
-						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
+						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
 					</td>
 					<td>-</td>
 					<td>
-						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
+						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
 					</td>
 					<td>&nbsp;</td>
 					<td>
@@ -62,53 +59,80 @@
 			<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 		</div>
 		
-	    <div id="depotHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	    <div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
 	            closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
 	        <form id="depotHeadFM" method="post"  novalidate>
 	            <table>
 					<tr>
-	            <td>收货仓库：</td>
-	            <td style="padding:5px">
-                <select name="ProjectId" id="ProjectId" style="width:110px;"></select>
-                </td>
-                <td>单据日期：</td>
-                <td style="padding:5px">
-                <input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:110px;"/>
-                </td>
-	            <td>退货单位：</td>
+						<td>客户：</td>
 						<td style="padding:5px">
 							<input id="OrganId" name="OrganId" style="width:110px;" />
 						</td>
-	            <td>经手人：</td>
+						<td style="width:70px;">销售人员：</td>
 						<td style="padding:5px">
-	            <select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
+							<input id="Salesman" name="Salesman" style="width:130px;" />
 						</td>
-	            </tr>
-	            <tr>
-	            <td>付款账户：</td>
+						<td>单据日期：</td>
 						<td style="padding:5px">
-	            <select name="AccountId" id="AccountId" style="width:110px;"></select>
-	            </td>
-	            <td>付款金额：</td>
-				<td style="padding:5px">
-	            <input id="ChangeAmount" name="ChangeAmount" data-changeamount="0" style="width:110px;" />
+							<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate" style="width:140px;"/>
 						</td>
 						<td>单据编号：</td>
 						<td style="padding:5px">
-	            <input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 110px;"/>
-	            </td>
-	            <td>单据备注：</td>
-	            <td style="padding:5px">
-	            <input name="Remark" id="Remark" class="easyui-validatebox" style="width: 110px;"/>
+							<input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
 						</td>
+						<td style="width:100px;"></td>
 					</tr>
 					<tr>
-	            <td>商品列表：</td>
-	            <td colspan="7">
+					<td colspan="9">
 					<!-- 商品列表table -->
 					<table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table>
 					</td>
 					</tr>
+					<tr>
+						<td colspan="9">
+							<textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息" style="width: 1130px; height:35px;"></textarea>
+						</td>
+					</tr>
+					<tr>
+						<td>优惠率：</td>
+						<td style="padding:5px">
+							<input id="Discount" name="Discount" style="width:110px;" />
+							%
+						</td>
+						<td>退款优惠：</td>
+						<td style="padding:5px">
+							<input id="DiscountMoney" name="DiscountMoney" style="width:120px;" />
+						</td>
+						<td>优惠后金额：</td>
+						<td style="padding:5px">
+							<input id="DiscountLastMoney" name="DiscountLastMoney" readonly="readonly" style="width:120px;" />
+						</td>
+						<td>本次退款：</td>
+						<td style="padding:5px">
+							<input id="ChangeAmount" name="ChangeAmount" data-changeamount="0" style="width:120px;" />
+						</td>
+						<td style="width:100px;"></td>
+					</tr>
+					<tr>
+						<td>结算账户：</td>
+						<td style="padding:5px">
+							<select name="AccountId" id="AccountId" style="width:120px;"></select>
+							<img class="many-account-ico" src="<%=path%>/js/easyui-1.3.5/themes/icons/filelist.jpg"  style="display: none;"/>
+						</td>
+						<td>本次欠款：</td>
+						<td style="padding:5px">
+							<input id="Debt" name="Debt" readonly="readonly" style="width:120px;" />
+						</td>
+						<td>销售费用：</td>
+						<td style="padding:5px">
+							<input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly" />
+							<img class="other-money-ico" src="<%=path%>/js/easyui-1.3.5/themes/icons/filelist.jpg" />
+						</td>
+						<td></td>
+						<td style="padding:5px">
+						</td>
+						<td style="width:100px;"></td>
+					</tr>
 	            </table>
 	            <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
 	        </form>
@@ -117,53 +141,131 @@
 	        <a href="javascript:void(0)" id="saveDepotHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
 	        <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
 	    </div>
-	    <div id="depotHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	    <div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
 	            closed="true" modal="true" cache="false" collapsible="false" closable="true">
 			<table>
 				<tr>
-	            <td>收货仓库：</td>
-	            <td style="padding:5px;width:110px;">
-                <span id="ProjectIdShow"></span>
-                </td>
-                <td>单据日期：</td>
-                <td style="padding:5px;width:110px;">
-                <span id="OperTimeShow"></span>
-                </td>
-	            <td>退货单位：</td>
-	            <td style="padding:5px;width:110px;">
+					<td style="width:60px;">客户：</td>
+					<td style="padding:5px;width:130px;">
 						<span id="OrganIdShow"></span>
 					</td>
-	            <td>经手人：</td>
-	            <td style="padding:5px;width:110px;">
-	            <span id="HandsPersonIdShow"></span>
+					<td style="width:70px;">销售人员：</td>
+					<td style="padding:5px;width:130px;">
+						<span id="SalesmanShow"></span>
 					</td>
-	            </tr>
-	            <tr>
-	            <td>付款账户：</td>
-	            <td style="padding:5px;width:110px;">
-	            <span id="AccountIdShow"></span>
+					<td style="width:80px;">单据日期：</td>
+					<td style="padding:5px;width:140px;">
+						<span id="OperTimeShow"></span>
 					</td>
-	            <td>付款金额：</td>
-				<td style="padding:5px;width:110px;">
-	            <span id="ChangeAmountShow"></span>
-				</td>
-				<td>单据编号：</td>	            
-	            <td style="padding:5px;width:110px;">
+					<td style="width:70px;">单据编号：</td>
+					<td style="padding:5px;width:140px;">
 						<span id="NumberShow"></span>
 					</td>
-	            <td>单据备注：</td>
-	            <td style="padding:5px;width:110px;">
-	            <span id="RemarkShow"></span>
-	            </td>
+					<td style="width:100px;"></td>
 				</tr>
 				<tr>
-	            <td>商品列表：</td>
-	            <td colspan="7">
+					<td colspan="9" style="width: 1130px;">
 						<!-- 商品列表table -->
 						<table id="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
 					</td>
 				</tr>
+				<tr>
+					<td style="width:60px;">单据备注：</td>
+					<td colspan="8" style="height:35px;">
+						<span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+					</td>
+				</tr>
+				<tr>
+					<td>优惠率：</td>
+					<td>
+						<span id="DiscountShow" style="width: 110px;"></span>
+						%
+					</td>
+					<td>退款优惠：</td>
+					<td>
+						<span id="DiscountMoneyShow" style="width: 120px;"></span>
+					</td>
+					<td>优惠后金额：</td>
+					<td>
+						<span id="DiscountLastMoneyShow" style="width: 120px;"></span>
+					</td>
+					<td>本次退款：</td>
+					<td style="padding:5px">
+						<span id="ChangeAmountShow"></span>
+					</td>
+					<td style="width:100px;"></td>
+				</tr>
+				<tr>
+					<td>结算账户：</td>
+					<td style="padding:5px">
+						<span id="AccountIdShow"></span>
+					</td>
+					<td>本次欠款：</td>
+					<td style="padding:5px">
+						<span id="DebtShow"></span>
+					</td>
+					<td>销售费用：</td>
+					<td style="padding:5px">
+						<span id="OtherMoneyShow"></span>
+					</td>
+					<td></td>
+					<td style="padding:5px">
+					</td>
+					<td style="width:100px;"></td>
+				</tr>
 			</table>
 	    </div>
+		<div id="depotHeadAccountDlg" class="easyui-dialog" style="width:380px;padding:10px 20px;top:80px"
+			 closed="true" modal="true" buttons="#accountDlgButtons" cache="false" collapsible="false" closable="true">
+			<table class="account-dlg">
+				<tr class="account-head-tmp">
+					<td style="width:30px;"></td>
+					<td style="width:140px; padding:5px;">结算账户</td>
+					<td style="width:100px; padding:5px;">金额</td>
+				</tr>
+				<tr>
+					<td style="width:30px;"></td>
+					<td style="width:140px;text-align: center;">合计：</td>
+					<td style="width:100px;"><span id="accountMoneyTotalDlg"></span></td>
+				</tr>
+			</table>
+			<table class="tabs-tmp">
+				<tr class="account-content-tmp">
+					<td style="width:30px;"></td>
+					<td style="width:140px; padding:3px;"><select class="account-id-dlg" style="width:140px;"></select></td>
+					<td style="width:100px; padding:3px;"><input class="account-money-dlg" style="width:100px;" /></td>
+				</tr>
+			</table>
+		</div>
+		<div id="accountDlgButtons">
+			<a href="javascript:void(0)" id="saveDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+			<a href="javascript:void(0)" id="cancelDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
+		</div>
+		<div id="otherMoneyDlg" class="easyui-dialog" style="width:380px;padding:10px 20px;top:80px"
+			 closed="true" modal="true" buttons="#otherMoneyDlgBtn" cache="false" collapsible="false" closable="true">
+			<table class="money-dlg">
+				<tr class="money-head-tmp">
+					<td style="width:30px;"></td>
+					<td style="width:140px; padding:5px;">结算账户</td>
+					<td style="width:100px; padding:5px;">金额</td>
+				</tr>
+				<tr>
+					<td style="width:30px;"></td>
+					<td style="width:140px;text-align: center;">合计：</td>
+					<td style="width:100px;"><span id="otherMoneyTotalDlg"></span></td>
+				</tr>
+			</table>
+			<table class="tabs-tmp">
+				<tr class="money-content-tmp">
+					<td style="width:30px;"></td>
+					<td style="width:140px; padding:3px;"><select class="money-id-dlg" style="width:140px;"></select></td>
+					<td style="width:100px; padding:3px;"><input class="other-money-dlg" style="width:100px;" /></td>
+				</tr>
+			</table>
+		</div>
+		<div id="otherMoneyDlgBtn">
+			<a href="javascript:void(0)" id="saveOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+			<a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
+		</div>
 	</body>
 </html>

src/main/webapp/pages/materials/sale_out_list.jsp

@@ -15,6 +15,7 @@
 		<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" />
+		<link type="text/css" rel="stylesheet" href="<%=path %>/css/in_out.css" />
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
@@ -32,21 +33,17 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>发货仓库：</td>
-					<td>
-						<select name="searchProjectId" id="searchProjectId"  style="width:80px;"></select>
-					</td>
 					<td>单据编号：</td>
 					<td>
-						<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
+						<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
 					</td>
 					<td>单据日期：</td>
 					<td>
-						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
+						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
 					</td>
 					<td>-</td>
 					<td>
-						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
+						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
 					</td>
 					<td>&nbsp;</td>
 					<td>
@@ -62,52 +59,81 @@
 			<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 		</div>
 		
-	    <div id="depotHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	    <div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
 	            closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
 	        <form id="depotHeadFM" method="post"  novalidate>
 	            <table>
 					<tr>
-	            <td>发货仓库：</td>
+						<td style="width:60px;">客户：</td>
 						<td style="padding:5px">
-                <select name="ProjectId" id="ProjectId" style="width:110px;"></select>
+							<input id="OrganId" name="OrganId" style="width:130px;" />
 						</td>
-                <td>单据日期：</td>
+						<td style="width:70px;">销售人员：</td>
 						<td style="padding:5px">
-                <input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:110px;"/>
+							<input id="Salesman" name="Salesman" style="width:130px;" />
 						</td>
-	            <td>购买单位：</td>
+						<td style="width:80px;">单据日期：</td>
 						<td style="padding:5px">
-	            <input id="OrganId" name="OrganId" style="width:110px;" />  
+							<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate" style="width:140px;"/>
 						</td>
-	            <td>经手人：</td>
+						<td style="width:70px;">单据编号：</td>
 						<td style="padding:5px">
-	            <select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
+							<input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
 						</td>
+						<td style="width:100px;"></td>
 					</tr>
 					<tr>
-	            <td>收款账户：</td>
-	            <td style="padding:5px">
-	            <select name="AccountId" id="AccountId" style="width:110px;"></select>
-	            </td>
-	            <td>收款金额：</td>
-				<td style="padding:5px">
-	            <input id="ChangeAmount" name="ChangeAmount" data-changeamount="0" style="width:110px;" />
-				</td>
-				<td>单据编号：</td>
-	            <td style="padding:5px"><input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 110px;"/>
-	            </td>
-	            <td>单据备注：</td>
-	            <td style="padding:5px">
-	            <input name="Remark" id="Remark" class="easyui-validatebox" style="width: 110px;"/>
-	            </td>
-	            </tr>
-	            <tr>
-	            <td>商品列表：</td>
-	            <td colspan="7">
+						<td colspan="9">
 							<!-- 商品列表table -->
 							<table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table>
 						</td>
 					</tr>
+					<tr>
+						<td colspan="9">
+							<textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息" style="width: 1130px; height:35px;"></textarea>
+						</td>
+					</tr>
+					<tr>
+						<td>优惠率：</td>
+						<td style="padding:5px">
+							<input id="Discount" name="Discount" style="width:110px;" />
+							%
+						</td>
+						<td>收款优惠：</td>
+						<td style="padding:5px">
+							<input id="DiscountMoney" name="DiscountMoney" style="width:120px;" />
+						</td>
+						<td>优惠后金额：</td>
+						<td style="padding:5px">
+							<input id="DiscountLastMoney" name="DiscountLastMoney" readonly="readonly" style="width:120px;" />
+						</td>
+						<td>本次收款：</td>
+						<td style="padding:5px">
+							<input id="ChangeAmount" name="ChangeAmount" data-changeamount="0" style="width:120px;" />
+						</td>
+						<td style="width:100px;"></td>
+					</tr>
+					<tr>
+						<td>结算账户：</td>
+						<td style="padding:5px">
+							<select name="AccountId" id="AccountId" style="width:120px;"></select>
+							<img class="many-account-ico" src="<%=path%>/js/easyui-1.3.5/themes/icons/filelist.jpg"  style="display: none;"/>
+						</td>
+						<td>本次欠款：</td>
+						<td style="padding:5px">
+							<input id="Debt" name="Debt" readonly="readonly" style="width:120px;" />
+						</td>
+						<td>销售费用：</td>
+						<td style="padding:5px">
+							<input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly" />
+							<img class="other-money-ico" src="<%=path%>/js/easyui-1.3.5/themes/icons/filelist.jpg" />
+						</td>
+						<td>结算天数：</td>
+						<td style="padding:5px">
+							<input id="AccountDay" name="AccountDay" class="easyui-numberbox" data-options="validType:'length[1,3]'" style="width:120px;" />
+						</td>
+						<td style="width:100px;"></td>
+					</tr>
 	            </table>
 	            <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
 	        </form>
@@ -116,53 +142,133 @@
 	        <a href="javascript:void(0)" id="saveDepotHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
 	        <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
 	    </div>
-	    <div id="depotHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	    <div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
 	            closed="true" modal="true" cache="false" collapsible="false" closable="true">
 			<table>
 				<tr>
-	            <td>发货仓库：</td>
-	            <td style="padding:5px;width:110px;">
-                <span id="ProjectIdShow"></span>
-                </td>
-                <td>单据日期：</td>
-                <td style="padding:5px;width:110px;">
-                <span id="OperTimeShow"></span>
-                </td>
-	            <td>购买单位：</td>
-	            <td style="padding:5px;width:110px;">
+					<td style="width:60px;">客户：</td>
+					<td style="padding:5px;width:130px;">
 						<span id="OrganIdShow"></span>
 					</td>
-	            <td>经手人：</td>
-	            <td style="padding:5px;width:110px;">
-	            <span id="HandsPersonIdShow"></span>
+					<td style="width:70px;">销售人员：</td>
+					<td style="padding:5px;width:130px;">
+						<span id="SalesmanShow"></span>
 					</td>
-	            </tr>
-	            <tr>
-	            <td>收款账户：</td>
-	            <td style="padding:5px">
-	            <span id="AccountIdShow"></span>
+					<td style="width:80px;">单据日期：</td>
+					<td style="padding:5px;width:140px;">
+						<span id="OperTimeShow"></span>
 					</td>
-	            <td>收款金额：</td>
-				<td style="padding:5px">
-	            <span id="ChangeAmountShow"></span>
-				</td>
-				<td>单据编号：</td>	            
-	            <td style="padding:5px">
+					<td style="width:70px;">单据编号：</td>
+					<td style="padding:5px;width:140px;">
 						<span id="NumberShow"></span>
 					</td>
-	            <td>单据备注：</td>
-	            <td style="padding:5px">
-	            <span id="RemarkShow"></span>
-	            </td>
+					<td style="width:100px;"></td>
 				</tr>
 				<tr>
-	            <td>商品列表：</td>
-	            <td colspan="7">
+					<td colspan="9" style="width: 1130px;">
 						<!-- 商品列表table -->
 						<table id="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
 					</td>
 				</tr>
+				<tr>
+					<td style="width:60px;">单据备注：</td>
+					<td colspan="8" style="height:35px;">
+						<span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+					</td>
+				</tr>
+				<tr>
+					<td>优惠率：</td>
+					<td>
+						<span id="DiscountShow" style="width: 110px;"></span>
+						%
+					</td>
+					<td>收款优惠：</td>
+					<td>
+						<span id="DiscountMoneyShow" style="width: 120px;"></span>
+					</td>
+					<td>优惠后金额：</td>
+					<td>
+						<span id="DiscountLastMoneyShow" style="width: 120px;"></span>
+					</td>
+					<td>本次收款：</td>
+					<td style="padding:5px">
+						<span id="ChangeAmountShow"></span>
+					</td>
+					<td style="width:100px;"></td>
+				</tr>
+				<tr>
+					<td>结算账户：</td>
+					<td style="padding:5px">
+						<span id="AccountIdShow"></span>
+					</td>
+					<td>本次欠款：</td>
+					<td style="padding:5px">
+						<span id="DebtShow"></span>
+					</td>
+					<td>销售费用：</td>
+					<td style="padding:5px">
+						<span id="OtherMoneyShow"></span>
+					</td>
+					<td>结算天数：</td>
+					<td style="padding:5px">
+						<span id="AccountDayShow"></span>
+					</td>
+					<td style="width:100px;"></td>
+				</tr>
 			</table>
 	    </div>
+		<div id="depotHeadAccountDlg" class="easyui-dialog" style="width:380px;padding:10px 20px;top:80px"
+			 closed="true" modal="true" buttons="#accountDlgButtons" cache="false" collapsible="false" closable="true">
+			<table class="account-dlg">
+				<tr class="account-head-tmp">
+					<td style="width:30px;"></td>
+					<td style="width:140px; padding:5px;">结算账户</td>
+					<td style="width:100px; padding:5px;">金额</td>
+				</tr>
+				<tr>
+					<td style="width:30px;"></td>
+					<td style="width:140px;text-align: center;">合计：</td>
+					<td style="width:100px;"><span id="accountMoneyTotalDlg"></span></td>
+				</tr>
+			</table>
+			<table class="tabs-tmp">
+				<tr class="account-content-tmp">
+					<td style="width:30px;"></td>
+					<td style="width:140px; padding:3px;"><select class="account-id-dlg" style="width:140px;"></select></td>
+					<td style="width:100px; padding:3px;"><input class="account-money-dlg" style="width:100px;" /></td>
+				</tr>
+			</table>
+		</div>
+		<div id="accountDlgButtons">
+			<a href="javascript:void(0)" id="saveDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+			<a href="javascript:void(0)" id="cancelDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
+		</div>
+		<div id="otherMoneyDlg" class="easyui-dialog" style="width:380px;padding:10px 20px;top:80px"
+			 closed="true" modal="true" buttons="#otherMoneyDlgBtn" cache="false" collapsible="false" closable="true">
+			<table class="money-dlg">
+				<tr class="money-head-tmp">
+					<td style="width:30px;"></td>
+					<td style="width:140px; padding:5px;">结算账户</td>
+					<td style="width:100px; padding:5px;">金额</td>
+				</tr>
+				<tr>
+					<td style="width:30px;"></td>
+					<td style="width:140px;text-align: center;">合计：</td>
+					<td style="width:100px;"><span id="otherMoneyTotalDlg"></span></td>
+				</tr>
+			</table>
+			<table class="tabs-tmp">
+				<tr class="money-content-tmp">
+					<td style="width:30px;"></td>
+					<td style="width:140px; padding:3px;"><select class="money-id-dlg" style="width:140px;"></select></td>
+					<td style="width:100px; padding:3px;"><input class="other-money-dlg" style="width:100px;" /></td>
+				</tr>
+			</table>
+		</div>
+		<div id="otherMoneyDlgBtn">
+			<a href="javascript:void(0)" id="saveOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+			<a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
+		</div>
+
 	</body>
 </html>

src/main/webapp/pages/reports/in_out_stock_report.jsp

@@ -304,7 +304,6 @@
 					url: "<%=path %>/depotHead/findByMonth.action",
 					dataType: "json",
 					data: ({
-						ProjectId: $.trim($("#searchProjectId").val()),
 						MonthTime:$("#searchMonth").val()
 					}),
 					success: function (res)

src/main/webapp/pages/user/userCustomer.jsp

@@ -0,0 +1,136 @@
+<%@page import="com.jsh.util.Tools"%>
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
+<%
+	String path = request.getContextPath();
+	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>
+		<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>
+		<!-- 数据显示table -->
+		<div>
+			<a id="btnOK" class="easyui-linkbutton">保存</a>
+		</div>
+		<div>
+		<ul id="tt"></ul>
+		</div>
+
+		<script type="text/javascript">
+		var url_id = getUrlParam('id');  //获取传值id（用户id）
+		var type="UserCustomer";
+		var url;//定义链接地址
+	    function GetNode(ctype) {
+	        var node = $('#tt').tree('getChecked');
+	        var cnodes = '';
+	        var pnodes = '';
+	
+	        var prevNode = ''; //保存上一步所选父节点
+	        for (var i = 0; i < node.length; i++) {
+	
+	            if ($('#tt').tree('isLeaf', node[i].target)) {
+	                cnodes += '[' + node[i].id + ']';
+	
+	                var pnode = $('#tt').tree('getParent', node[i].target); //获取当前节点的父节点
+	                if (prevNode != pnode.id) //保证当前父节点与上一次父节点不同
+	                {
+	                    pnodes += '[' + pnode.id + ']';
+	                    prevNode = pnode.id; //保存当前节点
+	                }
+	            }
+	        }
+	        //cnodes = cnodes.substring(0, cnodes.length - 1);
+	        pnodes = pnodes.substring(0, pnodes.length - 1);
+	
+	        if (ctype == 'child') { return cnodes; }
+	        else { return pnodes };
+	    };
+		
+		$(function () {
+		
+			$('#tt').tree({   
+			   url:'<%=path%>/supplier/findUserCustomer.action?UBType='+type+'&UBKeyId='+url_id,
+			   animate:true,
+			   checkbox:true
+			});  
+			
+			
+	        $("#btnOK").click(	        
+		        function() {
+			        if(!checkUserDepot())
+					{
+					    url = '<%=path%>/userBusiness/create.action';
+					}
+					else
+					{
+					    url = '<%=path%>/userBusiness/update.action';
+					}
+		        
+		        if (confirm("您确定要保存吗？")) {
+		        
+			        $.ajax({
+	                    type: "post",
+	                    url:url,
+	                    data: { Type: type, KeyId: url_id, Value: GetNode('child'),clientIp:'<%=clientIp %>'
+	                    },
+	                    dataType: "json",
+						async :  false,
+	                    success: function (tipInfo) {
+	                        if (tipInfo) {
+	                            self.parent.$.colorbox.close();
+	                            alert("操作成功！");
+	                        }
+	                        else
+	                            alert(tipInfo);
+	                    }
+	                });
+			      }
+		        }
+	        );
+	        
+        });
+        
+        //检查记录是否存在 
+        function checkUserDepot()
+        {
+        	//表示是否存在 true == 存在 false = 不存在
+        	var flag = false;
+       		//开始ajax名称检验，是否存在
+      			$.ajax({
+				type:"post",
+				url: "<%=path %>/userBusiness/checkIsValueExist.action",
+				dataType: "json",
+				async :  false,
+				data: ({
+					Type : type,
+					KeyId : url_id
+				}),
+				success: function (tipInfo)
+				{
+					flag = tipInfo;
+				},
+				//此处添加错误处理
+	    		error:function()
+	    		{
+	    			$.messager.alert('提示','检查用户对应功能是否存在异常，请稍后再试！','error');
+					return;
+				}
+			});	
+       		return flag;
+        }
+		</script>
+	</body>
+</html>