更新

src/layout/login/webLogin.vue

@@ -8,15 +8,8 @@
             <el-tab-pane label="登录" name="first">
               <el-col :span="24">
                 <el-form ref="form" :model="form" label-width="120px">
-                  <el-form-item
-                    label="手机号"
-                    prop="phone"
-                    :rules="[
-                      { required: true, message: '手机号不能为空' },
-                      { type: 'number', message: '手机号必须为数字值' },
-                    ]"
-                  >
-                    <el-input type="phone" v-model.number="form.phone" autocomplete="off" placeholder="请输入手机号" :minlength="11" :maxlength="11"></el-input>
+                  <el-form-item label="用户名" prop="phone">
+                    <el-input type="phone" v-model="form.phone" autocomplete="off" placeholder="请输入手机号/统一社会信用代码"></el-input>
                   </el-form-item>
                   <el-form-item label="登录密码">
                     <el-input v-model="form.passwd" placeholder="请输入登录密码" show-password></el-input>
@@ -76,6 +69,10 @@
                     </el-form-item>
                   </span>
                   <span v-else-if="forms.role == '5'">
+                    <el-form-item label="统一社会信用代码" prop="institution_code">
+                      <el-input v-model="forms.institution_code" placeholder="请输入统一社会信用代码"></el-input>
+                      <el-link type="danger" :underline="false">统一社会信用代码作为机构用户登录平台唯一凭证</el-link>
+                    </el-form-item>
                     <el-form-item label="注册类型">
                       <el-input v-model="forms.companytype" placeholder="请输入注册类型"></el-input>
                     </el-form-item>
@@ -83,9 +80,6 @@
                       <el-date-picker v-model="forms.companydate" placeholder="请选择" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date">
                       </el-date-picker>
                     </el-form-item>
-                    <el-form-item label="组织机构代码">
-                      <el-input v-model="forms.institution_code" placeholder="请输入组织机构代码"></el-input>
-                    </el-form-item>
                     <el-form-item label="注册资金">
                       <el-input v-model="forms.companycapital" placeholder="请输入注册资金"></el-input>
                     </el-form-item>
@@ -240,12 +234,13 @@ export default {
       activeName: 'first',
       rules: {
         name: [{ required: true, message: '请输入用户名称', trigger: 'blur' }],
-        phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
+        phone: [{ required: true, message: '请输入手机号/统一社会信用代码', trigger: 'blur' }],
         password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
         code: [
           { required: true, message: '请输入邀请码', trigger: 'blur' },
           // { type: 'number', message: '年龄必须为数字值' },
         ],
+        institution_code: [{ required: true, message: '请输入统一社会信用代码', trigger: 'blur' }],
         // cardnumber: [{ required: true, message: '请输入身份证号', trigger: 'blur' }],
         // email: [{ required: true, message: '请输入邮箱', trigger: 'blur' }],
         // addr: [{ required: true, message: '请输入地址', trigger: 'blur' }],
@@ -256,7 +251,7 @@ export default {
         // img_qy: [{ required: false, message: '请输入组织机构图片', trigger: 'blur' }],
         // institution_type: [{ required: false, message: '请输入机构类型', trigger: 'blur' }],
         // institution_name: [{ required: false, message: '请输入机构名称', trigger: 'blur' }],
-        // institution_code: [{ required: false, message: '请输入机构代码', trigger: 'blur' }],
+
         // institution_nature: [{ required: false, message: '请输入机构性质', trigger: 'blur' }],
         // office_phone: [{ required: false, message: '请输入办公电话', trigger: 'blur' }],
         // profession: [{ required: false, message: '请输入从事专业', trigger: 'blur' }],

src/views/superAdminCenter/user/index.vue

@@ -280,10 +280,9 @@ export default {
     },
     // 提交
     async handleSave() {
-      let data = this.editData;
-      data.status = this.form.status;
+      let data = this.form;
       if (data.role == '4' || data.role == '5') {
-        data.id = data.uid;
+        data.id = this.editData.uid;
         let res = await this.update(data);
         if (this.$checkRes(res)) {
           this.$message({
@@ -293,7 +292,7 @@ export default {
           this.handleClose();
         }
       } else if (data.role == '6') {
-        data.id = data.uid;
+        data.id = this.editData.uid;
         let res = await this.exportuserUpdate(data);
         if (this.$checkRes(res)) {
           this.$message({

src/views/webLogin.vue

@@ -44,6 +44,7 @@ export default {
     async submitRegisters({ data }) {
       if (data.role == '4' || data.role == '5') {
         let res = await this.userCreate(data);
+        console.log(res.data);
         let msg = `注册成功，等待管理员审核，方可登录`;
         this.$checkRes(res, msg);
       } else if (data.role == '6') {