manage-client 3.3.64 → 3.3.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.3.64",
+  "version": "3.3.66",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/sale/businessquery/ChargeQuery.vue

@@ -278,9 +278,9 @@
                   <label class="font_normal_body">抄&ensp;表&ensp;册</label>
                   <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"
                             :options='$parent.$parent.meterbooks' placeholder='抄表册'
-                            style="width:60%"
+                            style="width:60%" multiple
                             close-on-select
-                            condition="f_meter_book_num = '{}'"></v-select>
+                            condition="f_meter_book_num in {}"></v-select>
                 </div>
                   <div class="col-sm-2 form-group">
                       <label class="font_normal_body" title="参数名称:写卡状态">写卡状态</label>

package/src/components/webmeter/DrillData/UserLostContactAnalysis.vue

@@ -469,6 +469,11 @@
             args.condition = args.condition + " and initinsertdate <> '开户未上报'"
           }
         }
+        this.startDate = this.$refs.paged.$refs.cri.model.startDate
+        this.endDate = this.$refs.paged.$refs.cri.model.endDate
+        if (this.endDate == '' || this.startDate == '') {
+          return this.$showMessage("时间区间的开始和结束时间不能为空！")
+        }
         this.model.search(args.condition, args.model)
       },
       getorg(obj) {

package/src/components/webmeter/report/ckhReportList.vue

@@ -0,0 +1,391 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main">
+      <div class="flex" v-if="!show">
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' v-ref:criteria  @condition-changed='$parent.search'>
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+              <div class="row" >
+                <div class="col-sm-2">
+                  <label class="font_normal_body">组织机构</label>
+                  <res-select :initresid="$parent.$parent.org"
+                              style="width:60%"
+                              @res-select="$parent.$parent.getorg"
+                              :is-mul=false
+                              restype='organization'>
+                  </res-select>
+                </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">表&nbsp;钢&nbsp;号&nbsp;</label>
+                  <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_meternumber" placeholder='表钢号'
+                         condition="f_meternumber = '{}'" v-next-el='meternumber' v-el:meternumber
+                  >
+                </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">客户编号</label>
+                  <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_userinfo_code" placeholder='客户编号'
+                         condition="f_userinfo_code = '{}'" v-next-el='f_userinfo_code' v-el:meternumber
+                  >
+                </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">客户名称</label>
+                  <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_username" placeholder='客户名称'
+                         condition="f_user_name like '%{}%'" v-next-el='userid' v-el:username>
+                </div>
+
+                <div class="span" style="float:right;margin-top:10px">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
+                  <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
+                                :field="$parent.$parent.getfield"
+                                sqlurl="rs/ckh/export" sql-name="ckh_getReportList" template-name='上报查询'
+                                :choose-col="true"></export-excel>
+                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+                </div>
+              </div>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <div class="col-sm-2">
+                  <label class="font_normal_body">客户地址</label>
+                  <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_address" placeholder='客户地址'
+                         condition="f_address like '%{}%'" v-next-el='userid' v-el:username>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户类型</label>
+                  <v-select :value.sync="model.f_user_type"
+                            @change="$parent.$parent.userTypeChange()"
+                            :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
+                            condition="f_user_type = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用气性质</label>
+                  <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
+                            :options='$parent.$parent.gasproperties' placeholder='请选择'
+                            condition="f_gasproperties = '{}'"
+                            closfe-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气价类型</label>
+                  <v-select :value.sync="model.pricetype" v-model="model.pricetype"
+                            placeholder='气价类型' :options="$parent.$parent.pricetypes"
+                            close-on-select>
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气价名称</label>
+                  <v-select :value.sync="model.f_price_name"
+                            v-model="model.f_price_name"
+                            :options="$parent.$parent.getPricenames"
+                            condition="f_price_name = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气表品牌</label>
+                  <v-select :value.sync="model.f_meter_brand"
+                            v-model="model.f_meter_brand"
+                            :options="$parent.$parent.meterbrands"
+                            condition="f_meter_brand = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group" >
+                  <label class="font_normal_body" >开始时间</label>
+                  <datepicker style="width: 60%" placeholder="大于等于"
+                              :value.sync="model.f_start_date"
+                              v-model="model.f_start_date"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              condition="f_hand_date >= '{}'"
+                  ></datepicker>
+                </div>
+                <div class="col-sm-2 form-group" >
+                  <label class="font_normal_body">结束时间</label>
+                  <datepicker style="width: 60%" placeholder="小于等于"
+                              :value.sync="model.f_end_date"
+                              v-model="model.f_end_date"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              condition="f_hand_date <= '{}'"
+                  ></datepicker>
+                </div>
+              </div>
+            </div>
+          </criteria>
+          <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
+            <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>
+                <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>
+                <!--<th><nobr>每小时上报量</nobr></th>-->
+              </tr>
+            </template>
+            <template partial='body' partial='list'>
+              <tr >
+                <td style="text-align: left;"><nobr> <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span></nobr></td>
+                <td style="text-align: left;"><nobr>{{row.f_meternumber}}</nobr></td>
+                <td style="text-align: left;"><nobr>{{row.f_user_name}}</nobr></td>
+                <td style="text-align: left;"><nobr>{{row.f_user_phone}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_address}}</nobr></td>
+
+                <td style="text-align:center"><nobr>{{row.f_hand_date}}</nobr></td>
+                <th style="text-align:center"><nobr>{{row.f_insert_date}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_jval}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_price}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_tablebase}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_valvestate}}</nobr></th>
+
+
+                <th style="text-align:center"><nobr>{{row.f_upload_type}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_meterdebitamt}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_signal}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_snr}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_batterylevel}}</nobr></th>
+
+                <th style="text-align:center"><nobr>{{row.f_table_msg}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_moneystate}}</nobr></th>
+              </tr>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+        <table class="table-hover">
+        </table>
+        <modal :show.sync="detail24" >
+          <header slot="modal-header" class="modal-header">
+            <h4 class="modal-title">24小时上报数据明细</h4>
+          </header>
+          <article slot="modal-body" class="modal-body">
+            <table v-for="detail of detaillist">
+              <tr><td>{{detail.frozenDate}}</td><td>&nbsp;&nbsp;--&nbsp;&nbsp;</td><td>{{detail.frozenValue}}</td></tr>
+            </table>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <div class="form-group">
+              <button class="btn btn-success" @click="close()">确认</button>
+              <button type="button" class="btn btn-default" @click='close'>取消</button>
+            </div>
+          </footer>
+        </modal>
+      </div>
+      <div  class="flex" v-if="show">
+        <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+  import exportConfig from '../../sale/config/exportConfig'
+  import plugins from '../../../plugins/GetLoginInfoService'
+  import defaultPrint from "../../sale/config/DefaultPrint";
+  import * as Util from '../../../Util'
+
+  let readySomething = async function (self) {
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
+    // self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
+  }
+  export default {
+    title: '上报查询',
+    data () {
+      return {
+        show:false,
+        detail24: false,
+        org:[this.$login.f.orgid],
+        orgcondition: ' and f_orgid = ' + `'${this.$login.f.orgid}'`,
+        //f_filialeid: this.$login.f.f_orgid,
+        detaillist: [],
+        meterbrands: [],
+        prices: [],
+        gasproperties:[],
+        condition:'',
+        rowdata:{},
+        sumsmodel: {},
+        orgid:[this.$login.f.orgid],
+        criteriaShow:false,
+        orgCondtionStr: '',
+        model: new PagedList('rs/ckh/ckh_getReportList', 50,{startDate: 'this.model.f_start_date', endDate: 'this.model.f_end_date'},{f_meterbalanceamt: 0,f_meterdebitamt: 0})
+      }
+    },
+    ready () {
+      // this.$refs.paged.$refs.criteria.search()
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+      this.$refs.paged.$refs.criteria.model.f_start_date = Util.addDate(new Date(),-1).substring(0,10) + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.f_end_date = Util.addDate(new Date(),-1).substring(0,10) + ' 23:59:59'
+      this.$refs.paged.$refs.criteria.search()
+    },
+    methods: {
+      initParams() {
+        // 初始化气表品牌
+        let brandArr = []
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          if(item.value.f_meter_type==='物联网表'){
+            temp.label = item.label
+            temp.value = item.value.f_meter_brand
+            brandArr.push(temp )
+          }
+
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+        //初始化气表价格
+        this.prices = this.$MagGetSaleParam.getPrices();
+      },
+      async updateParams() {
+        await this.$MagLoadParams.loadParam(this.f_filialeid)
+        this.initParams()
+      },
+      getorg(obj) {
+        if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
+          this.orgcondition = " and f_orgid  in " + plugins.convertToIn(obj)
+        }else{
+          this.orgcondition = " and f_orgid  = " + `'${this.$login.f.orgid}'`
+        }
+
+      },
+      userTypeChange () {
+        this.gasproperties=[]
+        if(this.$refs.paged.$refs.criteria.model !==null) {
+          this.$refs.paged.$refs.criteria.model.f_gasproperties=''
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
+        }
+        else{
+          this.gasproperties =[{label: '全部', value: ''}]
+        }
+      },
+      hidden(){
+        this.criteriaShow = !this.criteriaShow
+      },
+      cancel() {
+        this.show = false
+      },
+      clearmsg () {
+        Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
+          this.$refs.paged.$refs.criteria.model[key] = []
+        })
+      },
+      getRes (obj) {
+        this.orgCondtionStr = condition
+        this.orgname = obj.orgnames[0]
+        this.depname = obj.depnames[0]
+      },
+      showmsg(obj){
+        this.rowdata=obj
+        this.show=true
+      },
+
+      search (args) {
+        args.condition =  `${args.condition}`+this.orgcondition
+        console.log(args.condition+"args.condition")
+        this.condition = args.condition
+        this.model.search(args.condition, args.model)
+        console.log(this.$refs.paged.$refs.grid.model.sums+"--this.$refs.paged.$refs.grid.model.sums")
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+      }
+    },
+    watch: {
+      'orgCondtionStr'(val) {
+        let res = val.match(/'(.*?)'/)
+        console.log('正则提取:',res && res[1])
+        if (res) {
+          this.f_filialeid = res[1]
+          // this.updateParams()
+        }
+      }
+    },
+    computed: {
+      getPricenames() {
+        let f_user_type = this.$refs.paged.$refs.criteria.model.f_user_type;
+        let f_gasproperties = this.$refs.paged.$refs.criteria.model.f_gasproperties;
+        let pricetype = this.$refs.paged.$refs.criteria.model.pricetype;
+        console.log("打印一下:",f_user_type,f_gasproperties,pricetype,this.f_filialeid,this.prices)
+        console.log("查看f_orgid:",this.$login.f.f_orgid)
+        if(this.$refs.paged.$refs.criteria.model !==null) {
+          let rs = []
+          let priceArr = []
+          if ( pricetype.length >0) {
+            let params = {
+              f_price_type: pricetype[0],
+              filter: this.org[0],
+              prices: this.prices
+            }
+            console.log("打印一下params:",params)
+            this.$MagGetSaleParam.getPrice(params).forEach((item) => {
+              console.log("====================================》")
+              let temp = {}
+              temp.label = item.label
+              temp.value = item.value.f_price_name
+              priceArr.push(temp)
+              console.log("打印一下temp:",temp)
+            })
+
+            rs = [{label: '全部', value: ''}, ...priceArr]
+          }
+          if (rs.length === 0) {
+            console.log('rs读出来是空')
+            this.$refs.paged.$refs.criteria.model.f_price_name = ''
+          }
+          return rs
+        }
+      },
+      getfield () {
+        return exportConfig.ReportListConfig
+      },
+      usertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
+      pricetypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
+      },
+      getCondition () {
+        var con = ""
+        if (this.orgCondtionStr) {
+          con = `${this.$refs.paged.$refs.criteria.condition} `+this.orgcondition
+        }
+        else {
+          con = `${this.$refs.paged.$refs.criteria.condition} `+this.orgcondition
+        }
+        return {
+          startDate: this.$refs.paged.$refs.criteria.model.f_start_date,
+          endDate: this.$refs.paged.$refs.criteria.model.f_end_date,
+          condition: con
+        }
+      }
+    }
+  }
+</script>
+
+<style>
+  .mystyle{
+    margin-left:80px;
+  }
+  .datapanel {
+    color: #333;
+    background-color: white;
+    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px ;
+    padding: 10px 10px 10px 10px;
+    border-radius:15px;
+  }
+</style>

package/src/filiale/WEINAN/ChargeQuery.vue

@@ -553,6 +553,7 @@
       await this.equipment()
       this.getaddress()
       console.log('this.$login.f:',this.$login.f)
+      console.log('this.$login.r:',this.$login.r)
       if(!this.$login.r.includes('收费查询选择权限')){
         this.initres.dep.push(this.$login.f.depids)
         this.initres.user.push(this.$login.f.id)

package/src/filiale/WEINAN/ResSelectGroupNew.vue

@@ -0,0 +1,211 @@
+<template>
+  <div :class="style" v-show="companyshow">
+    <label class="font_normal_body">公&emsp;&emsp;司</label>
+    <right-tree @re-res="getorg"
+                :mustselect="mustselect"
+                :initresid='initres.org'></right-tree>
+  </div>
+  <div :class="style" v-show="departmentshow">
+    <label class="font_normal_body">部&emsp;&emsp;门</label>
+    <res-select restype='department' v-ref:department
+                @res-select="getdep"
+                :parentresid="depresid"
+                :initresid='initres.dep'
+                :mustselect="mustselect"
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style" v-show="operatorshow && (!cascade)">
+    <label class="font_normal_body">人&emsp;&emsp;员</label>
+    <res-select restype='user'
+                @res-select="getuser"
+                :parentresid="depresid"
+                :initresid='initres.user'
+                :mustselect="mustselect"
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style" v-show="operatorshow && cascade">
+    <label class="font_normal_body">人&emsp;&emsp;员</label>
+    <res-select restype='user'
+                @res-select="getuser"
+                :parentresid="userresid"
+                :initresid='initres.user'
+                :mustselect="mustselect"
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style " v-if="sliceareashow" >
+    <label class="font_normal_body">片&emsp;&emsp;区</label>
+    <v-select :value.sync="slice_area" v-model="slice_area"  @change='getarea'
+              :options='sliceArea' placeholder='片区/管理站' filer-key="name"
+              close-on-select v-ref:slice>
+    </v-select>
+  </div>
+</template>
+<script>
+import plugin from '../../plugins/GetLoginInfoService'
+import { HttpResetClass } from 'vue-client'
+export default {
+  title: '资源选择测试',
+  props: {
+    style: {
+      type: String,
+      default: 'col-sm-2 form-group'
+    },
+    mul: {
+      type: Boolean,
+      default: true
+    },
+    //初始值
+    initres: {
+      type: Object,
+      default: null,
+    },
+    showComponent:{
+      default:['company','department','operator','slicearea']
+    },
+    //人员是否和部门关联
+    cascade: {
+      type: Boolean,
+      default: true
+    },
+    selectin: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data () {
+    return {
+      orgresid:[this.$login.f.orgid],
+      depresid:[],
+      userresid:[],
+      operatorsid: [],
+      sliceArea: [],
+      slice_area:[],
+      companyshow:false,
+      departmentshow:false,
+      operatorshow:false,
+      sliceareashow:false,
+      mustselect:false,
+      obj:{
+        orgnames:[],
+        depnames:[],
+        operatornames:[]
+      }
+    }
+  },
+  ready () {
+    if(this.$login.r.includes('部门默认选中')&& this.selectin){
+      this.initres.dep = [this.$login.f.depids]
+    }
+    if(this.$login.r.includes('人员默认选中')&& this.selectin){
+      this.initres.user = [this.$login.f.id]
+      if(this.$login.r.includes('人员强制选中')){
+        this.mustselect = true
+      }
+    }
+    this.initComponent();
+    this.initAreas(this.$login.f.orgid)
+  },
+  methods:{
+    initComponent(){
+      let self=this;
+      this.showComponent.find((item)=>{
+        switch(item){
+          case 'company': self.companyshow=true; break;
+          case 'department': self.departmentshow=true; break;
+          case 'operator': self.operatorshow=true; break;
+          case 'slicearea': self.sliceareashow=true; break;
+        }
+      })
+    },
+    // 初始化片区
+    async initAreas (val) {
+      if (val) {
+        let http = new HttpResetClass()
+        let getAllArea = await http.load('POST', '/rs/search', {
+          source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
+          userid: this.$login.f.id
+        }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
+        let arr = getAllArea.data.filter((res) => {
+          return res.parentid == val
+        })
+        this.sliceArea = []
+        this.slice_area = []
+        arr.forEach((res) => {
+          this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
+        })
+      }
+    },
+    returnOrg(ids){
+      let limit = this.$login.r.includes('数据授权限定')
+      let deplimit = this.$login.r.includes('部门筛选')
+
+      let condition;
+      if(this.depresid.length > 0)
+        condition = " and f_orgid in " + plugin.convertToIn(this.depresid);
+      else
+        condition = " and f_orgid = " + this.$login.f.orgid;
+      if(this.userresid.length > 0){
+        condition += " and f_depid in " + plugin.convertToIn(this.userresid);
+      } else {
+        if (limit) {
+          let depids = []
+          for (let row of this.$refs.department.resoptions) {
+            depids.push(row.value)
+          }
+          let depid = depids.length ? plugin.convertToIn(depids) : ('')
+          condition += " and f_depid in " + depid;
+        }
+      }
+      if(ids && ids.length > 0){
+        condition += " and f_operatorid in " + plugin.convertToIn(ids);
+      }
+      if(this.slice_area.length>0){
+        condition += " and f_zones = '" + this.slice_area[0].name+"'"
+      }
+      this.$dispatch('re-res',condition,this.obj)
+      // 只显示自身部门的人员
+      if (deplimit) {
+        if (this.$refs.department.resoptions.length>0) {
+          let resoptionsDepar = []
+          this.$refs.department.resoptions.forEach(item => {
+            if (item.value === this.$login.f.depids) {
+              resoptionsDepar.push(item)
+            }
+          })
+          this.$refs.department.resoptions = resoptionsDepar
+        }
+      }
+    },
+    getorg (obj) {
+      this.depresid=obj.resids
+      this.obj.orgnames = obj.res
+      this.initAreas(obj.resids)
+      this.returnOrg();
+    },
+    getdep(obj,val) {
+      this.obj.depnames = val
+      this.userresid=obj
+      this.returnOrg();
+    },
+    getuser(obj,val) {
+      this.obj.operatornames = val
+      this.operatorsid = obj
+      this.returnOrg(obj);
+    },
+    getarea(val) {
+      this.slice_area=val
+      if(this.operatorsid){
+        this.returnOrg(this.operatorsid);
+      }else{
+        this.returnOrg();
+      }
+    }
+  },
+  watch: {
+
+  }
+}
+</script>

package/src/filiale/WEINAN/sale.js

@@ -74,4 +74,6 @@ export default function () {
   Vue.component('user-equipment-query', (resolve) => { require(['./filesquery/UserDeviceQuery'], resolve) })
   // 档案变更查询
   Vue.component('changeuser-query', (resolve) => { require(['./filesquery/ChangeUserQuery'], resolve) })
+  // 新的人员查询
+  Vue.component('res-select-group', (resolve) => { require(['./ResSelectGroupNew'], resolve) })
 }

package/src/filiale/shanxian/UserLostContactAnalysis.vue

@@ -464,6 +464,11 @@
       search(args) {
         this.condition = this.$refs.paged.$refs.cri.condition + `${this.orgCondtionStr}`
         args.condition = this.condition
+        this.startDate = this.$refs.paged.$refs.cri.model.startDate
+        this.endDate = this.$refs.paged.$refs.cri.model.endDate
+        if (this.endDate == '' || this.startDate == '') {
+          return this.$showMessage("时间区间的开始和结束时间不能为空！")
+        }
         if(this.$refs.paged.$refs.cri.model.notappear) {
           if (this.$refs.paged.$refs.cri.model.notappear === '不包含') {
             args.condition = args.condition + " and initinsertdate <> '开户未上报'"

package/src/filiale/wuhai/ChargeQuery.vue

@@ -34,7 +34,7 @@
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户名称</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                         condition="f_user_name = '{}'" placeholder="客户名称">
+                         condition="f_user_name like '%{}%'" placeholder="客户名称">
                 </div>
 
                 <div class="span" style="float:right;">

package/src/filiale/wuhai/MeterQuery.vue

@@ -15,7 +15,7 @@
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">客户名称</label>
                     <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                           condition="f_user_name = '{}'" placeholder="客户名称">
+                           condition="f_user_name like '%{}%'" placeholder="客户名称">
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body" title="旧客户编号">档案编号</label>

package/src/filiale/wuhai/OtherChargeQuery.vue

@@ -60,7 +60,7 @@
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户名称</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                         condition="f_user_name = '{}'" placeholder="客户名称">
+                         condition="f_user_name like '%{}%'" placeholder="客户名称">
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户地址</label>

package/src/filiale/wuhai/ReportList.vue

@@ -38,7 +38,7 @@
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户名称</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_username" placeholder='客户名称'
-                         condition="ui.f_user_name = '{}'" v-next-el='userid' v-el:username>
+                         condition="ui.f_user_name like '%{}%'" v-next-el='userid' v-el:username>
                 </div>
 
                 <div class="span" style="float:right;margin-top:10px">

package/src/filiale/wuhai/UserQuery.vue

@@ -15,7 +15,7 @@
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">客户名称</label>
                     <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                           condition="f_user_name = '{}'" placeholder="客户名称">
+                           condition="f_user_name like '%{}%'" placeholder="客户名称">
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body" title="旧客户编号">档案编号</label>

package/src/main.js

@@ -7,6 +7,7 @@ import { system } from 'system-clients'
 import { ldap } from 'ldap-clients'
 import saleManage from './saleManage'
 import ShanXianSaleManage from './filiale/shanxian/sale'
+import ShanXianWebmeterManage from './filiale/shanxian/webmeterManage'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'
 import newmanage from './newmanage'
@@ -48,6 +49,7 @@ system(false)
 saleManage()
 ShanXianSaleManage()
 webmeterManage()
+ShanXianWebmeterManage()
 ManageHome()
 newmanage()
 reportManage()

package/src/webmeterManage.js

@@ -89,6 +89,7 @@ export default function () {
   Vue.component('planned-security-inspection-analysis', (resolve) => { require(['./components/webmeter/DrillData/LargeScreenAnalysisEcharts'], resolve) })
 // 上报查询
   Vue.component('report-list', (resolve) => { require(['./components/webmeter/report/ReportList'], resolve) })
+  Vue.component('ckh-report-list', (resolve) => { require(['./components/webmeter/report/ckhReportList'], resolve) })
   // =========================================物联网表==========================================================
   // 表具查看
   //  Vue.component('web-meter-Manage', (resolve) => { require(['./components/webmeter/meterinfo/NewMeterListMain'], resolve) })