safecheck-client 3.0.35-gongyi-5 → 3.0.35-gongyi-7

package/src/components/pc/CheckBookManage.vue

@@ -238,6 +238,17 @@
                           close-on-select
                           condition="{}"></v-select>
 
+              </div>
+              <div class="col-sm-2 form-group" style="margin-top: 0px">
+
+                <label class="font_normal_body">抄&ensp;表&ensp;员</label>
+                <v-select :value.sync="model.f_inputtor" v-model='model.f_inputtor'
+                          :value-single="true" style="width: 60%"
+                          class="select_list select"
+                          :options='$parent.$parent.meterReader' placeholder='抄&ensp;表&ensp;员'
+                          close-on-select
+                          condition="f_inputtor ='{}'"></v-select>
+
               </div>
               <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right" v-if="$parent.$parent.permission === 'c1'">
 
@@ -446,6 +457,7 @@ export default {
         "f_check_book_name":'所属安检册'
       },
       checkBooks: [],
+      meterReader:[],
       f_orgid: '',
       bookAll: false,
       bookCheckedAll:false,
@@ -489,7 +501,7 @@ export default {
 
     }
   },
-  props:['permission'],
+  props:['f_check_book_name'],
   computed: {
     getgasbrand(){
       let ops=[{label:'全部',value:''}]
@@ -522,6 +534,30 @@ export default {
     }
   },
   methods: {
+    async getmeterreader(){
+      this.meterReader=[]
+      let http=new HttpResetClass()
+      let getMeterReader = await http.load('pOST',`rs/sql/safe_singleTable_OrderBy`,{
+        data:{
+          items:'f_inputtor',
+          tablename: 't_userfiles',
+          condition:`f_orgid = '${this.$login.f.orgid}' and f_inputtor is not null ` + ` group by f_inputtor`,
+          orderitem: 'f_inputtor'
+        }
+      },{resolveMsg:null,rejectMsg:"获取抄表员失败"}).then(res =>{
+        this.meterReader =  res.data.map(item=>{
+            console.log('打印item',item)
+        return{
+          label : item.f_inputtor,
+                value : item.f_inputtor
+              }
+
+          })
+        this.meterReader.unshift({label:'全部',value:''})
+        }
+
+      )
+    },
     //片区获取
     async getSliceArea()  {
       let http = new HttpResetClass()
@@ -923,6 +959,7 @@ export default {
   ready () {
     // 获取片区
     this.getSliceArea()
+    this.getmeterreader()
     // 获取营收气表参数
     this.setConList()
     if (this.permission === 'c1'){

package/src/components/pc/RoleSelector.vue

@@ -1,122 +1,125 @@
-<template>
-    <div style="width: 100%;height: 100%">
-        <div class="col-sm-6 form-group" style="margin-bottom: 0px">
-            <label class="font_normal_body">公&emsp;&emsp;司</label>
-            <right-tree-safe :width="leftWidth" @re-res="getRes"></right-tree-safe>
-        </div>
-        <div class="col-sm-6 form-group" style="margin-bottom: 0px">
-            <label class="font_normal_body">{{roleLable}}</label>
-            <v-select :value="changeval" v-model='changeval'
-                      :value-single="!valueMultiple"
-                      class="select_list select"
-                      :options='users' :placeholder='roleName'
-                      close-on-select
-                      :multiple="valueMultiple"
-                      :width="rightWidth"
-                      @change="valuechange">
-            </v-select>
-        </div>
-    </div>
-</template>
-
-<script>
-import {HttpResetClass} from 'vue-client'
-  export default {
-    name: "RoleSelector",
-    props: {
-      valueMultiple: {
-        type: Boolean,
-        default: false
-      },
-      roleName: {
-        type: String,
-        default: '安检员'
-      },
-      roleLable: {
-        type: String,
-        default: '安检员'
-      },
-      leftWidth: {
-        type: String,
-        default: '60%'
-      },
-      rightWidth: {
-        type: String,
-        default: '60%'
-      },
-      value: {
-        default: ''
-      }
-    },
-    data() {
-      return {
-        source: `tool.getChildrenOfResName($${this.roleName}$)`,
-        allUsers: [],
-        users: [],
-        resids: [],
-        changeval: ''
-      }
-    },
-    watch: {
-      'value' (val) {
-        if (val) {
-          this.changeval = val
-        }
-      }
-    },
-    ready () {
-      let http = new HttpResetClass()
-      http.load('POST', '/rs/search', {data: {source: this.source, userid: this.$login.f.id}}, {resolveMsg: null, rejectMsg: null})
-        .then(res => {
-          console.log('res-->' + JSON.stringify(res))
-          this.allUsers = res.data
-          this.filterUser(this.resids)
-
-         })
-    },
-    methods: {
-      valuechange(val){
-        this.changeval = val
-        if(this.valueMultiple){
-          if(val&&val.length > 0){
-            var valuesele = `(`
-            for (var i= 0;i<val.length;i++) {
-              valuesele += `'${val[i]}',`
-            }
-            this.value =  valuesele.substring(0,valuesele.length -1 ) + ')'
-          }else{
-            this.value =  ''
-          }
-        }else{
-           this.value = val
-        }
-      },
-      getRes(obj) {
-        this.resids = obj.resids
-        console.log(this.resids)
-        this.filterUser(this.resids)
-        this.$dispatch('re-res',obj)
-      },
-      filterUser(resids) {
-        // 处理第一次进入页面值异常问题
-        if(resids.length > 0 && typeof resids[0] == "object"){
-          resids = resids[0]
-        }
-        this.users = []
-        this.allUsers.forEach(user => {
-          if (resids.indexOf(user.orgid) != -1) {
-            this.users.push({label: user.name, value: user.name})
-          }
-        })
-        if(this.users.length > 0){
-          this.users = [{label: '全部', value: ''},...this.users]
-        }
-        console.log(this.users)
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
+<template>
+    <div style="width: 100%;height: 100%">
+        <div class="col-sm-6 form-group" style="margin-bottom: 0px">
+            <label class="font_normal_body">公&emsp;&emsp;司</label>
+            <right-tree-safe :width="leftWidth" @re-res="getRes"></right-tree-safe>
+        </div>
+        <div class="col-sm-6 form-group" style="margin-bottom: 0px">
+            <label class="font_normal_body">{{roleLable}}</label>
+            <v-select :value="changeval" v-model='changeval'
+                      :value-single="!valueMultiple"
+                      class="select_list select"
+                      :options='users' :placeholder='roleName'
+                      close-on-select
+                      :multiple="valueMultiple"
+                      :width="rightWidth"
+                      @change="valuechange">
+            </v-select>
+        </div>
+    </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+  export default {
+    name: "RoleSelector",
+    props: {
+      valueMultiple: {
+        type: Boolean,
+        default: false
+      },
+      roleName: {
+        type: String,
+        default: '安检员'
+      },
+      roleLable: {
+        type: String,
+        default: '安检员'
+      },
+      leftWidth: {
+        type: String,
+        default: '60%'
+      },
+      rightWidth: {
+        type: String,
+        default: '60%'
+      },
+      value: {
+        default: ''
+      }
+    },
+    data() {
+      return {
+        source: `tool.getChildrenOfResName($${this.roleName}$)`,
+        allUsers: [],
+        users: [],
+        resids: [],
+        changeval: ''
+      }
+    },
+    watch: {
+      'value' (val) {
+        if (val) {
+          this.changeval = val
+        }
+      }
+    },
+    ready () {
+      let http = new HttpResetClass()
+      http.load('POST', '/rs/search', {data: {source: this.source, userid: this.$login.f.id}}, {resolveMsg: null, rejectMsg: null})
+        .then(res => {
+          console.log('res-->' + JSON.stringify(res))
+          this.allUsers = res.data
+          this.filterUser(this.resids)
+
+         })
+    },
+    methods: {
+      valuechange(val){
+        if(typeof val =='object' && val.hasOwnProperty('isTrusted')){
+          return
+        }
+        this.changeval = val
+        if(this.valueMultiple){
+          if(val&&val.length > 0){
+            var valuesele = `(`
+            for (var i= 0;i<val.length;i++) {
+              valuesele += `'${val[i]}',`
+            }
+            this.value =  valuesele.substring(0,valuesele.length -1 ) + ')'
+          }else{
+            this.value =  ''
+          }
+        }else{
+           this.value = val
+        }
+      },
+      getRes(obj) {
+        this.resids = obj.resids
+        console.log(this.resids)
+        this.filterUser(this.resids)
+        this.$dispatch('re-res',obj)
+      },
+      filterUser(resids) {
+        // 处理第一次进入页面值异常问题
+        if(resids.length > 0 && typeof resids[0] == "object"){
+          resids = resids[0]
+        }
+        this.users = []
+        this.allUsers.forEach(user => {
+          if (resids.indexOf(user.orgid) != -1) {
+            this.users.push({label: user.name, value: user.name})
+          }
+        })
+        if(this.users.length > 0){
+          this.users = [{label: '全部', value: ''},...this.users]
+        }
+        console.log(this.users)
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/planmanage/checkUserList.vue

@@ -275,7 +275,17 @@
                     >
                     </v-select>
                   </div>
+                  <div class="col-sm-2 form-group" style="margin-top: 0px">
 
+                    <label class="font_normal_body">抄&ensp;表&ensp;员</label>
+                    <v-select :value.sync="model.f_inputtor" v-model='model.f_inputtor'
+                              :value-single="true" style="width: 60%"
+                              class="select_list select"
+                              :options='$parent.$parent.meterReader' placeholder='抄&ensp;表&ensp;员'
+                              close-on-select
+                              condition="uf.f_inputtor ='{}'"></v-select>
+
+                  </div>
                 </div>
               </div>
               <div slot="modal-footer" class="modal-footer" style="text-align: center">
@@ -367,6 +377,7 @@
             opt:[{label:"测试",value:"测试"}],
             showCondtion:false,
             userTypes:[],//用户类型
+            meterReader:[], //抄表员
             userStates:[],//用户状态
             gasproperties:[],//用气性质
             meter_classifys:[],//气表类型
@@ -393,8 +404,34 @@
           //this.$refs.paged.$refs.criteria.model.f_hasHousehold='未入户'
           this.setConList()
           this.loadpage()
+          this.getmeterreader()
         },
         methods: {
+          async getmeterreader(){
+            this.meterReader=[]
+            let http=new HttpResetClass()
+            let getMeterReader = await http.load('pOST',`rs/sql/safe_singleTable_OrderBy`,{
+              data:{
+                items:'f_inputtor',
+                tablename: 't_userfiles',
+                condition:`f_orgid = '${this.$login.f.orgid}' and f_inputtor is not null ` + ` group by f_inputtor`,
+                orderitem: 'f_inputtor'
+              }
+            },{resolveMsg:null,rejectMsg:"获取抄表员失败"}).then(res =>{
+                this.meterReader =  res.data.map(item=>{
+                  console.log('打印item',item)
+                  return{
+                    label : item.f_inputtor,
+                    value : item.f_inputtor
+                  }
+
+                })
+                this.meterReader.unshift({label:'全部',value:''})
+              }
+
+            )
+          },
+
           loadpage(){
             this.select_search()
             this.Mreadibook()

package/src/components/querycheckpaper/CheckSearchUser.vue

@@ -456,9 +456,7 @@
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_checker_name }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_last_check_date }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_last_check_state }}</td>
-          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">
-            {{row.f_last_check_result }}
-          </td>
+          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{row.f_last_check_result }}</td>
         </template>
       </data-grid>
     </criteria-paged>
@@ -506,7 +504,7 @@ export default {
 
       },
       excelHeaders: {
-        //用户编号	用户名称	用户电话	安检次数	用户类型	小区名称	地址	安检日期	安检状态	安检结果
+        //用户编号	用户名称	用户电话	安检次数	用户类型	小区名称	地址	安检日期	安检状态	安检结果    气表类型   安装位置  房屋类型
 
         'f_userinfo_code': '用户编号',
         'f_user_name': '用户名称',
@@ -519,7 +517,10 @@ export default {
         'f_address': '地址',
         'f_last_check_date': '安检日期',
         'f_last_check_state': '安检状态',
-        'f_last_check_result': '安检结果'
+        'f_last_check_result': '安检结果',
+        'f_position':'安装位置',
+        'F_METER_CLASSIFY':'机表类型',
+        'f_house_type':'房屋类型',
       },
       model: new PagedList('rs/sql/根据安检员查询用户档案', 20, {
         orderitem: "'f_last_check_date'",

package/src/components/report/CheckPlanAreaList.vue

@@ -138,9 +138,11 @@
               <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>
+              <label for="f_dep">安检科室</label>
               <input type="checkbox" id="f_user_number" value="f_user_number" v-model="$parent.$parent.nameForSql"/>
-              <label for="f_checker_name">档案数量</label>
+              <label for="f_user_number">档案数量</label>
+              <input type="checkbox" id="f_user_type" value="f_user_type" v-model="$parent.$parent.nameForSql"/>
+              <label for="f_user_type">用户类型</label>
             </div>
           </div>
         </div>
@@ -159,6 +161,7 @@
             <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 v-if="$parent.$parent.$parent.nameForSql.includes('f_user_type')"><nobr>用户类型</nobr></th>
             <th>
               <nobr>计划总数</nobr>
             </th>
@@ -198,6 +201,7 @@
             <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" v-if="$parent.$parent.$parent.nameForSql.includes('f_user_type')">{{row.f_user_type}}</td>
             <td style="text-align:center">{{row.f_plan_total}}</td>
             <td style="text-align:center">{{row.f_weijian}}</td>
             <td style="text-align:center"><nobr>{{row.f_yijian}}</nobr></td>
@@ -319,6 +323,8 @@
             this.exportExcelField.f_checker_name='小区名称'
           }if (ff==='f_user_number') {
             this.exportExcelField.f_checker_name='档案数量'
+          }if (ff==='f_user_type'){
+            this.exportExcelField.f_user_type='用户类型'
           }
         }
       },
@@ -372,6 +378,9 @@
         if(this.f_dep){
           args.condition += ` and f_dep  = '${this.f_dep}'`
         }
+        if(this.f_user_type){
+          args.condition += ` and f_user_type  = '${this.f_user_type}'`
+        }
         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
@@ -386,7 +395,7 @@
 
       // 拼接groupName1
       getGroupName1 () {
-        var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_dep','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','f_user_type']
         var newtemp=[]
 
         for (var i=0;i<temp.length;i++){
@@ -423,7 +432,7 @@
         }
         this.listflag=true
         console.log(this.model.rows)
-        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_user_number','f_user_type']
         var newtemp=[]
         for (var i=0;i<temp.length;i++){
           for (var j=0;j<this.nameForSql.length;j++){

package/src/components/report/CheckPlanUserList.vue

@@ -147,7 +147,7 @@
           'f_address':'用户地址',
           'f_state':'是否已检',
           'f_entry_status':'安检状态',
-          'f_offsite_time':'安检时间',
+          'f_upload_date':'安检时间',
           'f_defect_content':'隐患状态',
           'f_check_number':'上报条数'
         }