从源更新

erp_web/css/css.css

@@ -636,10 +636,10 @@ input.inputstyle:hover{
 	background:#EAF2FD;
 	z-index:90;
 }
-#login_body{
+#login_body,#register_body{
 	background:#93bbe5 url(../images/bg_login.jpg) top center no-repeat;
 }
-#login_main{
+#login_main,#register_main{
 	width:459px;
 	overflow:hidden;
 	margin:160px auto 0 auto;
@@ -649,7 +649,14 @@ input.inputstyle:hover{
 	height:263px;
 	overflow:hidden;
 	position:relative;
-	background:url(../images/bg_loginmain.jpg) no-repeat;
+	background:url(../images/bg_login_main.jpg) no-repeat;
+}
+#register{
+	width:459px;
+	height:300px;
+	overflow:hidden;
+	position:relative;
+	background:url(../images/bg_register_main.jpg) no-repeat;
 }
 #login .login_btn{
 	float:left;
@@ -657,13 +664,13 @@ input.inputstyle:hover{
 	height:50px;
 	margin:160px auto 0 120px;
 }
-#login .register_btn{
+#register .register_btn{
 	float:left;
 	width:230px;
 	height:50px;
-	margin:218px auto 0 120px;
+	margin:228px auto 0px 120px;
 }
-#login_signal{
+#login_signal,#register_signal{
 	position:absolute;
 	left: 63px;
 	top: 19px;
@@ -707,7 +714,7 @@ input.inputstyle:hover{
 	border:none;
 	font-family:Arial, Helvetica, sans-serif;
 	background:url(../images/bg_logininout.jpg) no-repeat;
-	left: 118px;
+	left: 120px;
 	top: 84px;
 }
 #user_pwd{
@@ -719,7 +726,7 @@ input.inputstyle:hover{
 	border:none;
 	font-family:Arial, Helvetica, sans-serif;
 	background:url(../images/bg_logininout.jpg) no-repeat;
-	left: 118px;
+	left: 120px;
 	top: 118px;
 }
 #user_pwd_repeat{
@@ -731,7 +738,7 @@ input.inputstyle:hover{
 	border:none;
 	font-family:Arial, Helvetica, sans-serif;
 	background:url(../images/bg_logininout.jpg) no-repeat;
-	left: 118px;
+	left: 120px;
 	top: 152px;
 }
 #user_captcha{
@@ -743,7 +750,7 @@ input.inputstyle:hover{
 	border:none;
 	font-family:Arial, Helvetica, sans-serif;
 	background:url(../images/bg_logininout.jpg) no-repeat;
-	left: 118px;
+	left: 120px;
 	top: 186px;
 }
 #imgCaptcha{

erp_web/js/common/common.js

@@ -275,4 +275,16 @@
 			}
 		}
 		return newArr;
+	}
+
+    /**
+	 * 验证单据
+     * @param id
+     */
+    function validateForm(id) {
+        if(!$('#'+ id).form('validate')) {
+        	return true;
+		} else {
+        	return false;
+		}
 	}
\ No newline at end of file

erp_web/js/pages/manage/supplier.js

@@ -76,7 +76,7 @@
                 { 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: 'taxrate',width:50,align:"center"},
                 { title: '状态',field: 'enabled',width:70,align:"center",formatter:function(value){
                     return value? "启用":"禁用";
                 }}
@@ -457,6 +457,9 @@
         });
         //保存信息
         $("#saveSupplier").off("click").on("click", function () {
+            if(validateForm("supplierFM")) {
+                return;
+            }
             if (checkSupplierName()) {
                 return;
             }
@@ -554,13 +557,15 @@
     //编辑信息
     function editSupplier(supplierTotalInfo) {
         var supplierInfo = supplierTotalInfo.split("AaBb");
+        var beginNeedGet = supplierInfo[5];
+        var beginNeedPay = supplierInfo[6];
         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],
+            BeginNeedGet : beginNeedGet == "0"? "":beginNeedGet,
+            BeginNeedPay : beginNeedPay == "0"? "":beginNeedPay,
             AllNeedGet: "",
             AllNeedPay: "",
             description : supplierInfo[8].replace("undefined",""),
@@ -602,7 +607,7 @@
                 supType: supType
             }),
             success: function(res){
-                if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney) {
+                if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney !== "") {
                     var moneyA = res.data.rows.getAllMoney.toFixed(2)-0;
                     $.ajax({
                         type:"get",
@@ -615,7 +620,7 @@
                             supType: supType
                         }),
                         success: function(res){
-                            if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney) {
+                            if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney !== "") {
                                 var moneyB = res.data.rows.getAllMoney.toFixed(2)-0;
                                 var money = moneyA+moneyB;
                                 var moneyBeginNeedGet = $("#BeginNeedGet").val()-0; //期初应收

erp_web/js/pages/materials/in_out.js

 	//初始化界面
+	var defDepotId = null;
 	var kid = sessionStorage.getItem("userId");
     var pageType = getUrlParam('t');  //获取页面类型传值
 	var depotList = null;
@@ -53,7 +54,7 @@
 		initMProperty(); //初始化商品属性
 		initTableData();
 		ininPager();
-		initForm();	
+		initForm();
 		bindEvent();//绑定操作事件
 	});
 	//根据单据名称获取类型
@@ -74,8 +75,8 @@
             amountNum = "CGDD";
         }
 		else if(listTitle === "采购入库列表"){
-			listType = "入库"; 
-			listSubType = "采购"; 
+			listType = "入库";
+			listSubType = "采购";
 			payTypeTitle = "付款";
 			organUrl = supUrl;
 			amountNum = "CGRK";
@@ -88,15 +89,15 @@
 			amountNum = "LSTH";
 		}
 		else if(listTitle === "销售退货列表"){
-			listType = "入库"; 
-			listSubType = "销售退货"; 
+			listType = "入库";
+			listSubType = "销售退货";
 			payTypeTitle = "付款";
 			organUrl = cusUrl;
 			amountNum = "XSTH";
 		}
 		else if(listTitle === "其它入库列表"){
-			listType = "入库"; 
-			listSubType = "其它"; 
+			listType = "入库";
+			listSubType = "其它";
 			payTypeTitle = "隐藏";
 			organUrl = supUrl;
 			amountNum = "QTRK";
@@ -116,29 +117,29 @@
             amountNum = "XSDD";
         }
 		else if(listTitle === "销售出库列表"){
-			listType = "出库"; 
-			listSubType = "销售"; 
+			listType = "出库";
+			listSubType = "销售";
 			payTypeTitle = "收款";
 			organUrl = cusUrl;
 			amountNum = "XSCK";
 		}
 		else if(listTitle === "采购退货列表"){
-			listType = "出库"; 
+			listType = "出库";
 			listSubType = "采购退货";
 			payTypeTitle = "收款";
 			organUrl = supUrl;
 			amountNum = "CGTH";
 		}
 		else if(listTitle === "其它出库列表"){
-			listType = "出库"; 
-			listSubType = "其它"; 
+			listType = "出库";
+			listSubType = "其它";
 			payTypeTitle = "隐藏";
 			organUrl = cusUrl;
 			amountNum = "QTCK";
 		}
 		else if(listTitle === "调拨出库列表"){
-			listType = "出库"; 
-			listSubType = "调拨"; 
+			listType = "出库";
+			listSubType = "调拨";
 			payTypeTitle = "隐藏";
 			organUrl = supUrl;
 			amountNum = "DBCK";
@@ -178,12 +179,12 @@
                     userBusinessList = null;
                 }
             }
-		});		
-		
+		});
+
 	}
 	//初始化页面选项卡
 	function initSelectInfo_UB(){
-		
+
 		if(userBusinessList !=null)
 		{
 			if(userBusinessList.length>0)
@@ -193,8 +194,8 @@
 			}
 		}
 	}
-	
-	
+
+
 	//初始化系统基础信息
 	function initSystemData_depot(){
 		$.ajax({
@@ -211,24 +212,27 @@
                     return;
                 }
             }
-		});				
+		});
 	}
 	//初始化页面选项卡
 	function initSelectInfo_depot(){
 		var options = "";
-		
+
 		if(depotList !=null)
 		{
 			options = "";
 			for(var i = 0 ;i < depotList.length;i++)
 			{
 				var depot = depotList[i];
-				
+
 				if(userdepot!=null)
 				{
 					if(userdepot.indexOf("["+depot.id+"]")!=-1)
 					{
-						options += '<option value="' + depot.id + '">' + depot.name + '</option>';
+						if(depot.isDefault){
+                            defDepotId =  depot.id;
+						}
+                        options += '<option value="' + depot.id + '">' + depot.name + '</option>';
 						depotString = depotString + depot.id + ",";
 					}
 				}
@@ -238,16 +242,16 @@
 			}
 			depotString = depotString.substring(1, depotString.length-1);
 			$("#ProjectId").empty().append(options);
-			$("#AllocationProjectId").empty().append(options);			
+			$("#AllocationProjectId").empty().append(options);
 			$("#searchProjectId").empty().append('<option value="">全部</option>').append(options);
 		}
 	}
-	
+
 	//初始化供应商、客户、散户信息
 	function initSupplier(){
 		$('#OrganId').combobox({
 			url: organUrl,
-		    valueField:'id',    
+		    valueField:'id',
 		    textField:'supplier',
 			filter: function(q, row){
 				var opts = $(this).combobox('options');
@@ -297,7 +301,7 @@
 					});
 				}
 			}
-		});  
+		});
 	}
 
 	//初始化销售人员
@@ -364,7 +368,7 @@
 			}
 		});
 	}
-	
+
 	//初始化系统基础信息
 	function initSystemData_person(){
 		$.ajax({
@@ -380,12 +384,12 @@
                     }
                 }
             }
-		});				
+		});
 	}
 	//初始化页面选项卡
 	function initSelectInfo_person(){
 		var options1 = "";
-		
+
 		if(personList !=null)
 		{
 			for(var i = 0 ;i < personList.length;i++)
@@ -398,7 +402,7 @@
 				if(person.type=="仓管员")
 				{
 					options1 += '<option value="' + person.id + '">' + person.name + '</option>';
-				}	
+				}
 			}
 			$("#HandsPersonId").empty().append(options1);
 		}
@@ -418,11 +422,11 @@
 					}
 				}
 			}
-		});				
+		});
 	}
 	//获取账户信息
 	function initSelectInfo_account(){
-		var options = "";				
+		var options = "";
 		if(accountList !=null){
 			options = "<option value=''>(空)</option>";
 			options += "<option value='many' class='many' data-manyAmount=''>多账户</option>";
@@ -432,11 +436,11 @@
 				if(account.isdefault) {
 					defaultAccountId = account.id; //给账户赋值默认id
 				}
-			}	
+			}
 			$("#AccountId").empty().append(options);
 		}
 	}
-	
+
 	//防止表单提交重复
 	function initForm(){
 		$('#depotHeadFM').form({
@@ -445,7 +449,7 @@
 		    }
 		});
 	}
-	
+
 	//初始化表格数据
 	function initTableData(){
 		if(pageType === "skip") {
@@ -616,7 +620,7 @@
 			onLoadError:function() {
 				$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
 				return;
-			}    
+			}
 		});
 	}
 
@@ -1112,7 +1116,7 @@
 					iconCls:'icon-undo',
 					handler:function()
 					{
-						reject(); //撤销	
+						reject(); //撤销
 					}
 				}
 			],
@@ -1120,7 +1124,7 @@
 			{
 				$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
 				return;
-			}    
+			}
 		});
 		$.ajax({
 			type:"get",
@@ -1164,8 +1168,8 @@
 				$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
 			}
 		});
-	}			
-	
+	}
+
 	//初始化表格数据-商品列表-查看状态
 	function initTableData_material_show(TotalPrice){
 		var isShowAnotherDepot = true; //显示对方仓库,true为隐藏,false为显示
@@ -1221,7 +1225,7 @@
 			onLoadError:function() {
 				$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
 				return;
-			}    
+			}
 		});
 		$.ajax({
 			type:"get",
@@ -1256,28 +1260,28 @@
 	function ininPager(){
 		try
 		{
-			var opts = $("#tableData").datagrid('options');  
-			var pager = $("#tableData").datagrid('getPager'); 
-			pager.pagination({  
+			var opts = $("#tableData").datagrid('options');
+			var pager = $("#tableData").datagrid('getPager');
+			pager.pagination({
 				onSelectPage:function(pageNum, pageSize)
-				{  
-					opts.pageNumber = pageNum;  
-					opts.pageSize = pageSize;  
+				{
+					opts.pageNumber = pageNum;
+					opts.pageSize = pageSize;
 					pager.pagination('refresh',
-					{  
-						pageNumber:pageNum,  
-						pageSize:pageSize  
-					});  
+					{
+						pageNumber:pageNum,
+						pageSize:pageSize
+					});
 					showDepotHeadDetails(pageNum,pageSize);
-				}  
-			}); 
+				}
+			});
 		}
-		catch (e) 
+		catch (e)
 		{
 			$.messager.alert('异常处理提示',"分页信息异常 :  " + e.name + ": " + e.message,'error');
 		}
 	}
-	
+
 	//删除单据信息
 	function deleteDepotHead(depotHeadID, thisOrganId, totalPrice, status){
 		if(status == "1" || status == "2") {
@@ -1349,11 +1353,11 @@
 
 	//批量删除单据信息
 	function batDeleteDepotHead(){
-		var row = $('#tableData').datagrid('getChecked');	
+		var row = $('#tableData').datagrid('getChecked');
 		if(row.length == 0)
 		{
-			$.messager.alert('删除提示','没有记录被选中！','info');				
-			return;	
+			$.messager.alert('删除提示','没有记录被选中！','info');
+			return;
 		}
 		if(row.length > 0)
 		{
@@ -1575,14 +1579,24 @@
 		var addTitle = listTitle.replace("列表","信息");
 		$('#depotHeadDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加' + addTitle);
 		$(".window-mask").css({ width: webW ,height: webH});
-	    
+
 	    orgDepotHead = "";
 	    depotHeadID = 0;
 	    initTableData_material("add"); //商品列表
 	    reject(); //撤销下、刷新商品列表
 		$("#addOrgan").off("click").on("click",function(){
 			$('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加供应商信息');
+            $('#supplierFM').form('clear');
 		});
+
+        $("#addMember").off("click").on("click",function(){
+            $('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加会员信息');
+            $('#supplierFM').form('clear');
+        });
+        $("#addCustomer").off("click").on("click",function(){
+            $('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加客户信息');
+            $('#supplierFM').form('clear');
+        });
 	    url = '/depotHead/addDepotHeadAndDetail';
 
 		//零售单据修改收款时，自动计算找零
@@ -1627,7 +1641,7 @@
 				}
 			});
 		}
-	}	
+	}
 
 	//编辑信息
 	function editDepotHead(depotHeadTotalInfo, status){
@@ -1735,7 +1749,7 @@
 			var itemMoneyArr = depotHeadInfo[26].split(",");
 			$("#OtherMoney").attr("data-itemArr",JSON.stringify(itemArr)).attr("data-itemMoneyArr",JSON.stringify(itemMoneyArr));  //json数据存储
 		}
-	    
+
 	    initTableData_material("edit",TotalPrice); //商品列表
 	    reject(); //撤销下、刷新商品列表
 		if(pageType === "skip") {
@@ -1746,7 +1760,7 @@
             url = '/depotHead/updateDepotHeadAndDetail?id=' + depotHeadInfo[0]; //更新接口
 		}
 	}
-	
+
 	//查看信息
 	function showDepotHead(depotHeadTotalInfo){
 		var depotHeadInfo = depotHeadTotalInfo.split("AaBb");
@@ -1812,7 +1826,7 @@
 	    var showTitle = listTitle.replace("列表","信息");
 	    $('#depotHeadDlgShow').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/list.png"/>&nbsp;查看' + showTitle);
 	    $(".window-mask").css({ width: webW ,height: webH});
-	    
+
 	    depotHeadID = depotHeadInfo[0];
 	    initTableData_material_show(TotalPrice); //商品列表-查看状态
 
@@ -1862,7 +1876,7 @@
 			}
 		}
 	}
-	
+
 	//绑定操作事件
 	function bindEvent(){
 		showDepotHeadDetails(1,initPageSize); //初始化时自动查询
@@ -2569,7 +2583,13 @@
 			$("#otherMoneyTotalDlg").text($("#OtherMoney").val());
 		});
 
-		if(listTitle === "采购入库列表" || listTitle === "其它入库列表" || listTitle === "采购订单列表"){
+		if(listTitle === "采购入库列表" || listTitle === "其它入库列表" || listTitle === "采购订单列表"|| listTitle === "零售出库列表"|| listTitle === "销售出库列表"|| listTitle === "销售订单列表"){
+			var supplierType = "供应商";
+			if(listTitle === "零售出库列表"){
+                supplierType = "会员";
+			}else if(listTitle === "销售出库列表" || listTitle === "销售订单列表"){
+            supplierType = "客户";
+			}
 			//检查单位名称是否存在 ++ 重名无法提示问题需要跟进
 			function checkSupplierName() {
 				var supplierName = $.trim($("#supplier").val());
@@ -2608,8 +2628,12 @@
 				}
 				return flag;
 			}
+
 			//保存供应商信息
 			$("#saveSupplier").off("click").on("click",function() {
+                if(validateForm("supplierFM")) {
+                    return;
+                }
 				if(checkSupplierName()){
 					return;
 				}
@@ -2629,7 +2653,7 @@
 				}
 				var url = '/supplier/add';
                 var supObj = $("#supplierFM").serializeObject();
-                supObj.type = "供应商";
+                supObj.type = supplierType;
                 supObj.enabled = 1;
 				$.ajax({
 					url: url,
@@ -2706,7 +2730,7 @@
 			}
 		});
 	}
-	
+
 	//自动计算事件
 	function autoReckon() {
 		//延时绑定事件
@@ -2892,8 +2916,8 @@
 			}
 	    },500);
 	}
-	
-	//结束编辑	
+
+	//结束编辑
 	function endEditing() {
 	    if (editIndex == undefined) { return true }
 	    if ($('#materialData').datagrid('validateRow', editIndex)) {
@@ -2927,7 +2951,7 @@
 	//新增
 	function append(){
 	    if (endEditing()) {
-	        $('#materialData').datagrid('appendRow', {});
+	        $('#materialData').datagrid('appendRow', {DepotId:defDepotId});
 	        editIndex = $('#materialData').datagrid('getRows').length - 1;
 	        $('#materialData').datagrid('selectRow', editIndex).datagrid('beginEdit', editIndex);
 	        autoReckon();
@@ -3000,7 +3024,7 @@
 	    }
 	    if (totalRowNum != "") {
 	        var totalRowNum = totalRowNum.substring(0, totalRowNum.length - 1);
-	        $.messager.alert('提示',"第" + totalRowNum + "行数据填写不完整！",'info');	
+	        $.messager.alert('提示',"第" + totalRowNum + "行数据填写不完整！",'info');
 	        return false;
 	    }
 	    return true;
@@ -3056,7 +3080,7 @@
                 }
 			}
 		});
-		
+
 		if(depotHeadMax !=null) {
             depotHeadMaxId=depotHeadMax;
 		}

erp_web/js/print/print_form.html

@@ -20,6 +20,15 @@
     <script type="text/javascript">
         var tableString = localStorage.getItem("tableString");
         document.write(tableString);
+        var rowLen = $(".datagrid .datagrid-view2 .datagrid-body .datagrid-row").length;
+        if(rowLen > 7) {
+            var allHeight = (rowLen+2)*25;
+            var rowHeight = rowLen*25;
+            $(".datagrid .datagrid-wrap").height(allHeight);
+            $(".datagrid .datagrid-view").height(allHeight);
+            $(".datagrid .datagrid-view1 .datagrid-body").height(rowHeight);
+            $(".datagrid .datagrid-view2 .datagrid-body").height(rowHeight);
+        }
         window.print();
     </script>
 </body>

erp_web/pages/common/main.html

@@ -105,13 +105,12 @@
         });
 
         $('#loginOut').click(function () {
-            if (confirm("确认要退出系统吗？")){
-                //确定
-                sessionStorage.removeItem("userId");
-                location.href = '/user/logout';
-            }else{
-                //取消
-            }
+            $.messager.confirm("提示","确认要退出系统吗？",function(r){
+                if(r) {
+                    sessionStorage.removeItem("userId");
+                    location.href = '/user/logout';
+                }
+            });
         })
         //IE下禁止选中
         document.body.onselectstart = document.body.ondrag = function () {

erp_web/pages/manage/customer.html

@@ -120,9 +120,9 @@
                 <td style="padding:1px">
                     <input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
                 </td>
-                <td>税率</td>
+                <td>税率(%)</td>
                 <td style="padding:1px">
-                    <input name="taxRate" id="taxRate" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+                    <input name="taxRate" id="taxRate" class="easyui-numberbox" data-options="validType:'length[1,2]'" style="width: 160px;height: 20px"/>
                 </td>
             </tr>
             <tr>

erp_web/pages/manage/depot.html

@@ -182,7 +182,19 @@
                 {title: '搬运费', field: 'truckage', width: 60},
                 {title: '负责人', field: 'principalName', width: 60},
                 {title: '排序', field: 'sort', width: 60},
+                {
+                    title: '是否默认', field: 'isDefault', width: 100, align: "center",
+                    formatter: function (value, rec) {
+                        if (rec.isDefault) {
+                            return "<b style='color:green'>是</b>";
+                        }
+                        else {
+                            return "否";
+                        }
+                    }
+                },
                 {title: '描述', field: 'remark', width: 120}
+
             ]],
             toolbar: [
                 {
@@ -200,6 +212,14 @@
                     handler: function () {
                         batDeleteDepot();
                     }
+                },
+                {
+                    id: 'setDepotIsDefault',
+                    text: '设为默认',
+                    iconCls: 'icon-ok',
+                    handler: function () {
+                        setDepotIsDefault();
+                    }
                 }
             ],
             onLoadError: function () {
@@ -286,7 +306,53 @@
             }
         });
     }
+    //设为默认操作事件
+    function setDepotIsDefault() {
+        var allRow = $('#tableData').datagrid('getRows');
+        var row = $('#tableData').datagrid('getChecked');
+        if (row.length == 0) {
+            $.messager.alert('设置提示', '没有记录被选中！', 'info');
+            return;
+        }
+        if (row.length > 0) {
+            function setDefault(depotID, isDefault) {
+                $.ajax({
+                    type: "post",
+                    url: "/depot/updateDepotIsDefault",
+                    dataType: "json",
+                    async: false,
+                    data: ({
+                        depotID: depotID,
+                        isDefault: isDefault
+                    }),
+                    success: function (res) {
+                        if (res == "true" && isDefault) {
 
+                        }
+                    },
+                    //此处添加错误处理
+                    error: function () {
+                        $.messager.alert('提示', '设为默认账户异常，请稍后再试！', 'error');
+                        return;
+                    }
+                });
+            }
+
+            if (row.length == 1) {
+                setDefault(row[0].id, true); //设置默认
+                for (var i = 0; i < allRow.length; i++) {
+                    if (allRow[i].id != row[0].id) {
+                        setDefault(allRow[i].id, false);
+                    }
+                }
+                setTimeout(function () {
+                    $("#searchBtn").click();
+                }, 1000);
+            }
+
+            return;
+        }
+    }
     //批量删除仓库
     function batDeleteDepot() {
         var row = $('#tableData').datagrid('getChecked');
@@ -565,4 +631,4 @@
     });
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file

erp_web/pages/manage/log.html

@@ -121,11 +121,11 @@
                 {title: '操作人员', field: 'username', width: 80, align: "center"},
                 {title: '操作IP', field: 'clientip', width: 90, align: "center"},
                 {title: '操作时间', field: 'createtime', width: 130, align: "center"},
-                {title: '操作详情', field: 'remark', width: 380},
+                {title: '操作详情', field: 'remark', width: 260},
                 {title: '操作状态',field: 'status',width:70,align:"center",formatter:function(value){
                     return value? "失败":"成功";
                 }},
-                {title: '备注', field: 'remark', width: 180}
+                {title: '备注', field: 'remark', width: 150}
             ]],
             onLoadError: function () {
                 $.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');

erp_web/pages/manage/vendor.html

@@ -120,9 +120,9 @@
                 <td style="padding:1px">
                     <input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
                 </td>
-                <td>税率</td>
+                <td>税率(%)</td>
                 <td style="padding:1px">
-                    <input name="taxRate" id="taxRate" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+                    <input name="taxRate" id="taxRate" class="easyui-numberbox" data-options="validType:'length[1,2]'" style="width: 160px;height: 20px"/>
                 </td>
             </tr>
             <tr>

erp_web/pages/materials/material.html

@@ -1109,6 +1109,7 @@
             $(".window-mask").css({width: webW, height: webH});
             $("#Name").val("").focus();
             $("#manyUnitCheck").prop("checked", false);
+            $("#manyUnit").val(""); //置空
             //当前为不选中状态
             $("#Unit").show();
             $("#manyUnit").hide();
@@ -1200,6 +1201,10 @@
                 $.messager.alert('提示', '型号不能为空！', 'warning');
                 return;
             }
+            if(!$("#Unit").val() && !$("#manyUnit").val()) {
+                $.messager.alert('提示', '单位为必填项！', 'warning');
+                return;
+            }
             if (checkIsExist()) {
                 return;
             }
@@ -1283,9 +1288,9 @@
             $("#Color").focus().val(materialInfo[11]);
             $("#EnableSerialNumber").val(materialInfo[24]=='1'?'1':'0');
             //商品类别id
-            $("#parentid").val(materialInfo[14]);
+            $("#parentid").val(materialInfo[14] == "undefined" ? "" : materialInfo[14]);
             //商品类别名称
-            $("#parentName").val(materialInfo[15]);
+            $("#parentName").val(materialInfo[15] == "undefined" ? "" : materialInfo[15]);
             mId = materialInfo[14];
             mName = materialInfo[15];
             $("#Packing").focus().val(materialInfo[12]);

erp_web/pages/materials/purchase_back_list.html

@@ -344,9 +344,9 @@
                 <td style="padding:1px">
                     <input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
                 </td>
-                <td>税率</td>
+                <td>税率(%)</td>
                 <td style="padding:1px">
-                    <input name="taxRate" id="taxRate" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+                    <input name="taxRate" id="taxRate" class="easyui-numberbox" data-options="validType:'length[1,2]'" style="width: 160px;height: 20px"/>
                 </td>
             </tr>
             <tr>

erp_web/pages/materials/purchase_in_list.html

@@ -346,9 +346,9 @@
                 <td style="padding:1px">
                     <input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
                 </td>
-                <td>税率</td>
+                <td>税率(%)</td>
                 <td style="padding:1px">
-                    <input name="taxRate" id="taxRate" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+                    <input name="taxRate" id="taxRate" class="easyui-numberbox" data-options="validType:'length[1,2]'" style="width: 160px;height: 20px"/>
                 </td>
             </tr>
             <tr>

erp_web/pages/materials/purchase_orders_list.html

@@ -265,9 +265,9 @@
                 <td style="padding:1px">
                     <input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
                 </td>
-                <td>税率</td>
+                <td>税率(%)</td>
                 <td style="padding:1px">
-                    <input name="taxRate" id="taxRate" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+                    <input name="taxRate" id="taxRate" class="easyui-numberbox" data-options="validType:'length[1,2]'" style="width: 160px;height: 20px"/>
                 </td>
             </tr>
             <tr>

erp_web/pages/materials/retail_out_list.html

@@ -63,7 +63,13 @@
             <tr>
                 <td style="width:60px;height:50px;">会员卡号：</td>
                 <td style="padding:5px;width:200px;">
+                    <div class="org-list">
                     <input id="OrganId" name="OrganId" style="width:130px;"/>
+                    </div>
+                <div class="add-org-btn">
+                    <img id="addMember" src="/js/easyui-1.3.5/themes/icons/edit_add.png"
+                         style="cursor: pointer;" alt="增加会员" title="增加会员"/>
+                </div>
                 </td>
                 <td style="width:70px;">单据日期：</td>
                 <td style="padding:5px">
@@ -243,5 +249,107 @@
     <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="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>
+</html>
\ No newline at end of file

erp_web/pages/materials/sale_orders_list.html

@@ -63,7 +63,13 @@
             <tr>
                 <td style="width:60px;">客户：</td>
                 <td style="padding:5px">
-                    <input id="OrganId" name="OrganId" style="width:130px;"/>
+                    <div class="org-list">
+                        <input id="OrganId" name="OrganId" style="width:130px;"/>
+                    </div>
+                    <div class="add-org-btn">
+                        <img id="addCustomer" src="/js/easyui-1.3.5/themes/icons/edit_add.png"
+                             style="cursor: pointer;" alt="增加客戶" title="增加客戶"/>
+                    </div>
                 </td>
                 <td style="width:70px;">单据日期：</td>
                 <td style="padding:5px">
@@ -195,6 +201,107 @@
     <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-numberbox" data-options="validType:'length[1,2]'" 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>
+</html>
\ No newline at end of file

erp_web/pages/materials/sale_out_list.html

@@ -63,7 +63,13 @@
             <tr>
                 <td style="width:60px;">客户：</td>
                 <td style="padding:5px">
-                    <input id="OrganId" name="OrganId" style="width:130px;"/>
+                    <div class="org-list">
+                        <input id="OrganId" name="OrganId" style="width:130px;"/>
+                    </div>
+                    <div class="add-org-btn">
+                        <img id="addCustomer" src="/js/easyui-1.3.5/themes/icons/edit_add.png"
+                             style="cursor: pointer;" alt="增加客戶" title="增加客戶"/>
+                    </div>
                 </td>
                 <td style="width:70px;">单据日期：</td>
                 <td style="padding:5px">
@@ -276,6 +282,107 @@
     <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-numberbox" data-options="validType:'length[1,2]'" 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>
+</html>
\ No newline at end of file

erp_web/pages/reports/account_report.html

@@ -39,6 +39,10 @@
                   
                 <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-print" id="printBtn">打印</a>
             </td>
+            <td>&nbsp;</td>
+            <td>
+                当前总余额：<span class="first-total">0</span>&nbsp;&nbsp;
+            </td>
         </tr>
     </table>
 </div>
@@ -182,6 +186,13 @@
                 if(res && res.code === 200){
                     if(res.data && res.data.page) {
                         $("#tableData").datagrid('loadData', res.data.page);
+                        var total = 0;
+                        res.data.page.rows.forEach(function(value, index, array){
+                            //执行某些操作
+                            total += value.currentamount;
+                        })
+
+                        $(".first-total").text(total); //当前总余额
                     }
                 }
             },
@@ -316,4 +327,4 @@
     }
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file