Merge branch 'master' of http://47.105.205.210/property-platform/property-company

src/views/property/modules/NoticeForm.vue

@@ -25,7 +25,11 @@
           </a-col>
           <a-col :span="24" v-if="model.noticeRange === 'POINT'">
             <a-form-model-item label="指定小区" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="communityCodes">
-              <a-select style="width: 100%" mode="multiple" v-model="model.communityCodes" placeholder="请选择指定小区" labelInValue>
+              <a-select style="width: 100%;" mode="multiple" v-model="model.communityCodes" 
+              :getPopupContainer="
+                triggerNode => {
+                  return triggerNode.parentNode
+                }"  placeholder="请选择指定小区" labelInValue>
                 <a-select-option v-for="item in communityList" :key="item.communityCode" :value="item.communityCode">{{item.communityName}}</a-select-option>
               </a-select>
             </a-form-model-item>

src/views/system/modules/UserModal.vue

@@ -45,7 +45,7 @@
         </a-form-model-item> -->
 
         <a-form-model-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
-          <a-input placeholder="请输入手机号码" v-model="model.phone" :disabled="disableSubmit" />
+          <a-input placeholder="请输入手机号码" v-model="model.phone"  :readOnly="!!model.id" :disabled="disableSubmit" />
         </a-form-model-item>
 
         <!-- <a-form-model-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -388,6 +388,9 @@
       validatePhone(rule, value, callback){
         if(!value){
           callback()
+        }else{
+          if(this.model.id){
+            callback()
           }else{
               if(new RegExp(/^1[3|4|5|6|7|8|9][0-9]\d{8}$/).test(value)){
               var params = {
@@ -407,6 +410,7 @@
               callback("请输入正确格式的手机号码!");
             }
           }
+        }
       },
       validateEmail(rule, value, callback){
         if(!value){
@@ -433,6 +437,9 @@
         }
       },
       validateUsername(rule, value, callback){
+        if(this.model.id){
+            callback()
+          }else{
             var params = {
               tableName: 'sys_user',
               fieldName: 'username',
@@ -443,9 +450,10 @@
               if (res.success) {
                 callback()
               } else {
-            callback("用户名已存在!")
+                callback('该用户已存在')
               }
             })
+        }
       },
       validateWorkNo(rule, value, callback){
         var params = {