safecheck-client 3.0.33-8 → 3.0.33-80

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

@@ -274,7 +274,7 @@
                        style="width: 60%" placeholder="距上次安检天数" >
               </div>
               <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow">
-                <label class="font_normal_body">到访不遇次数</label>
+                <label class="font_normal_body">到访次数</label>
                 <input type="number" class="input_search" v-model="model.f_check_version"
                        style="width: 60%" placeholder="到访不遇次数" condition="f_check_version = '{}'" >
               </div>

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

@@ -0,0 +1,364 @@
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' class="search_area" @condition-changed='$parent.search' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div :class="{'form-group col-sm-6':$parent.$parent.$parent.showItem,'form-group col-sm-4':!$parent.$parent.$parent.showItem}" style="margin: 0">
+              <role-selector-safe
+                role-name="安检员"
+                role-lable="安&ensp;检&ensp;员"
+                @re-res="$parent.$parent.getRes"
+                :value.sync="model.f_checker_id"
+                v-model="model.f_checker_id">
+              </role-selector-safe>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">计划起始</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_check_start"
+                placeholder='起始月份' style="width:60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM'"
+                :select-month="true"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">计划截止</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_check_end"
+                placeholder='结束月份' style="width:60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM'"
+                :select-month="true"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+            <!--<div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" >
+              <label class="font_normal_body">安检状态</label>
+              <v-select :value.sync="model.f_last_check_state" :options='$parent.$parent.checkStates' placeholder='上次安检状态' close-on-select
+                        style="width:60% "   class="select select_list"  v-model='model.f_last_check_state'   condition="i.f_last_check_state = '{}'">
+              </v-select>
+            </div>-->
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">安检起始</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_start_time"
+                placeholder='安检起始' style="width:60%"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">安检截止</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_end_time"
+                placeholder='安检截止' style="width:60%"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+            <!--<div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" v-if="$parent.$parent.criteriaShow">-->
+            <!--<label class="font_normal_body">安检起始</label>-->
+            <!--<datepicker-->
+            <!--:value.sync="$parent.$parent.f_start_time"-->
+            <!--placeholder='起始时间' style="width:60%"-->
+            <!--:disabled-days-of-week="[]"-->
+            <!--:format="'yyyy-MM-dd'"-->
+            <!--:show-rest-button="reset">-->
+            <!--</datepicker>-->
+            <!--</div>-->
+            <!--<div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" v-if="$parent.$parent.criteriaShow">-->
+            <!--<label class="font_normal_body">安检结束</label>-->
+            <!--<datepicker-->
+            <!--:value.sync="$parent.$parent.f_end_time"-->
+            <!--placeholder='结束时间' style="width:60%"-->
+            <!--:disabled-days-of-week="[]"-->
+            <!--:format="'yyyy-MM-dd'"-->
+            <!--:show-rest-button="reset">-->
+            <!--</datepicker>-->
+            <!--</div>-->
+            <div style="width: auto;margin-top:8px;float: right" :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <export-excel-safe   :data="$parent.$parent.searchData"
+                                   :field="$parent.$parent.excelHeaders"
+                                   progress="safeGetExportProgress"
+                                   sqlurl="rs/logic/SafeExportExcel" sql-name="planCount" template-name='安检计划明细' ></export-excel-safe>
+              <button id="btnaaa" type="button" class="button_search button_spacing" @click="search()">查询</button>
+              <!--<div class="button_spacing"-->
+              <!--:class="{'button_shrink_top':$parent.criteriaShow,'button_shrink_bottom':!$parent.criteriaShow}"-->
+              <!--@click="$parent.$parent.hidden()">-->
+              <!--</div>-->
+              <div class="button_spacing"
+                   :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
+                   @click="$parent.$parent.hiddenr()"></div>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-sm-12">
+              <label class="control-label" style="color: #c7254e">汇 总 项</label>
+              <input type="checkbox" id="f_residential_area" value="f_residential_area" v-model="$parent.$parent.nameForSql"/>
+              <label for="f_residential_area">小区名称</label>
+          </div>
+        </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
+        <template partial='head'>
+          <tr>
+            <th>
+              <nobr>序号</nobr>
+            </th>
+            <th v-if="$parent.$parent.$parent.nameForSql.includes('f_residential_area')"><nobr>小区名称</nobr></th>
+            <th>安检员</th>
+            <th>总入户量</th>
+            <th>总到访不遇量</th>
+            <th>总拒检量</th>
+            <th>安检总量</th>
+            <th>计划总数</th>
+            <th>入户</th>
+            <th>到访不遇</th>
+            <th>拒检</th>
+            <th>无计划总数</th>
+            <th>无计划入户</th>
+            <th>无计划到访不遇</th>
+            <th>无计划拒检</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td style="text-align:center;">{{$index + 1}}</td>
+          <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_residential_area')">{{row.f_residential_area}}</td>
+          <td style="text-align: center">{{row.f_checker}}</td>
+          <td style="text-align: center">{{row.ruhu_total}}</td>
+          <td style="text-align: center">{{row.daofang_total}}</td>
+          <td style="text-align: center">{{row.jujian_total}}</td>
+          <td style="text-align: center">{{row.total_sum}}</td>
+          <td style="text-align: center">{{row.plannum}}</td>
+          <td style="text-align: center">{{row.ruhu}}</td>
+          <td style="text-align: center">{{row.daofang}}</td>
+          <td style="text-align: center">{{row.jujian}}</td>
+          <td style="text-align: center">{{row.no_plan_num}}</td>
+          <td style="text-align: center">{{row.noruhu}}</td>
+          <td style="text-align: center">{{row.nodaofang}}</td>
+          <td style="text-align: center">{{row.nojujian}}</td>
+        </template>
+        <template partial="foot">
+          <td style="text-align: center"><span><b>合计：</b></span></td>
+          <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_residential_area')"></td>
+          <td style="text-align:center;"></td>
+          <td style="text-align: center">{{model.sums.ruhu_total}}</td>
+          <td style="text-align: center">{{model.sums.daofang_total}}</td>
+          <td style="text-align: center">{{model.sums.jujian_total}}</td>
+          <td style="text-align: center">{{model.sums.total_sum}}</td>
+          <td style="text-align: center">{{model.sums.plannum}}</td>
+          <td style="text-align: center">{{model.sums.ruhu}}</td>
+          <td style="text-align: center">{{model.sums.daofang}}</td>
+          <td style="text-align: center">{{model.sums.jujian}}</td>
+          <td style="text-align: center">{{model.sums.no_plan_num}}</td>
+          <td style="text-align: center">{{model.sums.noruhu}}</td>
+          <td style="text-align: center">{{model.sums.nodaofang}}</td>
+          <td style="text-align: center">{{model.sums.nojujian}}</td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+import {PagedList} from 'vue-client'
+
+
+export default {
+  title: '安检计划查询',
+  data() {
+    let options = []
+    let year = (new Date()).getFullYear()
+    for (let i = year - 8; i <= year + 1; i++)
+      options.push({label: i + '', value: i + ''})
+    let model = new PagedList('rs/sql/planCount', 20, {
+      f_filialeids: 'this.f_filialeids',
+      f_start_time: 'this.f_start_time',
+      condition1:'this.condition1',
+      condition2:'this.condition2',
+      condition3:'this.condition3',
+      otheritem:'this.otheritem',
+      f_end_time: 'this.f_end_time'
+    }, {plannum: '', ruhu: '', jujian: '', daofang: '',no_plan_num:'',noruhu:'',nodaofang:'',nojujian:'',ruhu_total:'',daofang_total:'',jujian_total:'',total_sum:''})
+    model.f_filialeids = '('+this.$login.f.orgid+')'
+    return {
+      excelHeaders:{
+        'f_checker': '安检员',
+        'plannum': '计划总数',
+        // 'yrj': '计划中已入户',
+        // 'wrj': '计划中未入户',
+        'ruhu': '入户',
+        'jujian': '拒检',
+        'daofang': '到访不遇',
+        'no_plan_num': '无计划总数',
+        'noruhu': '无计划入户',
+        'nojujian': '无计划拒检',
+        'nodaofang': '无计划到访不遇'
+      },
+      nameForSql: [],
+      groupNameForSql: '',
+      searchData:{
+        condition:"1=1",
+        condition1:"1=1",
+        condition2:"1=1",
+        condition3:"and 1=1",
+        otheritem:'',
+        f_plan_year:year[0],
+        f_checker:'',
+        f_filialeids:'('+this.$login.f.orgid+')',
+        f_start_time:'',
+        f_end_time:''
+      },
+      checker: this.$login.f,
+      checkers: [],
+      checkersname: [],
+      checkStates: this.$appdata.getParam('安检状态'),
+      f: this.$login.f,
+      criteriaShow: false,
+      model: model,
+      c_year_list: options,
+      f_check_start:'',
+      f_check_end: '',
+      f_start_time:'',
+      f_end_time:''
+    }
+  },
+  methods: {
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    hiddenr() {
+      this.$parent.showItem = !this.$parent.showItem
+    },
+    search(args) {
+      if (this.nameForSql.length >0 ){
+        this.excelHeaders = {
+          'f_residential_area':'小区名称',
+          'f_checker': '安检员',
+          'plannum': '计划总数',
+          'ruhu': '入户',
+          'jujian': '拒检',
+          'daofang': '到访不遇',
+          'no_plan_num': '无计划总数',
+          'noruhu': '无计划入户',
+          'nojujian': '无计划拒检',
+          'nodaofang': '无计划到访不遇'
+        }
+        this.groupNameForSql = `,${this.nameForSql.join().trim()}`
+      }else {
+        this.excelHeaders = {
+          'f_checker': '安检员',
+          'plannum': '计划总数',
+          'ruhu': '入户',
+          'jujian': '拒检',
+          'daofang': '到访不遇',
+          'no_plan_num': '无计划总数',
+          'noruhu': '无计划入户',
+          'nojujian': '无计划拒检',
+          'nodaofang': '无计划到访不遇'
+        }
+        this.groupNameForSql = ``
+      }
+      debugger
+      let tempStr = args.condition
+      let condition1 =tempStr
+      let condition2 =tempStr
+      let condition3 = ' and 1=1 '
+      if (this.f_check_start) {
+        condition1 += ` AND f_plan_year >= ${this.f_check_start.substr(0,4)} `
+        condition1 += ` AND f_plan_month >= ${this.f_check_start.substr(5,2)} `
+      }
+      if (this.f_check_end) {
+        condition1 += ` AND f_plan_year <= ${this.f_check_end.substr(0,4)} `
+        condition1 += ` AND f_plan_month <= ${this.f_check_end.substr(5,2)} `
+      }
+      if(this.f_start_time){
+        condition2 += ` AND f_offsite_time >= '${this.f_start_time} 00:00:00'`
+      }
+      if (this.f_end_time){
+        condition2 += ` AND f_offsite_time <= '${this.f_end_time} 23:59:59'`
+      }
+      if (this.$refs.paged.$refs.cri.model.f_checker_id){
+        condition3 += ` AND f_checker = '${this.$refs.paged.$refs.cri.model.f_checker_id}' `
+        condition2 += ` AND f_checker_name = '${this.$refs.paged.$refs.cri.model.f_checker_id}' `
+      }
+      this.model.f_start_time=this.f_start_time
+      this.model.f_end_time=this.f_end_time
+      this.model.condition1=condition1
+      this.model.condition2=condition2
+      this.model.condition3=condition3
+      this.model.otheritem = this.groupNameForSql
+      this.searchData.condition1=condition1
+      this.searchData.condition2=condition2
+      this.searchData.condition3=condition3
+      this.searchData.otheritem = this.groupNameForSql
+      this.model.search(args.condition, args.model)
+    },
+    getRes(obj){
+      this.model.f_filialeids = this.$login.convertToIn(obj.resids);
+      //tag
+    }
+  },
+  ready() {
+    this.model.id = this.$login.f.id
+    this.model.f_subcompany = this.$login.f.f_fengongsi
+    this.model.f_filialeid = this.$login.f.orgid
+  },
+
+  watch: {
+    'nameForSql' () {
+      var e = document.createEvent("MouseEvents");
+      e.initEvent("click", true, true);
+      document.getElementById("btnaaa").dispatchEvent(e);
+    },
+    'model.condition'(val) {
+      if(val){
+        this.searchData.condition = val
+      }
+    },
+    'model.f_checker'(val) {
+      if(val){
+        this.searchData.f_checker = val
+      }
+    },
+    'f_start_time'(val) {
+      if(val){
+        this.searchData.f_start_time = val
+      }
+    },
+    'f_end_time'(val) {
+      if(val){
+        this.searchData.f_end_time = val
+      }
+    },
+    'checker'() {
+      // //tag
+      //tag
+      this.model.chosenOrg = this.checker[0]
+    },
+    'model.rows.length'() {
+      // 如果查询无结果，将合计置为0
+      if(this.model.rows.length < 1 &&this. model.sums){
+        this.model.sums.yrj = 0
+        this.model.sums.no_plan_num = 0
+        this.model.sums.wrj = 0
+        this.model.sums.ruhu = 0
+        this.model.sums.jujian = 0
+        this.model.sums.daofang = 0
+        this.model.sums.ruhu_total=0
+        this.model.sums.daofang_total=0
+        this.model.sums.jujian_total=0
+        this.model.sums.total_sum=0
+      }
+    }
+  },
+  computed: {
+    selected() {
+      // //tag
+      // this.$parent.showItem=!this.$parent.showItem
+      return this.$refs.paged.$refs.grid.selected
+    }
+  }
+}
+</script>

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

@@ -5,59 +5,26 @@
         <criteria partial='criteria' class="search_area" @condition-changed='$parent.selfSearch' v-ref:criteria>
           <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="model.start_time"
-                  v-model="model.start_time"
-                  condition="tcp.f_upload_date >= '{} 00:00:00'">
-                </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="model.end_time"
-                  v-model="model.end_time"
-                  condition="tcp.f_upload_date <= '{} 23:59:59'">
-                </datepicker>
-              </div>
               <div class="col-sm-4 form-group">
-                <label class="font_normal_body">小区名称：</label>
-                <input style="width: 60%" class="input_search" v-model="model.f_residential_area"
-                       placeholder="请输入小区（可模糊查询）" condition="f_residential_area like '%{}%'">
+                <label class="font_normal_body">用户名称：</label>
+                <input style="width: 60%" class="input_search" v-model="model.f_user_name"
+                       placeholder="请输入用户名称（可模糊查询）" condition="f_user_name like '%{}%'">
               </div>
-              <div class="col-sm-4 form-group" style="margin: 0">
-                <role-selector-safe
-                  role-name="安检员"
-                  :resobjprop.sync="$parent.$parent.resids"
-                  role-lable="安&nbsp;检&nbsp;员&nbsp;"
-                  @re-res="$parent.$parent.getRes"
-                  :value.sync="model.f_checker_id"
-                  v-model="model.f_checker_id"
-                  condition="tcp.f_checker_name = '{}'">
-                </role-selector-safe>
+              <div class="col-sm-4 form-group">
+                <label class="font_normal_body">安检年份：</label>
+                <input style="width: 60%" class="input_search" v-model="model.year">
               </div>
               <div style="float: right">
                 <export-excel-safe :data="$parent.$parent.searchData"
                                    :field="$parent.$parent.excelHeaders"
                                    progress="safeGetExportProgress"
                                    sqlurl="rs/logic/SafeExportExcel" sql-name="communityTypeDetailG"
-                                   template-name='工商隐患类型明细' :choose-col="true"></export-excel-safe>
+                                   template-name='工商情况明细表' :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" :chooserow="true"
-                          :titletable="'工商隐患类型明细'" :starthead="$parent.$parent.getstart"
-              ></print-data-safe>
+<!--              <print-data-safe :sum-field="$parent.$parent.excelHeaders" :model="$parent.$parent.print_model" :field="$parent.$parent.excelHeaders"-->
+<!--                          :defaultfield="$parent.$parent.defaultPrint" :chooserow="true"-->
+<!--                          :titletable="'工商情况明细表'" :starthead="$parent.$parent.getstart"-->
+<!--              ></print-data-safe>-->
               <button class="button_spacing button_search" @click="search()">查询</button>
             </div>
           </div>
@@ -65,56 +32,35 @@
         <data-grid class="list_area table_sy" style="overflow: hidden" :model="model" partial='list' v-ref:grid>
           <template partial='head'>
             <tr>
-              <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 rowspan="2">序号</th>
+              <th rowspan="2">用户名称</th>
+              <th colspan="2">1季度完成情况</th>
+              <th colspan="2">2季度完成情况</th>
+              <th colspan="2">3季度完成情况</th>
+              <th colspan="2">4季度完成情况</th>
+            </tr>
+            <tr>
+              <th>已安检</th>
+              <th>未安检原因</th>
+              <th>已安检</th>
+              <th>未安检原因</th>
+              <th>已安检</th>
+              <th>未安检原因</th>
+              <th>已安检</th>
+              <th>未安检原因</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.ljcount }}</td>
-            <td style="text-align: center">{{ row.jgcount }}</td>
-            <td style="text-align: center">{{ row.rqjcount }}</td>
-            <td style="text-align: center">{{ row.yhhs }}</td>
-            <td style="text-align: center">{{ row.yclyh }}</td>
-            <td style="text-align: center">{{ row.clzyh }}</td>
-            <td style="text-align: center">{{ row.wcl }}</td>
-          </template>
-          <template partial="foot">
-            <td style="text-align: center" colspan="2"><span><b>合计：</b></span></td>
-            <td style="text-align: center">{{ model.sums.yhhs }}</td>
-            <td style="text-align: center">{{ model.sums.ljcount }}</td>
-            <td style="text-align: center">{{ model.sums.jgcount }}</td>
-            <td style="text-align: center">{{ model.sums.rqjcount }}</td>
-            <td style="text-align: center">{{ model.sums.yclyh }}</td>
-            <td style="text-align: center">{{ model.sums.clzyh }}</td>
-            <td style="text-align: center">{{ model.sums.wcl }}</td>
+            <td style="text-align: center">{{ row.f_user_name }}</td>
+            <td style="text-align: center">{{ row.m1_safe }}</td>
+            <td style="text-align: center">{{ row.m1_remarks }}</td>
+            <td style="text-align: center">{{ row.m2_safe }}</td>
+            <td style="text-align: center">{{ row.m2_remarks }}</td>
+            <td style="text-align: center">{{ row.m3_safe }}</td>
+            <td style="text-align: center">{{ row.m3_remarks }}</td>
+            <td style="text-align: center">{{ row.m4_safe }}</td>
+            <td style="text-align: center">{{ row.m4_remarks }}</td>
           </template>
         </data-grid>
       </criteria-paged>
@@ -127,58 +73,42 @@ import {PagedList} from "vue-client";
 
 export default {
   name: "communityTypeDetailG",
-  title: "工商隐患类型明细",
+  title: "工商情况明细表",
   data() {
+    let model = new PagedList("/rs/sql/communityTypeDetailG", 20, {year: 'this.year'})
+    model.year = ''
     return {
-      model: new PagedList("/rs/sql/communityTypeDetailG", 999, {orgid: this.$login.f.orgid}, {
-        yhhs: '',
-        yclyh: '',
-        clzyh: '',
-        rqjcount: '',
-        ljcount: '',
-        wcl:'',
-        jgcount: ''
-      }),
+      model: model,
       resids: {},
       print_model:{},
       searchData: {
         condition: "1=1",
-        orgid: this.$login.f.orgid
+        year: null
       },
       excelHeaders: {
-        'f_residential_area': '小区名称',
-        'ljcount': '隐患类型-漏气',
-        'jgcount': '隐患类型-胶管',
-        'rqjcount': '隐患类型-燃气具老化',
-        'yhhs': '存在隐患户数',
-        'yclyh': '已处理户数',
-        'clzyh': '处理中户数',
-        'wcl' : '未处理户数'
+        'f_user_name': '用户名称',
+        'm1_safe': '1季度完成安检',
+        'm1_remarks': '1季度未安检原因',
+        'm2_safe': '2季度完成安检',
+        'm2_remarks': '2季度未安检原因',
+        'm3_safe': '3季度完成安检',
+        'm3_remarks': '3季度未安检原因',
+        'm4_safe' : '4季度完成安检',
+        'm4_remarks' : '4季度未安检原因'
       },
       printshow: false,
-      defaultPrint:['f_residential_area', 'ljcount','jgcount','rqjcount','yhhs', 'yclyh', 'clzyh','wcl'],
-      sumsmodel: {},
     }
   },
   ready() {
+    this.$refs.paged.$refs.criteria.model.year = new Date().getFullYear()
     // this.model.search('1=1')
   },
   methods: {
-    async selfSearch(args) {
-      await this.model.search(args.condition, args.model, args.condValue)
+    selfSearch(args) {
+      this.model.year = args.model.year
+      args.condition += ` and uf.f_user_type = '非民用' `
       this.searchData.condition = args.condition
-      this.print_model = JSON.parse(JSON.stringify(this.$refs.paged.$refs.grid.model))
-      this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
-      this.print_model.rows.push({
-        f_residential_area: '合计',
-        ljcount : this.sumsmodel.ljcount,
-        jgcount : this.sumsmodel.jgcount,
-        rqjcount : this.sumsmodel.rqjcount,
-        yhhs: this.sumsmodel.yhhs,
-        yclyh: this.sumsmodel.yclyh,
-        clzyh: this.sumsmodel.clzyh,
-        wcl: this.sumsmodel.wcl,
-      })
+      this.model.search(args.condition, args.model, args.condValue)
       this.print_model.totalPage = 0
     },
     getRes(obj) {