3333

src/views/report/talent/components/resumeInfo.vue

@@ -32,7 +32,7 @@
             </div>
           </a-col>
         </a-row>
-        <a-row v-for="(item, index) in educationList" :key="'educationList'+index" type="flex" class="row_center">
+        <a-row v-for="(item, index) in resumeList" :key="'educationList'+index" type="flex" class="row_center" v-if="item.resumeType === 'e76f5097-fe28-11ef-b6cb-0c42a1380f01'">
           <a-col :span="8">
             <div class="special-middle">
               <div>{{ moment(item.resumeStart).format('YYYY-MM-DD') }} 至 {{ moment(item.resumeEnd).format('YYYY-MM-DD') }}</div>
@@ -76,7 +76,7 @@
             </div>
           </a-col>
         </a-row>
-        <a-row v-for="(item, index) in studyList" :key="'studyList'+index" type="flex" class="row_center">
+        <a-row v-for="(item, index) in resumeList" :key="'studyList'+index" type="flex" class="row_center" v-if="item.resumeType === 'e76f5097-fe28-11ef-b6cb-0c42a1380f02'">
           <a-col :span="8">
             <div class="special-middle">
               <div>{{ moment(item.resumeStart).format('YYYY-MM-DD') }} 至 {{ moment(item.resumeEnd).format('YYYY-MM-DD') }}</div>
@@ -125,7 +125,7 @@
             </div>
           </a-col>
         </a-row>
-        <a-row v-for="(item, index) in workList" :key="'workList'+index" type="flex" class="row_center">
+        <a-row v-for="(item, index) in resumeList" :key="'workList'+index" type="flex" class="row_center" v-if="item.resumeType === 'e76f5097-fe28-11ef-b6cb-0c42a1380f03'">
           <a-col :span="6">
             <div class="special-middle">
               <div>{{ moment(item.resumeStart).format('YYYY-MM-DD') }} 至 {{ moment(item.resumeEnd).format('YYYY-MM-DD') }}</div>

src/views/report/talent/components/scientificGainInfo.vue

@@ -41,7 +41,7 @@
         </div>
       </a-col>
     </a-row>
-    <a-row v-for="(item, index) in gainList" :key="'gainList'+index" type="flex" class="row_center">
+    <a-row v-for="(item, index) in scientificList" :key="'gainList'+index" type="flex" class="row_center" v-if="item.gainType === 'dff44c90-ff10-11ef-b6cb-0c42a1380f01'">
       <a-col :span="2">
         <div class="special-middle">{{ item.showIndex }}</div>
       </a-col>
@@ -101,7 +101,7 @@
         </div>
       </a-col>
     </a-row>
-    <a-row v-for="(item, index) in thesisList" :key="'thesisList'+index" type="flex" class="row_center">
+    <a-row v-for="(item, index) in scientificList" :key="'thesisList'+index" type="flex" class="row_center" v-if="item.gainType === 'dff44c90-ff10-11ef-b6cb-0c42a1380f02'">
       <a-col :span="2">
         <div class="special-middle">{{ item.showIndex }}</div>
       </a-col>
@@ -161,7 +161,7 @@
         </div>
       </a-col>
     </a-row>
-    <a-row v-for="(item, index) in appearList" :key="'appearList'+index" type="flex" class="row_center">
+    <a-row v-for="(item, index) in scientificList" :key="'appearList'+index" type="flex" class="row_center" v-if="item.gainType === 'dff44c90-ff10-11ef-b6cb-0c42a1380f03'">
       <a-col :span="2">
         <div class="special-middle">{{ item.showIndex }}</div>
       </a-col>
@@ -221,7 +221,7 @@
         </div>
       </a-col>
     </a-row>
-    <a-row v-for="(item, index) in courseList" :key="'courseList'+index" type="flex" class="row_center">
+    <a-row v-for="(item, index) in scientificList" :key="'courseList'+index" type="flex" class="row_center" v-if="item.gainType === 'dff44c90-ff10-11ef-b6cb-0c42a1380f04'">
       <a-col :span="2">
         <div class="special-middle">{{ item.showIndex }}</div>
       </a-col>
@@ -246,6 +246,7 @@
         </div>
       </a-col>
     </a-row>
+    <span></span>
   </div>
 </template>
 
@@ -268,7 +269,7 @@ export default {
       },
     },
   },
-  data() {
+  data () {
     return {
       gainList: [],
       thesisList: [],
@@ -276,12 +277,12 @@ export default {
       courseList: [],
     };
   },
-  created() {
-    
+  created () {
+
   },
   methods: {
     moment,
-    InitData() {
+    InitData () {
       if (this.scientificList && this.scientificList.length > 0) {
         this.gainList = this.scientificList
           .filter(item => item.gainType === 'dff44c90-ff10-11ef-b6cb-0c42a1380f01')
@@ -315,7 +316,7 @@ export default {
   },
   watch: {
     scientificList: {
-      handler(scientificList) {
+      handler (scientificList) {
         if (!!scientificList) {
           this.InitData()
         } else {

src/views/report/talent/components/talentInfo.vue

@@ -292,7 +292,7 @@
       </a-row>
     </div>
     <div v-if="tabsData[2].isShow">
-      <resume-info :resumeList.sync="value.resumeList" />
+      <resume-info :resumeList="value.resumeList" />
       <a-row>
         <a-col :span="24" style="border-top: 0px; text-align: center">
           <div class="main-title">
@@ -314,7 +314,7 @@
       </a-row>
     </div>
     <div v-if="tabsData[3].isShow">
-      <scientific-gain-info :scientificList.sync="value.scientificList" />
+      <scientific-gain-info :scientificList="value.scientificList" />
       <a-row>
         <a-col :span="24" style="border-top: 0px; text-align: center">
           <div class="main-title">