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

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

@@ -1,8 +1,10 @@
 <template>
-  <div id="five">
+  <div id="one">
     <el-row>
       <el-col :span="24" class="main">
-        test
+        <el-form :model="form" :rules="rules" ref="form" label-width="80px">
+          aaaa
+        </el-form>
       </el-col>
     </el-row>
   </div>
@@ -11,8 +13,11 @@
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
-  name: 'five',
-  props: {},
+  name: 'one',
+  props: {
+    form: { type: Object },
+    rules: { type: Object },
+  },
   components: {},
   data: function() {
     return {};

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

@@ -1,8 +1,10 @@
 <template>
-  <div id="four">
+  <div id="one">
     <el-row>
       <el-col :span="24" class="main">
-        test
+        <el-form :model="form" :rules="rules" ref="form" label-width="80px">
+          aaaa
+        </el-form>
       </el-col>
     </el-row>
   </div>
@@ -11,8 +13,11 @@
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
-  name: 'four',
-  props: {},
+  name: 'one',
+  props: {
+    form: { type: Object },
+    rules: { type: Object },
+  },
   components: {},
   data: function() {
     return {};

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

@@ -2,7 +2,23 @@
   <div id="one">
     <el-row>
       <el-col :span="24" class="main">
-        test
+        <el-form :model="form" :rules="rules" ref="form" label-width="80px">
+          <el-col :span="24">
+            <el-form-item label="企业名称" prop="company">
+              <el-input v-model="form.company"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系人" prop="contacts">
+              <el-input v-model="form.contacts"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="phone">
+              <el-input v-model="form.phone"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
       </el-col>
     </el-row>
   </div>
@@ -12,7 +28,10 @@
 import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
   name: 'one',
-  props: {},
+  props: {
+    form: { type: Object },
+    rules: { type: Object },
+  },
   components: {},
   data: function() {
     return {};

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

@@ -1,8 +1,10 @@
 <template>
-  <div id="seven">
+  <div id="one">
     <el-row>
       <el-col :span="24" class="main">
-        test
+        <el-form :model="form" :rules="rules" ref="form" label-width="80px">
+          aaaa
+        </el-form>
       </el-col>
     </el-row>
   </div>
@@ -11,8 +13,11 @@
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
-  name: 'seven',
-  props: {},
+  name: 'one',
+  props: {
+    form: { type: Object },
+    rules: { type: Object },
+  },
   components: {},
   data: function() {
     return {};

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

@@ -1,8 +1,10 @@
 <template>
-  <div id="six">
+  <div id="one">
     <el-row>
       <el-col :span="24" class="main">
-        test
+        <el-form :model="form" :rules="rules" ref="form" label-width="80px">
+          aaaa
+        </el-form>
       </el-col>
     </el-row>
   </div>
@@ -11,8 +13,11 @@
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
-  name: 'six',
-  props: {},
+  name: 'one',
+  props: {
+    form: { type: Object },
+    rules: { type: Object },
+  },
   components: {},
   data: function() {
     return {};

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

@@ -1,8 +1,10 @@
 <template>
-  <div id="thr">
+  <div id="one">
     <el-row>
       <el-col :span="24" class="main">
-        test
+        <el-form :model="form" :rules="rules" ref="form" label-width="80px">
+          aaaa
+        </el-form>
       </el-col>
     </el-row>
   </div>
@@ -11,8 +13,11 @@
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
-  name: 'thr',
-  props: {},
+  name: 'one',
+  props: {
+    form: { type: Object },
+    rules: { type: Object },
+  },
   components: {},
   data: function() {
     return {};

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

@@ -1,23 +1,34 @@
 <template>
-  <div id="two">
+  <div id="one">
     <el-row>
       <el-col :span="24" class="main">
-        test
+        <el-form :model="form" :rules="rules" ref="form" label-width="80px">
+          1
+        </el-form>
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
+import { one } from '../fields.js';
 import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
-  name: 'two',
-  props: {},
+  name: 'one',
+  props: {
+    form: { type: Object },
+    rules: { type: Object },
+  },
   components: {},
   data: function() {
-    return {};
+    return {
+      disabled: false,
+      question: one,
+    };
+  },
+  created() {
+    console.log(this.question);
   },
-  created() {},
   methods: {},
   computed: {
     ...mapState(['user']),

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

@@ -21,7 +21,7 @@
                   <span>答卷企业</span>
                 </el-col>
                 <el-col :span="24" class="info">
-                  <one></one>
+                  <one :form="form" :rules="rules"></one>
                 </el-col>
               </el-col>
               <el-col :span="24" class="common">
@@ -29,7 +29,7 @@
                   <span>企业基本信息</span>
                 </el-col>
                 <el-col :span="24" class="info">
-                  <two></two>
+                  <two :form="form" :rules="rules"></two>
                 </el-col>
               </el-col>
               <el-col :span="24" class="common">
@@ -37,7 +37,7 @@
                   <span>企业创新能力</span>
                 </el-col>
                 <el-col :span="24" class="info">
-                  <thr></thr>
+                  <thr :form="form" :rules="rules"></thr>
                 </el-col>
               </el-col>
               <el-col :span="24" class="common">
@@ -45,7 +45,7 @@
                   <span>企业新品开发</span>
                 </el-col>
                 <el-col :span="24" class="info">
-                  <four></four>
+                  <four :form="form" :rules="rules"></four>
                 </el-col>
               </el-col>
               <el-col :span="24" class="common">
@@ -53,7 +53,7 @@
                   <span>企业研发投入</span>
                 </el-col>
                 <el-col :span="24" class="info">
-                  <five></five>
+                  <five :form="form" :rules="rules"></five>
                 </el-col>
               </el-col>
               <el-col :span="24" class="common">
@@ -61,7 +61,7 @@
                   <span>企业研发成效</span>
                 </el-col>
                 <el-col :span="24" class="info">
-                  <six></six>
+                  <six :form="form" :rules="rules"></six>
                 </el-col>
               </el-col>
               <el-col :span="24" class="common">
@@ -69,7 +69,7 @@
                   <span>对于技术合作</span>
                 </el-col>
                 <el-col :span="24" class="info">
-                  <seven></seven>
+                  <seven :form="form" :rules="rules"></seven>
                 </el-col>
               </el-col>
               <el-col :span="24" class="btn">
@@ -85,6 +85,12 @@
 
 <script>
 import one from './parts-models/one.vue';
+import two from './parts-models/two.vue';
+import thr from './parts-models/thr.vue';
+import four from './parts-models/four.vue';
+import five from './parts-models/five.vue';
+import six from './parts-models/six.vue';
+import seven from './parts-models/seven.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
   name: 'questionnaire-models',
@@ -93,6 +99,12 @@ export default {
   },
   components: {
     one,
+    two,
+    thr,
+    four,
+    five,
+    six,
+    seven,
   },
   data: function() {
     return {