Merge branch '3.3.7-scxjy' into web-v2

src/views/safetyCheck/components/addPage/addPage.vue

@@ -434,7 +434,7 @@
       findCheckManage(){
         findCheckManage({id:this.propsAddData.id}).then(response => {
           if(response.data.checkCategory==1){//综合检查
-            response.data.checkResult = response.data.checkResult === 0 || response.data.checkResult === 1?response.data.checkResult:"";
+            // response.data.checkResult = response.data.checkResult === 0 || response.data.checkResult === 1?response.data.checkResult:"";
             response.data.rectifyNotice = response.data.rectifyNotice?response.data.rectifyNotice:"";
             response.data.rectifyDeadline = response.data.rectifyDeadline?response.data.rectifyDeadline:"";
             for(let i=0;i<response.data.checkHazardDtoList.length;i++){

src/views/safetyCheck/components/infoPage/infoPage.vue

@@ -29,7 +29,7 @@
               <p style="background-color: #f5f5f5;color:#333;border-radius:4px;width:690px;padding:10px 15px;font-size:14px;line-height:20px;min-height:40px;">{{addForm.checkDemand}}<span v-if="!addForm.checkDemand" style="color:#999;">未输入</span></p>
               <!--<el-input disabled v-model="addForm.checkDemand" placeholder="未填写" style="width: 690px"/>-->
             </el-form-item>
-            <el-form-item label="检查结果" prop="checkResult" v-if="addForm.checkResult">
+            <el-form-item label="检查结果" prop="checkResult" v-if="addForm.checkResult == 0 || addForm.checkResult == 1">
               <p style="background-color: #f5f5f5;color:#333;border-radius:4px;width:690px;padding:0 15px;">{{addForm.checkResult==0?'不符合':(addForm.checkResult==1?'符合':'')}}</p>
             </el-form-item>
             <div style="display: flex">
@@ -307,7 +307,7 @@ import { getToken } from '@/utils/auth'
       findCheckManage(){
         findCheckManage({id:this.propsInfoData.id}).then(response => {
           if(response.data.checkCategory==1){//综合检查
-            response.data.checkResult = response.data.checkResult === 0 || response.data.checkResult === 1?response.data.checkResult:"";
+            // response.data.checkResult = response.data.checkResult === 0 || response.data.checkResult === 1?response.data.checkResult:"";
             response.data.rectifyNotice = response.data.rectifyNotice?response.data.rectifyNotice:"";
             response.data.rectifyDeadline = response.data.rectifyDeadline?response.data.rectifyDeadline:"";
             for(let i=0;i<response.data.checkHazardDtoList.length;i++){

src/views/safetyCheck/startInspection/index.vue

@@ -1061,7 +1061,7 @@
       findCheckManage(id){
         findCheckManage({id:id}).then(response => {
           if(response.data.checkCategory==1){//综合检查
-            response.data.checkResult = response.data.checkResult === 0 || response.data.checkResult === 1?response.data.checkResult:"";
+            // response.data.checkResult = response.data.checkResult === 0 || response.data.checkResult === 1?response.data.checkResult:"";
             response.data.rectifyNotice = response.data.rectifyNotice?response.data.rectifyNotice:"";
             response.data.rectifyDeadline = response.data.rectifyDeadline?response.data.rectifyDeadline:"";
             response.data.dateRange = [response.data.cycleStartTime,response.data.cycleEndTime];