Explorar el Código

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

guhongwei hace 5 años
padre
commit
63dcd7c935

+ 9 - 72
src/layout/enterprise/contextfabu.vue

@@ -108,26 +108,22 @@
                     <el-input v-model="demandForm.field" placeholder="请输入应用领域"></el-input>
                   </el-form-item>
                 </span>
-                <span v-if="totaltype == 0">
-                  <el-form-item label="市场前景">
-                    <el-input type="textarea" v-model="demandForm.prospect" placeholder="请输入市场前景"></el-input>
-                  </el-form-item>
-                </span>
-                <el-form-item label="电子合同">
+
+                <!-- <el-form-item label="电子合同">
                   <el-input v-model="demandForm.contract" placeholder="请输入电子合同"></el-input>
-                </el-form-item>
-                <el-form-item label="供给类型">
+                </el-form-item> -->
+                <!-- <el-form-item label="供给类型">
                   <el-select v-model="demandForm.gxtype" placeholder="请选择供给类型">
                     <el-option label="需" value="0"></el-option>
                     <el-option label="供" value="1"></el-option>
                   </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="服务范围">
                   <el-input type="textarea" v-model="demandForm.scope" placeholder="请输入产品名称"></el-input>
                 </el-form-item>
-                <el-form-item label="知识产权">
+                <!-- <el-form-item label="知识产权">
                   <el-input v-model="demandForm.property" placeholder="请输入知识产权"></el-input>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="交易方式">
                   <el-select v-model="demandForm.business" placeholder="请选择交易方式">
                     <el-option label="公用" value="0"></el-option>
@@ -141,9 +137,9 @@
                 <el-form-item label="联系电话" prop="contact_tel">
                   <el-input v-model="demandForm.contact_tel" placeholder="请输入联系电话"></el-input>
                 </el-form-item>
-                <el-form-item label="产品描述">
+                <!-- <el-form-item label="产品描述">
                   <el-input type="textarea" v-model="demandForm.description" placeholder="请输入产品描述"></el-input>
-                </el-form-item>
+                </el-form-item> -->
 
                 <el-row class="demandBtn">
                   <el-button type="primary" @click="demandBtn()" v-if="this.anniu == 1">信息发布</el-button>
@@ -197,10 +193,6 @@ export default {
         disabled: true,
       },
 
-      {
-        value: 'description',
-        label: '产品描述',
-      },
       {
         value: 'product_type_id',
         label: '类型',
@@ -237,28 +229,11 @@ export default {
         label: '应用领域',
       },
 
-      {
-        value: 'prospect',
-        label: '市场前景',
-      },
-      {
-        value: 'contract',
-        label: '电子合同',
-      },
-      {
-        value: 'gxtype',
-        label: '供给类型',
-      },
       {
         value: 'scope',
         label: '服务范围',
       },
 
-      {
-        value: 'property',
-        label: '知识产权',
-      },
-
       {
         value: 'business',
         label: '交易方式',
@@ -288,10 +263,6 @@ export default {
         disabled: true,
       },
 
-      {
-        value: 'description',
-        label: '产品描述',
-      },
       {
         value: 'product_type_id',
         label: '类型',
@@ -321,24 +292,11 @@ export default {
         label: '产品参数',
       },
 
-      {
-        value: 'contract',
-        label: '电子合同',
-      },
-      {
-        value: 'gxtype',
-        label: '供给类型',
-      },
       {
         value: 'scope',
         label: '服务范围',
       },
 
-      {
-        value: 'property',
-        label: '知识产权',
-      },
-
       {
         value: 'business',
         label: '交易方式',
@@ -368,10 +326,6 @@ export default {
         disabled: true,
       },
 
-      {
-        value: 'description',
-        label: '产品描述',
-      },
       {
         value: 'product_type_id',
         label: '类型',
@@ -402,28 +356,11 @@ export default {
         label: '应用领域',
       },
 
-      {
-        value: 'prospect',
-        label: '市场前景',
-      },
-      {
-        value: 'contract',
-        label: '电子合同',
-      },
-      {
-        value: 'gxtype',
-        label: '供给类型',
-      },
       {
         value: 'scope',
         label: '服务范围',
       },
 
-      {
-        value: 'property',
-        label: '知识产权',
-      },
-
       {
         value: 'business',
         label: '交易方式',

+ 219 - 0
src/layout/market/zhuanjia.vue

@@ -0,0 +1,219 @@
+<template>
+  <div id="context">
+    <el-col :span="24" class="one">
+      <el-col :span="7" class="oneLeft">
+        <el-image :src="zhuanjiainfo.imgpath" style="height:210px"> </el-image>
+      </el-col>
+      <el-col :span="17" class="oneRight">
+        <p class="textOver">姓名 {{ zhuanjiainfo.name }}</p>
+        <p>
+          <span>民族:{{ zhuanjiainfo.gender || '暂无' }}</span>
+          <span>出生年月:{{ zhuanjiainfo.birth || '暂无' }}/{{ zhuanjiainfo.priceunit || '暂无' }}</span>
+        </p>
+        <p>
+          <span> 毕业院校:{{ zhuanjiainfo.school }} </span>
+          <span>所学专业:{{ zhuanjiainfo.major_studied }}</span>
+        </p>
+        <p>
+          <span>学历:{{ zhuanjiainfo.eduback || '暂无' }}</span>
+          <span>学位:{{ zhuanjiainfo.degree || '暂无' }}</span>
+        </p>
+        <p>
+          <span>办公电话:{{ zhuanjiainfo.tel || '暂无' }}</span>
+          <span>邮箱:{{ zhuanjiainfo.email || '暂无' }}</span>
+        </p>
+      </el-col>
+      <el-col :span="24" class="oneRight">
+        <div>
+          <p>
+            <span>职务:{{ zhuanjiainfo.position || '暂无' }}</span
+            ><span>从事专业:{{ zhuanjiainfo.email || '暂无' }}</span>
+            <span>住址:{{ zhuanjiainfo.email || '暂无' }}</span>
+            <span>可供咨询领域:{{ zhuanjiainfo.email || '暂无' }}</span>
+          </p>
+        </div>
+        <div></div>
+        <div></div>
+        <div></div>
+        <div>
+          <p>工作简介:</p>
+          <p class="job_profile" v-if="job_profile != ''">{{ zhuanjiainfo.job_profile || '暂无' }}</p>
+          <p class="job_profile1" v-else>{{ zhuanjiainfo.job_profile || '暂无' }}</p>
+          <el-button size="mini" v-if="zhuanjiainfo.job_profile != null">
+            <span v-if="job_profile != ''" @click="job_profileMore()">更多</span>
+            <span v-else @click="job_profileMore1()">收起</span>
+          </el-button>
+        </div>
+      </el-col>
+    </el-col>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'context',
+  props: {
+    zhuanjiainfo: null,
+  },
+  components: {},
+  data: () => ({
+    scope: '123',
+    job_profile: '123',
+  }),
+  created() {},
+  computed: {},
+  methods: {
+    scopeMore() {
+      this.scope = '';
+    },
+    // 收起
+    scopeMore1() {
+      this.scope = '123';
+    },
+    // 更多
+    job_profileMore() {
+      this.introduction = '';
+    },
+    // 收起
+    job_profileMore1() {
+      this.introduction = '123';
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+p {
+  padding: 0;
+  margin: 0;
+}
+.textOver {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+// .textOver{}
+// 	overflow: hidden;
+// 	text-overflow: ellipsis;
+// 	-webkit-line-clamp: 3;
+// 	word-break: break-all;
+// 	display: -webkit-box;
+//   -webkit-box-orient: vertical;
+//   }
+.style {
+  height: 100vh;
+}
+.style .info {
+  position: relative;
+  top: -450px;
+}
+.style .top {
+  position: relative;
+  top: 0;
+  width: 100%;
+  text-align: center;
+  z-index: 999;
+  height: 230px;
+  margin: 0 0 20px 0;
+}
+.style .top p:first-child {
+  font-size: 50px;
+  color: #fff;
+}
+.style .top p:last-child {
+  font-size: 30px;
+  color: #fff;
+  position: absolute;
+  width: 100%;
+  top: 170px;
+}
+
+.one {
+  min-height: 550px;
+  padding: 20px;
+  .oneLeft {
+    height: 210px;
+    overflow: hidden;
+
+    img {
+      height: 100px;
+    }
+  }
+  .oneRight {
+    padding: 0 15px;
+    p {
+      font-size: 16px;
+      padding: 0 0 20px 0;
+      span {
+        display: inline-block;
+        width: 50%;
+      }
+    }
+    p:first-child {
+      font-size: 20px;
+      font-weight: bold;
+      padding: 20px 0;
+    }
+    p:nth-child(2) span:last-child {
+      color: red;
+      font-weight: bold;
+    }
+  }
+  .oneDown {
+    border-top: 1px dashed #ccc;
+    margin: 30px 0 0 0;
+    padding: 30px 0 0 0;
+    div {
+      padding: 0 0 15px 0;
+      p {
+        font-size: 18px;
+      }
+      p:first-child {
+        color: #333;
+        font-weight: bold;
+        padding: 0 0 10px 0;
+      }
+    }
+    div:nth-child(2) p span:last-child {
+      color: #409eff;
+      padding: 0 10px;
+    }
+    div:nth-child(2) p span:last-child:hover {
+      cursor: pointer;
+    }
+    div:nth-child(3) .moreScope {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      -webkit-line-clamp: 6;
+      word-break: break-all;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+    }
+    div:nth-child(3) .moreScope1 {
+      overflow: none;
+    }
+    div:nth-child(3) .el-button {
+      float: right;
+    }
+    div:nth-child(5) .job_profileMore {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      -webkit-line-clamp: 6;
+      word-break: break-all;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+    }
+    div:nth-child(5) .job_profileMore1 {
+      overflow: none;
+    }
+    div:last-child .el-button {
+      float: right;
+    }
+  }
+  .mainDown {
+    height: 50px;
+    line-height: 50px;
+    text-align: center;
+  }
+}
+</style>

+ 8 - 8
src/views/market/index.vue

@@ -220,28 +220,28 @@ export default {
       if (this.$checkRes(res)) this.$set(this, `expertsList`, res.data);
     },
     toProductList() {
-      this.$router.push({ path: '/supermaket/list', query: { totaltype: 1, column_name: '科技产品' } });
+      this.$router.push({ path: '/supermaket/list', query: { totaltype: 1, column_name: '科技产品', display: 1 } });
     },
     productDetail(id) {
-      this.$router.push({ path: '/supermaket/supermarketdetail', query: { totaltype: 2, id: id, display: 2 } });
+      this.$router.push({ path: '/supermaket/list', query: { totaltype: 2, id: id, display: 2 } });
     },
     toTecList() {
-      this.$router.push({ path: '/supermaket/list', query: { totaltype: 0, column_name: '技术供求' } });
+      this.$router.push({ path: '/supermaket/list', query: { totaltype: 0, column_name: '技术供求', display: 1 } });
     },
     tecDetail(id) {
-      this.$router.push({ path: '/supermaket/supermarketdetail', query: { totaltype: 0, id: id, display: 2 } });
+      this.$router.push({ path: '/supermaket/list', query: { totaltype: 0, id: id, display: 2 } });
     },
     toServiceList() {
-      this.$router.push({ path: '/supermaket/list', query: { totaltype: 2, column_name: '技术供求' } });
+      this.$router.push({ path: '/supermaket/list', query: { totaltype: 2, column_name: '技术供求', display: 1 } });
     },
     serviceDetail(id) {
-      this.$router.push({ path: '/supermaket/supermarketdetail', query: { totaltype: 2, id: id, display: 2 } });
+      this.$router.push({ path: '/supermaket/list', query: { totaltype: 2, id: id, display: 2 } });
     },
     zhuanjia() {
-      this.$router.push({ path: '/supermaket/list', query: { column_name: '专家供求' } });
+      this.$router.push({ path: '/supermaket/list', query: { column_name: '专家供求', display: 1 } });
     },
     zhuanjiaDetail(id) {
-      this.$router.push({ path: '/personnel/rencai', query: { id: id } });
+      this.$router.push({ path: '/supermaket/list', query: { id: id, display: 3 } });
     },
     fabu() {
       if (this.user.role == '2' || this.user.role == '3') {

+ 29 - 4
src/views/supermaket/list.vue

@@ -72,7 +72,7 @@
           <context :detailInfo="detailInfo" @onSubmit="onSubmit"></context>
         </el-col>
         <el-col :span="19" v-else-if="display == '3'" class="info">
-          <zhuanjia></zhuanjia>
+          <zhuanjia :zhuanjiainfo="zhuanjiainfo"></zhuanjia>
         </el-col>
       </el-col>
     </el-col>
@@ -82,7 +82,7 @@
 <script>
 import _ from 'lodash';
 import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: product } = createNamespacedHelpers('marketproduct');
+const { mapActions: product } = createNamespacedHelpers('enterpriseproject');
 const { mapActions: talentExperts } = createNamespacedHelpers('talentExperts');
 const { mapActions: transaction } = createNamespacedHelpers('transaction');
 const { mapActions: tranaudit } = createNamespacedHelpers('tranaudit');
@@ -112,13 +112,22 @@ export default {
     jiaoyuList: [],
     display: '1',
     detailInfo: {},
+    zhuanjiainfo: {},
   }),
   created() {
     this.searchList();
     this.search();
+    console.log(this.$route.query.display);
   },
   computed: {
     ...mapState(['user']),
+    dispaly() {
+      return this.$route.query.display;
+    },
+
+    id() {
+      return this.$route.query.id;
+    },
     pageTitle() {
       return `${this.$route.meta.title}`;
     },
@@ -210,12 +219,25 @@ export default {
     },
 
     async search() {
+      this.display = this.$route.query.display;
+      console.log(this.display);
+
       if (this.display == '2') {
-        console.log(id);
-        const res = await this.newfetch(id);
+        console.log(this.id);
+        const res = await this.newfetch(this.id);
         console.log(res.data);
         this.$set(this, `detailInfo`, res.data);
       }
+      // else if (this.dispaly == '1') {
+      //   const res = await this.newquery(this.id);
+      //   console.log(res.data);
+      //   this.$set(this, `detailInfo`, res.data);
+      // }
+      else if (this.dispaly == '3') {
+        const res = await this.fetch(this.id);
+        console.log(res.data);
+        this.$set(this, `zhuanjiainfo`, res.data);
+      }
     },
 
     async clickfuwu(id) {
@@ -228,6 +250,9 @@ export default {
 
     async clickzhuanjia(id) {
       this.display = '3';
+      const res = await this.fetch(id);
+      console.log(res.data);
+      this.$set(this, `zhuanjiainfo`, res.data);
     },
 
     async onSubmit() {