manage-client 4.0.73 → 4.0.74-2

package/build/dev-server.js

@@ -11,17 +11,17 @@ var compiler = webpack(config)
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-var shaoguan = 'http://119.146.1.106:8300/'
-var qtx = 'http://36.103.222.144:6300/'
+var shaoguan = 'https://www.rcenergy.cn:8401/'
+var qtx = 'https://www.rcenergy.cn:8401/'
 // var bendi = 'http://220.194.141.253:8600/'
 // var bendi = 'http://203.57.101.233:9001'
 // var bendi = 'http://172.168.1.11:9001/'
 // var bendi = 'http://203.57.101.233:9001/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://203.57.101.233:9001/'
+var bendi = 'https://www.rcenergy.cn:8401/'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://203.57.101.233:9001/'
+var wode = 'https://www.rcenergy.cn:8401/'
 // 192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
@@ -40,7 +40,7 @@ var proxyTable = {
     target: 'http://127.0.0.1:9026/'
   },
   '/api': {
-    target: 'http://192.168.50.67:31567/'
+    target: bendi
 
   },
   '/rs/sql/chargeQuery_by_gasproperties': {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "4.0.73",
+    "version": "4.0.74-2",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {
@@ -8,7 +8,9 @@
     },
     "dependencies": {
         "crypto-js": "^4.1.1",
-        "swiper": "^5.4.5"
+        "swiper": "^5.4.5",
+        "system-clients": "3.2.76",
+        "vue-client": "1.24.112"
     },
     "devDependencies": {
         "axios": "0.15.3",
@@ -67,11 +69,11 @@
         "style": "0.0.3",
         "style-loader": "^0.20.3",
         "swiper": "^5.4.5",
-        "system-clients": "3.3.2",
+
         "ldap-clients": "3.0.96",
         "url-loader": "^0.5.7",
         "vue-amap": "0.5.10",
-        "vue-client": "1.24.162",
+
         "vue-hot-reload-api": "^1.2.0",
         "vue-html-loader": "^1.0.0",
         "vue-loader": "8.2.1",

package/src/App.vue

@@ -1,29 +1,60 @@
 <template>
-  <div>
-    <app-base class="bg">
-      <div class='flex'>
-        <article>
-          <!--<route :comp="{name: 'liaoyuan-manage-home'}"></route>-->
-          <!--<route :comp="{name: 'meter-reading'}"></route>-->
-          <!--<route :comp="{name: 'Gasproperties'}"></route>-->
-          <!--<route :comp="{name: 'vender-management'}"></route>-->
-          <!--<route :comp="{name: 'malfunction-home'}"></route>-->
-          <route :comp="{name: 'login'}"></route>
-<!--          <route :comp="{name: 'call-report-main-page'}"></route>-->
-          <!-- <route :comp="{name: 'load-data'}"></route> -->
-           <!--<route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route>-->
-          <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['api/af-revenue/sql/getMeterBrand','api/af-revenue/sql/getPriceType','api/af-revenue/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
-        </article>
-      </div>
-    </app-base>
-  </div>
+  <app-base class="bg" @click="isTimeOut">
+    <div class='flex'>
+      <article>
+        <route :comp="{name: 'login'}"></route>
+      </article>
+    </div>
+  </app-base>
 </template>
 
 <script>
-
-
+import Vue from 'vue'
 export default {
-
-
+  data () {
+    return {
+      lastTime: null, // 最后一次点击的时间
+      currentTime: null, // 当前点击的时间
+      // 获取一次不在获取控制
+      getConfig: false,
+      config: {
+        timeOut: 0, // 单位: 分钟
+        exitPrompt: '因您长时间未操作, 请重新登陆!'
+      },
+    }
+  },
+  ready() {
+    Vue.mmType = 'nginx'
+    Vue.HWQMM = [51, 150, 231, 300, 565, 708, 721, 952, 738, 560, 935, 912, 1274, 1148, 840, 1440]
+  },
+  created () {
+    this.lastTime = new Date().getTime()
+  },
+  methods: {
+    async isTimeOut () {
+      // 获取config配置
+      if (!this.getConfig && this.$login.f && this.$login.f.dir) {
+        await this.$getConfig(this, 'App')
+        this.getConfig = true
+      }
+      // 无配置,不开启
+      if (this.config.timeOut <= 0) return
+      // 记录这次点击的时间
+      this.currentTime = new Date().getTime()
+      // 判断上次最后一次点击的时间和这次点击的时间间隔是否大于超时时间
+      if (this.currentTime - this.lastTime > (this.config.timeOut * 60 * 1000)) {
+        // 如果是登录状态
+        if (this.$login.f.id) {
+          await this.$showMessage(this.config.exitPrompt)
+          window.location.reload()
+        } else {
+          this.lastTime = new Date().getTime()
+        }
+      } else {
+        // 如果在超时时间内点击，则把这次点击的时间记录覆盖掉之前存的最后一次点击的时间
+        this.lastTime = new Date().getTime()
+      }
+    }
+  }
 }
 </script>

package/src/components/SellReport/ManageSellType.vue

@@ -52,10 +52,10 @@
           </div>
           <div class="col-sm-2 form-group">
             <label class="font_normal_body">用户类型</label>
-            <v-select :value.sync="$parent.$parent.f_user_type"
-                      v-model="$parent.$parent.f_user_type"
+            <v-select :value.sync="model.f_user_type"
+                      v-model="model.f_user_type"
                       :options='$parent.$parent.user_type' placeholder='请选择'
-                      condition="f_user_type in '{}'"
+                      condition="f_user_type = '{}'"
                       close-on-select></v-select>
           </div>
           <div class="col-sm-2 form-group">

package/src/components/webmeter/newwebmeter/NewException/MeterExceptionList.vue

@@ -220,6 +220,9 @@
                             <th style="text-align:center">
                                 <nobr>抄表日期</nobr>
                             </th>
+                            <th style="text-align:center">
+                              <nobr>上报日期</nobr>
+                            </th>
                             <th style="text-align:center">
                                 <nobr>最后一次通讯时间</nobr>
                             </th>
@@ -284,6 +287,9 @@
                         <td style="text-align:center">
                             <nobr>{{row.f_insert_date}}</nobr>
                         </td>
+                        <td style="text-align:center">
+                          <nobr>{{row.f_insert_enddate}}</nobr>
+                        </td>
                         <td style="text-align:center">
                           <nobr>{{row.f_electricity}}</nobr>
                         </td>
@@ -388,7 +394,7 @@
                 ],
                 getfield:{
                     "f_userinfo_code":"客户编号", "f_user_name":"客户名称","f_residential_area":"小区", "address":"客户地址","f_user_type":"客户类型","f_gasproperties":"用气性质","f_balance_amount":"账户余额","f_user_phone":"联系电话",
-                    "f_meternumber":"表号","f_meter_brand":"气表品牌","f_hand_date":"抄表日期","f_insert_date":"最后一次通讯时间","f_electricity":"电池电量","f_batterylevel":"电池电压",
+                    "f_meternumber":"表号","f_meter_brand":"气表品牌","f_hand_date":"抄表日期","f_insert_date":"上报日期","f_insert_enddate":"最后一次通讯时间","f_electricity":"电池电量","f_batterylevel":"电池电压",
                     "f_signal":"信号强度","f_magneticInterference":"磁干扰异常","f_valvestate":"阀门状态","f_error_type":"异常类型","f_error_level":"异常级别","f_is_read":"处理状态","f_error_reason":"备注信息","f_orgname":"分公司"
                 },
                 outlets: [],

package/src/filiale/bayan/businessquery/weChatBind.vue

@@ -0,0 +1,423 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex">
+        <div style="flex:1;" class="flex" v-if="!show">
+          <criteria-paged :model="model" v-ref:paged>
+            <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+              <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+                <div class="row">
+                  <div class="col-sm-2 form-group">
+                    <label for="startDate" class="font_normal_body">开始日期</label>
+                    <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                                v-model="model.startDate"
+                                :value.sync="model.startDate"
+                                :format="'yyyy-MM-dd'"
+                                :show-reset-button="true"
+                                condition="f_band_time >= '{}'">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label for="endDate" class="font_normal_body">结束日期</label>
+                    <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                                v-model="model.endDate"
+                                :value.sync="model.endDate"
+                                :format="'yyyy-MM-dd'"
+                                :show-reset-button="true"
+                                condition="f_band_time <= '{}'">
+                    </datepicker>
+                  </div>
+                  <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_userinfo_code"
+                           condition="f_userinfo_code = '{}' " placeholder="客户编号">
+                  </div>
+                  <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 like '%{}%'" placeholder="客户名称">
+                  </div>
+                  <div class="span" style="float:right;">
+                    <button class="button_search button_spacing" @click="search()">查询</button>
+                    <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                    <!--<button class="btn btn-default" @click="$parent.$parent.stamp()">打印</button>-->
+
+                    <export-excel :data="$parent.$parent.getCondition"
+                                  :field="$parent.$parent.getExportField"
+                                  sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="wechatQuery" 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">
+                  <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"></res-select-group>
+                  <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_phone"
+                           condition="f_user_phone like '%{}%'" placeholder="客户电话">
+                  </div>
+                  <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_address"
+                           condition="f_address like '%{}%'" placeholder='客户地址'>
+                  </div>
+                  <div class="col-sm-2 form-group" >
+                    <label class="font_normal_body">气表品牌</label>
+                    <v-select :value.sync="model.gasbrand" v-model="model.gasbrand"
+                              :options='$parent.$parent.meterbrands' placeholder='气表品牌' close-on-select
+                              v-model='$parent.$parent.gasbrand'
+                              condition="f_meter_brand = '{}'"
+                    ></v-select>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
+                    <v-select :value.sync="model.f_residential_area"
+                              class="select_list select"
+                              v-model="model.f_residential_area"
+                              style="width: 60%"
+                              multiple
+                              condition="f_residential_area in {}"
+                              :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                              close-on-select>
+
+                    </v-select>
+                  </div>
+                  <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_area_period"
+                           condition="f_area_period = '{}'" placeholder='区期'>
+                  </div>
+                  <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_building"
+                           condition="f_building = '{}'" placeholder='楼号'>
+                  </div>
+                  <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_unit"
+                           condition="f_unit = '{}'" placeholder='单元'>
+                  </div>
+                  <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_floor"
+                           condition="f_floor = '{}'" placeholder='楼层'>
+                  </div>
+                  <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_room"
+                           condition="f_room = '{}'" placeholder='房间号'>
+                  </div>
+                </div>
+              </div>
+            </criteria>
+
+            <data-grid :model="model" partial='list' class="list_area table_sy" @dblclick="$parent.dblclick" v-ref:grid>
+              <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>
+                </tr>
+              </template>
+              <template partial='body'>
+                <td  :class="'back-blue'" style="text-align: center;" >
+                  <nobr>
+                  {{row.f_userinfo_code}}
+                </nobr> </td>
+                <td :class="'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_user_name}}</nobr>
+                </td>
+                <td :class="'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_meter_brand}}</nobr>
+                </td>
+                <td :class="'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_meter_type}}</nobr>
+                </td>
+                <td :class="'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_user_phone}}</nobr>
+                </td>
+                <td :class="'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_open_id}}</nobr>
+                </td>
+                <td :class="'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_band_state}}</nobr>
+                </td>
+                <td :class="'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_residential_area}}</nobr>
+                </td>
+                <td :class="'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_address}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <button type="button" name="button" class="btn btn-link"
+                          @click="$parent.$parent.$parent.wechatbing(row)">解绑
+                  </button>
+                </td>
+              </template>
+            </data-grid>
+          </criteria-paged>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+  import defaultPrint from '../config/DefaultPrint'
+  import exportConfig from '../config/exportConfig'
+
+  let readySomething = async function (self) {
+
+
+    await self.$MagLoadParams.loadParam()
+    await self.$LoadParams.loadParam(self.f_filialeid)
+    self.loadMeterBooks()
+    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+    await self.$refs.paged.$refs.cri.search()
+    // self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+
+  }
+
+  export default {
+    title: '微信绑定查询',
+    data() {
+      return {
+        model: new PagedList('api/af-revenue/sql/wechatQuery', 20, {}),
+        criteriaShow: false,
+        orgCondtionStr: '',
+        modelval: [],
+        residentialArea: [],
+        printshow: false,
+        all: false,
+        fields: {},
+        meterbrands:[{label: '全部',value: ''}],
+        thead: '',
+        tfoot: '',
+        area: [],
+        //合计数据
+        // sumsmodel: {},
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        userdetail: {
+          show: false,
+          f_userinfo_code: '',
+          f_filialeids: ''
+        },
+        show:false,
+        rowdata:{},
+        sliceArea: []
+      }
+    },
+    ready() {
+      this.getaddress()
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+      this.initAreas(this.$login.f.orgid)
+    },
+    methods: {
+      loadMeterBooks(){
+        let meterbrand = this.$GetSaleParam.getGasbrand()
+        for(let row of meterbrand){
+          this.meterbrands.push({label: row.label,value: row.value.f_meter_brand})
+        }
+      },
+      async getaddress(){
+        console.log('开始获取小区')
+        let HttpReset = new HttpResetClass()
+        var data = await HttpReset.load('POST', 'api/af-revenue/sql/manage_getarealist', {
+          data: {
+            condition: `1=1 and s.f_filialeid = '${this.$login.f.orgid}'`
+          }
+        }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+        console.log('小区',data)
+        let house = []
+        for (let row of data.data){
+          console.log('开始保存小区')
+          house.push({label: row.f_residential_area, value: row.f_residential_area})
+        }
+        this.residentialArea = house
+      },
+      //把数据库查询数据转换为下拉数据
+      calculate(rows){
+        let data = []
+        rows.forEach((row, n) => {
+          data[n] = {label: row.f_residential_area, value: row.id}
+        })
+        return data
+      },
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      wechatbing(row) {
+        console.log('微信解绑用户', row)
+        let param = {
+          id: row.id
+        }
+        this.$resetpost('api/af-revenue/logic/wechatbind', {data: param}, {warnMsg: '确定对这条记录进行解绑吗？'}).then(() => {
+          this.$refs.paged.$refs.cri.search()
+        })
+      },
+      cancel(obj) {
+        this.show = false
+      },
+      async initAreas (val) {
+
+        if (val) {
+          let getAllArea = await this.$resetpost('/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
+          })
+          console.log('过滤之后的片区', arr)
+          this.sliceArea = []
+          this.sliceArea.push({label: "全部", value: ""})
+          arr.forEach((res) => {
+            this.sliceArea.push({label: res.name, value: res.name})
+          })
+          console.log(this.sliceArea)
+        }
+      },
+      selfSearch(args) {
+        if (!this.orgCondtionStr) {
+          args.condition = `${args.condition}` + " and f_orgid = " + this.$login.f.orgid
+        } else {
+          args.condition = `${args.condition}` + this.orgCondtionStr
+        }
+        this.model.search(args.condition, args.model)
+      },
+      clear() {
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = []
+        })
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      getRes(obj) {
+        this.orgCondtionStr = obj
+      },
+      stamp() {
+        this.all = false
+        //默认选择要打印的列
+        this.modelval = defaultPrint.config
+        this.fields = this.getfield
+        console.log('所有打印字段', this.fields)
+        this.printshow = true
+        this.put()
+      },
+      put() {
+        // 对Modelval进行排序
+        this.sortModelval()
+        this.thead = `<tr><th colspan=${this.modelval.length}>用户查询统计报表</th></tr><tr>`
+        for (let key of this.modelval) {
+          this.thead += '<th>' + this.fields[key] + '</th>'
+        }
+        this.thead += '</tr>'
+      },
+      print() {
+        this.$refs.print.PrintAsFile()
+        this.printshow = false
+      },
+      close() {
+        this.printshow = false
+      },
+      // 对选择的列进行排序
+      sortModelval() {
+        let sortModel = []
+        Object.keys(this.fields).forEach((key) => {
+          if (this.modelval.includes(key)) {
+            sortModel.push(key)
+          }
+        })
+        this.modelval = sortModel
+        console.log('选择的打印的字段', this.modelval)
+      },
+      dblclick(row, index) {
+        console.log('双击之后数据', row, index)
+        this.userdetail.show = true
+        this.userdetail.f_userinfo_code = row.f_userinfo_code
+        this.userdetail.f_filialeids = row.f_filialeids
+      }
+    },
+    watch: {
+      'all'(val) {
+        if (val) {
+          this.modelval = this.bodyData
+        } else {
+          this.modelval = defaultPrint.config
+          this.put()
+        }
+      },
+      'modelval.length'() {
+        this.put()
+      },
+    },
+    computed: {
+      authArr () {
+        return this.$login.r ? this.$login.r : []
+      },
+
+      getCondition() {
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+      },
+      getfield() {
+        let data = {}
+        this.bodyData.forEach((value, index) => {
+          data[this.bodyData[index]] = this.headData[index]
+        })
+        return data
+      },
+      getExportField() {
+        return exportConfig.wechatConfig
+      }
+    }
+  }
+</script>
+<style>
+  .back-red{		/* 红色背景 */
+    background-color: #F6C6CE;
+  }
+  .back-blue{		/* 蓝色背景 */
+
+  }
+</style>
+

package/src/filiale/bayan/sale.js

@@ -13,4 +13,7 @@ export default function () {
   Vue.component('record-info-query', (resolve) => {
     require(['./RecordInfoQuery'], resolve)
   })
+  Vue.component('wechat-bind', (resolve) => {
+    require(['./businessquery/weChatBind'], resolve)
+  })
 }