From 52fb4c6e0638fee92734182c0813531c1819a585 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, 6 Jan 2019 21:53:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=87=87=E8=B4=AD=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=AD=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E6=96=B0=E5=A2=9E=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/pages/materials/in_out.js          | 23 ++++---------------
 erp_web/pages/materials/purchase_in_list.html | 14 +++++------
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js
index bffab1fb..f4c3fa09 100644
--- a/erp_web/js/pages/materials/in_out.js
+++ b/erp_web/js/pages/materials/in_out.js
@@ -1556,7 +1556,7 @@
 	    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;增加供应商');
+			$('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加供应商信息');
 		});
 	    url = '/depotHead/add';
 
@@ -2553,28 +2553,15 @@
 					return;
 				}
 				var url = '/supplier/add';
+                var supObj = $("#supplierFM").serializeObject();
+                supObj.type = "供应商";
+                supObj.enabled = 1;
 				$.ajax({
 					url: url,
 					type:"post",
 					dataType: "json",
 					data:{
-						supplier:$("#supplier").val(),
-						type: "供应商",
-						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
+                        info: JSON.stringify(supObj)
 					},
 					success: function(res) {
 						if (res) {
diff --git a/erp_web/pages/materials/purchase_in_list.html b/erp_web/pages/materials/purchase_in_list.html
index 231f2122..3ac46f83 100644
--- a/erp_web/pages/materials/purchase_in_list.html
+++ b/erp_web/pages/materials/purchase_in_list.html
@@ -292,22 +292,22 @@
                 </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>手机号码</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>
+            </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"/>