zc

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

@@ -110,7 +110,7 @@
                   style="width: 898px"
                   type="textarea"
                   :autosize="{ minRows: 6, maxRows: 6}"
-                  placeholder="请输入检查要点"
+                  placeholder="未查到此项检查要点，可在此输入添加"
                   resize="none"
                   maxlength="100"
                   show-word-limit

src/views/safetyCheck/components/infoDialog/infoDialog.vue

@@ -62,7 +62,7 @@
         <div class="text-box-two-box">
           <div>
             <p>检查类型</p>
-            <p>{{infoDialogData.checkType==1?'校园巡查':(infoDialogData.checkType==2?'实验室自查':'')}}</p>
+            <p>{{infoDialogData.checkType==1?'校院巡查':(infoDialogData.checkType==2?'实验室自查':'')}}</p>
           </div>
           <div>
             <p>{{infoDialogData.checkType==1?'计划周期':(infoDialogData.checkType==2?'任务周期':'')}}</p>

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

@@ -45,7 +45,7 @@
           </div>
           <div class="top-form-right-box">
             <el-form-item label="检查类型" prop="checkType">
-              <p style="background-color: #f5f5f5;color:#333;border-radius:4px;width:450px;padding:0 15px;">{{addForm.checkType==1?'校园巡查':(addForm.checkType==2?'实验室自查':'')}}</p>
+              <p style="background-color: #f5f5f5;color:#333;border-radius:4px;width:450px;padding:0 15px;">{{addForm.checkType==1?'校院巡查':(addForm.checkType==2?'实验室自查':'')}}</p>
             </el-form-item>
             <el-form-item label="楼栋" prop="buildName">
               <el-input disabled v-model="addForm.buildName" placeholder="未填写" maxLength="10" style="width: 450px"/>

src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/addDialog.vue

@@ -24,7 +24,7 @@
           <el-form-item label="检查类型:">
             <p style="width:450px;background:#f5f5f5;border-radius:4px;padding:0 15px;">实验室自查</p>
           </el-form-item>
-          <el-form-item label="检查周期:" prop="dateRange">
+          <el-form-item label="任务周期:" prop="dateRange">
             <div class="date-range-box">
               <div class="date-range-left-box">
                 <el-date-picker
@@ -74,7 +74,7 @@
               :disabled="lookInfoType"
               type="textarea"
               :autosize="{ minRows: 4, maxRows: 4}"
-              :placeholder="lookInfoType?'未输入':'请输入检查检查要点：'"
+              :placeholder="lookInfoType?'未输入':'请输入检查要求：'"
               v-model="dialogForm.checkDemand"
               maxlength="100"
               resize="none"
@@ -82,7 +82,7 @@
               style="width:450px;">
             </el-input>
           </el-form-item>
-          <el-form-item label="检查材料:">
+          <el-form-item label="材料附件:">
             <div class="dialog-material-max-box">
               <div class="dialog-material-button-box" v-if="!lookInfoType&&dialogForm.uploadDtoList.length<10">
                 <el-upload
@@ -455,7 +455,7 @@
             { required: true, message: "请输入计划标题", validator: this.spaceJudgment, trigger: "change" },
           ],
           dateRange: [
-            { required: true, message: "请选择检查周期", trigger: "change" },
+            { required: true, message: "请选择任务周期", trigger: "change" },
           ],
           checkRange: [
             { required: true, message: "请选择检查范围", trigger: "change" },

src/views/safetyCheck/safetyHazard/batchAudit.vue

@@ -40,10 +40,11 @@
           <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip/>
           <el-table-column label="隐患描述" align="center" prop="hazardDescribe" show-overflow-tooltip width="220"/>
           <el-table-column label="实验室" align="center" prop="subRoom" show-overflow-tooltip width="170"/>
+          <el-table-column label="安全责任人" align="center" prop="safeUserName" show-overflow-tooltip width="170"/>
           <el-table-column label="检查时间" sortable="custom" align="center" prop="checkTime" show-overflow-tooltip width="160"/>
           <el-table-column label="整改人" align="center" prop="rectifyName" show-overflow-tooltip width="90"/>
           <el-table-column label="整改期限" sortable="custom" align="center" prop="rectifyDeadline" show-overflow-tooltip width="130"/>
-          <el-table-column label="整改状态" align="center" prop="rectifyStatus" show-overflow-tooltip width="110">
+          <el-table-column label="状态" align="center" prop="rectifyStatus" show-overflow-tooltip width="110">
             <template slot-scope="scope">
               <p :class="scope.row.rectifyStatus==1?'rectifyStatusColorA':(scope.row.rectifyStatus==2?'rectifyStatusColorB':(scope.row.rectifyStatus==3?'rectifyStatusColorC':''))">{{scope.row.rectifyStatus==1?'已完成':(scope.row.rectifyStatus==2?'待整改':(scope.row.rectifyStatus==3?'待复核':''))}}</p>
             </template>
@@ -53,7 +54,6 @@
               <p>{{scope.row.rectifyTime}}<span v-if="scope.row.overdueStatus==1" style="margin-left:10px;color:#EE0606;">已逾期</span></p>
             </template>
           </el-table-column>
-          <el-table-column label="审核状态" align="center" prop="examineResult" show-overflow-tooltip width="80"/>
           <el-table-column label="操作" align="center" width="80">
             <template slot-scope="scope">
               <div class="table-button-box">

src/views/safetyCheck/schoolInspection/inspectionGroup/index.vue

@@ -7,7 +7,7 @@
           <el-input
             maxLength="30"
             v-model="queryParams.searchValue"
-            placeholder="巡查组组名称"
+            placeholder="巡查组名称"
             clearable
             style="width: 200px"
           />

src/views/safetyCheck/schoolInspection/inspectionPlan/addDialog.vue

@@ -24,7 +24,7 @@
           <el-form-item label="检查类型:">
             <p style="width:450px;background:#f5f5f5;border-radius:4px;padding:0 15px;">校院巡查</p>
           </el-form-item>
-          <el-form-item label="检查周期:" prop="dateRange">
+          <el-form-item label="计划周期:" prop="dateRange">
             <div class="date-range-box">
               <div class="date-range-left-box">
                 <el-date-picker
@@ -74,7 +74,7 @@
               :disabled="lookInfoType"
               type="textarea"
               :autosize="{ minRows: 4, maxRows: 4}"
-              :placeholder="lookInfoType?'未输入':'请输入检查检查要点：'"
+              :placeholder="lookInfoType?'未输入':'请输入检查要求：'"
               v-model="dialogForm.checkDemand"
               maxlength="100"
               resize="none"
@@ -82,7 +82,7 @@
               style="width:450px;">
             </el-input>
           </el-form-item>
-          <el-form-item label="检查材料:">
+          <el-form-item label="材料附件:">
             <div class="dialog-material-max-box">
               <div class="dialog-material-button-box" v-if="!lookInfoType&&dialogForm.uploadDtoList.length<10">
                 <el-upload
@@ -597,7 +597,7 @@
             { required: true, message: "请输入计划标题", validator: this.spaceJudgment, trigger: "change" },
           ],
           dateRange: [
-            { required: true, message: "请选择检查周期", trigger: "change" },
+            { required: true, message: "请选择计划周期", trigger: "change" },
           ],
           checkRange: [
             { required: true, message: "请选择检查范围", trigger: "change" },

src/views/safetyCheck/startInspection/index.vue

@@ -159,7 +159,7 @@
                     style="width: 898px"
                     type="textarea"
                     :autosize="{ minRows: 6, maxRows: 6}"
-                    placeholder="请输入检查要点"
+                    placeholder="未查到此项检查要点，可在此输入添加"
                     resize="none"
                     maxlength="100"
                     show-word-limit