Merge remote-tracking branch 'origin/master'

src/views/hpuser/modules/UserModal.vue

@@ -9,76 +9,44 @@
     
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
-      
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
-          label="手机号">
-          <a-input placeholder="手机号" v-decorator="['phone', {} ]" :readOnly="!!model.id"/>
+          label="姓名">
+          <a-input placeholder="姓名" v-decorator="['realName', {}]" :readOnly="!!model.id"/>
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
-          label="性别">
-          <j-dict-select-tag  v-decorator="['gender', {}]" placeholder="性别" :type="'radio'" :triggerChange="true" dictCode="sex"/>
+          label="手机号">
+          <a-input placeholder="手机号" v-decorator="['phone', {} ]" :readOnly="!!model.id"/>
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
-          label="头像">
-          <img :src="getAvatarView()" :preview="getAvatarView()" alt="头像" style="height:104px;max-width:300px"/>
+          label="性别">
+          <j-dict-select-tag  v-decorator="['gender', {}]" placeholder="性别" :type="'radio'" :triggerChange="true" dictCode="sex"/>
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
-          label="真实姓名">
-          <a-input placeholder="请输入真实姓名" v-decorator="['realName', {}]" :readOnly="!!model.id"/>
+          label="职位">
+          <a-input placeholder="职位" v-decorator="['position', {}]" :readOnly="!!model.id"/>
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="身份证号">
-          <a-input placeholder="请输入身份证号" v-decorator="['idCardNumber', {}]" :readOnly="!!model.id"/>
+          <a-input placeholder="身份证号" v-decorator="['idCardNumber', {}]" :readOnly="!!model.id"/>
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
-          label="身份证正面">
+          label="身份证">
           <img :src="getCardFrontView()" :preview="getCardFrontView()" alt="身份证正面" style="height:104px;max-width:300px"/>
+          <img :src="getCardBackView()" :preview="getCardBackView()" alt="身份证反面" style="height:104px;max-width:300px;margin-left: 30px"/>
         </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="身份证反面">
-          <img :src="getCardBackView()" :preview="getCardBackView()" alt="身份证反面" style="height:104px;max-width:300px"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="职位">
-          <a-input placeholder="请输入职位" v-decorator="['position', {}]" :readOnly="!!model.id"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="身份">
-          <j-dict-select-tag :triggerChange="true" dictCode="hp_user_type" v-decorator="[ 'userType', {}]" placeholder="请选择身份">
-          </j-dict-select-tag>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="认证状态">
-          <j-dict-select-tag :triggerChange="true" dictCode="authentication_status" v-decorator="[ 'authenticationStatus', {}]" placeholder="请选择认证状态">
-          </j-dict-select-tag>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="是否禁用">
-          <j-dict-select-tag  v-decorator="['delFlag', {}]" placeholder="请选择是否禁用" :type="'radio'" :triggerChange="true" dictCode="hp_del_flag"/>
-        </a-form-item>
-		
+
       </a-form>
     </a-spin>
   </a-modal>
@@ -89,7 +57,6 @@
   import pick from 'lodash.pick'
   import moment from "moment"
 
-
   export default {
     name: "UserModal",
     data () {
@@ -114,8 +81,9 @@
         url: {
           add: "/user/user/add",
           edit: "/user/user/edit",
-          imgerver: window._CONFIG['domianURL']+"/sys/common/view",
+          imgerver: window._CONFIG['imgDomainURL'],
         },
+        sex:{},
       }
     },
     created () {
@@ -130,9 +98,6 @@
         this.visible = true;
         this.$nextTick(() => {
           this.form.setFieldsValue({
-            authenticationStatus:String(this.model.authenticationStatus),
-            userType:String(this.model.userType),
-            delFlag:String(this.model.delFlag),
             gender:String(this.model.gender)
           });
           this.form.setFieldsValue(pick(this.model,'phone','headImgUrl','clientId','userToken','realName','idCardNumber','idCardFront','idCardBack','position'))
@@ -178,27 +143,24 @@
               that.close();
             })
 
-
-
           }
         })
       },
       handleCancel () {
         this.close()
       },
-      getAvatarView(){
-        return this.url.imgerver +"/"+ this.model.headImgUrl;
-      },
       getCardFrontView(){
         return this.url.imgerver +"/"+ this.model.idCardFront;
       },
       getCardBackView(){
         return this.url.imgerver +"/"+ this.model.idCardBack;
-      },
+      }
     }
   }
 </script>
 
 <style lang="less" scoped>
-
+  .ant-form-item{
+    margin-bottom: 12px;
+  }
 </style>