safecheck-client 3.0.33-gongyi → 3.0.35-gongyi-1

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"
@@ -41,13 +56,14 @@
                         close-on-select clear-button></v-select>
 
             </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">安&ensp;检&ensp;员</label>
               <input type="text" class="input_search" style="width:60%" v-model="model.f_checker_name" placeholder='安检员'
                      condition="f_checker_name like '%{}%'" v-next-el="cx" v-el:qjmc>
             </div>-->
-            <div class="form-group col-sm-2" v-if="!$parent.$parent.$parent.isdetail"></div>
+<!--            <div class="form-group col-sm-2" v-if="!$parent.$parent.$parent.isdetail"></div>-->
             <div  :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}" style="float:right; padding-right: 25px">
               <div class="span" style="float:right;">
                 <div style="float: right;margin-left:10px" class="button_spacing"
@@ -57,16 +73,34 @@
                      :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
                      @click="$parent.$parent.hidden()">
                 </div>
-<!--                <export-excel-safe   :data="$parent.$parent.exportParameter"
+                <export-excel-safe   :data="$parent.$parent.exportParameter"
                                      :field="$parent.$parent.exportExcelField"
                                      sqlurl="rs/logic/SafeExportExcel" sql-name="getCheckPlanAreaList"
-                                     template-name='安检汇总' :choose-col="true">
-                </export-excel-safe>-->
-                <button id="btnaaa" style="float: right" class="button_search"
+                                     template-name='安检汇总' :choose-col="true"
+                                     >
+                </export-excel-safe>
+                <button id="btnaaa" style="float: right;margin: 0px -140px 0px;position: fixed;" class="button_search"
                         @click="$parent.$parent.getGroupName1(),search(),$parent.$parent.getexportExcelField(),$parent.$parent.$parent.isdetail=false,$parent.$parent.listflag=false"
                         v-el:cx>查询</button>
+
               </div>
             </div>
+
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}" v-if="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">用户类型</label>
+              <v-select id="f_usertype"
+                        placeholder='用户类型'
+                        class="select select_list"
+                        :value.sync="model.f_usertype"
+                        :value-single="true"
+                        :options='$parent.$parent.usertypes'
+                        v-model="model.f_usertype"
+                        condition="f_user_type='{}'"
+                        close-on-select clear-button>
+              </v-select>
+            </div>
+
+
             <div  :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}" v-if="$parent.$parent.criteriaShow">
               <label class="font_normal_body">起始时间</label>
               <datepicker
@@ -103,6 +137,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 +157,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 +177,9 @@
             <th>
               <nobr>拒检</nobr>
             </th>
+            <th>
+              <nobr>入户率</nobr>
+            </th>
             <th>
               <nobr>安检率</nobr>
             </th>
@@ -156,6 +196,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 +204,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 +226,17 @@
   export default {
     data () {
       return {
-        model: new PagedList('rs/sql/getCheckPlanAreaList', 99999),
+        model: new PagedList('rs/sql/getCheckPlanAreaList',99999),
+        usertypes: this.usertypes(),
         // 公司下拉
         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 +269,24 @@
 
     },
     methods: {
+      usertypes () {
+        return this.$appdata.getParam('用户类型') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('用户类型')] : [{label: '全部', value: ''}]
+      },
+      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 +312,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 +369,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/CheckPlanUserList.vue

@@ -107,7 +107,7 @@
             <td style="text-align:center;white-space: nowrap;">{{row.f_address}}</td>
             <td style="text-align:center">{{row.f_state}}</td>
             <td style="text-align:center">{{row.f_entry_status}}</td>
-            <td style="text-align:center">{{row.f_offsite_time}}</td>
+            <td style="text-align:center">{{row.f_upload_date}}</td>
             <td style="text-align:center">{{row.f_defect_content}}</td>
             <td style="text-align:center">{{row.f_check_number}}</td>
           </tr>
@@ -199,7 +199,8 @@
       'checkrow' () {
         this.search()
       }
-    },computed: {
+    },
+    computed: {
       // 导出到Excel的条件构造
       exportParameter() {
         return {

package/src/components/report/HiddenSituation.vue

@@ -37,6 +37,64 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
+
+
+
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">气表类型</label>
+              <v-select class="select_list select"
+                        placeholder='请选择' style="width: 60%"
+                        :value.sync="model.meter_classify" v-model="model.meter_classify"
+                        :options='$parent.$parent.meter_classifys'
+                        filer-key="name"
+                        close-on-select clear-button
+                        condition="F_METER_CLASSIFY='{}'"
+                        :value-single="true">
+              </v-select>
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">安装位置</label>
+              <v-select class="select_list select"
+                        placeholder='请选择' style="width: 60%"
+                        :value.sync="model.f_position" v-model="model.f_position"
+                        :options='$parent.$parent.positions'
+                        filer-key="name"
+                        close-on-select clear-button
+                        condition="f_position='{}'"
+                        :value-single="true">
+              </v-select>
+            </div>
+            <div class="form-group col-sm-2" >
+              <label class="font_normal_body">房屋类型</label>
+              <v-select class="select_list select"
+                        placeholder='请选择' style="width: 60%"
+                        :value.sync="model.f_house_type" v-model="model.f_house_type"
+                        :options='$parent.$parent.housetype'
+                        filer-key="name"
+                        close-on-select clear-button
+                        condition="f_house_type='{}'"
+                        :value-single="true">
+              </v-select>
+            </div>
+            <div class="form-group col-sm-2">
+              <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-2">
+              <label class="font_normal_body">用户类型</label>
+              <v-select
+                        placeholder='用户类型'
+                        class="select select_list"
+                        :value.sync="model.f_usertype"
+                        :value-single="true"
+                        :options='$parent.$parent.userTypes'
+                        v-model="model.f_usertype"
+                        condition="f_check_type='{}'"
+                        close-on-select clear-button></v-select>
+            </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>
@@ -82,20 +140,60 @@
       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 {
+        userTypes: [],
         filialeNameStr: '',
         filialeCodeStr: '',
         userid: this.$login.f.id,
-        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
-        model: model
+        // source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
+        model: model,
+        positions: [],
+        housetype: [],
+        source:
+          'dep=this.getParentByType($organization$).getSpecialResByType($department$),' +
+          'tool.getFullTree(dep.where(row.hasSpecialRole($安检册二次分配$)))',
+        meter_classifys:[]//气表类型
       }
     },
     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
+        }
+      },
       getRes(obj) {
         this.model.f_filialeid = this.$login.convertToIn(obj.resids);
         console.log(this.model.f_filialeid)
       },
+      setConList(){
+        this.userTypes=this.$appdata.getParam('用户类型') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('用户类型')] : [{label: '全部', value: ''}]
+
+        this.meter_classifys=this.$appdata.getParam('气表类型') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('气表类型')] : [{label: '全部', value: ''}]
+
+        this.positions=this.$appdata.getParam('安装位置') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('安装位置')] : [{label: '全部', value: ''}]
+        this.housetype=this.$appdata.getParam('房屋类型') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('房屋类型')] : [{label: '全部', value: ''}]
+      },
     },
     ready() {
+      this.setConList()
     },
     computed: {
       selected() {

package/src/safecheck.js

@@ -589,7 +589,7 @@ export default function (filiale) {
     require(['./components/defect/DefectListWeixiu'], resolve)
   })
   // 隐患查看
-  Vue.component('defect-main-weixiu', (resolve) => {
+  Vue.component('defect-main-new', (resolve) => {
     require(['./components/defect/DefectMainWeixiu'], resolve)
   })
   // 隐患详情