From 8937235726327c30bc93d488c3f302d5b03b3a29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sat, 2 Nov 2019 09:08:38 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8c010b28..1a0e3aaa 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 * 欢迎加入华夏ERP交流QQ群，群1：120725710(满)、群2：732152262
 * 系统的默认超管账户：admin，默认租户账号：jsh，默认密码均为：123456
 * 部署如遇到困难请参考Wiki文档  **https://gitee.com/jishenghua/JSH_ERP/wikis/pages** 
-* 本系统演示地址：[http://www.huaxiaerp.com](http://www.huaxiaerp.com)，账号：jsh，密码：123456，**欢迎登录（如需试用，欢迎注册）** 
+* 官网地址：[http://www.huaxiaerp.com](http://www.huaxiaerp.com)，测试账号：jsh，密码：123456，**（如需长期使用，欢迎注册）** 
 
 # 定制服务
 * 如有ERP **私人定制** 需求，请将需求整理成文档，发给邮箱： **514869858@qq.com** ，我会及时回复哒
@@ -42,7 +42,7 @@
 
 # 系统美图
 * 首页
-![输入图片说明](https://images.gitee.com/uploads/images/2019/0914/113956_ce9b6518_852955.png "首页.png")
+![输入图片说明](https://images.gitee.com/uploads/images/2019/1102/090743_f2f048e8_852955.png "首页.png")
 * 零售管理
 ![输入图片说明](https://images.gitee.com/uploads/images/2019/0914/113648_9334e6cb_852955.png "零售管理.png")
 * 采购管理

From 15a431e77f99a08697a3163f89cbb55407cbdd03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sat, 2 Nov 2019 09:49:01 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E7=BB=99=E6=B3=A8=E5=86=8C=E7=9A=84?=
 =?UTF-8?q?=E8=B4=A6=E6=88=B7=E9=99=90=E5=88=B6=E4=B8=BA=E5=8F=AA=E8=83=BD?=
 =?UTF-8?q?=E7=94=A8=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/common/common.js | 14 ++++++++++++++
 erp_web/register.html       | 13 ++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/erp_web/js/common/common.js b/erp_web/js/common/common.js
index cd866865..3c91a0d0 100644
--- a/erp_web/js/common/common.js
+++ b/erp_web/js/common/common.js
@@ -334,4 +334,18 @@
 
     function turnBillDetailPage(number, type) {
         js.addTabPage(null, "单据明细", "/pages/materials/bill_detail.html?n="+ number + "&type=" + type);
+    }
+
+    /**
+	 * 验证手机号码
+     * @param phoneInput
+     * @returns {boolean}
+     */
+    function isPhoneAvailable(phoneInput) {
+        var myreg=/^[1][3,4,5,7,8,9][0-9]{9}$/;
+        if (!myreg.test(phoneInput.val())) {
+            return false;
+        } else {
+            return true;
+        }
     }
\ No newline at end of file
diff --git a/erp_web/register.html b/erp_web/register.html
index 65cf02ea..839ca92a 100644
--- a/erp_web/register.html
+++ b/erp_web/register.html
@@ -48,9 +48,9 @@
         </div>
         <div class="register-box-body">
             <div class="form-group has-feedback">
-                <span class="glyphicon glyphicon-user form-control-feedback" title="登录账号"></span>
+                <span class="glyphicon glyphicon-user form-control-feedback" title="登录账户"></span>
                 <input type="text" id="username" name="username" class="form-control required"
-                       data-msg-required="请填写登录账号." placeholder="登录账号"/>
+                       data-msg-required="请填写登录账号." placeholder="登录账户(请输入手机号码）"/>
             </div>
             <div class="form-group has-feedback">
                 <span class="glyphicon glyphicon-lock form-control-feedback"
@@ -127,10 +127,13 @@
         if($("#validCode").val()) {
             var res = verifyCode.validate($("#validCode").val());
             if(res){
-                if(!$("#username").val()) {
-                    alert("用户名不能为空!");
+                var userName = $("#username");
+                if(!userName.val()) {
+                    alert("登录账户不能为空!");
+                } else if(!isPhoneAvailable(userName)) {
+                    alert("请输入正确的手机号码!");
                 } else if(!$("#password").val()) {
-                    alert("密码不能为空!");
+                    alert("登录密码不能为空!");
                 } else if(!$("#confirmPassword").val()) {
                     alert("确认密码不能为空!");
                 } else if($("#password").val()!=$("#confirmPassword").val()) {

From f83285744554e57d44c13190a9249eab7d57d4f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sat, 2 Nov 2019 14:34:21 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/index.html | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/erp_web/index.html b/erp_web/index.html
index 4784b8cf..34adc65e 100644
--- a/erp_web/index.html
+++ b/erp_web/index.html
@@ -44,7 +44,17 @@
 			</div>
 			<div class="navbar-custom-menu">
 				<ul class="nav navbar-nav">
-					<li class="treeview"><a href="javascript:" data-href="/pages/user/userHelp.html" class="addTabPage"><i class="fa fa-diamond"></i> 新手引导</a></li>
+					<li class="treeview">
+						<a href="javascript:" data-href="/pages/user/userHelp.html" class="addTabPage">
+							<i class="fa fa-diamond"></i> 新手引导
+						</a>
+					</li>
+					<li class="treeview">
+						<a target="_blank" style="color:yellow;font-weight: bold"
+						   href="https://cloud.tencent.com/act/cps/redirect?fromSource=gwzcw.3018172.3018172.3018172&redirect=10140&cps_key=4fb6482d716575dcb7b8fe600d93766a&from=activity">
+							<i class="fa fa-cloud"></i> 腾讯云促销中
+						</a>
+					</li>
 					<li><a href="javascript:" id="fullScreen" title="全屏" data-placement="bottom"
 						   data-container="body"><i class="fa fa-arrows-alt"></i></a></li>
 					<li class="dropdown messages-menu">

From 9405f29aedbbac76f32c131b59dcc9f3ab7e0732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 3 Nov 2019 00:12:16 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E8=B4=A6=E6=88=B7=E5=9C=A8=E5=8D=95=E6=8D=AE=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/pages/materials/add_temp.js        | 253 +++++++++++++++++-
 erp_web/js/pages/materials/in_out.js          | 167 +-----------
 .../pages/materials/allocation_out_list.html  |   2 +
 erp_web/pages/materials/assemble_list.html    |   2 +
 erp_web/pages/materials/disassemble_list.html |   1 +
 erp_web/pages/materials/other_in_list.html    |   2 +
 erp_web/pages/materials/other_out_list.html   |   2 +
 .../pages/materials/purchase_back_list.html   |   6 +-
 erp_web/pages/materials/purchase_in_list.html |   6 +-
 .../pages/materials/purchase_orders_list.html |   1 +
 erp_web/pages/materials/retail_back_list.html |   2 +
 erp_web/pages/materials/retail_out_list.html  |   2 +
 erp_web/pages/materials/sale_back_list.html   |   6 +-
 erp_web/pages/materials/sale_orders_list.html |   1 +
 erp_web/pages/materials/sale_out_list.html    |  15 +-
 erp_web/pages/template/base.html              |  32 +++
 16 files changed, 330 insertions(+), 170 deletions(-)

diff --git a/erp_web/js/pages/materials/add_temp.js b/erp_web/js/pages/materials/add_temp.js
index b5a06bd3..341c60e7 100644
--- a/erp_web/js/pages/materials/add_temp.js
+++ b/erp_web/js/pages/materials/add_temp.js
@@ -57,5 +57,256 @@ $.get("../../pages/template/base.html?789", function(tem) {
         $("#cancelDepot").linkbutton({
             iconCls: 'icon-cancel'
         });
+
+        /**
+         * 加载账户
+         */
+        $("#account").html(template({
+            accountSelect: true
+        }));
+        $('#accountDlg').dialog({
+            closed: true,
+            modal: true,
+            collapsible: false,
+            closable: true
+        });
+        $("#accountDlg #name,#accountDlg #serialNo").validatebox({
+            required: true,
+            validType: 'length[2,30]'
+        });
+        $("#accountDlg #initialAmount").numberbox({
+            min:0,
+            precision:2
+        });
+        $("#saveAccount").linkbutton({
+            iconCls: 'icon-ok'
+        });
+        $("#cancelAccount").linkbutton({
+            iconCls: 'icon-cancel'
+        });
     }
-});
\ No newline at end of file
+});
+
+//绑定供应商、客户事件
+function bindSupplierEvent() {
+    if(listTitle === "采购入库列表" || listTitle === "其它入库列表" || listTitle === "采购订单列表"
+        || listTitle === "零售出库列表"|| listTitle === "销售出库列表"|| listTitle === "销售订单列表"){
+        var supplierType = "供应商";
+        if(listTitle === "零售出库列表"){
+            supplierType = "会员";
+        }else if(listTitle === "销售出库列表" || listTitle === "销售订单列表"){
+            supplierType = "客户";
+        }
+        //检查单位名称是否存在 ++ 重名无法提示问题需要跟进
+        function checkSupplierName() {
+            var supplierName = $.trim($("#supplier").val());
+            var orgSupplier = "";
+            //表示是否存在 true == 存在 false = 不存在
+            var flag = false;
+            //开始ajax名称检验，不能重名
+            if(supplierName.length > 0 &&( orgSupplier.length ==0 || supplierName != orgSupplier))
+            {
+                $.ajax({
+                    type:"get",
+                    url: "/supplier/checkIsNameExist",
+                    dataType: "json",
+                    async :  false,
+                    data: ({
+                        id : 0,
+                        name : supplierName
+                    }),
+                    success: function (res) {
+                        if(res && res.code === 200) {
+                            if(res.data && res.data.status) {
+                                flag = res.data.status;
+                                if (flag) {
+                                    $.messager.alert('提示', '单位名称已经存在', 'info');
+                                    return;
+                                }
+                            }
+                        }
+                    },
+                    //此处添加错误处理
+                    error:function() {
+                        $.messager.alert('提示','检查单位名称是否存在异常，请稍后再试！','error');
+                        return;
+                    }
+                });
+            }
+            return flag;
+        }
+
+        //保存供应商信息
+        $("#saveSupplier").off("click").on("click",function() {
+            if(validateForm("supplierFM")) {
+                return;
+            }
+            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;
+            }
+            var url = '/supplier/add';
+            var supObj = $("#supplierFM").serializeObject();
+            supObj.type = supplierType;
+            supObj.enabled = 1;
+            $.ajax({
+                url: url,
+                type:"post",
+                dataType: "json",
+                data:{
+                    info: JSON.stringify(supObj)
+                },
+                success: function(res) {
+                    if (res) {
+                        $('#supplierDlg').dialog('close');
+                        initSupplier(); //刷新供应商
+                    }
+                }
+            });
+        });
+    }
+}
+
+//绑定仓库事件
+function bindDepotEvent() {
+    $("#depotFM #name").focus();
+    $("#selectType").val("principal");
+    //检查名称是否存在 ++ 重名无法提示问题需要跟进
+    function checkDepotName() {
+        var name = $.trim($("#depotDlg #name").val());
+        //表示是否存在 true == 存在 false = 不存在
+        var flag = false;
+        //开始ajax名称检验，不能重名
+        if (name.length > 0) {
+            $.ajax({
+                type: "get",
+                url: "/depot/checkIsNameExist",
+                dataType: "json",
+                async: false,
+                data: ({
+                    id: 0,
+                    name: name
+                }),
+                success: function (res) {
+                    if(res && res.code === 200) {
+                        if(res.data && res.data.status) {
+                            flag = res.data.status;
+                            if (flag) {
+                                $.messager.alert('提示', '仓库名称已经存在', 'info');
+                                return;
+                            }
+                        }
+                    }
+                },
+                //此处添加错误处理
+                error: function () {
+                    $.messager.alert('提示', '检查仓库名称是否存在异常，请稍后再试！', 'error');
+                    return;
+                }
+            });
+        }
+        return flag;
+    }
+    $("#saveDepot").off("click").on("click", function () {
+        var infoObj = $("#depotFM").serializeObject();
+        infoObj.type = 0;
+        if (checkDepotName()) {
+            return;
+        }
+        $.ajax({
+            url: "/depot/add",
+            type: "post",
+            dataType: "json",
+            data: ({
+                info: JSON.stringify(infoObj)
+            }),
+            success: function(res) {
+                if(res && res.code === 200) {
+                    $('#depotDlg').dialog('close');
+                }
+            },
+            //此处添加错误处理
+            error: function () {
+                $.messager.alert('提示', '保存仓库信息异常，请稍后再试！', 'error');
+                return;
+            }
+        });
+    });
+}
+
+//绑定账户事件
+function bindAccountEvent() {
+    function checkAccountName() {
+        var accountName = $.trim($("#accountDlg #name").val());
+        //表示是否存在 true == 存在 false = 不存在
+        var flag = false;
+        //开始ajax名称检验，不能重名
+        if (accountName.length > 0) {
+            $.ajax({
+                type: "get",
+                url: "/account/checkIsNameExist",
+                dataType: "json",
+                async: false,
+                data: ({
+                    id: 0,
+                    name: accountName
+                }),
+                success: function (res) {
+                    if(res && res.code === 200) {
+                        if(res.data && res.data.status) {
+                            flag = res.data.status;
+                            if (flag) {
+                                $.messager.alert('提示', '结算账户名称已经存在', 'info');
+                                return;
+                            }
+                        }
+                    }
+                },
+                //此处添加错误处理
+                error: function () {
+                    $.messager.alert('提示', '检查结算账户名称是否存在异常，请稍后再试！', 'error');
+                    return;
+                }
+            });
+        }
+        return flag;
+    }
+    //保存结算账户
+    $("#saveAccount").off("click").on("click", function () {
+        if (checkAccountName()) {
+            return;
+        }
+        $.ajax({
+            url: '/account/add',
+            type: "post",
+            dataType: "json",
+            data: ({
+                info: JSON.stringify($("#accountFM").serializeObject())
+            }),
+            success: function(res) {
+                if(res && res.code === 200) {
+                    $('#accountDlg').dialog('close');
+                    initSystemData_account(); //刷新账户
+                }
+            },
+            //此处添加错误处理
+            error: function () {
+                $.messager.alert('提示', '保存结算账户异常，请稍后再试！', 'error');
+                return;
+            }
+        });
+    });
+}
\ No newline at end of file
diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js
index baf39217..175c9740 100644
--- a/erp_web/js/pages/materials/in_out.js
+++ b/erp_web/js/pages/materials/in_out.js
@@ -1042,7 +1042,8 @@
                     text:'新增商品',
                     iconCls:'icon-add',
                     handler:function() {
-                        appendMaterial(); //新增商品
+                        js.addTabPage(null, "商品信息", "/pages/materials/material.html");
+                        // appendMaterial(); //新增商品
                     }
                 }
 			],
@@ -1454,7 +1455,9 @@
             supplierDlgFun("客户");
         });
         $("#addAccount").off("click").on("click",function(){
-            alert("增加结算账户");
+            $('#accountDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加结算账户');
+            $('#accountFM').form('clear');
+            bindAccountEvent();
         });
 	    url = '/depotHead/addDepotHeadAndDetail';
 
@@ -2372,98 +2375,7 @@
 		});
 
 	}
-    //绑定供应商、客户事件
-	function bindSupplierEvent() {
-        if(listTitle === "采购入库列表" || listTitle === "其它入库列表" || listTitle === "采购订单列表"
-            || listTitle === "零售出库列表"|| listTitle === "销售出库列表"|| listTitle === "销售订单列表"){
-            var supplierType = "供应商";
-            if(listTitle === "零售出库列表"){
-                supplierType = "会员";
-            }else if(listTitle === "销售出库列表" || listTitle === "销售订单列表"){
-                supplierType = "客户";
-            }
-            //检查单位名称是否存在 ++ 重名无法提示问题需要跟进
-            function checkSupplierName() {
-                var supplierName = $.trim($("#supplier").val());
-                var orgSupplier = "";
-                //表示是否存在 true == 存在 false = 不存在
-                var flag = false;
-                //开始ajax名称检验，不能重名
-                if(supplierName.length > 0 &&( orgSupplier.length ==0 || supplierName != orgSupplier))
-                {
-                    $.ajax({
-                        type:"get",
-                        url: "/supplier/checkIsNameExist",
-                        dataType: "json",
-                        async :  false,
-                        data: ({
-                            id : 0,
-                            name : supplierName
-                        }),
-                        success: function (res) {
-                            if(res && res.code === 200) {
-                                if(res.data && res.data.status) {
-                                    flag = res.data.status;
-                                    if (flag) {
-                                        $.messager.alert('提示', '单位名称已经存在', 'info');
-                                        return;
-                                    }
-                                }
-                            }
-                        },
-                        //此处添加错误处理
-                        error:function() {
-                            $.messager.alert('提示','检查单位名称是否存在异常，请稍后再试！','error');
-                            return;
-                        }
-                    });
-                }
-                return flag;
-            }
 
-            //保存供应商信息
-            $("#saveSupplier").off("click").on("click",function() {
-                if(validateForm("supplierFM")) {
-                    return;
-                }
-                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;
-                }
-                var url = '/supplier/add';
-                var supObj = $("#supplierFM").serializeObject();
-                supObj.type = supplierType;
-                supObj.enabled = 1;
-                $.ajax({
-                    url: url,
-                    type:"post",
-                    dataType: "json",
-                    data:{
-                        info: JSON.stringify(supObj)
-                    },
-                    success: function(res) {
-                        if (res) {
-                            $('#supplierDlg').dialog('close');
-                            initSupplier(); //刷新供应商
-                        }
-                    }
-                });
-            });
-        }
-    }
 	//查询单据列表信息
 	function showDepotHeadDetails(pageNo,pageSize){
 		var materialParam = $.trim($("#searchMaterial").val());
@@ -2699,76 +2611,11 @@
         $('#depotDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加仓库信息');
         $(".window-mask").css({width: webW, height: webH});
         $('#depotFM').form('clear');
-        $("#depotFM #name").focus();
-        $("#selectType").val("principal");
-        oldDepot = "";
-        depotID = 0;
-        url = '/depot/add';
-        //检查名称是否存在 ++ 重名无法提示问题需要跟进
-        function checkDepotName() {
-            var name = $.trim($("#name").val());
-            //表示是否存在 true == 存在 false = 不存在
-            var flag = false;
-            //开始ajax名称检验，不能重名
-            if (name.length > 0 && (oldDepot.length == 0 || name != oldDepot)) {
-                $.ajax({
-                    type: "get",
-                    url: "/depot/checkIsNameExist",
-                    dataType: "json",
-                    async: false,
-                    data: ({
-                        id: depotID,
-                        name: name
-                    }),
-                    success: function (res) {
-                        if(res && res.code === 200) {
-                            if(res.data && res.data.status) {
-                                flag = res.data.status;
-                                if (flag) {
-                                    $.messager.alert('提示', '仓库名称已经存在', 'info');
-                                    return;
-                                }
-                            }
-                        }
-                    },
-                    //此处添加错误处理
-                    error: function () {
-                        $.messager.alert('提示', '检查仓库名称是否存在异常，请稍后再试！', 'error');
-                        return;
-                    }
-                });
-            }
-            return flag;
-        }
-        $("#saveDepot").off("click").on("click", function () {
-            var infoObj = $("#depotFM").serializeObject();
-            infoObj.type = 0;
-            if (checkDepotName()) {
-                return;
-            }
-            $.ajax({
-                url: url,
-                type: "post",
-                dataType: "json",
-                data: ({
-                    info: JSON.stringify(infoObj)
-                }),
-                success: function(res) {
-                    if(res && res.code === 200) {
-                        $('#depotDlg').dialog('close');
-                    }
-                },
-                //此处添加错误处理
-                error: function () {
-                    $.messager.alert('提示', '保存仓库信息异常，请稍后再试！', 'error');
-                    return;
-                }
-            });
-        });
+        bindDepotEvent();
     }
     //新增商品
     function appendMaterial() {
-        alert("新增商品");
+        js.addTabPage(null, "商品信息", "/pages/materials/material.html");
 	}
 	//判断明细
 	function CheckData(type) {
diff --git a/erp_web/pages/materials/allocation_out_list.html b/erp_web/pages/materials/allocation_out_list.html
index 32de82b3..c560241d 100644
--- a/erp_web/pages/materials/allocation_out_list.html
+++ b/erp_web/pages/materials/allocation_out_list.html
@@ -16,6 +16,7 @@
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/common/jsherp.js"></script>
     <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
 </head>
@@ -132,5 +133,6 @@
     <a href="javascript:void(0)" id="cancelDepotHeadShow" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#depotHeadDlgShow').dialog('close')">取消</a>
 </div>
+<div id="depot"></div>
 </body>
 </html>
\ No newline at end of file
diff --git a/erp_web/pages/materials/assemble_list.html b/erp_web/pages/materials/assemble_list.html
index 8c04ddad..c104b318 100644
--- a/erp_web/pages/materials/assemble_list.html
+++ b/erp_web/pages/materials/assemble_list.html
@@ -16,6 +16,7 @@
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/common/jsherp.js"></script>
     <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
 </head>
@@ -131,5 +132,6 @@
     <a href="javascript:void(0)" id="cancelDepotHeadShow" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#depotHeadDlgShow').dialog('close')">取消</a>
 </div>
+<div id="depot"></div>
 </body>
 </html>
\ No newline at end of file
diff --git a/erp_web/pages/materials/disassemble_list.html b/erp_web/pages/materials/disassemble_list.html
index a338f472..944b88dd 100644
--- a/erp_web/pages/materials/disassemble_list.html
+++ b/erp_web/pages/materials/disassemble_list.html
@@ -132,5 +132,6 @@
     <a href="javascript:void(0)" id="cancelDepotHeadShow" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#depotHeadDlgShow').dialog('close')">取消</a>
 </div>
+<div id="depot"></div>
 </body>
 </html>
\ No newline at end of file
diff --git a/erp_web/pages/materials/other_in_list.html b/erp_web/pages/materials/other_in_list.html
index f246f6f3..9d4cee03 100644
--- a/erp_web/pages/materials/other_in_list.html
+++ b/erp_web/pages/materials/other_in_list.html
@@ -16,6 +16,7 @@
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/common/jsherp.js"></script>
     <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
 </head>
@@ -143,5 +144,6 @@
        onclick="javascript:$('#depotHeadDlgShow').dialog('close')">取消</a>
 </div>
 <div id="supplier"></div>
+<div id="depot"></div>
 </body>
 </html>
diff --git a/erp_web/pages/materials/other_out_list.html b/erp_web/pages/materials/other_out_list.html
index 132b0f4a..f8c3e404 100644
--- a/erp_web/pages/materials/other_out_list.html
+++ b/erp_web/pages/materials/other_out_list.html
@@ -16,6 +16,7 @@
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/common/jsherp.js"></script>
     <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
 </head>
@@ -136,5 +137,6 @@
     <a href="javascript:void(0)" id="cancelDepotHeadShow" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#depotHeadDlgShow').dialog('close')">取消</a>
 </div>
+<div id="depot"></div>
 </body>
 </html>
\ No newline at end of file
diff --git a/erp_web/pages/materials/purchase_back_list.html b/erp_web/pages/materials/purchase_back_list.html
index d7074476..d4a15104 100644
--- a/erp_web/pages/materials/purchase_back_list.html
+++ b/erp_web/pages/materials/purchase_back_list.html
@@ -16,6 +16,7 @@
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/common/jsherp.js"></script>
     <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
 </head>
@@ -52,7 +53,7 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
+<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="depotHeadFM" method="post" novalidate>
         <table>
@@ -139,7 +140,7 @@
     <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:1200px;padding:10px 20px;top:20px"
+<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
     <table>
         <tr>
@@ -268,5 +269,6 @@
     <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="depot"></div>
 </body>
 </html>
diff --git a/erp_web/pages/materials/purchase_in_list.html b/erp_web/pages/materials/purchase_in_list.html
index b777b6b6..f34221df 100644
--- a/erp_web/pages/materials/purchase_in_list.html
+++ b/erp_web/pages/materials/purchase_in_list.html
@@ -16,6 +16,7 @@
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/common/jsherp.js"></script>
     <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
 </head>
@@ -52,7 +53,7 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
+<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="depotHeadFM" method="post" novalidate>
         <table>
@@ -154,7 +155,7 @@
     <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:1200px;padding:10px 20px;top:20px"
+<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
     <table>
         <tr>
@@ -286,5 +287,6 @@
 </div>
 <div id="supplier"></div>
 <div id="depot"></div>
+<div id="account"></div>
 </body>
 </html>
diff --git a/erp_web/pages/materials/purchase_orders_list.html b/erp_web/pages/materials/purchase_orders_list.html
index 235335cc..17be58e2 100644
--- a/erp_web/pages/materials/purchase_orders_list.html
+++ b/erp_web/pages/materials/purchase_orders_list.html
@@ -197,5 +197,6 @@
     <a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
 </div>
 <div id="supplier"></div>
+<div id="depot"></div>
 </body>
 </html>
diff --git a/erp_web/pages/materials/retail_back_list.html b/erp_web/pages/materials/retail_back_list.html
index ce6286f0..a46fe74e 100644
--- a/erp_web/pages/materials/retail_back_list.html
+++ b/erp_web/pages/materials/retail_back_list.html
@@ -16,6 +16,7 @@
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/common/jsherp.js"></script>
     <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
 </head>
@@ -208,5 +209,6 @@
     <a href="javascript:void(0)" id="cancelDepotHeadShow" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#depotHeadDlgShow').dialog('close')">取消</a>
 </div>
+<div id="depot"></div>
 </body>
 </html>
\ No newline at end of file
diff --git a/erp_web/pages/materials/retail_out_list.html b/erp_web/pages/materials/retail_out_list.html
index 8cb5c40a..ee521c81 100644
--- a/erp_web/pages/materials/retail_out_list.html
+++ b/erp_web/pages/materials/retail_out_list.html
@@ -16,6 +16,7 @@
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/common/jsherp.js"></script>
     <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
 </head>
@@ -246,5 +247,6 @@
     <a href="javascript:void(0)" id="cancelDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
 </div>
 <div id="supplier"></div>
+<div id="depot"></div>
 </body>
 </html>
diff --git a/erp_web/pages/materials/sale_back_list.html b/erp_web/pages/materials/sale_back_list.html
index 0f83aea4..96613010 100644
--- a/erp_web/pages/materials/sale_back_list.html
+++ b/erp_web/pages/materials/sale_back_list.html
@@ -16,6 +16,7 @@
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/common/jsherp.js"></script>
     <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
 </head>
@@ -52,7 +53,7 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
+<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="depotHeadFM" method="post" novalidate>
         <table>
@@ -138,7 +139,7 @@
     <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:1200px;padding:10px 20px;top:20px"
+<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
     <table>
         <tr>
@@ -268,5 +269,6 @@
     <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="depot"></div>
 </body>
 </html>
\ No newline at end of file
diff --git a/erp_web/pages/materials/sale_orders_list.html b/erp_web/pages/materials/sale_orders_list.html
index 16c3b817..ade0fa03 100644
--- a/erp_web/pages/materials/sale_orders_list.html
+++ b/erp_web/pages/materials/sale_orders_list.html
@@ -199,5 +199,6 @@
     <a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
 </div>
 <div id="supplier"></div>
+<div id="depot"></div>
 </body>
 </html>
diff --git a/erp_web/pages/materials/sale_out_list.html b/erp_web/pages/materials/sale_out_list.html
index c8e5a872..5e104954 100644
--- a/erp_web/pages/materials/sale_out_list.html
+++ b/erp_web/pages/materials/sale_out_list.html
@@ -16,6 +16,7 @@
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/common/jsherp.js"></script>
     <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
 </head>
@@ -52,7 +53,7 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
+<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="depotHeadFM" method="post" novalidate>
         <table>
@@ -119,7 +120,13 @@
             <tr>
                 <td>结算账户：</td>
                 <td style="padding:5px">
-                    <select name="AccountId" id="AccountId" style="width:120px;"></select>
+                    <div class="account-list">
+                        <select name="AccountId" id="AccountId" style="width:110px;"></select>
+                    </div>
+                    <div class="add-account-btn">
+                        <img id="addAccount" src="/js/easyui-1.3.5/themes/icons/edit_add.png"
+                             style="cursor: pointer;" alt="增加结算账户" title="增加结算账户"/>
+                    </div>
                     <img class="many-account-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"
                          style="display: none;"/>
                 </td>
@@ -146,7 +153,7 @@
     <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:1200px;padding:10px 20px;top:20px"
+<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
     <table>
         <tr>
@@ -279,5 +286,7 @@
     <a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
 </div>
 <div id="supplier"></div>
+<div id="depot"></div>
+<div id="account"></div>
 </body>
 </html>
diff --git a/erp_web/pages/template/base.html b/erp_web/pages/template/base.html
index 82f3da6f..609088a0 100644
--- a/erp_web/pages/template/base.html
+++ b/erp_web/pages/template/base.html
@@ -141,4 +141,36 @@
 	<a href="javascript:void(0)" id="saveDepot">保存</a>
 	<a href="javascript:void(0)" id="cancelDepot" onclick="javascript:$('#depotDlg').dialog('close')">取消</a>
 </div>
+{{/if}}
+
+{{#if accountSelect}}
+<div id="accountDlg" style="width:380px;padding:10px 20px" buttons="#accountDlgBtn">
+	<form id="accountFM">
+		<table>
+			<tr>
+				<td>名称</td>
+				<td style="padding:5px">
+					<input name="name" id="name" style="width: 230px;height: 20px"/>
+				</td>
+			</tr>
+			<tr>
+				<td>编号</td>
+				<td style="padding:5px">
+					<input name="serialNo" id="serialNo" style="width: 230px;height: 20px"/>
+				</td>
+			</tr>
+			<tr>
+				<td>期初金额</td>
+				<td style="padding:5px">
+					<input name="initialAmount" id="initialAmount" style="width: 230px;height: 20px"></input>
+				</td>
+			</tr>
+		</table>
+	</form>
+</div>
+<div id="accountDlgBtn">
+	<a href="javascript:void(0)" id="saveAccount" iconCls="icon-ok">保存</a>
+	<a href="javascript:void(0)" id="cancelAccount" iconCls="icon-cancel"
+	   onclick="javascript:$('#accountDlg').dialog('close')">取消</a>
+</div>
 {{/if}}
\ No newline at end of file

From c13026d3d614c00cd08d369128ec664921d06eca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 3 Nov 2019 20:11:13 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=E7=9A=84=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/home.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erp_web/home.html b/erp_web/home.html
index d37eafb4..d6429059 100644
--- a/erp_web/home.html
+++ b/erp_web/home.html
@@ -94,7 +94,7 @@
         </div>
     </div>
     <footer class="main-footer m0">
-        <div class="pull-right hidden-xs">当前版本： V1.0</div>
+        <div class="pull-right hidden-xs">当前版本： V2.1</div>
         &copy; 2015-2020 华夏ERP Demo - Powered By <a href="https://www.huaxiaerp.com/" target="_blank">官方网站</a>
     </footer>
 </div>