safecheck-client 3.0.34-86 → 3.0.34-88

package/src/filiale/siyang/pc/CheckBookList.vue

@@ -99,7 +99,7 @@
         <template partial='head'>
           <tr>
             <th>
-              <nobr>所属安检员11</nobr>
+              <nobr>所属安检员</nobr>
             </th>
             <th>
               <nobr>片区名称</nobr>

package/src/filiale/siyang/pc/CheckSearchUser.vue

@@ -135,6 +135,40 @@
               <input style="width: 60%" type="text" class="input_search" v-model="model.anjiancishu" placeholder="安检次数"
                      condition="anjiancishu = '{}'">
             </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">连续安检</label>
+              <datepicker
+                :value.sync="model.f_check_start_continuity"
+                placeholder='连续安检时间起始'
+                style="width: 60%"
+                :format="'yyyy-MM-dd 00:00:00'"
+                :show-rest-button="reset"
+                v-model="model.f_check_start_continuity">
+              </datepicker>
+            </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">连续安检</label>
+              <datepicker
+                :value.sync="model.f_check_end_continuity"
+                placeholder='连续安检时间结束'
+                style="width: 60%"
+                :format="'yyyy-MM-dd 23:59:59'"
+                :show-rest-button="reset"
+                v-model="model.f_check_end_continuity">
+              </datepicker>
+            </div>
+
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">连续安检状态</label>
+              <v-select placeholder='安检状态'
+                        :value.sync="model.f_entry_status_continuity"
+                        v-model="model.f_entry_status_continuity"
+                        class="select select_list"
+                        :value-single="true"
+                        close-on-select
+                        :options='$parent.$parent.entry_status'
+              ></v-select>
+            </div>
           </div>
           <div class="row" v-show="$parent.$parent.$parent.showItem">
             <div :class="$parent.$parent.style">
@@ -408,6 +442,7 @@ export default {
       SafeCheckXZ: '',
       civil: '',   //民用安检周期
       civilian: '',      //非民用安检周期
+      entry_status:[{label: '入户', value: '入户'}, {label: '拒检', value: '拒检'}, {label: '到访不遇', value: '到访不遇'}],
       SafeCheckXZs: [{ label: '全部', value: '' }, { label: '未安检', value: '未安检' }, { label: '已安检', value: '已安检' }], // 安检筛选选项
       SafeCheckSXs: [{ label: '是', value: '是' }, { label: '否', value: '否' }, { label: '全部', value: '' }],
       // user_states:[{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')],
@@ -693,9 +728,27 @@ export default {
         con += ` and f_check_version  = '${args.model.f_check_version}'`
       }
       con += args.model.f_checker_id ? ` and f_checker_name in ${args.model.f_checker_id}` : ' and 1=1'
+
+      let cn = ' 1=1 '
+      if (args.model.f_check_start_continuity || args.model.f_check_end_continuity || args.model.f_entry_status_continuity){
+        if (args.model.f_check_start_continuity && args.model.f_check_end_continuity && args.model.f_entry_status_continuity){
+          cn += ` and f_offsite_time >= '${args.model.f_check_start_continuity}' and f_offsite_time <= '${args.model.f_check_end_continuity}'`
+          switch (args.model.f_entry_status_continuity) {
+            case '到访不遇' : args.condition += ` and f_ruhu = 0 and f_jujian = 0 and f_buyu > 0`
+              break
+            case '入户' : args.condition += ` and f_ruhu > 0 and f_jujian = 0 and f_buyu = 0`
+              break
+            case '拒检' : args.condition += ` and f_ruhu = 0 and f_jujian > 0 and f_buyu = 0`
+              break
+          }
+        }else {
+          this.$showMessage('请选择连续安检时间起始、连续安检时间结束以及连续安检状态条件！')
+        }
+      }
       let condition = {
         condition1: args.condition,
-        condition2: con
+        condition2: con,
+        condition3: cn
       }
       this.searchData.condition = condition
       return this.model.search(condition, args.model)