guhongwei 4 år sedan
förälder
incheckning
626f6cb8f5

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

@@ -83,22 +83,22 @@ export const four = [
 
 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: [

+ 51 - 6
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>

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

@@ -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>