safecheck-client 3.0.33-13 → 3.0.33-132

package/src/filiale/yongzhou/pc/safeDetail.vue

@@ -6,9 +6,9 @@
           <div partial>
             <div class="row">
               <div class="form-group col-sm-4">
-                <label class="font_normal_body">开始时间:</label>
+                <label class="font_normal_body">计划开始:</label>
                 <datepicker
-                  placeholder='请选择'
+                  placeholder='计划开始'
                   style="width:60%"
                   :disabled-days-of-week="[]"
                   :format="'yyyy-MM-dd'"
@@ -19,9 +19,9 @@
                 </datepicker>
               </div>
               <div class="form-group col-sm-4">
-                <label class="font_normal_body">结束时间:</label>
+                <label class="font_normal_body">计划结束:</label>
                 <datepicker
-                  placeholder='请选择'
+                  placeholder='计划结束'
                   :disabled-days-of-week="[]"
                   style="width:60%"
                   :format="'yyyy-MM-dd'"
@@ -53,7 +53,7 @@
                   @re-res="$parent.$parent.getRes"
                   :value.sync="model.f_checker_id"
                   v-model="model.f_checker_id"
-                  condition="tcp.f_checker_name = '{}'">
+                  condition="tcp.f_checker = '{}'">
                 </role-selector-safe>
               </div>
               <div style="float: right">
@@ -64,10 +64,10 @@
                                    :choose-col="true"></export-excel-safe>
               </div>
               <print-data-safe :sum-field="$parent.$parent.excelHeaders" :model="$parent.$parent.print_model"
-                          :field="$parent.$parent.excelHeaders"
-                          :defaultfield="$parent.$parent.defaultPrint"
-                          :titletable="'安检情况明细'" :starthead="$parent.$parent.getstart"
-                          ></print-data-safe>
+                               :field="$parent.$parent.excelHeaders"
+                               :defaultfield="$parent.$parent.defaultPrint"
+                               :titletable="'安检情况明细'" :starthead="$parent.$parent.getstart"
+              ></print-data-safe>
               <button class="button_spacing button_search" @click="search()">查询</button>
             </div>
           </div>
@@ -84,6 +84,7 @@
               <th>
                 <nobr>计划安检总户数</nobr>
               </th>
+
               <th>
                 <nobr>未检户数</nobr>
               </th>
@@ -111,13 +112,19 @@
               <th>
                 <nobr>安检率</nobr>
               </th>
+              <th>
+                <nobr>申请安检户数</nobr>
+              </th>
+              <th>
+                <nobr>总入户数</nobr>
+              </th>
             </tr>
           </template>
           <template partial='body'>
 
             <td style="text-align: center">{{ $index + 1 }}</td>
             <td style="text-align: center">{{ row.f_residential_area }}</td>
-            <td style="text-align: center">{{ row.totalcount }}</td>
+            <td style="text-align: center"><a @click="$parent.$parent.$parent.modalShow(row,'1')">{{ row.totalcount }}</a></td>
             <td style="text-align: center">{{ row.wjcount }}</td>
             <td style="text-align: center">{{ row.yjcount }}</td>
             <td style="text-align: center">{{ row.rhcount }}</td>
@@ -127,17 +134,16 @@
             <td style="text-align: center">{{ row.unique_dfby_count }}</td>
             <td style="text-align: center">{{ row.jjcount }}</td>
             <td style="text-align: center">{{ row.check_bv }}</td>
+            <td style="text-align: center"><a @click="$parent.$parent.$parent.modalShow(row,'0')">{{ row.sqajcount }}</a></td>
+            <td style="text-align: center">{{ row.ruhucount }}</td>
+
           </template>
           <template partial="foot">
             <td style="text-align: center" colspan="2"><span><b>合计：</b></span></td>
             <td style="text-align: center">{{ model.sums.totalcount }}</td>
-
             <td style="text-align: center">{{ model.sums.wjcount }}</td>
-
             <td style="text-align: center">{{ model.sums.yjcount }}</td>
-
             <td style="text-align: center">{{ model.sums.rhcount }}</td>
-
             <td style="text-align: center">{{ model.sums.dfbycount1 }}</td>
             <td style="text-align: center">{{ model.sums.dfbycount2 }}</td>
             <td style="text-align: center">{{ model.sums.dfbycount3 }}</td>
@@ -146,11 +152,155 @@
             <td style="text-align: center">
               {{ ((model.sums.yjcount / model.sums.totalcount)*100.0).toFixed(2) }}%
             </td>
-
+            <td style="text-align: center">{{ model.sums.sqajcount }}</td>
+            <td style="text-align: center">{{ model.sums.ruhucount }}</td>
           </template>
         </data-grid>
       </criteria-paged>
     </div>
+    <modal :show.sync="modal_show" backdrop="false"
+           class="allQuotaRecordModalShow" width="80%">
+      <header slot="modal-header" class="modal-header" style="text-align: center">
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <criteria-paged :model="modalModel" v-ref:paged2>
+          <criteria partial='criteria' class="search_area" v-ref:criteria2>
+            <div partial>
+              <div class="row">
+                <div class="form-group col-sm-4">
+                  <label class="font_normal_body">开始时间</label>
+                  <datepicker
+                    placeholder='请选择'
+                    style="width:60%"
+                    :disabled-days-of-week="[]"
+                    :format="'yyyy-MM-dd'"
+                    :show-rest-button="reset"
+                    :value.sync="$parent.$parent.modalSearchData.start_time"
+                    v-model="$parent.$parent.modalSearchData.start_time"
+                  >
+                  </datepicker>
+                </div>
+                <div class="form-group col-sm-4">
+                  <label class="font_normal_body">结束时间</label>
+                  <datepicker
+                    placeholder='请选择'
+                    :disabled-days-of-week="[]"
+                    style="width:60%"
+                    :format="'yyyy-MM-dd'"
+                    :show-rest-button="reset"
+                    :value.sync="$parent.$parent.$parent.modalSearchData.end_time"
+                    v-model="$parent.$parent.$parent.modalSearchData.end_time">
+                  </datepicker>
+                </div>
+                <div class="col-sm-4 form-group">
+                  <label class="font_normal_body">用户编号</label>
+                  <input style="width: 60%" class="input_search" v-model="$parent.$parent.$parent.modalSearchData.f_userinfo_code">
+                </div>
+                <div class="col-sm-4 form-group">
+                  <label class="font_normal_body">用户名称</label>
+                  <input style="width: 60%" class="input_search" v-model="$parent.$parent.$parent.modalSearchData.f_user_name">
+                </div>
+                <div class="col-sm-4 form-group">
+                  <label class="font_normal_body">用户地址</label>
+                  <input style="width: 60%" class="input_search" v-model="$parent.$parent.$parent.modalSearchData.f_address">
+                </div>
+                <div class="col-sm-4 form-group">
+                  <label class="font_normal_body">用户电话</label>
+                  <input style="width: 60%" class="input_search" v-model="$parent.$parent.$parent.modalSearchData.f_user_phone">
+                </div>
+                <div class="col-sm-4 form-group">
+                  <label class="font_normal_body">安&nbsp;检&nbsp;员</label>
+                  <input style="width: 60%" class="input_search" v-model="$parent.$parent.$parent.modalSearchData.f_checker">
+                </div>
+                <div class="col-sm-4 form-group">
+                  <label class="font_normal_body">安检状态</label>
+                  <v-select :value.sync="$parent.$parent.$parent.modalSearchData.f_last_check_state" v-model='$parent.$parent.$parent.modalSearchData.f_last_check_state'
+                            :value-single="true" style="width: 60%"
+                            class="select_list select"
+                            :options='$parent.$parent.$parent.last_check_states' placeholder='安检状态'
+                            close-on-select
+                  ></v-select>
+                </div>
+                <div class="form-group col-sm-4">
+                  <label class="font_normal_body">用户类型</label>
+                  <v-select :value.sync="$parent.$parent.$parent.modalSearchData.f_user_type" v-model='$parent.$parent.$parent.modalSearchData.f_user_type'
+                            :value-single="true" style="width: 60%"
+                            class="select_list select"
+                            :options='$parent.$parent.$parent.user_types' placeholder='用户类型'
+                            close-on-select
+                  ></v-select>
+                </div>
+                <div class="col-sm-4 form-group">
+                  <label class="font_normal_body">到访次数</label>
+                  <input style="width: 60%" class="input_search" v-model="$parent.$parent.$parent.modalSearchData.f_check_version">
+                </div>
+                <div style="float: right">
+                  <button class="button_spacing button_search" @click="$parent.$parent.$parent.modalSearch()">查询</button>
+                  <export-excel-safe :data="$parent.$parent.$parent.modalSearchExcelData"
+                                     :field="$parent.$parent.$parent.modalExcelHeaders"
+                                     progress="safeGetExportProgress"
+                                     sqlurl="rs/logic/SafeExportExcel" sql-name="safe_singleTable_OrderBy" template-name='安检情况明细'
+                                     :choose-col="true"></export-excel-safe>
+                </div>
+              </div>
+            </div>
+          </criteria>
+          <data-grid class="list_area table_sy" :model="$parent.$parent.modalModel" v-ref:modalgrid partial='list'>
+            <template partial='head'>
+              <th>
+                <nobr>用户编号</nobr>
+              </th>
+              <th>
+                <nobr>用户名称</nobr>
+              </th>
+              <th>
+                <nobr>小区</nobr>
+              </th>
+              <th>
+                <nobr>地址</nobr>
+              </th>
+              <th>
+                <nobr>客户电话</nobr>
+              </th>
+              <th>
+                <nobr>到访不遇次数</nobr>
+              </th>
+              <th>
+                <nobr>安检时间</nobr>
+              </th>
+              <th>
+                <nobr>安检员</nobr>
+              </th>
+              <th>
+                <nobr>计划名称</nobr>
+              </th>
+              <th>
+                <nobr>用户类型</nobr>
+              </th>
+              <th>
+                <nobr>安检状态</nobr>
+              </th>
+            </template>
+            <template partial='body'>
+              <td style="text-align:center">{{row.f_userinfo_code}}</td>
+              <td style="text-align:center">{{row.f_user_name }}</td>
+              <td style="text-align:center">{{row.f_residential_area}}</td>
+              <td style="text-align:center">{{row.f_address}}</td>
+              <td style="text-align:center">{{row.f_user_phone}}</td>
+              <td style="text-align:center">{{row.f_check_version}}</td>
+              <td style="text-align:center">{{row.f_last_check_date}}</td>
+              <td style="text-align:center">{{row.f_checker}}</td>
+              <td style="text-align:center">{{row.f_plan_name}}</td>
+              <td style="text-align:center">{{row.f_user_type}}</td>
+              <td style="text-align:center">{{row.f_last_check_state}}</td>
+            </template>
+          </data-grid>
+        </criteria-paged>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-default" @click='modal_show = false'>关闭</button>
+      </footer>
+    </modal>
   </div>
 </template>
 
@@ -165,6 +315,8 @@ export default {
     return {
       model: new PagedList("/rs/sql/safeDetail", 999, {orgid: this.$login.f.orgid}, {
         totalcount: '',
+        sqajcount:'',
+        ruhucount:'',
         wjcount: '',
         yjcount: '',
         rhcount: '',
@@ -175,11 +327,43 @@ export default {
         jjcount: ''
       }),
       resids: {},
+      modalModel: new PagedList('rs/sql/safe_singleTable_OrderBy', 15, {
+        items: '"tcpi.*,tcp.f_checker,tcp.f_plan_name"',
+        tablename: '"t_check_plan_item tcpi left join t_check_plan tcp on tcpi.f_plan_id = tcp.id"',
+        orderitem: '"1"'
+      }),
+      modalModel2: new PagedList('rs/sql/safe_singleTable_OrderBy', 15, {
+        items: '"*,f_offsite_time as f_last_check_date,f_checker_name as f_checker,f_check_type as f_user_type,f_entry_status as f_last_check_state"',
+        tablename: '"t_check_paper"',
+        orderitem: '"1"'
+      }),
+      modalSearchData:{},
+      modalSearchExcelData:{
+        items: "tcpi.*,tcp.f_checker,tcp.f_plan_name",
+        tablename: "t_check_plan_item tcpi left join t_check_plan tcp on tcpi.f_plan_id = tcp.id",
+        orderitem: "f_userinfo_code"
+      },
+      modalExcelHeaders:{
+        'f_userinfo_code': '用户编号',
+        'f_user_name': '用户名称',
+        'f_residential_area': '小区',
+        'f_address': '地址',
+        'f_user_phone': '客户电话',
+        'f_check_version': '到访不遇次数',
+        'f_last_check_date': '安检时间',
+        'f_checker': '安检员',
+        'f_plan_name':"计划名称",
+        'f_user_type': '用户类型',
+        'f_last_check_state': '安检状态'
+
+      },
       searchData: {
         condition: "1=1",
         orgid: this.$login.f.orgid
       },
+      modal_show:false,
       print_model:{},
+      last_check_states:[{label:'全部',value:''},{label:'入户',value:'入户'},{label:'拒检',value:'拒检'},{label:'到访不遇',value:'到访不遇'}],
       user_types: [{label:'全部',value:''},{label:'民用',value:'民用'},{label:'非民用',value:'非民用'}],
       excelHeaders: {
         'f_residential_area': '小区名称',
@@ -192,10 +376,14 @@ export default {
         'dfbycount3': '到访不遇-3次',
         'unique_dfby_count': '到访不遇小计',
         'jjcount': '拒检户数',
-        'check_bv':'安检率'
+        'check_bv':'安检率',
+        'sqajcount': '申请安检户数',
+        'ruhucount': '总入户数',
       },
+      modalRow:{},
+      type:'1',
       printshow: false,
-      defaultPrint: ['f_residential_area', 'totalcount', 'wjcount', 'rhcount','dfbycount1','dfbycount2','dfbycount3','unique_dfby_count','jjcount','check_bv'],
+      defaultPrint: ['f_residential_area', 'totalcount','wjcount', 'rhcount','dfbycount1','dfbycount2','dfbycount3','unique_dfby_count','jjcount','check_bv', 'sqajcount', 'ruhucount'],
       sumsmodel: {},
     }
   },
@@ -203,9 +391,110 @@ export default {
     // this.model.search('1=1')
   },
   methods: {
+    async modalShow (row,type) {
+      this.type = type
+      this.modalRow = row
+      this.modal_show = true
+      this.modalSearchData = {}
+      await this.modalSearch(row)
+    },
+    modalSearch () {
+      this.modalModel = new PagedList('rs/sql/safe_singleTable_OrderBy', 15, {
+        items: '"tcpi.*,tcp.f_checker,tcp.f_plan_name"',
+        tablename: '"t_check_plan_item tcpi left join t_check_plan tcp on tcpi.f_plan_id = tcp.id"',
+        orderitem: '"1"'
+      })
+      let modalCondition = '1=1'
+      if (this.type == '0') {
+        modalCondition = this.$refs.paged.model.condition.condition2
+        modalCondition += ` and f_no_checkplan='无计划安检'`
+        if (this.modalSearchData.f_user_name){
+          modalCondition += ` and f_user_name = '${this.modalSearchData.f_user_name}'`
+        }
+        if (this.modalSearchData.f_user_type){
+          modalCondition += ` and f_check_type = '${this.modalSearchData.f_user_type}'`
+        }
+        if (this.modalSearchData.start_time){
+          modalCondition += ` and f_offsite_time >= '${this.modalSearchData.start_time}'`
+        }
+        if (this.modalSearchData.end_time){
+          modalCondition += ` and f_offsite_time <= '${this.modalSearchData.end_time}'`
+        }
+        if (this.modalSearchData.f_userinfo_code){
+          modalCondition += ` and f_userinfo_code = '${this.modalSearchData.f_userinfo_code}'`
+        }
+        if (this.modalSearchData.f_address){
+          modalCondition += ` and f_address = '${this.modalSearchData.f_address}'`
+        }
+        if (this.modalSearchData.f_user_phone){
+          modalCondition += ` and f_user_phone = '${this.modalSearchData.f_user_phone}'`
+        }
+        if (this.modalSearchData.f_checker){
+          modalCondition += ` and f_checker_name = '${this.modalSearchData.f_checker}'`
+        }
+        modalCondition += ` and f_residential_area = '${this.modalRow.f_residential_area}'`
+        this.modalModel = this.modalModel2
+        this.modalModel.search(modalCondition, this.modalModel)
+
+      }else {
+        modalCondition = this.$refs.paged.model.condition.condition1
+        if (this.modalSearchData.f_last_check_state){
+          modalCondition += ` and tcpi.f_last_check_state = '${this.modalSearchData.f_last_check_state}'`
+        }
+        if (this.modalSearchData.f_user_name){
+          modalCondition += ` and tcpi.f_user_name = '${this.modalSearchData.f_user_name}'`
+        }
+        if (this.modalSearchData.f_user_type){
+          modalCondition += ` and tcpi.f_user_type = '${this.modalSearchData.f_user_type}'`
+        }
+        if (this.modalSearchData.start_time){
+          modalCondition += ` and tcp.f_create_time >= '${this.modalSearchData.start_time}'`
+        }
+        if (this.modalSearchData.end_time){
+          modalCondition += ` and tcp.f_create_time <= '${this.modalSearchData.end_time}'`
+        }
+        if (this.modalSearchData.f_userinfo_code){
+          modalCondition += ` and tcpi.f_userinfo_code = '${this.modalSearchData.f_userinfo_code}'`
+        }
+        if (this.modalSearchData.f_address){
+          modalCondition += ` and tcpi.f_address = '${this.modalSearchData.f_address}'`
+        }
+        if (this.modalSearchData.f_user_phone){
+          modalCondition += ` and tcpi.f_user_phone = '${this.modalSearchData.f_user_phone}'`
+        }
+        if (this.modalSearchData.f_checker){
+          modalCondition += ` and tcp.f_checker = '${this.modalSearchData.f_checker}'`
+        }
+        if (this.modalSearchData.f_check_version){
+          modalCondition += ` and tcpi.f_check_version = '${this.modalSearchData.f_check_version}'`
+        }
+        modalCondition += ` and tcpi.f_residential_area = '${this.modalRow.f_residential_area}'`
+        this.modalModel.search(modalCondition, this.modalModel)
+      }
+      this.modalSearchExcelData.condition = modalCondition
+    },
     async selfSearch(args) {
-      await this.model.search(args.condition, args.model, args.condValue)
-      this.searchData.condition = args.condition
+      let condition = {
+        condition1 : args.condition,
+        condition2 : `1=1 and f_entry_status = '入户'`
+      }
+      if (args.model.f_checker_id){
+        condition.condition2 += ` and f_checker_name = '${args.model.f_checker_id}'`
+      }
+      if (args.model.f_user_type){
+        condition.condition2 += ` and f_check_type = '${args.model.f_user_type}'`
+      }
+      if (args.model.f_residential_area){
+        condition.condition2 += ` and f_residential_area = '${args.model.f_residential_area}'`
+      }
+      if (args.model.start_time){
+        condition.condition2 += ` and f_offsite_time >= '${args.model.start_time}'`
+      }
+      if (args.model.end_time){
+        condition.condition2 += ` and f_offsite_time <= '${args.model.end_time}'`
+      }
+      await this.model.search(condition, args.model)
+      this.searchData.condition = condition
       this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
       this.print_model = JSON.parse(JSON.stringify(this.$refs.paged.$refs.grid.model))
       this.print_model.rows.push({
@@ -218,7 +507,9 @@ export default {
         dfbycount2: this.sumsmodel.dfbycount2,
         dfbycount3: this.sumsmodel.dfbycount3,
         unique_dfby_count: this.sumsmodel.unique_dfby_count,
-        check_bv:`${((this.sumsmodel.yjcount / this.sumsmodel.totalcount)*100.0).toFixed(2)}%`
+        check_bv:`${((this.sumsmodel.yjcount / this.sumsmodel.totalcount)*100.0).toFixed(2)}%`,
+        sqajcount: this.sumsmodel.sqajcount,
+        ruhucount: this.sumsmodel.ruhucount
       })
       this.print_model.totalPage = 0
     },

package/src/filiale/yongzhou/pc/safeStatistics.vue

@@ -1,7 +1,7 @@
 <template>
   <div id='app' class="basic-main" style="height: 100%">
     <criteria-paged :model="model" :pager='false'>
-      <criteria partial='criteria' @condition-changed='search' class="search_area">
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' class="search_area">
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
             <div class="col-sm-4 form-group">
@@ -14,9 +14,25 @@
                 condition="tcp.f_checker = '{}'">
               </role-selector-safe>
             </div>
-            <div class="col-sm-2 form-group">
-              <label for="startDate" class="font_normal_body">开始日期:</label>
-              <datepicker id="startDate" placeholder="开始日期"
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">用户类型</label>
+              <v-select :value.sync="model.f_user_type" v-model='model.f_user_type'
+                        :value-single="true" style="width: 60%"
+                        class="select_list select"
+                        :options='$parent.$parent.user_types' placeholder='用户类型'
+                        close-on-select
+                        condition="tcpi.f_user_type = '{}'"></v-select>
+            </div>
+            <div class="form-group col-sm-4"  >
+              <label class="font_normal_body">小&emsp;&emsp;区</label>
+              <input type="text" class="input_search" v-model="model.f_residential_area"
+                     style="width: 60%" placeholder="小区" condition="tcpi.f_residential_area like '%{}%'">
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-sm-4 form-group">
+              <label for="startDate" class="font_normal_body">计划开始:</label>
+              <datepicker id="startDate" placeholder="计划开始"
                           v-model="model.startDate"
                           :value.sync="model.startDate"
                           style="width: 60%;"
@@ -26,9 +42,9 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
-            <div class="col-sm-2 form-group">
-              <label for="endDate" class="font_normal_body">结束日期:</label>
-              <datepicker id="endDate" placeholder="结束日期"
+            <div class="col-sm-4 form-group">
+              <label for="endDate" class="font_normal_body">计划结束:</label>
+              <datepicker id="endDate" placeholder="计划结束"
                           v-model="model.endDate"
                           :value.sync="model.endDate"
                           :disabled-days-of-Week="[]"
@@ -38,26 +54,38 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
-            <div class="form-group col-sm-2">
-              <label class="font_normal_body">用户类型</label>
-              <v-select :value.sync="model.f_user_type" v-model='model.f_user_type'
-                        :value-single="true" style="width: 60%"
-                        class="select_list select"
-                        :options='$parent.$parent.user_types' placeholder='用户类型'
-                        close-on-select
-                        condition="tcpi.f_user_type = '{}'"></v-select>
-            </div>
-            <div class="form-group col-sm-2"  >
-              <label class="font_normal_body">小&emsp;&emsp;区</label>
-              <input type="text" class="input_search" v-model="model.f_residential_area"
-                     style="width: 60%" placeholder="小区" condition="f_residential_area like '%{}%'">
-            </div>
             <div class="col-sm-4 form-group" style="margin-top: 8px">
               <button class="button_search button_spacing" @click="search()">查询</button>
               <report-print id='checkerPrint' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
               <report-excel id='checkerPrint'></report-excel>
             </div>
           </div>
+          <div class="row">
+            <div class="col-sm-4 form-group">
+              <label for="startDate" class="font_normal_body">安检开始:</label>
+              <datepicker id="startDate" placeholder="安检开始"
+                          v-model="model.checkstart"
+                          :value.sync="model.checkstart"
+                          style="width: 60%;"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          condition="tcpi.f_last_check_date >= '{}'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-4 form-group">
+              <label for="endDate" class="font_normal_body">安检结束:</label>
+              <datepicker id="endDate" placeholder="安检结束"
+                          v-model="model.checkend"
+                          :value.sync="model.checkend"
+                          :disabled-days-of-Week="[]"
+                          style="width: 60%;"
+                          condition="tcpi.f_last_check_date <= '{}'"
+                          :format="'yyyy-MM-dd 23:59:59'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+          </div>
         </div>
       </criteria>
       <div partial='list' id='checkerPrint' class="list_area" style="overflow-y: scroll">
@@ -70,8 +98,8 @@
           </tr>
           <tr>
             <th colspan='9' style="font-weight: normal; text-align: center;">
-              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
-              结束时间：{{ model.model.endDate }}
+              计划开始日期：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              计划结束日期：{{ model.model.endDate }}
             </th>
           </tr>
           </thead>
@@ -92,7 +120,7 @@
   import {DataModel, HttpResetClass} from 'vue-client'
 
   export default {
-    title: '隐患报表',
+    title: '安检员明细报表',
     data () {
       let model = new DataModel('rs/report/checkerReport', {})
       // model.f_filialeid = '(' + this.$login.f.orgid + ')'
@@ -107,6 +135,28 @@
       getRes (obj) {
         this.model.f_filialeid = this.$login.convertToIn(obj.resids)
       },
+      selfSearch (args) {
+        let condition = {
+          condition1 : args.condition,
+          condition2 : `1=1 and f_entry_status = '入户'`
+        }
+        if (args.model.f_checker_id){
+          condition.condition2 += ` and f_checker_name = '${args.model.f_checker_id}'`
+        }
+        if (args.model.f_user_type){
+          condition.condition2 += ` and f_check_type = '${args.model.f_user_type}'`
+        }
+        if (args.model.f_residential_area){
+          condition.condition2 += ` and f_residential_area = '${args.model.f_residential_area}'`
+        }
+        if (args.model.checkstart){
+          condition.condition2 += ` and f_offsite_time >= '${args.model.checkstart}'`
+        }
+        if (args.model.checkend){
+          condition.condition2 += ` and f_offsite_time <= '${args.model.checkend}'`
+        }
+        this.model.search(condition, args.model)
+      }
     },
     ready () {
     },

package/src/filiale/yongzhou/pc/safeStatisticsDay.vue

@@ -6,7 +6,7 @@
           <div partial>
             <div class="row">
               <div class="form-group col-sm-4">
-                <label class="font_normal_body">时间选择:</label>
+                <label class="font_normal_body">安检时间选择:</label>
                 <datepicker
                   placeholder='请选择'
                   style="width:60%"
@@ -55,7 +55,7 @@
                   @re-res="$parent.$parent.getRes"
                   :value.sync="model.f_checker_id"
                   v-model="model.f_checker_id"
-                  condition="tcp.f_checker = '{}'">
+                  condition="f_checker = '{}'">
                 </role-selector-safe>
               </div>
               <div style="float: right">

package/src/filiale/yongzhou/pc/safeStatisticsMonth.vue

@@ -6,7 +6,7 @@
           <div partial>
             <div class="row">
               <div class="form-group col-sm-4">
-                <label class="font_normal_body">时间选择:</label>
+                <label class="font_normal_body">安检时间选择:</label>
                 <datepicker
                   placeholder='请选择'
                   style="width:60%"
@@ -54,7 +54,7 @@
                 @re-res="$parent.$parent.getRes"
                 :value.sync="model.f_checker_id"
                 v-model="model.f_checker_id"
-                condition="tcp.f_checker = '{}'">
+                condition="f_checker = '{}'">
               </role-selector-safe>
               </div>
               <div style="float: right">