safecheck-client 3.0.35-1 → 3.0.35-3

package/src/filiale/bayan/pc/CheckPlanAreaList.vue

@@ -56,6 +56,9 @@
                 <button id="btnaaa" style="float: right" class="button_search"
                         @click="$parent.$parent.getGroupName1(),search(),$parent.$parent.getexportExcelField(),$parent.$parent.$parent.isdetail=false,$parent.$parent.listflag=false"
                         v-el:cx>查询</button>
+                <button id="cle" style="float: right" class="button_search"
+                        @click="$parent.$parent.cleamsg()"
+                        v-el:cx>清空</button>
               </div>
             </div>
             <div  :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}" v-if="$parent.$parent.criteriaShow">
@@ -80,6 +83,30 @@
                 :show-rest-button="reset">
               </datepicker>
             </div>
+            <div  :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}" v-if="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">安检时间</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_safe_start"
+                placeholder='结束时间' style="width: 60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM-dd 00:00:00'"
+                :show-rest-button="reset"
+                v-model="$parent.$parent.f_safe_start"
+              >
+              </datepicker>
+            </div>
+            <div  :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}" v-if="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">安检时间</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_safe_end"
+                placeholder='结束时间' style="width: 60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM-dd 23:59:59'"
+                :show-rest-button="reset"
+                v-model="$parent.$parent.f_safe_end"
+              >
+              </datepicker>
+            </div>
             <div :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}" v-if="$parent.$parent.criteriaShow">
               <label class="font_normal_body" >区&emsp;&emsp;域</label>
               <v-select :value.sync="model.f_quyu" :value-single="true" v-model="model.f_quyu"
@@ -240,6 +267,8 @@
         criteriaShow: false,
         f_check_start:new Date().getFullYear() + '-01',
         f_check_end:new Date().getFullYear() + '-12',
+        f_safe_start:'',
+        f_safe_end:'',
         planName:[{label: '全部', value: ''}],
         exportExcelField: {
           'f_weijian':'未检',
@@ -268,6 +297,9 @@
 
     },
     methods: {
+      cleamsg(){
+        this.$refs.paged.$refs.cri.model= {}
+      },
       getAllChecker() {
         new HttpResetClass().load('POST', `/rs/sql/tel_singleTable_OrderBy`, {
           data: {
@@ -418,6 +450,16 @@
             args.condition += ` and f_year<=${new Date(this.f_check_end).getFullYear()} and f_month<=${new Date(this.f_check_end).getMonth()+1}`
           }
         }
+        if(this.f_safe_start && this.f_safe_end){
+          args.condition += `and ch.f_offsite_time >= '${this.f_safe_start}' and ch.f_offsite_time <= '${this.f_safe_end}' `
+        } else {
+          if(this.f_safe_start){
+            args.condition += ` and ch.f_offsite_time >='${this.f_safe_start}'`
+          }
+          if(this.f_safe_end){
+            args.condition += ` and ch.f_offsite_time <='${this.f_safe_end}'`
+          }
+        }
         this.$refs.paged.$refs.grid.$el.scrollTop = 0
         if (this.groupNameForSql=='undefined'){
           //tag