safecheck-client 3.0.32-gongyi → 3.0.35-gongyi

package/src/components/report/CheckPlanAreaList.vue

@@ -20,14 +20,29 @@
                 @re-res="$parent.$parent.getorg"
                 :value.sync="model.f_checker_id"
                 v-model="model.f_checker_id"
-                condition="f_checker_name like '%{}%'">
+                condition="f_checker_name = '{}'">
               </role-selector-safe>
             </div>
+            <div :class="{'col-sm-3 form-group':$parent.$parent.$parent.isdetail,'col-sm-2 form-group':!$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">安检科室</label>
+              <right-tree-safe islist  :source="$parent.$parent.source"  v-on:re-res="$parent.$parent.reres2" :textContent="'选择科室'" >
+              </right-tree-safe>
+            </div>
             <div  :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}">
               <label class="font_normal_body">小区名称</label>
               <input type="text" class="input_search" style="width:60%" v-model="model.f_residential_area" placeholder='小区名称'
                      condition="f_residential_area like '%{}%'" v-next-el="cx" v-el:qjmc>
             </div>
+            <div  :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">入户率 > </label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_rh" placeholder='入户率'
+                      v-next-el="cx" v-el:qjmc>
+            </div>
+            <div  :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">安检率 > </label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_bv" placeholder='安检率'
+                      v-next-el="cx" v-el:qjmc>
+            </div>
             <div  :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}">
               <label class="font_normal_body">计划名称</label>
               <v-select class="select_list select"
@@ -103,6 +118,8 @@
               <label for="f_plan_name">计划名称</label>
               <input type="checkbox" id="f_checker_name" value="f_checker_name" v-model="$parent.$parent.nameForSql"/>
               <label for="f_checker_name">安检员</label>
+              <input type="checkbox" id="f_dep" value="f_dep" v-model="$parent.$parent.nameForSql"/>
+              <label for="f_plan_name">安检科室</label>
               <input type="checkbox" id="f_user_number" value="f_user_number" v-model="$parent.$parent.nameForSql"/>
               <label for="f_checker_name">档案数量</label>
             </div>
@@ -121,6 +138,7 @@
             <th v-if="$parent.$parent.$parent.nameForSql.includes('f_residential_area')"><nobr>小区名称</nobr></th>
             <th v-if="$parent.$parent.$parent.nameForSql.includes('f_plan_name')"><nobr>计划名称</nobr></th>
             <th v-if="$parent.$parent.$parent.nameForSql.includes('f_checker_name')"><nobr>安检员</nobr></th>
+            <th v-if="$parent.$parent.$parent.nameForSql.includes('f_dep')"><nobr>安检科室</nobr></th>
             <th v-if="$parent.$parent.$parent.nameForSql.includes('f_user_number')"><nobr>档案数量</nobr></th>
             <th>
               <nobr>计划总数</nobr>
@@ -140,6 +158,9 @@
             <th>
               <nobr>拒检</nobr>
             </th>
+            <th>
+              <nobr>入户率</nobr>
+            </th>
             <th>
               <nobr>安检率</nobr>
             </th>
@@ -156,6 +177,7 @@
             <td style="text-align:center" :class="{'td-0':row.f_residential_area==undefined,'td-1':model.rows.length!=($index+1)&&row.f_residential_area.indexOf('*&')==-1,'td-2':model.rows.length!=($index+1)&&row.f_residential_area.indexOf('*&')!=-1,'td-3':model.rows.length==($index+1)&&row.f_residential_area.indexOf('*&')!=-1,'td-4':model.rows.length==($index+1)&&row.f_residential_area.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql.includes('f_residential_area')">{{row.f_residential_area.indexOf('*&')!=-1?'':row.f_residential_area}}</td>
             <td style="text-align:center" :class="{'td-0':row.f_plan_name==undefined,'td-1':model.rows.length!=($index+1)&&row.f_plan_name.indexOf('*&')==-1,'td-2':model.rows.length!=($index+1)&&row.f_plan_name.indexOf('*&')!=-1,'td-3':model.rows.length==($index+1)&&row.f_plan_name.indexOf('*&')!=-1,'td-4':model.rows.length==($index+1)&&row.f_plan_name.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql.includes('f_plan_name')">{{row.f_plan_name.indexOf('*&')!=-1?'':row.f_plan_name}}</td>
             <td style="text-align:center" :class="{'td-0':row.f_checker_name==undefined,'td-1':model.rows.length!=($index+1)&&row.f_checker_name.indexOf('*&')==-1,'td-2':model.rows.length!=($index+1)&&row.f_checker_name.indexOf('*&')!=-1,'td-3':model.rows.length==($index+1)&&row.f_checker_name.indexOf('*&')!=-1,'td-4':model.rows.length==($index+1)&&row.f_checker_name.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql.includes('f_checker_name')">{{row.f_checker_name.indexOf('*&')!=-1?'':row.f_checker_name}}</td>
+            <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_dep')">{{row.f_dep}}</td>
             <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_user_number')">{{row.f_user_number}}</td>
             <td style="text-align:center">{{row.f_plan_total}}</td>
             <td style="text-align:center">{{row.f_weijian}}</td>
@@ -163,6 +185,7 @@
             <td style="text-align:center"><nobr>{{row.f_ruhu}}</nobr></td>
             <td style="text-align:center">{{row.f_buyu}}</td>
             <td style="text-align:center"><nobr>{{row.f_jujian}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_check_rhbv}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_check_bv}}</nobr></td>
             <!--<td style="text-align: center;">-->
             <!--<button class="btn btn-link" @click.stop="$parent.$parent.$parent.showhistory(row)">查看</button>-->
@@ -184,13 +207,16 @@
   export default {
     data () {
       return {
-        model: new PagedList('rs/sql/getCheckPlanAreaList', 99999),
+        model: new PagedList('rs/sql/getCheckPlanAreaList',99999),
         // 公司下拉
         curorgid: [this.$login.f.orgid],
         row: {},
         f_orgid: '',
         nameForSql: [],
         groupNameForSql: '',
+        source:
+          'dep=this.getParentByType($organization$).getSpecialResByType($department$),' +
+          'tool.getFullTree(dep.where(row.hasSpecialRole($安检册二次分配$)))',
         listflag:false,
         nameflag:false,
         criteriaShow: false,
@@ -223,6 +249,18 @@
 
     },
     methods: {
+      reres2(val){
+        if (!val.resids || val.resids.length === 0 || val.resids[0] ==='undefined' || !val.resids[0] || val.resids.length>1){
+          console.log('未选择',val)
+          this.f_dep = ''
+          return
+        }
+        console.log('val2',val)
+        const resids = val.orgobj.filter(res=>res.resourcetype==='department')
+        if (resids.length>0){
+          this.f_dep = resids[0].name
+        }
+      },
       // 获取导出列
       getexportExcelField(){
         this.exportExcelField = {
@@ -248,6 +286,9 @@
           }
           if (ff==='f_checker_name') {
             this.exportExcelField.f_checker_name='安检员'
+          }
+          if (ff==='f_dep') {
+            this.exportExcelField.f_dep='安检科室'
           }if (ff==='f_residential_area') {
             this.exportExcelField.f_checker_name='小区名称'
           }if (ff==='f_user_number') {
@@ -302,19 +343,24 @@
         if(this.f_check_end){
           args.condition += ` and f_year<=${new Date(this.f_check_end).getFullYear()} and f_month<=${new Date(this.f_check_end).getMonth()+1} `
         }
+        if(this.f_dep){
+          args.condition += ` and f_dep  = '${this.f_dep}'`
+        }
+        this.model.f_bv=this.$refs.paged.$refs.cri.model.f_bv?this.$refs.paged.$refs.cri.model.f_bv:''
+        this.model.f_rh=this.$refs.paged.$refs.cri.model.f_rh?this.$refs.paged.$refs.cri.model.f_rh:''
         this.$refs.paged.$refs.grid.$el.scrollTop = 0
         if (this.groupNameForSql=='undefined'){
           console.log("777777777")
           this.$showMessage("请至少选择一项进行汇总")
           return
         }
-        this.model.paramSource = {groupName: `'${this.groupNameForSql}'`}
+        this.model.paramSource = {groupName: `'${this.groupNameForSql}'`,f_rh: 'this.f_rh',f_bv: 'this.f_bv'}
         this.model.search(args.condition, args.model)
       },
 
       // 拼接groupName1
       getGroupName1 () {
-        var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number']
+        var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_dep','f_user_number']
         var newtemp=[]
 
         for (var i=0;i<temp.length;i++){

package/src/components/report/CheckPlanAreaManage.vue

@@ -1,111 +1,111 @@
-<template>
-  <div id="unit" class="flex-row" v-if="listpage" >
-    <div :class="{'basic-main':((!isdetail) && (!usershow)),'binary-left':isdetail||usershow}" >
-      <check-plan-area-list v-ref:list :row="row" :config="config" :f_filialeid.sync="f_filialeid" @select-changed="selected" ></check-plan-area-list>
-    </div>
-    <div class="binary-right" style="overflow-y: scroll" v-if="isdetail">
-      <check-plan-user-list :checkrow="checkrow" ></check-plan-user-list>
-    </div>
-  </div>
-  <div v-if="!listpage">
-    <user-info-detail-manage :f_userinfo_id="f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
-  </div>
-
-</template>
-<script>
-  import Vue from 'vue'
-
-  export default {
-    title: '安检情况汇总',
-    data () {
-      return {
-        f_userinfo_id: '',
-        f_filialeid: this.$login.f.orgid,
-        config: {
-          isLimit: false, // 限购
-          audit: false,  // 启用审核
-          heatingSeason: false, // 采暖季
-          deductionWay: 'cycle'  // 'cycle: 周期扣费； day: 日运算扣费； singleHS: 采暖季独立扣费； dayHS: 采暖季日扣费；' 此值不配置默认周期扣费
-        },
-        listpage: true,
-        row: null,
-        checkrow: null,
-        parentData: '',
-        isdetail: false,
-        gasPriceShow: false,
-        usershow: false,
-        // 控制气价信息界面和变更操作记录界面的展示
-        changeView: false,
-        nocivilshow:true,
-        modalshow:false,
-      }
-    },
-    ready () {
-    },
-    methods: {
-      cancel(obj) {
-        this.listpage = true
-      },
-      dealMsg(val) {
-        this.listpage = false
-        this.f_userinfo_id = val.f_userinfo_id
-      },
-      selected (obj) {
-        console.log("obj:"+JSON.stringify(obj))
-        console.log("checkrow:"+JSON.stringify(this.checkrow))
-        this.checkrow = obj.val
-        this.parentData = this.checkrow.id
-        this.isdetail = true
-        this.usershow = false
-        this.listpage = true
-      },
-      selected2 (obj) {
-
-      },
-      refresh () {
-        this.row = null
-        this.gasPriceShow = false
-        this.isdetail = false
-        this.usershow =false
-        this.listpage=true
-        this.$refs.list.search()
-      }
-    },
-    events: {
-      'success' (name, row, res) {
-        this.row = row
-        this.gasPriceShow = false
-        this.isdetail = false
-        this.usershow =false
-        this.listpage=true
-        this.$refs.list.search()
-      },
-      'error' (name, row, res) {
-        this.row = row
-        this.gasPriceShow = false
-        this.isdetail = false
-        this.usershow =false
-        this.listpage=true
-        this.$refs.list.search()
-      },
-      'close' (res) {
-        this.row = null
-        this.gasPriceShow = false
-        this.isdetail = false
-        this.usershow =false
-        this.listpage=true
-      },
-      'search' () {
-        this.row = null
-        this.gasPriceShow = false
-        this.isdetail = false
-        this.usershow =false
-        this.listpage=true
-        // this.$refs.list.search()
-      }
-    }
-  }
-</script>
-<style>
-
-</style>
+<template>
+  <div id="unit" class="flex-row" v-if="listpage" >
+    <div :class="{'basic-main':((!isdetail) && (!usershow)),'binary-left':isdetail||usershow}" >
+      <check-plan-area-list v-ref:list :row="row" :config="config" :f_filialeid.sync="f_filialeid" @select-changed="selected" ></check-plan-area-list>
+    </div>
+    <div class="binary-right" style="overflow-y: scroll" v-if="isdetail">
+      <check-plan-user-list :checkrow="checkrow" ></check-plan-user-list>
+    </div>
+  </div>
+  <div v-if="!listpage">
+    <user-info-detail-manage :f_userinfo_id="f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
+  </div>
+
+</template>
+<script>
+  import Vue from 'vue'
+
+  export default {
+    title: '安检情况汇总',
+    data () {
+      return {
+        f_userinfo_id: '',
+        f_filialeid: this.$login.f.orgid,
+        config: {
+          isLimit: false, // 限购
+          audit: false,  // 启用审核
+          heatingSeason: false, // 采暖季
+          deductionWay: 'cycle'  // 'cycle: 周期扣费； day: 日运算扣费； singleHS: 采暖季独立扣费； dayHS: 采暖季日扣费；' 此值不配置默认周期扣费
+        },
+        listpage: true,
+        row: null,
+        checkrow: null,
+        parentData: '',
+        isdetail: false,
+        gasPriceShow: false,
+        usershow: false,
+        // 控制气价信息界面和变更操作记录界面的展示
+        changeView: false,
+        nocivilshow:true,
+        modalshow:false,
+      }
+    },
+    ready () {
+    },
+    methods: {
+      cancel(obj) {
+        this.listpage = true
+      },
+      dealMsg(val) {
+        this.listpage = false
+        this.f_userinfo_id = val.f_userinfo_id
+      },
+      selected (obj) {
+        console.log("obj:"+JSON.stringify(obj))
+        console.log("checkrow:"+JSON.stringify(this.checkrow))
+        this.checkrow = obj.val
+        this.parentData = this.checkrow.id
+        this.isdetail = true
+        this.usershow = false
+        this.listpage = true
+      },
+      selected2 (obj) {
+
+      },
+      refresh () {
+        this.row = null
+        this.gasPriceShow = false
+        this.isdetail = false
+        this.usershow =false
+        this.listpage=true
+        this.$refs.list.search()
+      }
+    },
+    events: {
+      'success' (name, row, res) {
+        this.row = row
+        this.gasPriceShow = false
+        this.isdetail = false
+        this.usershow =false
+        this.listpage=true
+        this.$refs.list.search()
+      },
+      'error' (name, row, res) {
+        this.row = row
+        this.gasPriceShow = false
+        this.isdetail = false
+        this.usershow =false
+        this.listpage=true
+        this.$refs.list.search()
+      },
+      'close' (res) {
+        this.row = null
+        this.gasPriceShow = false
+        this.isdetail = false
+        this.usershow =false
+        this.listpage=true
+      },
+      'search' () {
+        this.row = null
+        this.gasPriceShow = false
+        this.isdetail = false
+        this.usershow =false
+        this.listpage=true
+        // this.$refs.list.search()
+      }
+    }
+  }
+</script>
+<style>
+
+</style>

package/src/components/report/CheckPlanUserList.vue

@@ -199,7 +199,8 @@
       'checkrow' () {
         this.search()
       }
-    },computed: {
+    },
+    computed: {
       // 导出到Excel的条件构造
       exportParameter() {
         return {

package/src/components/report/HiddenSituation.vue

@@ -1,112 +1,112 @@
-<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">
-        <div novalidate class="form-inline auto" partial>
-          <div class="row">
-           <div class="col-sm-4 form-group">
-
-             <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"
-               condition="f_checker_name = '{}'">
-             </role-selector-safe>
-           </div>
-            <div class="col-sm-2 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%;"
-                          :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd 00:00:00'"
-                          :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="结束日期"
-                          v-model="model.endDate"
-                          :value.sync="model.endDate"
-                          :disabled-days-of-Week="[]"
-                          style="width: 60%;"
-                          :format="'yyyy-MM-dd 23:59:59'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </div>
-            <div class="col-sm-3 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>
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <div partial='list' id='shexian' class="list_area" style="overflow-y: scroll">
-        <table class='tableprint' style="margin: 0px auto">
-          <thead>
-          <tr>
-            <th colspan='5' style="font-weight: normal; text-align: left;">
-              <h3 style="text-align: center">隐患报表</h3>
-            </th>
-          </tr>
-          <tr>
-            <th colspan='5' style="font-weight: normal; text-align: center;">
-              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
-              结束时间：{{ model.model.endDate }}
-            </th>
-          </tr>
-          </thead>
-          <tr>
-            <th colspan='5' style="font-weight: normal;">
-              {{{ model.data.substring(26,model.data.length-8) }}}
-            </th>
-          </tr>
-        </table>
-      </div>
-    </criteria-paged>
-  </div>
-
-</template>
-
-<script>
-  import {DataModel} from 'vue-client'
-
-  export default {
-    title: '隐患报表',
-    data() {
-
-      let model = new DataModel('rs/report/hiddensituation', {startDate: 'this.model.startDate', endDate: 'this.model.endDate', f_filialeid: 'this.f_filialeid'})
-      model.f_filialeid = '(' + this.$login.f.orgid + ')'
-      return {
-        filialeNameStr: '',
-        filialeCodeStr: '',
-        userid: this.$login.f.id,
-        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
-        model: model
-      }
-    },
-    methods: {
-      getRes(obj) {
-        this.model.f_filialeid = this.$login.convertToIn(obj.resids);
-        console.log(this.model.f_filialeid)
-      },
-    },
-    ready() {
-    },
-    computed: {
-      selected() {
-        return this.$refs.grid.selected
-      },
-      // outlets () {
-      //   return [{label: '全部', value: ''}, ...AppData.getParam('营业网点')]
-      // },
-      // operator () {
-      //   return [{label: '全部', value: ''}, ...AppData.getParam('操作员')]
-      // }
-    }
-  }
-</script>
+<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">
+        <div novalidate class="form-inline auto" partial>
+          <div class="row">
+           <div class="col-sm-4 form-group">
+
+             <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"
+               condition="f_checker_name = '{}'">
+             </role-selector-safe>
+           </div>
+            <div class="col-sm-2 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%;"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          :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="结束日期"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          style="width: 60%;"
+                          :format="'yyyy-MM-dd 23:59:59'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-3 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>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <div partial='list' id='shexian' class="list_area" style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th colspan='5' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">隐患报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='5' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <th colspan='5' style="font-weight: normal;">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </th>
+          </tr>
+        </table>
+      </div>
+    </criteria-paged>
+  </div>
+
+</template>
+
+<script>
+  import {DataModel} from 'vue-client'
+
+  export default {
+    title: '隐患报表',
+    data() {
+
+      let model = new DataModel('rs/report/hiddensituation', {startDate: 'this.model.startDate', endDate: 'this.model.endDate', f_filialeid: 'this.f_filialeid'})
+      model.f_filialeid = '(' + this.$login.f.orgid + ')'
+      return {
+        filialeNameStr: '',
+        filialeCodeStr: '',
+        userid: this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
+        model: model
+      }
+    },
+    methods: {
+      getRes(obj) {
+        this.model.f_filialeid = this.$login.convertToIn(obj.resids);
+        console.log(this.model.f_filialeid)
+      },
+    },
+    ready() {
+    },
+    computed: {
+      selected() {
+        return this.$refs.grid.selected
+      },
+      // outlets () {
+      //   return [{label: '全部', value: ''}, ...AppData.getParam('营业网点')]
+      // },
+      // operator () {
+      //   return [{label: '全部', value: ''}, ...AppData.getParam('操作员')]
+      // }
+    }
+  }
+</script>