guhongwei 5 years ago
parent
commit
9f4a361cc4

+ 2 - 2
src/layout/enterpriseProduct/detailForm.vue

@@ -148,7 +148,7 @@
             <el-input v-model="form.coopercompany" placeholder="请输入是否有拟合作企业,如有请填企业名称"></el-input>
           </el-form-item>
           <el-form-item label="其他需求" v-if="form.totaltype == null || form.totaltype == '1'">
-            <el-input v-model="form.other" placeholder="请输入其他需求"></el-input>
+            <el-input type="textarea" v-model="form.other" placeholder="请输入其他需求"></el-input>
           </el-form-item>
           <el-form-item label="联系人" prop="contact_user">
             <el-input v-model="form.contact_user" placeholder="请输入联系人"></el-input>
@@ -263,6 +263,6 @@ export default {
 
 <style lang="less" scoped>
 .main {
-  padding: 15px 0;
+  padding: 15px 90px 15px 0;
 }
 </style>

+ 1 - 0
src/layout/enterpriseProduct/enterpriseProduct.vue

@@ -10,6 +10,7 @@
             <template>
               <el-form ref="form" :model="forms" label-width="80px">
                 <el-radio-group v-model="forms.status" @change="submit">
+                  <el-radio label="3">草稿</el-radio>
                   <el-radio label="0">待审核</el-radio>
                   <el-radio label="1">审核成功</el-radio>
                   <el-radio label="2">审核失败</el-radio>

+ 2 - 2
src/layout/technical/columnDetail.vue

@@ -17,10 +17,10 @@
             </el-form-item>
             <el-form-item label="所在位置">
               <el-select v-model="form.site" placeholder="请选择所在位置">
-                <el-option label="专题研讨" value="ztyt"></el-option>
                 <el-option label="专家问诊" value="zjwz"></el-option>
                 <el-option label="行业研究" value="hyyj"></el-option>
-                <el-option label="教育培训" value="jypx"></el-option>
+                <el-option label="在线指导" value="zxzd"></el-option>
+                <el-option label="项目路演" value="xmly"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item>

+ 4 - 4
src/router/index.js

@@ -114,18 +114,18 @@ const routes = [
     meta: { title: '产品供求交易状态审核管理' },
     component: () => import('../views/enterpriseTrans/detail.vue'),
   },
-  //技术培训
+  //技术交流
   {
     path: '/technical/index',
-    meta: { title: '技术培训' },
+    meta: { title: '技术交流' },
     component: () => import('../views/technical/index.vue'),
   },
-  // 技术培训-栏目列表
+  // 技术交流-栏目列表
   {
     path: '/technical/columnDetail',
     component: () => import('../views/technical/columnDetail.vue'),
   },
-  // 技术培训-信息列表
+  // 技术交流-信息列表
   {
     path: '/technical/messageInfoDetail',
     component: () => import('../views/technical/messageInfoDetail.vue'),

+ 2 - 2
src/store/index.js

@@ -36,8 +36,8 @@ export default new Vuex.Store({
     transaction, //交易记录表
     productpact, //电子合同
     market, //产品信息表
-    liveTechnicalColumn, //技术培训类别
-    liveTechnicalNews, //技术培训内容
+    liveTechnicalColumn, //技术交流类别
+    liveTechnicalNews, //技术交流内容
     codeitem, //字典表
     codeCategory, //字典表类别
     users,

+ 1 - 1
src/util/role_menu.js

@@ -43,7 +43,7 @@ export const enterpriseTrans = {
   path: '/enterpriseTrans/index',
 };
 export const technical = {
-  name: '技术培训',
+  name: '技术交流',
   path: '/technical/index',
 };
 export const defaultMenu = {

+ 3 - 0
src/views/enterpriseProduct/detail.vue

@@ -64,6 +64,7 @@ export default {
           });
         }
       }
+      this.$router.push({ path: '/enterpriseProduct/index' });
     },
     // 信息发布
     async submitBtn({ data }) {
@@ -87,6 +88,7 @@ export default {
           });
         }
       }
+      this.$router.push({ path: '/enterpriseProduct/index' });
     },
     // 审核信息提交
     async examineBtn({ data }) {
@@ -97,6 +99,7 @@ export default {
           type: 'success',
         });
       }
+      this.$router.push({ path: '/enterpriseProduct/index' });
     },
   },
   computed: {

+ 13 - 13
src/views/enterpriseProduct/index.vue

@@ -21,7 +21,7 @@
 <script>
 import topInfo from '@/layout/public/top.vue';
 import enterpriseProduct from '@/layout/enterpriseProduct/enterpriseProduct.vue';
-import { createNamespacedHelpers, mapGetters } from 'vuex';
+import { createNamespacedHelpers, mapGetters, mapState } from 'vuex';
 const { mapActions: product } = createNamespacedHelpers('market');
 export default {
   name: 'recruit',
@@ -36,13 +36,15 @@ export default {
     total: 1,
     skip: '',
     forms: {
-      status: '',
+      status: '3',
     },
   }),
   created() {
     this.search();
   },
-  computed: {},
+  computed: {
+    ...mapState(['user']),
+  },
   methods: {
     ...product(['query', 'delete', 'fetch', 'update']),
     async submit() {
@@ -52,18 +54,16 @@ export default {
       if (this.forms.status) {
         status = this.forms.status;
         skip = this.skip;
-        const res = await this.query({ skip, limit, status, ...info });
-        let newData = res.data.filter(i => i.status != '3');
-        this.$set(this, `recruitInfo`, newData);
-        this.$set(this, `total`, newData.length);
+        let userid = this.user.uid;
+        const res = await this.query({ skip, limit, status, userid, ...info });
+        this.$set(this, `recruitInfo`, res.data);
+        this.$set(this, `total`, res.total);
       } else {
-        status = 0;
         skip = this.skip;
-        const res = await this.query({ skip, limit, status: 0, ...info });
-        const arr = await this.query({ skip, limit, status: 3, ...info });
-        var newData = res.data.concat(arr.data);
-        this.$set(this, `recruitInfo`, newData);
-        this.$set(this, `total`, newData.length);
+        let userid = this.user.uid;
+        const res = await this.query({ skip, limit, status: 3, userid, ...info });
+        this.$set(this, `recruitInfo`, res.data);
+        this.$set(this, `total`, res.total);
       }
     },
     // 删除

+ 1 - 1
src/views/technical/index.vue

@@ -32,7 +32,7 @@ export default {
     messageInfo, //信息列表
   },
   data: () => ({
-    topTitle: '技术培训',
+    topTitle: '技术交流',
     columnInfo: [],
     message: [],
     total: 0,