Merge branch 'master' of http://git.cc-lotus.info/financial_platform/finance-cms

src/layout/intelligentDocking/intelligentDockingForm.vue

@@ -25,7 +25,7 @@
             <span>{{ ruleForm.dictionary.name }}</span>
           </el-form-item>
           <el-form-item label="预计何时有融资需求：">
-            <span>{{ ruleForm.when }}</span>
+            <span>{{ ruleForm.when.name }}</span>
           </el-form-item>
           <el-form-item label="补充信息：">
             <span>{{ ruleForm.additional_information }}</span>

src/layout/intelligentDocking/intelligentForm.vue

@@ -25,7 +25,7 @@
             <span>{{ ruleForm.dictionary.name }}</span>
           </el-form-item>
           <el-form-item label="预计何时有融资需求：">
-            <span>{{ ruleForm.when }}</span>
+            <span>{{ ruleForm.when.name }}</span>
           </el-form-item>
           <el-form-item label="补充信息：">
             <span>{{ ruleForm.additional_information }}</span>

src/views/intelligentDocking/intelligentDockingDetail.vue

@@ -47,7 +47,10 @@ export default {
   data: () => ({
     display: 'none',
     topTitle: '对接信息详情',
-    intelligentForm: {},
+    intelligentForm: {
+      company: {},
+      when: {},
+    },
     charList: {
       name: '10',
     },
@@ -72,10 +75,8 @@ export default {
     ...intelligentFollow(['beforFollow', 'followIntelligent']),
     ...otheruser(['fetch', 'query']),
     async searchInfo() {
-      console.log(this.id);
       if (this.id) {
         const res = await this.dockingSearch({ id: this.id });
-        console.log(res);
         this.$set(this, `intelligentForm`, res.result[0]);
       }
     },

src/views/intelligentDocking/intelligentDockingIndex.vue

@@ -39,7 +39,7 @@ export default {
   data: () => ({
     topTitle: '银企对接需求',
     display: 'none',
-    debtTable: [],
+    debtTable: [ ],
     total: 0,
     jgpro: '0',
     jlList: '',