safecheck-client 3.0.35-gongyi-6 → 3.0.35-gongyi-8

package/src/components/pc/RoleSelector.vue

@@ -76,6 +76,9 @@ import {HttpResetClass} from 'vue-client'
     },
     methods: {
       valuechange(val){
+        if(typeof val =='object' && val.hasOwnProperty('isTrusted')){
+          return
+        }
         this.changeval = val
         if(this.valueMultiple){
           if(val&&val.length > 0){

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/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':'上报条数'
         }