zhuliu 7 mesi fa
parent
commit
4c41bf9686

+ 7 - 2
src/views/task/components/examine/components/projectMessage.vue

@@ -10,7 +10,8 @@
             <template v-for="fieldIndex in 3" v-if="columnList[getFileProperty(item,fieldIndex)]" >
                 <el-col :key="fieldIndex+'a'"><div>{{columnList[getFileProperty(item,fieldIndex)].name}}:</div></el-col>
                 <el-col :key="fieldIndex+'b'">
-                <div v-html="$commonJS.getColumnData(projectMessage,columnList[getFileProperty(item,fieldIndex)])"></div>
+                    <div v-if="['conclusion'].includes(columnList[getFileProperty(item,fieldIndex)].field)" v-html="$constants.litigationResult[projectMessage.conclusion]"></div>
+                    <div v-else v-html="$commonJS.getColumnData(projectMessage,columnList[getFileProperty(item,fieldIndex)])"></div>
                 </el-col>
             </template>
         </el-row>
@@ -164,7 +165,11 @@ export default {
             2:'reportProject',
             3:'patentDigProject'
         }
-        this.columnList = await this.$commonJS.getCustomField(projectType[this.taskMessage.projectType])
+        let columnType = projectType[this.taskMessage.projectType]
+        if(this.taskMessage.projectType == 2 && this.taskMessage.reportType == 7){
+            columnType = 'invalidReportProject'
+        }
+        this.columnList = await this.$commonJS.getCustomField(columnType)
     },
     //获取所属项目信息
     getProjectMessage(){