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

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

@@ -21,7 +21,7 @@ export const three = [
       { label: '与公司关系', model: 'relation', list: 'chargeRelation', 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' },
     ],
@@ -34,7 +34,7 @@ export const three = [
       { label: '负责人', model: 'charge', list: 'gCharge', type: 'select' },
       { label: '年龄', model: 'gage', list: 'age', type: 'select' },
       { label: '学历', model: 'gedu', list: 'edu', type: 'select' },
-      { label: '技术职称', model: 'gteckRank', list: 'teckRank', type: 'select' },
+      { label: '职称', model: 'gteckRank', list: 'teckRank', type: 'select' },
       { label: '专业', model: 'gmajor', list: 'major', type: 'select' },
       { label: '专业契合度', model: 'gagreePer', list: 'agreePer', type: 'select' },
     ],
@@ -44,10 +44,10 @@ export const three = [
     model: 'gw_group',
     type: 'object',
     children: [
-      { label: '技术顾问团', model: 'gnum', list: 'gwNum', type: 'select' },
-      { label: '平均年龄', model: 'gwage', list: 'age', type: 'select' },
-      { label: '最高学历', model: 'gwedu', list: 'edu', type: 'select' },
-      { label: '技术职称', model: 'gwteckRank', list: 'teckRank', type: 'select' },
+      { label: '负责人', model: 'gnum', list: 'gwNum', type: 'select' },
+      { label: '年龄', model: 'gwage', list: 'age', type: 'select' },
+      { label: '学历', model: 'gwedu', list: 'edu', type: 'select' },
+      { label: '职称', model: 'gwteckRank', list: 'teckRank', type: 'select' },
       { label: '专业', model: 'gwmajor', list: 'major', type: 'select' },
       { label: '专业契合度', model: 'gwagreePer', list: 'agreePer', type: 'select' },
     ],
@@ -58,47 +58,47 @@ export const four = [
   { label: 'PCT申请数', model: 'pctNum', list: 'zscqNum', type: 'select' },
   { label: '授权知识产权', model: 'zscqNum', list: 'zscqNum', type: 'select' },
   { label: '已实施知识产权数', model: 'useZscq', list: 'zscqNum', type: 'select' },
-  { label: '上年度专利许可与转让收入', model: 'in', list: 'zlIn', type: 'select', labelWidth: '180px' },
-  { label: '上年度新产品销售额', model: 'sell', list: 'productIn', type: 'select', labelWidth: '170px' },
+  { label: '上年度专利许可与转让收入', model: 'in', list: 'zlIn', type: 'select' },
+  { label: '上年度新产品销售额', model: 'sell', list: 'productIn', type: 'select' },
   {
-    label: '新产品开发来源(多选)',
+    label: '新品开发来源(多选)',
     model: 'dev_source',
     type: 'checkbox',
     list: 'source',
   },
   {
-    label: '科技新品发展战略(多选)',
+    label: '新品发展战略(多选)',
     model: 'dev_route',
     type: 'checkbox',
     list: 'route',
   },
 
-  { label: '产品开发周期', model: 'ePeriod', list: 'ePeriod', type: 'select', labelWidth: '160px' },
-  { label: '新品研发速度', model: 'eSpeed', list: 'eSpeed', type: 'select', labelWidth: '160px' },
-  { label: '新产品开发成功率', model: 'rate', list: 'rate', type: 'select', labelWidth: '160px' },
-  { label: '新品的市场可替代性', model: 'eReplaceable', list: 'eReplaceable', type: 'select', labelWidth: '160px' },
-  { label: '新品的创新质量', model: 'eQuality', list: 'eQuality', type: 'select', labelWidth: '160px' },
-  { label: '新产品利润新产品销售额', model: 'ePer', list: 'ePer', type: 'select', labelWidth: '180px' },
+  { label: '新品开发周期', model: 'ePeriod', list: 'ePeriod', type: 'select' },
+  { label: '新品研发速度', model: 'eSpeed', list: 'eSpeed', type: 'select' },
+  { label: '新品开发成功率', model: 'rate', list: 'rate', type: 'select' },
+  { label: '新品市场替代性', model: 'eReplaceable', list: 'eReplaceable', type: 'select' },
+  { label: '新品创新质量', model: 'eQuality', list: 'eQuality', type: 'select' },
+  { label: '新品利润/新品销售额', model: 'ePer', list: 'ePer', type: 'select' },
 ];
 
 export const five = [
   { label: '年均技改投入', model: 'yearCost', list: 'cost1', type: 'select' },
-  { label: '年均外部研发支出', model: 'yearOutCost', list: 'cost1', type: 'select' },
+  { label: '外部支出', model: 'yearOutCost', list: 'cost1', type: 'select' },
   { label: '政府补贴经费', model: 'yearZfCost', list: 'cost1', type: 'select' },
-  { label: '年均研发加计扣除额', model: 'yearMinCost', list: 'cost2', type: 'select', labelWidth: '160px' },
-  { label: '年均研发人员占比', model: 'costPer', list: 'costPer', type: 'select' },
-  { label: '年均研发人员培训费', model: 'yearTrainCost', list: 'cost3', type: 'select', labelWidth: '160px' },
+  { label: '加计扣除额', model: 'yearMinCost', list: 'cost2', type: 'select', labelWidth: '160px' },
+  { label: '研发人员占比', model: 'costPer', list: 'costPer', type: 'select' },
+  { label: '培训费', model: 'yearTrainCost', list: 'cost3', type: 'select', labelWidth: '160px' },
 ];
 
 export const six = [
   { label: '自主申报知识产权数', model: 'selfZscq', list: 'effect', type: 'select', labelWidth: '160px' },
-  { label: '购买（获得许可）知识产权', model: 'buyZscq', list: 'effect', type: 'select', labelWidth: '180px' },
+  { label: '购买(获得许可)知识产权数', model: 'buyZscq', list: 'effect', type: 'select', labelWidth: '180px' },
   { label: '企业自立科技项目数', model: 'comProject', list: 'effect', type: 'select', labelWidth: '160px' },
   { label: '自主开发新产品数', model: 'selfProject', list: 'effect', type: 'select', labelWidth: '160px' },
-  { label: '获得市级以上科技项目数', model: 'SjProject', list: 'effect', type: 'select', labelWidth: '170px' },
-  { label: '获得市级以上科技奖励数', model: 'SjAward', list: 'effect', type: 'select', labelWidth: '170px' },
-  { label: '与高校院所技术合作', model: 'SchoolProject', list: 'effect', type: 'select', labelWidth: '160px' },
-  { label: '与产业链关联企业技术合作', model: 'chainProject', list: 'effect', type: 'select', labelWidth: '180px' },
+  { label: '市级以上科技项目数', model: 'SjProject', list: 'effect', type: 'select', labelWidth: '170px' },
+  { label: '市级以上科技奖励数', model: 'SjAward', list: 'effect', type: 'select', labelWidth: '170px' },
+  { label: '与高校院所合作数', model: 'SchoolProject', list: 'effect', type: 'select', labelWidth: '160px' },
+  { label: '与产业链关联企业合作数', model: 'chainProject', list: 'effect', type: 'select', labelWidth: '180px' },
 ];
 
 export const seven = [
@@ -133,7 +133,7 @@ export const seven = [
     list: 'use',
   },
   {
-    label: '外来技术实用度',
+    label: '技术实用度',
     model: 'out_applied',
     type: 'object',
     children: [

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

@@ -5,10 +5,10 @@
         <el-form :model="form" :rules="rules" ref="form" label-width="180px">
           <el-row>
             <template v-for="(f, fi) in fields">
-              <el-col v-if="f.type === 'select'" :span="12" :key="`six-${f.model}-${fi}`">
+              <el-col v-if="f.type === 'select'" :span="12" :key="`five-${f.model}-${fi}`">
                 <el-form-item :label="f.label">
                   <el-select v-model="form[f.model]" filterable>
-                    <el-option v-for="(c, ci) in getList(f.list)" :key="`six-${f.model}-${fi}-c-${ci}`" :label="c" :value="c"></el-option>
+                    <el-option v-for="(c, ci) in getList(f.list)" :key="`five-${f.model}-${fi}-c-${ci}`" :label="c" :value="c"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>

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

@@ -3,20 +3,18 @@
     <el-row>
       <el-col :span="24" class="main">
         <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-col :span="12" v-for="(i, index) in question" :key="`four${index}`">
+            <el-form-item v-if="i.type === 'select'" :prop="`${index}`" :key="`select${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="`checkbox${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>
         </el-form>
       </el-col>
     </el-row>
@@ -40,7 +38,6 @@ export default {
   components: {},
   data: function() {
     return {
-      disabled: false,
       question: four,
     };
   },

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

@@ -32,6 +32,10 @@ export default {
     form: { type: Object },
     rules: { type: Object },
   },
+  model: {
+    prop: 'form',
+    event: 'change',
+  },
   components: {},
   data: function() {
     return {};

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

@@ -12,9 +12,27 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col v-else :span="24" :key="`seven-${f.model}-${fi}`">
-                <el-form-item :label="f.label" label-width="130px">
-                  <el-row type="flex" :gutter="5">
+              <el-col v-else :span="24" class="sevenList" :key="`seven-${f.model}-${fi}`">
+                <el-col :span="2" class="label">
+                  {{ f.label }}
+                </el-col>
+                <el-col :span="21" class="select">
+                  <el-col :span="6" class="chiList" v-for="(child, cIndex) in f.children" :key="`seven-${fi}-child-${cIndex}`" style="text-align:center">
+                    <el-col :span="24" class="chi_label">{{ child.label }}</el-col>
+                    <el-col :span="24" class="chi_select">
+                      <el-select v-model="form[child.model]">
+                        <el-option
+                          v-for="(c, ci) in getList(child.list)"
+                          :key="`seven-${f.model}-${fi}-children-${child.model}-c-${ci}`"
+                          :label="c"
+                          :value="c"
+                        ></el-option>
+                      </el-select>
+                    </el-col>
+                  </el-col>
+                </el-col>
+                <!-- <el-form-item :label="f.label" label-width="130px"> -->
+                <!-- <el-row type="flex" :gutter="5">
                     <el-col :span="8" v-for="(child, cIndex) in f.children" :key="`seven-${fi}-child-${cIndex}`" style="text-align:center">
                       <el-row>
                         <el-col :span="24">{{ child.label }}</el-col>
@@ -30,8 +48,8 @@
                         </el-col>
                       </el-row>
                     </el-col>
-                  </el-row>
-                </el-form-item>
+                  </el-row> -->
+                <!-- </el-form-item> -->
               </el-col>
             </template>
           </el-row>
@@ -83,4 +101,31 @@ export default {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.main {
+  .sevenList {
+    .label {
+      font-size: 14px;
+      color: #606266;
+      margin: 0 7px 0 0;
+      padding: 5px 0;
+    }
+    .select {
+      width: 90.8%;
+      .chiList {
+        width: 24%;
+        margin: 0 10px 0 0;
+        .chi_label {
+          text-align: center;
+          font-size: 14px;
+          color: #606266;
+          padding: 5px 0;
+        }
+      }
+      .chiList:last-child {
+        margin: 0;
+      }
+    }
+  }
+}
+</style>

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

@@ -3,25 +3,23 @@
     <el-row>
       <el-col :span="24" class="main">
         <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]" :disabled="disabled[f.model]" @change="toChange">
-                      <el-option v-for="(item, index) in getList(f.list)" :key="index" :value="item" :label="item"></el-option>
-                    </el-select>
-                  </el-col>
+          <el-col :span="24" class="thrList" v-for="(i, index) in question" :key="`thr${index}`">
+            <el-col :span="2" class="label">
+              {{ i.label }}
+            </el-col>
+            <el-col :span="21" class="select">
+              <el-col :span="4" class="chiList" v-for="(f, index) in i.children" :key="`children${index}`">
+                <el-col :span="24" class="chi_label">
+                  {{ f.label }}
+                </el-col>
+                <el-col :span="24" class="chi_select">
+                  <el-select v-model="form[f.model]" :disabled="disabled[f.model]" @change="toChange">
+                    <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>
-          </template>
+          </el-col>
         </el-form>
       </el-col>
     </el-row>
@@ -100,4 +98,36 @@ export default {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.main {
+  .thrList {
+    padding: 10px 0;
+    border-bottom: 1px solid #ccc;
+    .label {
+      font-size: 14px;
+      color: #606266;
+      margin: 0 7px 0 0;
+      padding: 5px 0;
+    }
+    .select {
+      width: 90.8%;
+      .chiList {
+        width: 15.6%;
+        margin: 0 10px 0 0;
+        .chi_label {
+          text-align: center;
+          font-size: 14px;
+          color: #606266;
+          padding: 5px 0;
+        }
+      }
+      .chiList:last-child {
+        margin: 0;
+      }
+    }
+  }
+  .thrList:last-child {
+    border-bottom: none;
+  }
+}
+</style>

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

@@ -35,7 +35,6 @@ export default {
   components: {},
   data: function() {
     return {
-      disabled: false,
       question: two,
     };
   },

src/views/techolchat/list/detail-model/questionnaire-models.vue

@@ -50,7 +50,7 @@
               </el-col>
               <el-col :span="24" class="common">
                 <el-col :span="24" class="txt">
-                  <span>企业研发投入</span>
+                  <span>企业研发投入(近三年平均)</span>
                 </el-col>
                 <el-col :span="24" class="info">
                   <five :form="form" :rules="rules"></five>
@@ -58,7 +58,7 @@
               </el-col>
               <el-col :span="24" class="common">
                 <el-col :span="24" class="txt">
-                  <span>企业研发成效</span>
+                  <span>企业研发成效(近三年平均)</span>
                 </el-col>
                 <el-col :span="24" class="info">
                   <six v-model="form" :rules="rules"></six>
@@ -66,7 +66,7 @@
               </el-col>
               <el-col :span="24" class="common">
                 <el-col :span="24" class="txt">
-                  <span>对于技术合作</span>
+                  <span>对外技术合作</span>
                 </el-col>
                 <el-col :span="24" class="info">
                   <seven v-model="form" :rules="rules"></seven>