From d10631233420c85421f95637c1e72829d351fc22 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, 24 Aug 2019 00:17:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=8D=95=E6=8D=AE=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E6=96=B0=E5=A2=9E=E8=B4=A6=E6=88=B7?=
 =?UTF-8?q?=E7=9A=84=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/css/in_out.css                        | 18 ++++++++++++++++--
 erp_web/js/pages/materials/in_out.js          |  3 +++
 erp_web/pages/materials/purchase_in_list.html | 12 ++++++++++--
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/erp_web/css/in_out.css b/erp_web/css/in_out.css
index 13d2dd06..e024682b 100644
--- a/erp_web/css/in_out.css
+++ b/erp_web/css/in_out.css
@@ -100,8 +100,22 @@
 	width:135px;
 }
 
-#depotHeadDlg .add-org-btn{
+#depotHeadDlg .account-list{
 	float: left;
-	width:30px;
+	width:112px;
+}
+
+#depotHeadDlg .add-org-btn, #depotHeadDlg .add-account-btn{
+	float: left;
+	width:20px;
 	padding: 2px;
+}
+
+#depotHeadDlg .other-money-list{
+	float: left;
+	width:122px;
+}
+
+#depotHeadDlg .other-money-ico{
+	padding-left: 5px;
 }
\ 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 0ed6536e..93d23924 100644
--- a/erp_web/js/pages/materials/in_out.js
+++ b/erp_web/js/pages/materials/in_out.js
@@ -1481,6 +1481,9 @@
         });
         $("#addCustomer").off("click").on("click",function(){
             supplierDlgFun("客户");
+        });
+        $("#addAccount").off("click").on("click",function(){
+            alert("增加结算账户");
         });
 	    url = '/depotHead/addDepotHeadAndDetail';
 
diff --git a/erp_web/pages/materials/purchase_in_list.html b/erp_web/pages/materials/purchase_in_list.html
index f3e8655d..204efe7a 100644
--- a/erp_web/pages/materials/purchase_in_list.html
+++ b/erp_web/pages/materials/purchase_in_list.html
@@ -125,7 +125,13 @@
             <tr>
                 <td>结算账户：</td>
                 <td style="padding:5px">
-                    <select name="AccountId" id="AccountId" style="width:110px;"></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>
@@ -135,7 +141,9 @@
                 </td>
                 <td>采购费用：</td>
                 <td style="padding:5px">
-                    <input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/>
+                    <div class="other-money-list">
+                        <input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/>
+                    </div>
                     <img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/>
                 </td>
                 <td></td>