octopus

fhKeeper/formulahousekeeper/octopus/src/views/workReport/review.vue

@@ -26,10 +26,15 @@
             <el-table-column prop="moduleName" label="模块" min-width="80"></el-table-column>
             <el-table-column prop="operatorName" label="操作人" min-width="100"></el-table-column>
             <el-table-column prop="time" label="操作时间" min-width="200"></el-table-column>
+            <el-table-column prop="projectName" label="项目名称" min-width="200">
+                <template slot-scope="scope">
+                    <span v-if="scope.row.projectName != 'null' && scope.row.projectName != null">{{scope.row.projectName}}</span>
+                    <span v-else></span>
+                </template>
+            </el-table-column>
             <el-table-column prop="content" label="操作内容" min-width="500">
                 <template slot-scope="scope">
                     <div v-for="item,index in contentString(scope.row.content)" :key="index">{{item}}</div>
-                    <!-- <span>{{contentString(scope.row.content)}}</span> -->
                     <!-- <span>{{scope.row.content}}</span> -->
                 </template>
             </el-table-column>