فهرست منبع

Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-test

wuhongyu 5 سال پیش
والد
کامیت
1a2010fa11

+ 152 - 5
src/layout/enterprise/jibencontext.vue

@@ -4,7 +4,115 @@
       <el-col :span="24" class="leftTop"> <span>|</span> <span>基本信息</span> </el-col>
       <el-col :span="24" class="info">
         <el-form ref="form" :model="form" label-width="80px">
-          <el-form-item label="用户名:">
+          <el-form-item label="用户名称">
+            <el-input v-model="form.name" placeholder="请输入用户名称"></el-input>
+          </el-form-item>
+          <el-form-item label="手机号">
+            <el-input v-model="form.phone" placeholder="请输入手机号" :minlength="11" :maxlength="11" disabled></el-input>
+          </el-form-item>
+          <el-form-item label="登录密码">
+            <el-input v-model="form.password" placeholder="请输入登录密码" show-password></el-input>
+          </el-form-item>
+          <el-form-item label="身份证号">
+            <el-input v-model="form.cardnumber" placeholder="请输入身份证号" :minlength="18" :maxlength="18"></el-input>
+          </el-form-item>
+          <el-form-item label="邮箱">
+            <el-input v-model="form.email" placeholder="请输入邮箱"></el-input>
+          </el-form-item>
+          <el-form-item label="地址">
+            <el-input v-model="form.addr" placeholder="请输入地址"></el-input>
+          </el-form-item>
+          <el-form-item label="头像图片" prop="img_path">
+            <upload :limit="1" :data="form.img_path" type="img_path" :url="'/files/imgpath/upload'" @upload="uploadSuccess"></upload>
+          </el-form-item>
+          <el-form-item label="用户类别">
+            <el-radio-group v-model="form.role">
+              <el-radio label="2">个人</el-radio>
+              <el-radio label="3">企业管理员</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'">
+            <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'">
+            <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'">
+            <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'">
+            <el-form-item label="机构类型">
+              <el-input v-model="form.institution_type" placeholder="请输入机构类型"></el-input>
+            </el-form-item>
+            <el-form-item label="机构名称">
+              <el-input v-model="form.institution_name" placeholder="请输入机构名称"></el-input>
+            </el-form-item>
+            <el-form-item label="机构代码">
+              <el-input v-model="form.institution_code" placeholder="请输入机构代码"></el-input>
+            </el-form-item>
+            <el-form-item label="机构性质">
+              <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'">
+            <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'">
+            <el-input v-model="form.profession" placeholder="请输入所属行业"></el-input>
+          </el-form-item>
+          <el-form-item label="性别" v-if="form.role == '6'">
+            <el-select v-model="form.gender" placeholder="请选择民性别">
+              <el-option v-for="(item, index) in gender_list" :key="index" :label="item.name" :value="item.name"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="出生日期" v-if="form.role == '6'">
+            <el-date-picker v-model="form.birthday" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"> </el-date-picker>
+          </el-form-item>
+          <el-form-item label="职称级别" v-if="form.role == '6'">
+            <el-input v-model="form.level" placeholder="请输入职称级别"></el-input>
+          </el-form-item>
+          <el-form-item label="职称" v-if="form.role == '6'">
+            <el-input v-model="form.levelname" placeholder="请输入职称"></el-input>
+          </el-form-item>
+          <el-form-item label="职务" v-if="form.role == '6'">
+            <el-input v-model="form.position" placeholder="请输入职务"></el-input>
+          </el-form-item>
+          <el-form-item label="院校" v-if="form.role == '6'">
+            <el-input v-model="form.school" placeholder="请输入院校"></el-input>
+          </el-form-item>
+          <el-form-item label="学历" v-if="form.role == '6'">
+            <el-select v-model="form.xl" placeholder="请选择学历要求">
+              <el-option v-for="(item, index) in edu_list" :key="index" :label="item.name" :value="item.name"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="学位" v-if="form.role == '6'">
+            <el-select v-model="form.xw" placeholder="请选择学位">
+              <el-option v-for="(item, index) in degree_list" :key="index" :label="item.name" :value="item.name"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="专业" v-if="form.role == '6'">
+            <el-input v-model="form.major" placeholder="请输入专业"></el-input>
+          </el-form-item>
+          <el-form-item label="从事专业" v-if="form.role == '6'">
+            <el-input v-model="form.professional" placeholder="请输入从事专业"></el-input>
+          </el-form-item>
+          <el-form-item label="个人简历" v-if="form.role == '2' || form.role == '6'">
+            <el-input type="textarea" v-model="form.resume" placeholder="请输入个人简介"></el-input>
+          </el-form-item>
+          <el-form-item label="项目" v-if="form.role == '6'">
+            <el-input v-model="form.project" placeholder="请输入项目"></el-input>
+          </el-form-item>
+          <el-form-item label="学术成就" v-if="form.role == '6'">
+            <el-input v-model="form.academic" placeholder="请输入学术成就"></el-input>
+          </el-form-item>
+          <el-form-item label="论文" v-if="form.role == '6'">
+            <el-input v-model="form.paper" placeholder="请输入论文"></el-input>
+          </el-form-item>
+          <el-form-item label="备注" v-if="form.role == '6'">
+            <el-input v-model="form.remark" placeholder="请输入备注"></el-input>
+          </el-form-item>
+          <!-- <el-form-item label="用户名:">
             <el-input v-model="form.name"></el-input>
           </el-form-item>
           <el-form-item label="身份证号">
@@ -63,7 +171,6 @@
           <el-form-item label="专业领域">
             <el-input v-model="form.major"></el-input>
           </el-form-item>
-
           <el-form-item label="所属行业">
             <el-input v-model="form.profession"></el-input>
           </el-form-item>
@@ -72,7 +179,7 @@
           </el-form-item>
           <el-form-item label="简介">
             <el-input type="textarea" v-model="form.resume"></el-input>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item>
             <el-button type="primary" @click="onSubmit">修改</el-button>
           </el-form-item>
@@ -94,14 +201,54 @@ export default {
   components: {
     upload,
   },
-  data: () => ({}),
+  data: () => ({
+    // 性别
+    gender_list: [
+      {
+        name: '男',
+      },
+      {
+        name: '女',
+      },
+    ],
+    // 学历
+    edu_list: [
+      {
+        name: '中专及以上',
+      },
+      {
+        name: '大专及以上',
+      },
+      {
+        name: '本科及以上',
+      },
+      {
+        name: '研究生及以上',
+      },
+    ],
+    // 学位
+    degree_list: [
+      {
+        name: '学士',
+      },
+      {
+        name: '学士',
+      },
+      {
+        name: '博士',
+      },
+      {
+        name: '其他',
+      },
+    ],
+  }),
   created() {},
   computed: {
     ...mapState(['user']),
   },
   methods: {
     uploadSuccess({ type, data }) {
-      this.$set(this.forms, `${type}`, data.uri);
+      this.$set(this.form, `${type}`, data.uri);
     },
 
     onSubmit() {

+ 5 - 3
src/layout/live/head.vue

@@ -12,7 +12,7 @@
           <p class="username">
             <span v-if="user.uid">
               {{ user.name }}
-              <button type="text" class="userCenter" @click="stnmae" v-if="user.role == '2' || user.role == '3'">
+              <button type="text" class="userCenter" @click="stnmae" v-if="user.role == '2' || user.role == '3' || user.role == '6'">
                 个人中心
               </button>
               <button type="button" class="logininfo" @click="zhuxiao">注销</button>
@@ -79,7 +79,9 @@ export default {
       logo: require('@/assets/live/logo.png'),
     };
   },
-  created() {},
+  created() {
+    console.log(this.user);
+  },
   methods: {
     ...login({ logout: 'logout', transactiondtetle: 'delete' }),
     fuwu() {
@@ -98,7 +100,7 @@ export default {
       this.$router.push({ path: '/newlogin' });
     },
     stnmae() {
-      if (this.user.role == '2' || this.user.role == '3') {
+      if (this.user.role == '2' || this.user.role == '3' || this.user.role == '6') {
         this.$router.push({ path: '/enterprise/enterprisejb' });
       } else if (this.user.role == '5') this.$router.push('/hallList/index');
       else this.$router.push('/market/index');

+ 2 - 0
src/store/index.js

@@ -9,6 +9,7 @@ import column from '@common/store/live/column';
 import news from '@common/store/live/news';
 import market from '@common/store/market/market';
 import transaction from '@common/store/market/transaction';
+import expertsaudit from '@common/store/market/expertsaudit';
 import marketproduct from '@common/store/market/marketproduct';
 import talentExperts from '@common/store/market/talentExperts';
 import * as ustate from '@common/store/user/state';
@@ -44,6 +45,7 @@ export default new Vuex.Store({
     personalchat,
     personalroom,
     transaction,
+    expertsaudit,
     markettype,
     enterpriseproject,
     newmarketproduct,

+ 2 - 10
src/views/enterprise/appointment.vue

@@ -63,7 +63,7 @@ export default {
     ...login({ logout: 'logout', transactiondtetle: 'delete' }),
     ...place({ palcequery: 'query', palcefetch: 'fetch' }),
     //查询
-    async search({ skip = 0, limit = 4 } = { skip: 0, limit: 4 }) {
+    async search({ skip = 0, limit = 0 } = { skip: 0, limit: 0 }) {
       let res = await this.query({ skip, limit });
       for (const val of res.data) {
         let parent = val.province;
@@ -72,7 +72,6 @@ export default {
         let resltes = await this.palcequery({ level: 2, parent });
         var arr = reslte.data.filter(item => item.code === parent);
         var cre = resltes.data.filter(item => item.code === places);
-        console.log(cre);
         for (const shi of cre) {
           val.shi = shi.name;
         }
@@ -80,13 +79,12 @@ export default {
           val.sheng = sheng.name;
         }
       }
-
       this.$set(this, `resultTable`, res.data);
       this.$set(this, `total`, res.total);
     },
 
     //查询
-    async searchinfo({ skip = 0, limit = 4, currentPage } = { skip: 0, limit: 4 }) {
+    async searchinfo({ skip = 0, limit = 0, currentPage } = { skip: 0, limit: 0 }) {
       this.display = 'dadad';
       this.$set(this, `total`, this.datas.apply.length);
       const newProducts = [];
@@ -104,7 +102,6 @@ export default {
       this.searchinfo();
     },
     async onsaveClick({ id }) {
-      console.log(id);
       if (id === '基本信息') {
         this.$router.push({ path: '/enterprise/enterprisejb' });
       } else if (id === '消息管理') {
@@ -133,23 +130,18 @@ export default {
     },
     handleCurrentChange({ currentPage }) {
       this.searchinfo({ skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
-      console.log(currentPage);
     },
     async success(row) {
       row.status = '1';
-      console.log(this.datas);
       row.dock_id = this.datas.id;
       row.id = row._id;
-      console.log(row);
       let res = await this.applyupdate(row);
       this.$checkRes(res, '通过审核', '添加失败');
     },
     async shibai(row) {
       row.status = '2';
-      console.log(this.datas);
       row.dock_id = this.datas.id;
       row.id = row._id;
-      console.log(row);
       let res = await this.applyupdate(row);
       this.$checkRes(res, '审核拒绝', '添加失败');
     },

+ 54 - 23
src/views/enterprise/enterprisedg.vue

@@ -26,8 +26,8 @@
 <script>
 import enterprisedgDetail from '@/components/enterprise/enterpisedg.vue';
 import { createNamespacedHelpers, mapGetters, mapState } from 'vuex';
-
 const { mapActions: transaction } = createNamespacedHelpers('transaction');
+const { mapActions: expertsaudit } = createNamespacedHelpers('expertsaudit');
 const { mapActions: login } = createNamespacedHelpers('login');
 export default {
   name: 'adviserList',
@@ -46,10 +46,10 @@ export default {
       { name: '修改密码' },
       { name: '注销账号' },
     ],
-    total1: 1,
-    total2: 1,
-    total3: 1,
-    totalfaqi: 1,
+    total1: 0,
+    total2: 0,
+    total3: 0,
+    totalfaqi: 0,
     faqilist: [],
     dinggou1: [],
     dinggou2: [],
@@ -67,44 +67,77 @@ export default {
   },
   methods: {
     ...transaction({ transactionList: 'query', transactiondtetle: 'delete', shenheupdate: 'update' }),
+    ...expertsaudit({ expertsauditList: 'query', expertsauditdtetle: 'delete', expertsauditupdate: 'update' }),
     ...login({ logout: 'logout', transactiondtetlse: 'delete' }),
     // 查询
     async faqijiaoyi({ skip = 0, limit = 3, ...info } = {}) {
       let status = 0;
       let market_userid = this.user.uid;
       skip = this.skip;
-      const res = await this.transactionList({ skip, limit, market_userid, status, ...info });
-      if (this.$checkRes(res)) {
-        this.$set(this, `faqilist`, res.data);
-        this.$set(this, `totalfaqi`, res.total);
+      if (this.user.role == '2' || this.user.role == '3') {
+        const res = await this.transactionList({ skip, limit, market_userid, status, ...info });
+        if (this.$checkRes(res)) {
+          this.$set(this, `faqilist`, res.data);
+          this.$set(this, `totalfaqi`, res.total);
+        }
+      } else if (this.role == '6') {
+        const res = await this.expertsauditList({ skip, limit, market_userid, status, ...info });
+        if (this.$checkRes(res)) {
+          this.$set(this, `faqilist`, res.data);
+          this.$set(this, `totalfaqi`, res.total);
+        }
       }
     },
     async jiaoyi1({ skip = 0, limit = 3, ...info } = {}) {
       let status = 1;
       let market_userid = this.user.uid;
       skip = this.skip;
-      const res = await this.transactionList({ skip, limit, market_userid, status, ...info });
-      if (this.$checkRes(res)) {
-        this.$set(this, `dinggou1`, res.data);
-        this.$set(this, `total1`, res.total);
+      if (this.user.role == '2' || this.user.role == '3') {
+        const res = await this.transactionList({ skip, limit, market_userid, status, ...info });
+        if (this.$checkRes(res)) {
+          this.$set(this, `dinggou1`, res.data);
+          this.$set(this, `total1`, res.total);
+        }
+      } else if (this.role == '6') {
+        const res = await this.expertsauditList({ skip, limit, market_userid, status, ...info });
+        if (this.$checkRes(res)) {
+          this.$set(this, `faqilist`, res.data);
+          this.$set(this, `totalfaqi`, res.total);
+        }
       }
     },
     async jiaoyi2({ skip = 0, limit = 3, ...info } = {}) {
       let status = 2;
       let market_userid = this.user.uid;
       skip = this.skip;
-      const res = await this.transactionList({ skip, limit, market_userid, status, ...info });
-      if (this.$checkRes(res)) {
-        this.$set(this, `dinggou2`, res.data);
-        this.$set(this, `total2`, res.total);
+      if (this.user.role == '2' || this.user.role == '3') {
+        const res = await this.transactionList({ skip, limit, market_userid, status, ...info });
+        if (this.$checkRes(res)) {
+          this.$set(this, `dinggou2`, res.data);
+          this.$set(this, `total2`, res.total);
+        }
+      } else if (this.role == '6') {
+        const res = await this.expertsauditList({ skip, limit, market_userid, status, ...info });
+        if (this.$checkRes(res)) {
+          this.$set(this, `faqilist`, res.data);
+          this.$set(this, `totalfaqi`, res.total);
+        }
       }
     },
     async jiaoyi3({ skip = 0, limit = 3, ...info } = {}) {
       skip = this.skip;
-      const res = await this.transactionList({ skip, limit, ...info });
-      if (this.$checkRes(res)) {
-        this.$set(this, `dinggou3`, res.data);
-        this.$set(this, `total3`, res.total);
+      if (this.user.role == '2' || this.user.role == '3') {
+        const res = await this.transactionList({ skip, limit, ...info });
+        if (this.$checkRes(res)) {
+          this.$set(this, `dinggou3`, res.data);
+          this.$set(this, `total3`, res.total);
+        }
+      } else if (this.role == '6') {
+        const res = await this.expertsauditList({ skip, limit, market_userid, status, ...info });
+        if (this.$checkRes(res)) {
+          this.$set(this, `faqilist`, res.data);
+          this.$set(this, `totalfaqi`, res.total);
+        }
       }
     },
 
@@ -145,8 +178,6 @@ export default {
       this.jiaoyi3();
     },
     async deleteData({ item }) {
-      console.log(item);
-
       const res = await this.transactiondtetle(item.id);
       this.$checkRes(res, '删除成功', '删除失败');
     },

+ 26 - 7
src/views/enterprise/enterprisejb.vue

@@ -16,6 +16,7 @@ import enterprisejbDetail from '@/components/enterprise/enterprisejb.vue';
 import { createNamespacedHelpers, mapGetters, mapState } from 'vuex';
 const { mapActions: login } = createNamespacedHelpers('login');
 const { mapActions: market } = createNamespacedHelpers('market');
+const { mapActions: expertsuser } = createNamespacedHelpers('expertsuser');
 export default {
   name: 'adviserList',
   props: {},
@@ -45,19 +46,37 @@ export default {
   },
   methods: {
     ...market(['fetch', 'update']),
+    ...expertsuser({ expertsuserFetch: 'fetch', expertsuserUpdate: 'update' }),
     ...login({ logout: 'logout', transactiondtetle: 'delete' }),
     // 查询基本信息
     async searchInfo() {
-      let res = await this.fetch(this.user.userid);
-      if (res.errcode === 0) {
-        this.$set(this, `form`, res.data);
+      if (this.user.role == '2' || this.user.role == '3') {
+        let res = await this.fetch(this.user.userid);
+        if (res.errcode === 0) {
+          this.$set(this, `form`, res.data);
+        }
+      } else if (this.user.role == '6') {
+        let res = await this.expertsuserFetch(this.user.userid);
+        if (res.errcode === 0) {
+          this.$set(this, `form`, res.data);
+        }
       }
     },
     async onSubmit({ data }) {
-      console.log(data);
-      let res;
-      let msg;
-      res = await this.update(data);
+      if (data.role == '2' || data.role == '3') {
+        let res;
+        let msg;
+        res = await this.update(data);
+      } else if (data.role == '6') {
+        let res;
+        let msg;
+        res = await this.expertsuserUpdate(data);
+      }
+      this.$message({
+        message: '修改信息成功',
+        type: 'success',
+      });
+      this.searchInfo();
     },
     async onsaveClick({ id }) {
       console.log(id);