Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop

@@ -126,11 +126,12 @@ edit.prototype={
         /*初始化文件上传*/
         if($('input[type="file"]').length>0){
             $('input[type="file"]').each(function(){
+                var src=$(this).attr("value");
                 var Temp='<ul class="upload-image-list">';
                     Temp+='<li class="fileinput-button">';
                     Temp+='<a class="fileinput-button-icon" href="javascript:void(0);">';
-                    if($(this).val()){
-                        Temp+='<img width="76" height="80" src="'+$(this).val()+'">';
+                    if(src){
+                        Temp+='<img width="76" height="80" src="'+src+'">';
                     }else{
                         Temp+='+';
                     }
@@ -255,7 +256,6 @@ edit.prototype={
         $("input:text",that.el)//number
         .add("input[type=number]",that.el)
         .add("input:hidden",that.el)
-        .add("input[type=file]",that.el)
         .add("select",that.el)
         .add("textarea",that.el)
         .each(function(){
@@ -263,6 +263,11 @@ edit.prototype={
             var value=$(this).val();
             data[name]=value;
         });
+        $("input[type=file]",that.el).each(function(){
+            var name=$(this).attr("id");
+            var value=$(this).attr("value");
+            data[name]=value;
+        });
 
         var options = {
             type: 'post',

@@ -150,22 +150,27 @@ exports.res = [{
             {name:"legalPerson",type:"String"},
             {name:"legalIdentityCard",type:"String"},
             {name:"registeredCapital",type:"String"},
-            {name:"industryLicense",type:"String"},
+            {name:"businessLicense",type:"String"},
             {name:"businessLicensePic",type:"String"},
+
+            {name:"taxCertificate",type:"String"},
+            {name:"accountOpeningLicense",type:"String"},
             {name:"taxpayerQualificationCertificate",type:"String"},
+            {name:"industryLicense",type:"String"},
+
             {name:"businessRange",type:"String"},
             {name:"contactPhone",type:"String"},
             {name:"contactAddress",type:"String"},
             {name:"linkman",type:"String"},
+            {name:"phone",type:"String"},
             {name:"fax",type:"String"},
             {name:"email",type:"String"},
             {name:"url",type:"String"},
             {name:"bankName",type:"String"},
             {name:"bankAccount",type:"String"},
             {name:"operations",type:"String",def: 1},
-            {name:"status",type:"String"},
-            {name:"phone",type:"String"},
-            {name:"accountOpeningLicense",type:"String"}
+            {name:"status",type:"String"}
+            
         ]
     },
     {//修改供应商
@@ -174,7 +179,7 @@ exports.res = [{
         url: '/supplier/supplier/updateSupplier',
         isJsonRaw: true,
         params:[
-            {name:"supplierName",type:"String"},
+             {name:"supplierName",type:"String"},
             {name:"supplierCode",type:"String"},
             {name:"foundTime",type:"String"},
             {name:"beginOperateTime",type:"String"},
@@ -183,22 +188,27 @@ exports.res = [{
             {name:"legalPerson",type:"String"},
             {name:"legalIdentityCard",type:"String"},
             {name:"registeredCapital",type:"String"},
-            {name:"industryLicense",type:"String"},
+            {name:"businessLicense",type:"String"},
             {name:"businessLicensePic",type:"String"},
+
+            {name:"taxCertificate",type:"String"},
+            {name:"accountOpeningLicense",type:"String"},
             {name:"taxpayerQualificationCertificate",type:"String"},
+            {name:"industryLicense",type:"String"},
+
             {name:"businessRange",type:"String"},
             {name:"contactPhone",type:"String"},
             {name:"contactAddress",type:"String"},
             {name:"linkman",type:"String"},
+            {name:"phone",type:"String"},
             {name:"fax",type:"String"},
             {name:"email",type:"String"},
             {name:"url",type:"String"},
             {name:"bankName",type:"String"},
             {name:"bankAccount",type:"String"},
-            {name:"id",type:"String"},
             {name:"operations",type:"String",def: 1},
-            {name:"phone",type:"String"},
-            {name:"status",type:"String"}
+            {name:"status",type:"String"},
+            {name:"id",type:"String"}
         ]
     },
     {// 供应商详情

@@ -147,7 +147,7 @@
                                 <p><span class="red">注：与联系人电话至少填一个</span></p>
                                 </label>
                                 <div class="col-sm-8">
-                                  <input type="text"  id="contactPhone" placeholder="请填写公司联系电话"  class="form-control" required value="{{contactPhone}}" >
+                                  <input type="text"  id="contactPhone" placeholder="请填写公司联系电话"  class="form-control"  value="{{contactPhone}}" >
                                 </div>
                                 <!--pattern="/^13[0-9]{9}$/"-->
                             </div>