lrf402788946 há 4 anos atrás
pai
commit
0dd0566420

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

@@ -55,28 +55,30 @@ export const three = [
 ];
 
 export const addThree = [
-  { 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' },
-  { label: '企业内部管理', model: 'qynbgl', list: 'qynbgl', type: 'select' },
-  { label: '知识产权纠纷(可多选)', model: 'zscqjf', list: 'zscqjf', type: 'checkbox' },
-  { label: '发展阻碍-内因(可多选)', model: 'zscqfzzany', list: 'zscqfzzany', type: 'checkbox' },
-  { label: '发展阻碍-外因(可多选)', model: 'zscqfzzawy', list: 'zscqfzzawy', type: 'checkbox' },
   {
-    label: '现有情况',
+    label: '授权知识产权',
     model: 'now',
     type: 'object',
     children: [
+      { label: 'PCT申请数', model: 'pctNum', list: 'zscqNum', type: 'select' },
       { label: '发明专利', model: 'fmzl', list: 'effect', type: 'select' },
       { label: '实用新型', model: 'syxx', list: 'effect', type: 'select' },
-      { label: '商标', model: 'sb', list: 'effect', type: 'select' },
-      { label: '软件著作权', model: 'zzq', list: 'effect', type: 'select' },
-      { label: '专有技术', model: 'zyjs', list: 'effect', type: 'select' },
+      { label: '外观设计', model: 'wgsj', list: 'effect', type: 'select' },
+      { label: '注册商标', model: 'zcsb', list: 'effect', type: 'select' },
       { label: '集成电路', model: 'jcdl', list: 'effect', type: 'select' },
+      { label: '专有技术', model: 'zyjs', list: 'effect', type: 'select' },
+      { label: '软件著作权', model: 'rjzzq', list: 'effect', type: 'select' },
+      { label: '文字,美术作品版权', model: 'zpbq', list: 'effect', type: 'select' },
       { label: '其他', model: 'qt', list: 'effect', type: 'select' },
     ],
   },
+
+  { label: '已实施知识产权数', model: 'useZscq', list: 'zscqNum', type: 'select' },
+  { label: '上年度专利许可与转让收入', model: 'in', list: 'zlIn', type: 'select' },
+  { label: '企业内部管理', model: 'qynbgl', list: 'qynbgl', type: 'select' },
+  { label: '知识产权纠纷(可多选)', model: 'zscqjf', list: 'zscqjf', type: 'checkbox' },
+  { label: '发展阻碍-内因(可多选)', model: 'zscqfzzany', list: 'zscqfzzany', type: 'checkbox' },
+  { label: '发展阻碍-外因(可多选)', model: 'zscqfzzawy', list: 'zscqfzzawy', type: 'checkbox' },
 ];
 
 export const four = [

+ 34 - 12
src/views/techolchat/list/detail-model/parts-models/add-three.vue

@@ -23,21 +23,32 @@
               </el-col>
             </template>
             <template v-else-if="i.type === 'object'">
-              <el-col :span="2" class="label" :key="`object-title${index}`">
-                {{ i.label }}
-              </el-col>
-              <el-col :span="22" class="select" :key="`object-child${index}`">
-                <el-col :span="3" 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]" placeholder="">
-                      <el-option v-for="(item, index) in getList(f.list)" :key="index" :value="item" :label="item"></el-option>
+              <!-- <el-col :span="24" :key="`object-addThree${index}`" style="text-align: center;padding-bottom:15px">{{ i.label }}</el-col>
+              <el-row class="object" :key="`object-children${index}`">
+                <el-col :span="12" v-for="(f, cindex) in i.children" :key="`children${cindex}`">
+                  <el-form-item :prop="`${index}-${cindex}`" :label="`${f.label}`">
+                    <el-select v-model="form[f.model]" multiple placeholder="">
+                      <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-row> -->
+              <el-row type="flex" :key="`object-addThree${index}`" align="middle" class="object">
+                <el-col :span="3" class="olabel">{{ i.label }}</el-col>
+                <el-col :span="21" class="oselect">
+                  <el-col :span="5" v-for="(f, cindex) in i.children" :key="`children${cindex}`" class="child">
+                    <span>{{ f.label }}</span>
+                    <el-select v-model="form[f.model]" multiple placeholder="">
+                      <el-option v-for="(item, index) in getList(i.list)" :key="index" :value="item" :label="item"></el-option>
                     </el-select>
+                    <!-- <el-form-item :prop="`${index}-${cindex}`" :label="`${f.label}`">
+                      <el-select v-model="form[f.model]" multiple placeholder="">
+                        <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-col>
-              </el-col>
+              </el-row>
             </template>
           </template>
         </el-form>
@@ -73,6 +84,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
+@borderColor: #ccc;
 .label {
   font-size: 14px;
   color: #606266;
@@ -95,6 +107,16 @@ export default {
     margin: 0;
   }
 }
+.object {
+  border-bottom: 1px #ccc solid;
+  margin-bottom: 15px;
+  .olabel {
+    text-align: center;
+  }
+}
+.child {
+  width: 20%;
+}
 /deep/.el-input__inner {
   border: 1px solid #333;
 }