zc

src/views/safetyCheck/components/initiateInspect/historyRecordsComponent.vue

@@ -100,12 +100,12 @@
                  v-for="(imgItem,imgIndex) in item.examineUploadList" :key="imgIndex">
           </div>
           <div class="right-text-box" style="display: flex;">
-            <div class="right-text-box">
-              <p class="right-text-name-p">复查人</p>
-              <div class="right-text-text-box" style="height:40px;width:300px;">
-                <p>{{item.reviewName}}{{item.reviewAccount?'-'+item.reviewAccount:''}}</p>
-              </div>
-            </div>
+            <!--<div class="right-text-box">-->
+              <!--<p class="right-text-name-p">复查人</p>-->
+              <!--<div class="right-text-text-box" style="height:40px;width:300px;">-->
+                <!--<p>{{item.reviewName}}{{item.reviewAccount?'-'+item.reviewAccount:''}}</p>-->
+              <!--</div>-->
+            <!--</div>-->
             <div class="right-text-box">
               <p class="right-text-name-p">复查时间</p>
               <div class="right-text-text-box" style="height:40px;width:300px;">

src/views/safetyCheck/components/initiateInspect/initiateInspect.vue

@@ -76,6 +76,12 @@
               <p>{{projectData.checkStartTime}}</p>
             </div>
           </div>
+          <div class="left-text-box">
+            <p class="left-text-name-p">检查结束日期</p>
+            <div class="left-text-title-box">
+              <p>{{projectData.checkEndTime}}</p>
+            </div>
+          </div>
           <div class="left-text-box">
             <p class="left-text-name-p">整改期限</p>
             <div class="left-text-title-box">

src/views/safetyCheck/components/projectAddPage.vue

@@ -83,10 +83,10 @@
                   value-format="yyyy-MM-dd"
                   type="daterange"
                   range-separator="-"
-                  :picker-options="pickerOptions"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
                 ></el-date-picker>
+                <!--:picker-options="pickerOptions"-->
               </el-form-item>
               <div class="date-range-right-box" v-if="!lookInfoType">
                 <p @click="checkTime(1)">本月</p>
@@ -100,7 +100,7 @@
                 :disabled="lookInfoType"
                 filterable
                 multiple
-                :multiple-limit="10"
+                :multiple-limit="50"
                 style="width:820px;"
                 v-model="dialogForm.checkGroupId"
                 @change="(val)=>groupChange(val)"
@@ -221,19 +221,30 @@
               <el-form-item label="检查名称" :prop="'checkPlanSetDtoList.'+index+'.checkName'" :rules="rules.checkName" style="margin-top:20px;">
                 <el-input v-model="item.checkName" :disabled="lookInfoType" clearable placeholder="请输入检查名称" maxLength="20" style="width:450px;"></el-input>
               </el-form-item>
-              <el-form-item label="检查开始日期" :prop="'checkPlanSetDtoList.'+index+'.checkStartTime'" :rules="rules.checkName">
+              <el-form-item label="检查开始日期" :prop="'checkPlanSetDtoList.'+index+'.checkStartTime'" :rules="rules.checkStartTime">
                 <el-date-picker
                   :disabled="lookInfoType"
                   style="width:450px;"
                   v-model="item.checkStartTime"
                   value-format="yyyy-MM-dd"
                   type="date"
-                  :picker-options="pickerOptions"
                   placeholder="请选择检查开始日期">
                 </el-date-picker>
+                <!--:picker-options="pickerOptions"-->
+              </el-form-item>
+              <el-form-item label="检查结束日期" :prop="'checkPlanSetDtoList.'+index+'.checkEndTime'" :rules="rules.checkEndTime">
+                <el-date-picker
+                  :disabled="lookInfoType"
+                  style="width:450px;"
+                  v-model="item.checkEndTime"
+                  value-format="yyyy-MM-dd"
+                  type="date"
+                  :picker-options="pickerOptions"
+                  placeholder="请选择检查结束日期">
+                </el-date-picker>
               </el-form-item>
               <div class="content-right-form-display">
-                <el-form-item label="整改期限" :prop="'checkPlanSetDtoList.'+index+'.rectifyDeadline'" :rules="rules.checkName">
+                <el-form-item label="整改期限" :prop="'checkPlanSetDtoList.'+index+'.rectifyDeadline'" :rules="rules.rectifyDeadline">
                   <el-date-picker
                     :disabled="lookInfoType"
                     style="width:450px;"
@@ -385,6 +396,7 @@
             {
               checkName:'第1次检查',
               checkStartTime:'',
+              checkEndTime:'',
               rectifyDeadline:'',
               checkBasisIds:null,
               overdueUnrectify:false,
@@ -415,10 +427,13 @@
             { required: true, message: "请输入检查名称", validator: this.spaceJudgment, trigger: "blur" }
           ],
           checkStartTime: [
-            { required: true, message: "请输入检查名称", trigger: "blur" },
+            { required: true, message: "请选择检查开始日期", trigger: "blur" },
+          ],
+          checkEndTime: [
+            { required: true, message: "请选择检查结束日期", trigger: "blur" },
           ],
           rectifyDeadline: [
-            { required: true, message: "请选择检查开始日期", trigger: "blur" },
+            { required: true, message: "请选择整改期限", trigger: "blur" },
           ],
           checkBasisIds: [
             { required: true, message: "请选择检查项目来源", trigger: "blur" },
@@ -557,6 +572,7 @@
         this.dialogForm.checkPlanSetDtoList.push({
           checkName:'第'+(this.dialogForm.checkPlanSetDtoList.length+1)+'次检查',
           checkStartTime:'',
+          checkEndTime:'',
           rectifyDeadline:'',
           checkBasisIds:null,
           overdueUnrectify:false,
@@ -690,6 +706,14 @@
               self.msgError('计划周期的开始时间与结束时间不能相同')
               return
             }
+            let overTime = this.timeToTimestamp(self.dialogForm.dateRange[1]);
+            let today = new Date();
+            today.setHours(0, 0, 0, 0);
+            const time = Math.floor(today.getTime() / 1000);
+            if(overTime < time){
+              self.msgError('计划周期结束日期必须等于大于今日')
+              return
+            }
             //交叉检查-督导组成员数量检测
             if(this.dialogForm.crossCheck){
               if(this.dialogForm.checkRange == 1){
@@ -726,6 +750,15 @@
                 self.msgError('第'+(i+1)+'个检查的检查开始日期必须在计划周期内')
                 return
               }
+              if(self.timeToTimestamp(self.dialogForm.checkPlanSetDtoList[i].checkEndTime)<self.timeToTimestamp(self.dialogForm.dateRange[0]) ||
+                self.timeToTimestamp(self.dialogForm.checkPlanSetDtoList[i].checkEndTime)>self.timeToTimestamp(self.dialogForm.dateRange[1])){
+                self.msgError('第'+(i+1)+'个检查的检查结束日期必须在计划周期内')
+                return
+              }
+              if(self.timeToTimestamp(self.dialogForm.checkPlanSetDtoList[i].checkEndTime)<self.timeToTimestamp(self.dialogForm.checkPlanSetDtoList[i].checkStartTime)){
+                self.msgError('第'+(i+1)+'个检查的检查结束日期不能小于开始日期')
+                return
+              }
               if(self.timeToTimestamp(self.dialogForm.checkPlanSetDtoList[i].rectifyDeadline)<self.timeToTimestamp(self.dialogForm.dateRange[0]) ||
                 self.timeToTimestamp(self.dialogForm.checkPlanSetDtoList[i].rectifyDeadline)>self.timeToTimestamp(self.dialogForm.dateRange[1])){
                 self.msgError('第'+(i+1)+'个检查的整改期限必须在计划周期内')

src/views/safetyCheck/components/rectificationReportDom.vue

@@ -23,7 +23,7 @@
       </div>
       <div class="title-2-max-box">
         <p class="title-1-p">实验室安全检查整改报告</p>
-        <p class="title-2-p" v-if="propsReportDomData.checkCategory == 1">{{documentData.checkYear}}年{{documentData.checkMonth}}月{{documentData.checkDay}}日，学校对本学院进行了{{documentData.planName}}，发现了 {{documentData.count}} 个不符合项，需要进行整改，具体条款和内容如下表：</p>
+        <p class="title-2-p" v-if="propsReportDomData.checkCategory == 1">{{documentData.checkYear}}年{{documentData.checkMonth}}月{{documentData.checkDay}}日至{{documentData.endCheckYear}}年{{documentData.endCheckMonth}}月{{documentData.endCheckDay}}日，学校对本学院进行了{{documentData.planName}}，发现了 {{documentData.count}} 个不符合项，需要进行整改，具体条款和内容如下表：</p>
         <p class="title-2-p" v-if="propsReportDomData.checkCategory == 2">{{documentData.checkYear}}年{{documentData.checkMonth}}月{{documentData.checkDay}}日，学院对本实验室进行了{{documentData.planName}}，发现了 {{documentData.count}} 个不符合项，需要进行整改，具体条款和内容如下表：</p>
         <div class="table-box-one" v-if="propsReportDomData.checkCategory == 1">
           <div class="table-title-box">