Merge remote-tracking branch 'origin/project9-8' into project9-8

src/views/check/oneTbale.vue

@@ -61,6 +61,16 @@
           style="width: 150px"
         />
       </el-form-item>
+      <el-form-item label="检查结果" prop="approveStatus">
+        <el-select v-model="queryParams.jcResult" placeholder="请选择">
+          <el-option
+            v-for="item in resultOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="审批状态" prop="approveStatus">
         <el-select v-model="queryParams.approveStatus" placeholder="请选择">
           <el-option
@@ -142,7 +152,9 @@
         </el-table-column>
         <el-table-column label="检查结果" prop="jcResult" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.jcResult || '-' }}
+            <span v-if="scope.row.jcResult=='1'">OK</span>
+            <span v-else-if="scope.row.jcResult=='2'">NO</span>
+            <span v-else>-</span>
           </template>
         </el-table-column>
         <el-table-column label="备注" prop="jcNote" :show-overflow-tooltip="true">
@@ -276,6 +288,14 @@ export default {
       // 是否显示弹出层
       open: false,
       // 状态菜单
+      resultOptions: [{
+        value: '1',
+        label: 'OK'
+      }, {
+        value: '2',
+        label: 'NO'
+      }],
+      // 状态菜单
       statusOptions: [{
         value: '0',
         label: '草稿'