guhongwei 4 éve
szülő
commit
6fce54b055
3 módosított fájl, 26 hozzáadás és 26 törlés
  1. 12 12
      src/layout/user/mainForm.vue
  2. 10 10
      src/views/duijiehui/detail.vue
  3. 4 4
      src/views/user/index.vue

+ 12 - 12
src/layout/user/mainForm.vue

@@ -33,21 +33,21 @@
           </el-form-item>
           <el-form-item label="用户类别" prop="role">
             <el-radio-group v-model="form.role">
-              <el-radio label="2">个人</el-radio>
-              <el-radio label="3">企业管理员</el-radio>
+              <el-radio label="4">个人</el-radio>
+              <el-radio label="5">企业管理员</el-radio>
               <el-radio label="6">专家</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="身份证正面" v-if="form.role == '2' || form.role == '3'" prop="cardfile_a">
+          <el-form-item label="身份证正面" v-if="form.role == '4' || form.role == '5'" prop="cardfile_a">
             <upload :limit="1" :data="form.cardfile_a" type="cardfile_a" :url="'/files/cardfilea/upload'" @upload="uploadSuccess"></upload>
           </el-form-item>
-          <el-form-item label="身份证背面" v-if="form.role == '2' || form.role == '3'" prop="cardfile_b">
+          <el-form-item label="身份证背面" v-if="form.role == '4' || form.role == '5'" prop="cardfile_b">
             <upload :limit="1" :data="form.cardfile_b" type="cardfile_b" :url="'/files/cardfileb/upload'" @upload="uploadSuccess"></upload>
           </el-form-item>
-          <el-form-item label="组织机构图片" v-if="form.role == '3'" prop="img_qy">
+          <el-form-item label="组织机构图片" v-if="form.role == '5'" prop="img_qy">
             <upload :limit="1" :data="form.img_qy" type="img_qy" :url="'/files/imgqy/upload'" @upload="uploadSuccess"></upload>
           </el-form-item>
-          <template v-if="form.role == '3'">
+          <template v-if="form.role == '5'">
             <el-form-item label="机构类型" prop="institution_type">
               <el-input v-model="form.institution_type" placeholder="请输入机构类型"></el-input>
             </el-form-item>
@@ -61,10 +61,10 @@
               <el-input v-model="form.institution_nature" placeholder="请输入机构性质"></el-input>
             </el-form-item>
           </template>
-          <el-form-item label="办公电话" v-if="form.role == '2' || form.role == '3'" prop="office_phone">
+          <el-form-item label="办公电话" v-if="form.role == '4' || form.role == '5'" prop="office_phone">
             <el-input v-model="form.office_phone" placeholder="请输入办公电话"></el-input>
           </el-form-item>
-          <el-form-item label="所属行业" v-if="form.role == '2' || form.role == '3'" prop="profession">
+          <el-form-item label="所属行业" v-if="form.role == '4' || form.role == '5'" prop="profession">
             <el-input v-model="form.profession" placeholder="请输入所属行业"></el-input>
           </el-form-item>
           <el-form-item label="性别" v-if="form.role == '6'" prop="gender">
@@ -103,7 +103,7 @@
           <el-form-item label="从事专业" v-if="form.role == '6'" prop="professional">
             <el-input v-model="form.professional" placeholder="请输入从事专业"></el-input>
           </el-form-item>
-          <el-form-item label="个人简历" v-if="form.role == '2' || form.role == '6'" prop="resume">
+          <el-form-item label="个人简历" v-if="form.role == '4' || form.role == '6'" prop="resume">
             <el-input type="textarea" v-model="form.resume" placeholder="请输入个人简介"></el-input>
           </el-form-item>
           <el-form-item label="项目" v-if="form.role == '6'" prop="project">
@@ -181,7 +181,7 @@ export default {
     ...users(['fetch', 'create', 'update']),
     ...exportuser({ exportuserFetch: 'fetch', exportuserCreate: 'create', exportuserUpdate: 'update' }),
     async search() {
-      if (this.role == '2' || this.role == '3') {
+      if (this.role == '4' || this.role == '5') {
         const res = await this.fetch(this.id);
         if (this.$checkRes(res)) this.$set(this, `form`, res.data);
       } else if (this.role == '6') {
@@ -196,7 +196,7 @@ export default {
       if (this.isNew) {
         data.status = '1';
         data.code = this.user.code;
-        if (data.role == '2' || data.role == '3') {
+        if (data.role == '4' || data.role == '5') {
           res = await this.create(data);
           msg = '用户创建成功';
         } else if (data.role == '6') {
@@ -204,7 +204,7 @@ export default {
           msg = '用户创建成功';
         }
       } else {
-        if (this.form.role == '2' || this.form.role == '3') {
+        if (this.form.role == '4' || this.form.role == '5') {
           res = await this.update(data);
           msg = '用户审核成功';
         } else if (this.form.role == '6') {

+ 10 - 10
src/views/duijiehui/detail.vue

@@ -78,16 +78,16 @@ export default {
       } else {
         data.user_id = this.user.uid;
         data.is_allowed = '1';
-        console.log(data);
-        this.$alert(`${data.user_id}`, '成功', {
-          dangerouslyUseHTMLString: true,
-          type: 'success',
-          center: true,
-        });
-        // let res = await this.livecreate(data);
-        // if (this.$checkRes(res)) {
-        //   this.$checkRes(res, '添加成功', '添加失败');
-        // }
+        // this.$alert(`${data.user_id}`, '成功', {
+        //   dangerouslyUseHTMLString: true,
+        //   type: 'success',
+        //   center: true,
+        // });
+        let res = await this.livecreate(data);
+        if (this.$checkRes(res)) {
+          // this.$checkRes(res, '添加成功', '添加失败');
+          console.log(res);
+        }
       }
       // this.$router.push({ path: '/duijiehui/index' });
     },

+ 4 - 4
src/views/user/index.vue

@@ -46,7 +46,7 @@ export default {
     fields: [
       { label: '姓名', prop: 'name', filter: 'input' },
       { label: '电话', prop: 'phone', filter: 'input' },
-      { label: '用戶类型', prop: 'role', format: i => (i == '2' ? '个人用户' : i == '3' ? '企业用户' : i == '6' ? '专家' : '临时用户') },
+      { label: '用戶类型', prop: 'role', format: i => (i == '4' ? '个人用户' : i == '5' ? '企业用户' : i == '6' ? '专家' : '临时用户') },
       { label: '状态', prop: 'status', format: i => (i == '0' ? '待审核' : i == '1' ? '审核成功' : i == '2' ? '审核拒绝' : '待认证') },
     ],
     list: [],
@@ -59,15 +59,15 @@ export default {
     ...users(['query', 'delete', 'update', 'userquery']),
     ...exportuser({ exportuserQuery: 'query' }),
     ...authUser({ authUserDelete: 'delete' }),
-    async search({ skip = 0, limit = 10, pid = '', ...info } = {}) {
+    async search({ skip = 0, limit = 10, ...info } = {}) {
       if (this.user.code.length == 3) {
-        const res = await this.userquery({ skip, limit, pid, ...info });
+        const res = await this.query({ skip, limit, ...info });
         if (this.$checkRes(res)) {
           this.$set(this, `list`, res.data);
           this.$set(this, `total`, res.total);
         }
       } else {
-        const res = await this.userquery({ skip, limit, pid, code: this.user.code, ...info });
+        const res = await this.userquery({ skip, limit, pid: this.user.pid, code: this.user.code, ...info });
         if (this.$checkRes(res)) {
           this.$set(this, `list`, res.data);
           this.$set(this, `total`, res.total);