Merge branch 'lisu_V4' into dev

src/views/modules/resourceManagement/enterprise/index.vue

@@ -92,11 +92,11 @@
                         label="联系电话"></el-table-column>
                     <el-table-column prop="orderDate" align="center" label="最新检查时间"
                         :show-overflow-tooltip="true"></el-table-column>
-                    <el-table-column prop="checkResultFlag" align="center" label="最新结果"
+                    <el-table-column prop="checkResultFlag" align="center" label="最新检查结果"
                         :show-overflow-tooltip="true">
                     <template  slot-scope="scope">
                         <span>
-                            {{scope.row.checkResultFlag=='1'?'合格':'不合格'}}
+                            {{scope.row.checkResultFlag=='1'?'合格':scope.row.checkResultFlag=='0'?'不合格':'--'}}
                         </span>
                     </template>
                     </el-table-column>