safecheck-client 3.0.30-3 → 3.0.30-34

package/src/filiale/yangchunboneng/android/PaperFeedback.vue

@@ -132,6 +132,7 @@
     </div>
     <div class="row">
       <label for="readsafe" class="text-left font">蓝牙状态:{{blueState}}</label>
+      <button type="button" @click="initBlueState()">重新连接</button>
     </div>
     <div class="form-group col-md-12 col-sm-12 col-xs-12" :class="style__">
       <div class="form-group col-md-12 col-sm-12 col-xs-12">
@@ -608,6 +609,25 @@
       Radio
     },
     methods: {
+      initBlueState(){
+        let state = HostApp.getBluetoothState()
+        if (state && state.state == 3){
+          this.blueState = '连接完成'
+        }else {
+          if (state && state.state == -1){
+            this.$showMessage('蓝牙连接未打开，打开后重新尝试')
+            return
+          }
+          this.blueState = '连接失败，请重试'
+          this.$androidUtil.print(JSON.stringify([{ type: 4, value: 2, unit: 'line' }]))
+          let state2 = HostApp.getBluetoothState()
+          if (state2 && state2.state == 3){
+            this.blueState = '连接完成'
+          }else {
+            this.blueState = '连接失败，请重试'
+          }
+        }
+      },
       timeSet(val) {
         //////tag
         if (!val) {

package/src/filiale/yangchunboneng/pc/DefectPaperNew.vue

@@ -10,7 +10,7 @@
               <input style="width: 60%" type="text" class="input_search" v-model="model.f_userinfo"
                      id="f_userinfo"
                      placeholder="编号 名称 电话 地址"
-                     condition="(f_userinfo_code like '%{}%' or f_user_name like '%{}%' or f_user_phone like '%{}%' or f_address like '%{}%')">
+                     condition="(f_userinfo_code like '%{}%' or f_user_name like '%{}%' or f_user_phone like '%{}%' or f_address like '%{}%' or f_zuhu_phone like '%${}%' or f_rent_phone like '%${}%')">
             </div>
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">安检计划</label>

package/src/filiale/yangchunboneng/pc/PaperDefectMain.vue

@@ -9,7 +9,7 @@
                 <label class="font_normal_body">模糊查询</label>
                 <input type="text" class="input_search" v-model="model.f_userinfo"
                        style="width: 60%" placeholder="编号 名称 电话 地址"
-                       condition="(f_userinfo_code like '%{}%' or f_user_name like '%{}%' or f_user_phone like '%{}%' or f_address like '%{}%')">
+                       condition="(f_userinfo_code like '%{}%' or f_user_name like '%{}%' or f_user_phone like '%{}%' or f_address like '%{}%' or f_zuhu_phone like '%${}%' or f_rent_phone like '%${}%')">
               </div>
               <div class="form-group col-sm-2"  >
                 <label class="font_normal_body">客户编号</label>
@@ -24,7 +24,7 @@
               <div class="form-group col-sm-2"  >
                 <label class="font_normal_body">客户电话</label>
                 <input type="text" class="input_search" v-model="model.f_user_phone"
-                       style="width: 60%" placeholder="客户电话" condition="f_user_phone like '%{}%'">
+                       style="width: 60%" placeholder="客户电话" condition=" ( f_user_phone like '%{}%' or f_zuhu_phone like '%${}%' or f_rent_phone like '%${}%' )">
               </div>
               <div class="form-group col-sm-4" style="display: flex; gap: 15px">
                 <export-excel-safe :data="$parent.$parent.searchData"

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

@@ -9,7 +9,7 @@
                 <label class="font_normal_body">模糊查询</label>
                 <input type="text" class="input_search" v-model="model.f_userinfo"
                        style="width: 60%" placeholder="编号 名称 电话 表号 地址"
-                       condition="(f_userinfo_code like '%{}%' or f_user_name like '%{}%' or f_user_phone like '%{}%' or f_meternumber like '%{}%' or f_address like '%{}%')">
+                       condition="(f_userinfo_code like '%{}%' or f_user_name like '%{}%' or f_user_phone like '%{}%' or f_meternumber like '%{}%' or f_address like '%{}%' or f_zuhu_phone like '%${}%' or f_rent_phone like '%${}%')">
               </div>
               <div class="form-group col-sm-2"  >
                 <label class="font_normal_body">客户编号</label>
@@ -24,7 +24,7 @@
               <div class="form-group col-sm-2"  >
                 <label class="font_normal_body">客户电话</label>
                 <input type="text" class="input_search" v-model="model.f_user_phone"
-                       style="width: 60%" placeholder="客户电话" condition="f_user_phone like '%{}%'">
+                       style="width: 60%" placeholder="客户电话" condition=" ( f_user_phone like '%{}%' or f_zuhu_phone like '%${}%' or f_rent_phone like '%${}%' )">
               </div>
               <div class="form-group col-sm-2"  >
                 <label class="font_normal_body">客户表号</label>

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

@@ -0,0 +1,230 @@
+<template>
+  <div class="flex">
+    <section>
+      <div class="basic-main row" style="height: 100%">
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+              <div class="row">
+                <div class="col-sm-3 form-group form-input-group" style="width: 30%;">
+                  <role-selector-safe
+                    role-name="安检员"
+                    role-lable="安&nbsp;检&nbsp;员&nbsp;"
+                    @re-res="$parent.$parent.getRes"
+                    :value.sync="model.f_checker_id"
+                    v-model="model.f_checker_id"
+                    condition="f_checker_name = '{}'">
+                  </role-selector-safe>
+                </div>
+                <div class="col-sm-3 form-group form-input-group" style="width: 20%;">
+                  <label for="startDate" class="font_normal_body">起始时间</label>
+                  <datepicker
+                    class="select_list select"
+                    :value.sync="model.startDate"
+                    id="startDate"
+                    placeholder='开始时间' style="width: 60%"
+                    :disabled-days-of-week="[]"
+                    :format="'yyyy-MM-dd 00:00:00'"
+                    :show-rest-button="reset"
+                    v-model="model.startDate"
+                    condition="f_upload_date > ='{} '">
+                  </datepicker>
+                </div>
+                <div class="col-sm-3 form-group form-input-group" style="width: 20%;">
+                  <label for="endDate" class="font_normal_body">结束时间</label>
+                  <datepicker
+                    class="select_list select"
+                    :value.sync="model.endDate"
+                    id="endDate"
+                    placeholder='结束日期' style="width: 60%"
+                    :disabled-days-of-week="[]"
+                    :format="'yyyy-MM-dd 23:59:59'"
+                    :show-rest-button="reset"
+                    v-model="model.endDate"
+                    condition="f_upload_date <='{} '">
+                  </datepicker>
+                </div>
+                <div class="form-group col-sm-3 form-input-group" style="width: 20%;">
+                  <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="f_check_type = '{}'"></v-select>
+                </div>
+                <div class="col-sm-3 form-group form-input-group" style="width: 20%;float: right;">
+<!--                  <report-print class="button_export button_spacing" style="width:28%" id='tongchuan'></report-print>-->
+                  <export-excel-safe :data="$parent.$parent.searchData"
+                                     :field="$parent.$parent.excelHeaders"
+                                     sqlurl="rs/logic/SafeExportExcel"
+                                     sql-name="SafecheckSummary"
+                                     :template-name="$parent.$parent.excelTitle">
+                  </export-excel-safe>
+                  <button type="button" name="button" class="button_search" style="margin-left: 9px" @click="search">查询</button>
+                </div>
+              </div>
+            </div>
+          </criteria>
+          <data-grid :model="model" partial='list' class="list_area table_sy" id="tongchuan" 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>
+              </tr>
+            </template>
+            <template partial='body'>
+              <tr>
+<!--                <td style="text-align:center">{{$index + 1}}</td>-->
+<!--                <td style="text-align:center">-->
+<!--                  <nobr>{{ row.yuefeng }}</nobr>-->
+<!--                </td>-->
+                <td style="text-align:center">
+                  <nobr>{{ row.f_checker_name }}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{ row.yijian }}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{ row.ruhu }}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{ row.daofang }}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{ row.jujian }}</nobr>
+                </td>
+<!--                <td style="text-align:center">-->
+<!--                  <nobr>{{ row.yinhuan }}</nobr>-->
+<!--                </td>-->
+                <td style="text-align:center">
+                  <nobr>{{ row.ruhu_bv }}</nobr>
+                </td>
+              </tr>
+            </template>
+            <template partial="foot">
+              <td style="text-align: center"><span><b>合计：</b></span></td>
+<!--              <td style="text-align: center"><span><b> </b></span></td>-->
+<!--              <td style="text-align: center"><span><b> </b></span></td>-->
+              <td style="text-align: center">{{model.sums.yijian}}</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.yinhuan}}</td>-->
+              <td style="text-align: center">{{ (model.sums.ruhu && model.sums.yijian) ? (model.sums.ruhu / model.sums.yijian * 100.0).toFixed(2) : 0.00}}%</td>
+            </template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </section>
+  </div>
+</template>
+<script>
+import {PagedList, HttpResetClass} from 'vue-client'
+import * as Util from '../../Util'
+
+export default {
+  title: '无计划安检汇总',
+  data () {
+    let model = new PagedList('rs/sql/SafecheckSummary', 20, {
+      f_filiale_id: 'this.f_filiale_id'
+    },{yijian:'',ruhu:'',daofang:'',jujian:'',yinhuan:''})
+    model.f_filiale_id = `('${this.$login.f.orgid}')`
+    return {
+      user_types: [{label:'全部',value:''},{label:'民用',value:'民用'},{label:'非民用',value:'非民用'}],
+      f_filiale_id: `('${this.$login.f.orgid}')`, // 分公司id
+      model: model,
+      source: 'tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))', //获取公司参数
+      userid: this.$login.f.id,
+      orgname: '',
+      // checker:{},
+      searchData: {
+        condition: '',
+        f_filiale_id: ''
+      },
+      excelHeaders: {
+        'yuefeng': '安检月份',
+        'f_checker_name': '安检员',
+        'yijian': '已检',
+        'ruhu': '入户',
+        'daofang': '到访不遇',
+        'jujian': '拒检',
+        'ruhu_bv': '入户率'
+      }
+    }
+  },
+  methods: {
+    getRes (obj) {
+      this.f_filiale_id = this.$login.convertToIn(obj.resids)
+      this.orgname = obj.res[0]
+      this.$set('orgname', obj.res[0])
+      console.log(
+        `%c 无计划安检汇总公司名 %c 呼叫模块 %c`,
+        'background:#35495e ; padding: 1px; border-radius: 3px 0 0 3px;  color: #fff',
+        'background:#41b883 ; padding: 1px; border-radius: 0 3px 3px 0;  color: #fff',
+        'background:transparent',
+        this.orgname
+      )
+    },
+    selfSearch (args) {
+      if (!this.f_filiale_id) {
+        return this.$showMessage("请选择公司进行查询！！！")
+      }
+      this.model.f_filiale_id = this.f_filiale_id // 只有选择了下面的条件才会变化
+      this.searchData.f_filiale_id = this.f_filiale_id //导出
+      this.searchData.condition=args.condition //导出
+      this.model.search(args.condition, args.model)
+    }
+  },
+  computed: {
+    excelTitle() {
+      return `${this.orgname }无计划安检汇总`
+    },
+  },
+  watch: {
+  },
+  ready () {
+    this.orgname = this.$login.f.orgs
+    //tag)
+    //tag
+    this.$refs.paged.$refs.cri.model.startDate=Util.toStartDateString() +' 00:00:00'
+    this.$refs.paged.$refs.cri.model.endDate=Util.toEndDateString() +' 23:59:59'
+
+  }
+
+}
+</script>
+
+<style lang="less" >
+.tableinfo {
+  text-align: center;
+  background-color: #00A3F0;
+  color: #0c2e4d;
+  font-size: 26px;
+}
+</style>

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

@@ -36,6 +36,15 @@
                 <input style="width: 60%" class="input_search" v-model="model.f_residential_area"
                        placeholder="请输入小区（可模糊查询）" condition="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="tcp.f_check_type = '{}'"></v-select>
+              </div>
               <div class="col-sm-4 form-group" style="margin: 0">
                 <role-selector-safe
                   role-name="安检员"
@@ -92,14 +101,14 @@
             <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>
             <td style="text-align: center">{{ model.sums.yhhs }}</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>
@@ -118,21 +127,24 @@ export default {
       model: new PagedList("/rs/sql/communityDetail", 999, {orgid: this.$login.f.orgid}, {
         yhhs: '',
         yclyh: '',
-        clzyh: ''
+        clzyh: '',
+        wcl:''
       }),
       resids: {},
       searchData: {
         condition: "1=1",
         orgid: this.$login.f.orgid
       },
+      user_types: [{label:'全部',value:''},{label:'民用',value:'民用'},{label:'非民用',value:'非民用'}],
       excelHeaders: {
         'f_residential_area': '小区名称',
         'yhhs': '存在隐患户数',
+        'wcl': '未处理户数',
         'yclyh': '已处理户数',
         'clzyh': '处理中户数',
       },
       printshow: false,
-      defaultPrint: ['f_residential_area','yhhs','yclyh','clzyh'],
+      defaultPrint: ['f_residential_area','yhhs','yclyh','clzyh','wcl'],
       sumsmodel: {},
     };
   },

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

@@ -52,12 +52,12 @@
                                    :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 :sum-field="$parent.$parent.excelHeaders" :model="$parent.$parent.model"
                           :field="$parent.$parent.excelHeaders"
                           :defaultfield="$parent.$parent.defaultPrint"
-                          titletable="居民隐患类型明细" :starthead="$parent.$parent.getstart"
+                          titletable="工商隐患类型明细" :starthead="$parent.$parent.getstart"
                           :sumsmodel="$parent.$parent.sumsmodel"></print-data>
               <button class="button_spacing button_search" @click="search()">查询</button>
             </div>
@@ -105,7 +105,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 +115,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 +128,7 @@ import {PagedList} from "vue-client";
 
 export default {
   name: "communityTypeDetailG",
-  title: "居民隐患类型明细",
+  title: "工商隐患类型明细",
   data() {
     return {
       model: new PagedList("/rs/sql/communityTypeDetailG", 999, {orgid: this.$login.f.orgid}, {
@@ -137,6 +137,7 @@ export default {
         clzyh: '',
         rqjcount: '',
         ljcount: '',
+        wcl:'',
         jgcount: ''
       }),
       resids: {},
@@ -152,9 +153,10 @@ 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: {},
     }
   },

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

@@ -52,12 +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"
+                          titletable="居民隐患类型明细" :starthead="$parent.$parent.getstart"
                           :sumsmodel="$parent.$parent.sumsmodel"></print-data>
               <button class="button_spacing button_search" @click="search()">查询</button>
             </div>
@@ -105,7 +105,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 +115,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 +128,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,6 +137,7 @@ export default {
         clzyh: '',
         rqjcount: '',
         ljcount: '',
+        wcl:'',
         jgcount: ''
       }),
       resids: {},
@@ -152,9 +153,10 @@ 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: {},
     }
   },

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

@@ -34,7 +34,16 @@
               <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
@@ -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,10 +179,12 @@ export default {
         condition: "1=1",
         orgid: this.$login.f.orgid
       },
+      user_types: [{label:'全部',value:''},{label:'民用',value:'民用'},{label:'非民用',value:'非民用'}],
       excelHeaders: {
         'f_residential_area': '小区名称',
         'totalcount': '计划安检总户数',
         'wjcount': '未检户数',
+        'yjcount': '已检户数',
         'rhcount': '入户户数',
         'dfbycount1': '到访不遇-1次',
         'dfbycount2': '到访不遇-2次',
@@ -181,7 +193,7 @@ export default {
         'jjcount': '拒检户数',
       },
       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: {},
     }
   },

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"
@@ -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