Administrator 4 лет назад
Родитель
Сommit
3c11b95439

+ 9 - 7
src/main/resources/static/js/supplier-center/setting/information.js

@@ -84,7 +84,7 @@ jqMultipleShow("click", ".navList", ".tab", ".con");
             license: '^[a-zA-Z0-9_]{18}$',
             license: '^[a-zA-Z0-9_]{18}$',
             email: '^(([^<>()\\[\\]\\\\.,;:\\s@&quot;]+(\\.[^<>()\\[\\]\\\\.,;:\\s@&quot;]+)*)|(&quot;.+&quot;))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$',
             email: '^(([^<>()\\[\\]\\\\.,;:\\s@&quot;]+(\\.[^<>()\\[\\]\\\\.,;:\\s@&quot;]+)*)|(&quot;.+&quot;))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$',
             password: "^[^\\u4e00-\\u9fa5]{8,16}$",
             password: "^[^\\u4e00-\\u9fa5]{8,16}$",
-            num:'/[^0-9]+/g'
+            num:'^[1-9]+(.[0-9]{2})?$'
         },
         },
         provinceArray:[],
         provinceArray:[],
         cityArray: [],//市
         cityArray: [],//市
@@ -144,11 +144,11 @@ jqMultipleShow("click", ".navList", ".tab", ".con");
             if (_self.loginLoading) { return false; }
             if (_self.loginLoading) { return false; }
             this.$nextTick(function() {
             this.$nextTick(function() {
                 if (!pass) {return false;}
                 if (!pass) {return false;}
-                _self.params2.mainpro = _self.shopMainPros.join("/");
-                _self.params2.businessScope = _self.shopScope.join("/");
                 if(_self.tabCurrentIndex==1){
                 if(_self.tabCurrentIndex==1){
                     params = _self.params;
                     params = _self.params;
                 }else if(_self.tabCurrentIndex==2){
                 }else if(_self.tabCurrentIndex==2){
+                    _self.params2.mainpro = _self.shopMainPros.join("/");
+                    _self.params2.businessScope = _self.shopScope.join("/");
                     params = _self.params2
                     params = _self.params2
                 }else if(_self.tabCurrentIndex==3){
                 }else if(_self.tabCurrentIndex==3){
                     params = _self.params3
                     params = _self.params3
@@ -362,14 +362,16 @@ jqMultipleShow("click", ".navList", ".tab", ".con");
             });
             });
             return newArr
             return newArr
         },
         },
-        setNewScope:function(arr){//回显处理主营内容
-            if (arr!=null){
-            var newArr = [];
+        setNewScope:function(arr) {//回显处理主营内容
+            if (arr==null){
+              var newArr = [];
+            }else{
+              var newArr = [];
                 arr.split('/').forEach(function(item){
                 arr.split('/').forEach(function(item){
                     newArr.push(item);
                     newArr.push(item);
                 });
                 });
                 return newArr
                 return newArr
-            }
+          }
         },
         },
     },
     },
     mounted:function () {
     mounted:function () {

+ 4 - 4
src/main/resources/templates/supplier-center/setting/information.html

@@ -100,7 +100,7 @@
                             </div>
                             </div>
                              <div class="formLine">
                              <div class="formLine">
                                 <p><em>*</em>注册资本:</p>
                                 <p><em>*</em>注册资本:</p>
-                                <input type="text" v-model.trim="params.registeredCapital" placeholder="请填写公司注册资本"  onkeyup="clearNoNum(this)"  @blur="blurHandle($event)" needverify>
+                                <input type="text" v-model.trim="params.registeredCapital" placeholder="请填写公司注册资本" :rule="rule.num" @blur="blurHandle($event)" needverify>
                                 <i class="checked icon mIcon"></i>
                                 <i class="checked icon mIcon"></i>
                                 <span class="errTips icon mIcon" tips="请输入注册资本"></span>
                                 <span class="errTips icon mIcon" tips="请输入注册资本"></span>
                             </div>
                             </div>
@@ -112,7 +112,7 @@
                             </div>
                             </div>
                              <div class="formLine">
                              <div class="formLine">
                                 <p><em>*</em>年营业额:</p>
                                 <p><em>*</em>年营业额:</p>
-                                <input type="text" v-model.trim="params.registeredCapital" placeholder="¥ 请输入公司年营业额"  onkeyup="clearNoNum(this)"  @blur="blurHandle($event)" needverify>
+                                <input type="text" v-model.trim="params.turnover" placeholder="¥ 请输入公司年营业额" :rule="rule.num"  @blur="blurHandle($event)" needverify>
                                 <i class="checked icon mIcon"></i>
                                 <i class="checked icon mIcon"></i>
                                 <span class="errTips icon mIcon" tips="请输入年营业额"></span>
                                 <span class="errTips icon mIcon" tips="请输入年营业额"></span>
                             </div>
                             </div>
@@ -157,7 +157,7 @@
                             <div class="formLine">
                             <div class="formLine">
                                 <p><em>*</em>主营产品:</p>
                                 <p><em>*</em>主营产品:</p>
                                 <p class="business">
                                 <p class="business">
-                                    <label v-for="pro in mentuzCampNullList" class="diyBox second"><input type="checkbox" name="secondShopType" v-model="shopMainPros" :value="pro.name" ><i class="icon mIcon">{{pro.name}}</i></label>
+                                    <label v-for="pro in mentuzCampNullList" class="diyBox second"><input type="checkbox"v-model="shopMainPros" :value="pro.name" ><i class="icon mIcon">{{pro.name}}</i></label>
                                 </p>
                                 </p>
                                 <p class="addbusiness">
                                 <p class="addbusiness">
                                     <input type="text" placeholder="请输入自定义主营内容" v-model.trim="mainProEdit" maxlength="5" >
                                     <input type="text" placeholder="请输入自定义主营内容" v-model.trim="mainProEdit" maxlength="5" >
@@ -171,7 +171,7 @@
                                     <label v-for="pro in Scopelist" class="diyBox second"><input type="checkbox" name="secondShopType" v-model="shopScope" :value="pro.name" ><i class="icon mIcon">{{pro.name}}</i></label>
                                     <label v-for="pro in Scopelist" class="diyBox second"><input type="checkbox" name="secondShopType" v-model="shopScope" :value="pro.name" ><i class="icon mIcon">{{pro.name}}</i></label>
                                 </p>
                                 </p>
                                 <p class="addbusiness">
                                 <p class="addbusiness">
-                                    <input type="text" placeholder="请输入自定义经营范围" v-model.trim="mainProEdit" maxlength="5" >
+                                    <input type="text" placeholder="请输入自定义经营范围" v-model.trim="shopScopeEdit" maxlength="5" >
                                     <a href="javascript:void(0);" @click="shopScopeAdd()">确认添加</a>
                                     <a href="javascript:void(0);" @click="shopScopeAdd()">确认添加</a>
                                 </p>
                                 </p>
                                 <span class="errTips icon mIcon" tips="请选择或添加主营产品"></span>
                                 <span class="errTips icon mIcon" tips="请选择或添加主营产品"></span>