Merge branch 'master' of http://git.cc-lotus.info/live/web-live

src/views/techolchat/list/detail-model/fields.js

@@ -7,9 +7,9 @@ export const two = [
     list: 'companyType',
     type: 'select',
   },
-  { label: '企业所处发展阶段', model: 'parts', list: 'parts', type: 'select' },
+  { label: '发展阶段', model: 'parts', list: 'parts', type: 'select' },
   { label: '所属行业', model: 'profession' },
-  { label: '行业内排名', model: 'order', list: 'order', type: 'select' },
+  { label: '行业排名', model: 'order', list: 'order', type: 'select' },
 ];
 
 export const three = [
@@ -23,7 +23,7 @@ export const three = [
       { label: '学历', model: 'edu', list: 'edu', type: 'select' },
       { label: '技术职称', model: 'teckRank', list: 'teckRank', type: 'select' },
       { label: '专业', model: 'major', list: 'major', type: 'select' },
-      { label: '专业与公司契合度', model: 'agreePer', list: 'agreePer', type: 'select' },
+      { label: '专业契合度', model: 'agreePer', list: 'agreePer', type: 'select' },
     ],
   },
   {
@@ -31,25 +31,25 @@ export const three = [
     model: 'group',
     type: 'array',
     children: [
-      { label: '技术团队负责人', model: 'charge', list: 'gCharge', type: 'select' },
+      { label: '负责人', model: 'charge', list: 'gCharge', type: 'select' },
       { label: '年龄', model: 'age', list: 'age', type: 'select' },
       { label: '学历', model: 'edu', list: 'edu', type: 'select' },
       { label: '技术职称', model: 'teckRank', list: 'teckRank', type: 'select' },
       { label: '专业', model: 'major', list: 'major', type: 'select' },
-      { label: '专业与公司契合度', model: 'agreePer', list: 'agreePer', type: 'select' },
+      { label: '专业契合度', model: 'agreePer', list: 'agreePer', type: 'select' },
     ],
   },
   {
-    label: '企业技术顾问团队',
+    label: '技术顾问团',
     model: 'gw_group',
     type: 'object',
     children: [
       { label: '技术顾问团', model: 'gnum', list: 'gwNum', type: 'select' },
       { label: '平均年龄', model: 'age', list: 'age', type: 'select' },
       { label: '最高学历', model: 'edu', list: 'edu', type: 'select' },
-      { label: '最高技术职称', model: 'teckRank', list: 'teckRank', type: 'select' },
+      { label: '技术职称', model: 'teckRank', list: 'teckRank', type: 'select' },
       { label: '专业', model: 'major', list: 'major', type: 'select' },
-      { label: '专业与公司契合度', model: 'agreePer', list: 'agreePer', type: 'select' },
+      { label: '专业契合度', model: 'agreePer', list: 'agreePer', type: 'select' },
     ],
   },
 ];

src/views/techolchat/list/detail-model/parts-models/four.vue

@@ -1,9 +1,22 @@
 <template>
-  <div id="one">
+  <div id="four">
     <el-row>
       <el-col :span="24" class="main">
-        <el-form :model="form" :rules="rules" ref="form" label-width="80px">
-          aaaa
+        <el-form :model="form" :rules="rules" ref="form" label-width="180px">
+          <template v-for="(i, index) in question">
+            <el-col :span="12" :key="`question${index}`">
+              <el-form-item v-if="i.type === 'select'" :prop="`${index}`" :key="`question${index}`" :label="`${i.label}`">
+                <el-select v-model="form[i.model]">
+                  <el-option v-for="(item, index) in getList(i.list)" :key="index" :value="item" :label="item"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item v-else-if="i.type === 'checkbox'" :prop="`${index}`" :key="`question${index}`" :label="`${i.label}`">
+                <el-select v-model="form[i.model]" multiple>
+                  <el-option v-for="(item, index) in getList(i.list)" :key="index" :value="item" :label="item"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </template>
         </el-form>
       </el-col>
     </el-row>
@@ -11,19 +24,33 @@
 </template>
 
 <script>
+import { four } from '../fields.js';
+import * as select from '../select.js';
 import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
-  name: 'one',
+  name: 'four',
   props: {
     form: { type: Object },
     rules: { type: Object },
   },
+  model: {
+    prop: 'form',
+    event: 'change',
+  },
   components: {},
   data: function() {
-    return {};
+    return {
+      disabled: false,
+      question: four,
+    };
   },
   created() {},
-  methods: {},
+  methods: {
+    // 获取列表
+    getList(type) {
+      return select[type];
+    },
+  },
   computed: {
     ...mapState(['user']),
   },

src/views/techolchat/list/detail-model/parts-models/thr.vue

@@ -1,9 +1,27 @@
 <template>
-  <div id="one">
+  <div id="thr">
     <el-row>
       <el-col :span="24" class="main">
-        <el-form :model="form" :rules="rules" ref="form" label-width="80px">
-          aaaa
+        <el-form :model="form" :rules="rules" ref="form" label-width="90px">
+          <template v-for="(i, index) in question">
+            <el-col :span="24" :key="`question${index}`">
+              <el-col :span="3">
+                {{ i.label }}
+              </el-col>
+              <el-col :span="21">
+                <el-col :span="8" v-for="(f, index) in i.children" :key="`children${index}`">
+                  <el-col :span="24">
+                    {{ f.label }}
+                  </el-col>
+                  <el-col :span="24">
+                    <el-select v-model="form[f.model]">
+                      <el-option v-for="(item, index) in getList(f.list)" :key="index" :value="item" :label="item"></el-option>
+                    </el-select>
+                  </el-col>
+                </el-col>
+              </el-col>
+            </el-col>
+          </template>
         </el-form>
       </el-col>
     </el-row>
@@ -11,19 +29,33 @@
 </template>
 
 <script>
+import { three } from '../fields.js';
+import * as select from '../select.js';
 import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
-  name: 'one',
+  name: 'thr',
   props: {
     form: { type: Object },
     rules: { type: Object },
   },
+  model: {
+    prop: 'form',
+    event: 'change',
+  },
   components: {},
   data: function() {
-    return {};
+    return {
+      disabled: false,
+      question: three,
+    };
   },
   created() {},
-  methods: {},
+  methods: {
+    // 获取列表
+    getList(type) {
+      return select[type];
+    },
+  },
   computed: {
     ...mapState(['user']),
   },

src/views/techolchat/list/detail-model/parts-models/two.vue

@@ -1,9 +1,17 @@
 <template>
-  <div id="one">
+  <div id="two">
     <el-row>
       <el-col :span="24" class="main">
         <el-form :model="form" :rules="rules" ref="form" label-width="80px">
-          1
+          <template v-for="(i, index) in question">
+            <el-col :span="8" :key="`question${index}`">
+              <el-form-item v-if="i.type === 'select'" :prop="`${index}`" :key="`question${index}`" :label="`${i.label}`">
+                <el-select v-model="form[i.model]">
+                  <el-option v-for="(item, index) in getList(i.list)" :key="index" :value="item" :label="item"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </template>
         </el-form>
       </el-col>
     </el-row>
@@ -11,25 +19,35 @@
 </template>
 
 <script>
-import { one } from '../fields.js';
+import { two } from '../fields.js';
+import * as select from '../select.js';
 import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
-  name: 'one',
+  name: 'two',
   props: {
     form: { type: Object },
     rules: { type: Object },
   },
+  model: {
+    prop: 'form',
+    event: 'change',
+  },
   components: {},
   data: function() {
     return {
       disabled: false,
-      question: one,
+      question: two,
     };
   },
   created() {
     console.log(this.question);
   },
-  methods: {},
+  methods: {
+    // 获取列表
+    getList(type) {
+      return select[type];
+    },
+  },
   computed: {
     ...mapState(['user']),
   },