Procházet zdrojové kódy

安全检查添加检查开始时间和检查结束时间

xujie před 1 rokem
rodič
revize
b6b99d914a

+ 26 - 0
src/views/menu/securityCheckRegister/add.vue

@@ -19,6 +19,8 @@
           <van-cell class="cell-item28" title="任务时间"
                     :value="formatTime(taskInfo.planStartTime,taskInfo.planEndTime)"/>
           <van-cell class="cell-item28" title="受检机构" :value="taskInfo.beCheckedOrgName"/>
+          <date-cell required title="检查开始时间" :max-date='endTime' @change="onStartTimeChange" :is-row="true"  v-model="taskInfo.startTime" date-type="datetime" />
+          <date-cell required title="检查结束时间" :min-date='startTime' @change="onEndTimeChange" :is-row="true"  v-model="taskInfo.endTime" date-type="datetime" />
           <van-cell class="cell-item28" v-if="!enable" title="检查组成员" :value="taskInfo.checkTeam || '无'"/>
           <van-field
             v-else
@@ -245,6 +247,10 @@ export default {
       oldSignatureSeal:"",
       confirmShow:false,
       this_window: process.env.NODE_ENV === 'development' ? '/dev' : window.origin,
+      minDate:null,
+      maxDate:new Date(),
+      startTime:null,
+      endTime:null
     }
   },
   computed: {
@@ -495,6 +501,12 @@ export default {
         this.activeNames = this.checkList.map(v => v.itemName);
         //判断是否可提交(在任务时间内)
         this.isSubmit = res.data.inRegisterTime;
+        //设置时间选址最大时间和最小时间
+        this.minDate = new Date(this.dayjs(this.taskInfo.planStartTime));
+        this.maxDate = new Date(this.dayjs(this.taskInfo.planEndTime));
+        this.startTime = new Date(this.dayjs(this.taskInfo.planStartTime));
+        this.endTime = new Date(this.dayjs(this.taskInfo.planEndTime));
+
         this.checkList.forEach(v => {
           v.pointList.forEach(item => {
             if (item.status == null) {
@@ -553,6 +565,14 @@ export default {
               return;
             }
           }
+          if (!this.taskInfo.startTime) {
+            this.$toast('请选择检查开始时间');
+            return;
+          }
+          if (!this.taskInfo.endTime) {
+            this.$toast('请选择检查结束时间');
+            return;
+          }
           let arr = pointData.filter(v => {
             if (v.status === 1) {
               return !v.remark || !v.rectificationDeadline
@@ -651,6 +671,12 @@ export default {
         }
       });
     },
+    onStartTimeChange(date){
+      this.startTime = new Date(this.dayjs(date));
+    },
+    onEndTimeChange(date){
+      this.endTime = new Date(this.dayjs(date));
+    },
     //上传签名图到服务器
     resultImg(img,oldImgUrl) {
       if (oldImgUrl !== "" && oldImgUrl !== null && oldImgUrl !== "null"){

+ 7 - 0
src/views/menu/securityCheckRegister/detail.vue

@@ -14,6 +14,8 @@
           </van-cell>
           <van-cell class="cell-item28" title="任务时间" :value="formatTime(taskInfo.planStartTime,taskInfo.planEndTime)" />
           <van-cell class="cell-item28" title="受检机构" :value="taskInfo.beCheckedOrgName" />
+          <van-cell class="cell-item28" title="检查开始时间" :value="formatRegisterTime(taskInfo.startTime)" />
+          <van-cell class="cell-item28" title="检查结束时间" :value="formatRegisterTime(taskInfo.endTime)" />
           <van-cell class="cell-item28" title="检查组成员" :value="taskInfo.checkTeam || '无'" />
         </van-cell-group>
       </div>
@@ -292,6 +294,11 @@ export default {
       format = format ||  'YYYY年MM月DD日'
       return `${this.dayjs(start).format(format)} ~ ${this.dayjs(end).format(format)}`;
     },
+    //格式化时间范围
+    formatRegisterTime(time,format){
+      format = format ||  'YYYY年MM月DD日 HH时mm分'
+      return `${this.dayjs(time).format(format)}`;
+    },
 
     //插入检查项
     addItem(val) {