safecheck-client 3.0.30-6 → 3.0.30-60

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

@@ -52,13 +52,12 @@
                                    :field="$parent.$parent.excelHeaders"
                                    progress="safeGetExportProgress"
                                    sqlurl="rs/logic/SafeExportExcel" sql-name="communityTypeDetailM"
-                                   template-name='工商隐患类型明细' :choose-col="true"></export-excel-safe>
+                                   template-name='居民隐患类型明细' :choose-col="true"></export-excel-safe>
               </div>
-              <print-data :sum-field="$parent.$parent.excelHeaders" :model="$parent.$parent.model"
-                          :field="$parent.$parent.excelHeaders"
-                          :defaultfield="$parent.$parent.defaultPrint"
-                          titletable="工商隐患类型明细" :starthead="$parent.$parent.getstart"
-                          :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+              <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>
@@ -105,7 +104,7 @@
             <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.yhhs - row.yclyh }}</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>
@@ -115,7 +114,7 @@
             <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.yhhs - model.sums.yclyh }}</td>
+            <td style="text-align: center">{{ model.sums.wcl }}</td>
           </template>
         </data-grid>
       </criteria-paged>
@@ -128,7 +127,7 @@ import {PagedList} from "vue-client";
 
 export default {
   name: "communityTypeDetailM",
-  title: "工商隐患类型明细",
+  title: "居民隐患类型明细",
   data() {
     return {
       model: new PagedList("/rs/sql/communityTypeDetailM", 999, {orgid: this.$login.f.orgid}, {
@@ -137,9 +136,11 @@ export default {
         clzyh: '',
         rqjcount: '',
         ljcount: '',
+        wcl:'',
         jgcount: ''
       }),
       resids: {},
+      print_model:{},
       searchData: {
         condition: "1=1",
         orgid: this.$login.f.orgid
@@ -152,20 +153,33 @@ export default {
         'yhhs': '存在隐患户数',
         'yclyh': '已处理户数',
         'clzyh': '处理中户数',
+        'wcl' : '未处理户数'
       },
       printshow: false,
-      defaultPrint: ['f_residential_area', 'ljcount','jgcount','rqjcount','yhhs', 'yclyh', 'clzyh'],
+      defaultPrint: ['f_residential_area', 'ljcount','jgcount','rqjcount','yhhs', 'yclyh', 'clzyh','wcl'],
       sumsmodel: {},
     }
   },
   ready() {
-    this.model.search('1=1')
+    // this.model.search('1=1')
   },
   methods: {
-    selfSearch(args) {
-      this.model.search(args.condition, args.model, args.condValue)
+    async selfSearch(args) {
+      await this.model.search(args.condition, args.model, args.condValue)
       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.print_model.totalPage = 0
     },
     getRes(obj) {
       //tag

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

@@ -15,7 +15,7 @@
                   :show-rest-button="reset"
                   :value.sync="model.start_time"
                   v-model="model.start_time"
-                  condition="tcp.f_upload_date >= '{} 00:00:00'">
+                  condition="tcp.f_create_time >= '{} 00:00:00'">
                 </datepicker>
               </div>
               <div class="form-group col-sm-4">
@@ -28,13 +28,22 @@
                   :show-rest-button="reset"
                   :value.sync="model.end_time"
                   v-model="model.end_time"
-                  condition="tcp.f_upload_date <= '{} 23:59:59'">
+                  condition="tcp.f_create_time <= '{} 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 '%{}%'">
+                       placeholder="请输入小区（可模糊查询）" condition="tcpi.f_residential_area like '%{}%'">
+              </div>
+              <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="col-sm-4 form-group" style="margin: 0">
                 <role-selector-safe
@@ -54,11 +63,11 @@
                                    sqlurl="rs/logic/SafeExportExcel" sql-name="safeDetail" template-name='安检情况明细'
                                    :choose-col="true"></export-excel-safe>
               </div>
-              <print-data :sum-field="$parent.$parent.excelHeaders" :model="$parent.$parent.model"
+              <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"
-                          :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+                          ></print-data-safe>
               <button class="button_spacing button_search" @click="search()">查询</button>
             </div>
           </div>
@@ -110,14 +119,14 @@
             <td style="text-align: center">{{ row.f_residential_area }}</td>
             <td style="text-align: center">{{ row.totalcount }}</td>
             <td style="text-align: center">{{ row.wjcount }}</td>
-            <td style="text-align: center">{{ row.rhcount + row.dfbycount3 }}</td>
+            <td style="text-align: center">{{ row.yjcount }}</td>
             <td style="text-align: center">{{ row.rhcount }}</td>
             <td style="text-align: center">{{ row.dfbycount1 }}</td>
             <td style="text-align: center">{{ row.dfbycount2 }}</td>
             <td style="text-align: center">{{ row.dfbycount3 }}</td>
             <td style="text-align: center">{{ row.unique_dfby_count }}</td>
             <td style="text-align: center">{{ row.jjcount }}</td>
-            <td style="text-align: center">{{ ((row.rhcount + row.dfbycount3) / row.totalcount).toFixed(2) }}%</td>
+            <td style="text-align: center">{{ row.check_bv }}</td>
           </template>
           <template partial="foot">
             <td style="text-align: center" colspan="2"><span><b>合计：</b></span></td>
@@ -125,7 +134,7 @@
 
             <td style="text-align: center">{{ model.sums.wjcount }}</td>
 
-            <td style="text-align: center">{{ model.sums.rhcount + model.sums.dfbycount3 }}</td>
+            <td style="text-align: center">{{ model.sums.yjcount }}</td>
 
             <td style="text-align: center">{{ model.sums.rhcount }}</td>
 
@@ -135,7 +144,7 @@
             <td style="text-align: center">{{ model.sums.unique_dfby_count }}</td>
             <td style="text-align: center">{{ model.sums.jjcount }}</td>
             <td style="text-align: center">
-              {{ ((model.sums.rhcount + model.sums.dfbycount3) / model.sums.totalcount).toFixed(2) }}%
+              {{ ((model.sums.yjcount / model.sums.totalcount)*100.0).toFixed(2) }}%
             </td>
 
           </template>
@@ -157,6 +166,7 @@ export default {
       model: new PagedList("/rs/sql/safeDetail", 999, {orgid: this.$login.f.orgid}, {
         totalcount: '',
         wjcount: '',
+        yjcount: '',
         rhcount: '',
         dfbycount1: '',
         dfbycount2: '',
@@ -169,30 +179,48 @@ export default {
         condition: "1=1",
         orgid: this.$login.f.orgid
       },
+      print_model:{},
+      user_types: [{label:'全部',value:''},{label:'民用',value:'民用'},{label:'非民用',value:'非民用'}],
       excelHeaders: {
         'f_residential_area': '小区名称',
         'totalcount': '计划安检总户数',
         'wjcount': '未检户数',
+        'yjcount': '已检户数',
         'rhcount': '入户户数',
         'dfbycount1': '到访不遇-1次',
         'dfbycount2': '到访不遇-2次',
         'dfbycount3': '到访不遇-3次',
         'unique_dfby_count': '到访不遇小计',
         'jjcount': '拒检户数',
+        'check_bv':'安检率'
       },
       printshow: false,
-      defaultPrint: ['f_residential_area', 'totalcount', 'wjcount', 'rhcount','dfbycount1','dfbycount2','dfbycount3','unique_dfby_count','jjcount'],
+      defaultPrint: ['f_residential_area', 'totalcount', 'wjcount', 'rhcount','dfbycount1','dfbycount2','dfbycount3','unique_dfby_count','jjcount','check_bv'],
       sumsmodel: {},
     }
   },
   ready() {
-    this.model.search('1=1')
+    // this.model.search('1=1')
   },
   methods: {
-    selfSearch(args) {
-      this.model.search(args.condition, args.model, args.condValue)
+    async selfSearch(args) {
+      await this.model.search(args.condition, args.model, args.condValue)
       this.searchData.condition = args.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({
+        f_residential_area:'合计',
+        totalcount: this.sumsmodel.totalcount,
+        wjcount: this.sumsmodel.wjcount,
+        yjcount: this.sumsmodel.yjcount,
+        rhcount: this.sumsmodel.rhcount,
+        dfbycount1: this.sumsmodel.dfbycount1,
+        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)}%`
+      })
+      this.print_model.totalPage = 0
     },
     getRes(obj) {
       //tag

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

@@ -38,6 +38,15 @@
                           :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"
@@ -45,13 +54,13 @@
             </div>
             <div class="col-sm-4 form-group" style="margin-top: 8px">
               <button class="button_search button_spacing" @click="search()">查询</button>
-              <report-print class="button_export button_spacing" style="width:28%" id='shexian'></report-print>
-              <report-excel class="button_export button_spacing" style="width:28%" id='shexian'></report-excel>
+              <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>
       </criteria>
-      <div partial='list' id='shexian' class="list_area" style="overflow-y: scroll">
+      <div partial='list' id='checkerPrint' class="list_area" style="overflow-y: scroll">
         <table class='tableprint' style="margin: 0px auto">
           <thead>
           <tr>
@@ -87,6 +96,7 @@
       let model = new DataModel('rs/report/checkerReport', {})
       // model.f_filialeid = '(' + this.$login.f.orgid + ')'
       return {
+        user_types: [{label:'全部',value:''},{label:'民用',value:'民用'},{label:'非民用',value:'非民用'}],
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
         model: model

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

@@ -16,7 +16,7 @@
                   :show-rest-button="reset"
                   :value.sync="model.start_time"
                   v-model="model.start_time"
-                  condition="tcp.f_upload_date >= '{}-01 00:00:00'">
+                  condition="tcpi.f_last_check_date >= '{}-01 00:00:00'">
                 </datepicker>
               </div>
               <div class="form-group col-sm-4">
@@ -30,13 +30,22 @@
                   :show-rest-button="reset"
                   :value.sync="model.end_time"
                   v-model="model.end_time"
-                  condition="tcp.f_upload_date <= '{}-31 23:59:59'">
+                  condition="tcpi.f_last_check_date <= '{}-31 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 '%{}%'">
+                       placeholder="请输入小区（可模糊查询）" condition="tcpi.f_residential_area like '%{}%'">
+              </div>
+              <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="col-sm-4 form-group" style="margin: 0">
                 <role-selector-safe
@@ -46,7 +55,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">
@@ -56,11 +65,11 @@
                                    sqlurl="rs/logic/SafeExportExcel" sql-name="safeStatisticsDay" template-name='安检报表日'
                                    :choose-col="true"></export-excel-safe>
               </div>
-              <print-data :sum-field="$parent.$parent.excelHeaders" :model="$parent.$parent.model"
+              <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"
-                          :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+                          ></print-data-safe>
               <button class="button_spacing button_search" @click="search()">查询</button>
             </div>
           </div>
@@ -167,6 +176,9 @@
               <th>
                 <nobr>31日</nobr>
               </th>
+              <th>
+                <nobr>小计</nobr>
+              </th>
             </tr>
           </template>
           <template partial='body'>
@@ -204,7 +216,7 @@
             <td style="text-align: center">{{ row.day29 }}</td>
             <td style="text-align: center">{{ row.day30 }}</td>
             <td style="text-align: center">{{ row.day31 }}</td>
-
+            <td style="text-align: center">{{ row.countarea }}</td>
           </template>
           <template partial="foot">
             <td style="text-align: center" colspan="2"><span><b>合计：</b></span></td>
@@ -239,6 +251,7 @@
             <td style="text-align: center">{{ model.sums.day29 }}</td>
             <td style="text-align: center">{{ model.sums.day30 }}</td>
             <td style="text-align: center">{{ model.sums.day31 }}</td>
+            <td style="text-align: center">{{ model.sums.countarea }}</td>
           </template>
         </data-grid>
       </criteria-paged>
@@ -285,13 +298,15 @@ export default {
         day28: '',
         day29: '',
         day30: '',
-        day31: ''
+        day31: '',
+        countarea:''
       }),
       resids: {},
       searchData: {
         condition: "1=1",
         orgid: this.$login.f.orgid
       },
+      print_model:{},
       excelHeaders: {
         'f_residential_area': '小区名称',
         'day1': '1日',
@@ -324,8 +339,10 @@ export default {
         'day28': '28日',
         'day29': '29日',
         'day30': '30日',
-        'day31': '31日'
+        'day31': '31日',
+        'countarea':'小计'
       },
+      user_types: [{label:'全部',value:''},{label:'民用',value:'民用'},{label:'非民用',value:'非民用'}],
       printshow: false,
       defaultPrint: ['f_residential_area', 'day1',
         'day2',
@@ -357,18 +374,60 @@ export default {
         'day28',
         'day29',
         'day30',
-        'day31'],
+        'day31','countarea'],
       sumsmodel: {},
     }
   },
   ready() {
-    this.model.search('1=1')
+    let a = new Date()
+    let year = a.getFullYear()
+    let month = '0'+(a.getMonth()+1)
+    this.$refs.paged.$refs.criteria.model.start_time = year + '-'+ (month.substring(month.length-2))
+    this.$refs.paged.$refs.criteria.model.end_time = year + '-'+ (month.substring(month.length-2))
   },
   methods: {
-    selfSearch(args) {
-      this.model.search(args.condition, args.model, args.condValue)
+    async selfSearch(args) {
+      await this.model.search(args.condition, args.model, args.condValue)
       this.searchData.condition = args.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({
+        'f_residential_area': '合计',
+        'day1': this.sumsmodel.day1,
+        'day2': this.sumsmodel.day2,
+        'day3': this.sumsmodel.day3,
+        'day4': this.sumsmodel.day4,
+        'day5': this.sumsmodel.day5,
+        'day6': this.sumsmodel.day6,
+        'day7': this.sumsmodel.day7,
+        'day8': this.sumsmodel.day8,
+        'day9': this.sumsmodel.day9,
+        'day10': this.sumsmodel.day10,
+        'day11': this.sumsmodel.day11,
+        'day12': this.sumsmodel.day12,
+        'day13': this.sumsmodel.day13,
+        'day14': this.sumsmodel.day14,
+        'day15': this.sumsmodel.day15,
+        'day16': this.sumsmodel.day16,
+        'day17': this.sumsmodel.day17,
+        'day18': this.sumsmodel.day18,
+        'day19': this.sumsmodel.day19,
+        'day20': this.sumsmodel.day20,
+        'day21': this.sumsmodel.day21,
+        'day22': this.sumsmodel.day22,
+        'day23': this.sumsmodel.day23,
+        'day24': this.sumsmodel.day24,
+        'day25': this.sumsmodel.day25,
+        'day26': this.sumsmodel.day26,
+        'day27': this.sumsmodel.day27,
+        'day28': this.sumsmodel.day28,
+        'day29': this.sumsmodel.day29,
+        'day30': this.sumsmodel.day30,
+        'day31': this.sumsmodel.day31,
+        'countarea':this.sumsmodel.countarea
+
+      })
+      this.print_model.totalPage = 0
     },
     getRes(obj) {
       //tag

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

@@ -16,7 +16,7 @@
                   :show-rest-button="reset"
                   :value.sync="model.start_time"
                   v-model="model.start_time"
-                  condition="tcp.f_upload_date >= '{}-01-01 00:00:00'">
+                  condition="tcpi.f_last_check_date >= '{}-01-01 00:00:00'">
                 </datepicker>
               </div>
               <div class="form-group col-sm-4">
@@ -30,13 +30,22 @@
                   :show-rest-button="reset"
                   :value.sync="model.end_time"
                   v-model="model.end_time"
-                  condition="tcp.f_upload_date <= '{}-12-31 23:59:59'">
+                  condition="tcpi.f_last_check_date <= '{}-12-31 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 '%{}%'">
+                  <input style="width: 60%" class="input_search" v-model="model.f_residential_area" placeholder="请输入小区（可模糊查询）" condition="tcpi.f_residential_area like '%{}%'">
             </div>
+              <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="col-sm-4 form-group" style="margin: 0">
               <role-selector-safe
                 role-name="安检员"
@@ -45,7 +54,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">
@@ -54,11 +63,11 @@
                                       progress="safeGetExportProgress"
                                       sqlurl="rs/logic/SafeExportExcel" sql-name="safeStatisticsMonth" template-name='安检报表月' :choose-col="true"></export-excel-safe>
               </div>
-                            <print-data :sum-field="$parent.$parent.excelHeaders" :model="$parent.$parent.model"
+                            <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"
-                          :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+                          ></print-data-safe>
               <button class="button_spacing button_search" @click="search()">查询</button>
             </div>
           </div>
@@ -108,6 +117,9 @@
               <th>
                 <nobr>12月</nobr>
               </th>
+              <th>
+                <nobr>小计</nobr>
+              </th>
             </tr>
           </template>
           <template partial='body'>
@@ -126,6 +138,7 @@
             <td style="text-align: center">{{ row.month10 }}</td>
             <td style="text-align: center">{{ row.month11 }}</td>
             <td style="text-align: center">{{ row.month12 }}</td>
+            <td style="text-align: center">{{ row.countarea }}</td>
           </template>
           <template partial="foot">
             <td style="text-align: center" colspan="2"><span><b>合计：</b></span></td>
@@ -141,6 +154,7 @@
             <td style="text-align: center">{{ model.sums.month10 }}</td>
             <td style="text-align: center">{{ model.sums.month11 }}</td>
             <td style="text-align: center">{{ model.sums.month12 }}</td>
+            <td style="text-align: center">{{ model.sums.countarea }}</td>
           </template>
         </data-grid>
       </criteria-paged>
@@ -169,13 +183,16 @@ export default {
         month9: '',
         month10: '',
         month11: '',
-        month12: ''
+        month12: '',
+        countarea: ''
       }),
             resids:{},
       searchData:{
         condition: "1=1",
         orgid: this.$login.f.orgid
       },
+      print_model:{},
+      user_types: [{label:'全部',value:''},{label:'民用',value:'民用'},{label:'非民用',value:'非民用'}],
       excelHeaders:{
         'f_residential_area': '小区名称',
         'month1': '1月',
@@ -190,20 +207,39 @@ export default {
         'month10': '10月',
         'month11': '11月',
         'month12': '12月',
+        'countarea':'小计'
       },
       printshow: false,
-      defaultPrint: ['f_residential_area', 'month1', 'month2', 'month3', 'month4', 'month5', 'month6', 'month7', 'month8', 'month9', 'month10', 'month11', 'month12',],
+      defaultPrint: ['f_residential_area', 'month1', 'month2', 'month3', 'month4', 'month5', 'month6', 'month7', 'month8', 'month9', 'month10', 'month11', 'month12','countarea'],
       sumsmodel: {},
     }
   },
   ready() {
-    this.model.search('1=1')
+    // this.model.search('1=1')
   },
   methods: {
-    selfSearch(args) {
-      this.model.search(args.condition, args.model, args.condValue)
+    async selfSearch(args) {
+      await this.model.search(args.condition, args.model, args.condValue)
       this.searchData.condition = args.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({
+        'f_residential_area': '合计',
+        'month1': this.sumsmodel.month1,
+        'month2': this.sumsmodel.month2,
+        'month3': this.sumsmodel.month3,
+        'month4': this.sumsmodel.month4,
+        'month5': this.sumsmodel.month5,
+        'month6': this.sumsmodel.month6,
+        'month7': this.sumsmodel.month7,
+        'month8': this.sumsmodel.month8,
+        'month9': this.sumsmodel.month9,
+        'month10': this.sumsmodel.month10,
+        'month11': this.sumsmodel.month11,
+        'month12': this.sumsmodel.month12,
+        'countarea':this.sumsmodel.countarea
+      })
+      this.print_model.totalPage = 0
     },
     getRes(obj) {
       //tag

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

@@ -35,15 +35,24 @@
               <input type="text" class="input_search" v-model="model.f_residential_area"
                      style="width: 60%" placeholder="小区" condition="f_residential_area like '%{}%'">
             </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="col-sm-4 form-group" style="margin-top: 8px">
               <button class="button_search button_spacing" @click="search()">查询</button>
-              <report-print class="button_export button_spacing" style="width:28%" id='shexian'></report-print>
-              <report-excel class="button_export button_spacing" style="width:28%" id='shexian'></report-excel>
+              <report-print id='yearPrint' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+              <report-excel id='yearPrint'></report-excel>
             </div>
           </div>
         </div>
       </criteria>
-      <div partial='list' id='shexian' class="list_area" style="overflow-y: scroll">
+      <div partial='list' id='yearPrint' class="list_area" style="overflow-y: scroll">
         <table class='tableprint' style="margin: 0px auto">
           <thead>
           <tr>
@@ -79,6 +88,7 @@
       let model = new DataModel('rs/report/safeStatisticsYear', {})
       // model.f_filialeid = '(' + this.$login.f.orgid + ')'
       return {
+        user_types: [{label:'全部',value:''},{label:'民用',value:'民用'},{label:'非民用',value:'非民用'}],
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
         model: model