manage-client 3.2.51 → 3.2.56

package/src/filiale/shaoguan/config/exportConfig.js

@@ -5,6 +5,17 @@ export default{
     'f_building': '楼栋','f_unit': '单元','f_floor': '楼层','f_room': '门牌号',
     'f_user_state': '客户状态','f_createfile_date': '建档日期','f_createfile_person': '建档人','f_comments': '备注'
   },
+  Wrongquery: {
+    'f_userinfo_code' : '用户编号',
+    'f_user_name' : '用户名称',
+    'f_meternumber' : '表号',
+    'f_bank_pay_number' : '缴费编号',
+    'f_operator_date' : '抄表时间',
+    'f_operator_type' : '错误类型',
+    'f_error_type' : '错误原因',
+    'f_bankname' : '银行名称',
+    'f_msg' : '错误信息'
+  },
   //操作记录查询
   recordConfig:{
     'f_operat_type':'操作类型','f_describe':'操作详情','f_state':'状态','f_operate_date':'操作时间','f_orgname':'公司名称',

package/src/filiale/shaoguan/errorHandplanQuery.vue

@@ -309,20 +309,39 @@
     async cxfps(row){
         console.log("登录人",this.$login.f)
           //组织数据
-      let param=this.cxfpsParam(row)
-      let http=new HttpResetClass()
-        let res=  await http.load('post','rs/logic/machineChargePay', {data: param}, {resolveMsg: '', rejectMsg: ''})
-        let data={
-          id:row.id,
-          f_error_type:'扣款成功',
-          f_operator_type: `反盘导入`,
-          f_operator_info:`${this.$login.f.name}进行重新反盘,收费成功`,
-          f_msg:`反盘收费,${row.f_userinfo_code}收费成功`
-        }
-        if(res.data){
-            await this.$resetpost('rs/logic/updateHanderror', {data:data},{resolveMsg: '反盘收费成功', rejectMsg: '反盘收费成功,修改错误状态失败'})
-          this.$refs.paged.$refs.cri.search()
-        }
+        let param=this.cxfpsParam(row)
+        //查询本月是否已缴费
+        let queryFee=  await this.$resetpost('rs/logic/feeChargeQuery', {data: param}, {resolveMsg: '', rejectMsg: '查询本月收费失败'})
+        if(queryFee.data){
+            this.$showAlert('此用户已反盘，请在收费查询确认此用户是否已缴费','warning','3000')
+            let data={
+              id:row.id,
+              f_error_type:'扣款成功',
+              f_operator_type: `反盘导入`,
+              f_operator_info:`${this.$login.f.name}进行反盘导入,收费成功`,
+              f_msg:`反盘收费,${row.f_userinfo_code}收费成功`
+            }
+             await this.$resetpost('rs/entity/t_handerror',data,{resolveMsg: '', rejectMsg: '更新错误查询记录失败'})
+            this.$refs.paged.$refs.cri.search()
+        } else {
+            let http=new HttpResetClass()
+            let res = await http.load('post', 'rs/logic/machineChargePay', {data: param}, {
+              resolveMsg: '',
+              rejectMsg: '反盘收费失败，请确认系统信息'
+            })
+            let data={
+              id:row.id,
+              f_error_type:'扣款成功',
+              f_operator_type: `反盘导入`,
+              f_operator_info:`${this.$login.f.name}进行重新反盘,收费成功`,
+              f_msg:`反盘收费,${row.f_userinfo_code}收费成功`
+            }
+            if(res.data){
+              await this.$resetpost('rs/logic/updateHanderror', {data:data},{resolveMsg: '反盘收费成功', rejectMsg: '反盘收费成功,修改错误状态失败'})
+              this.$refs.paged.$refs.cri.search()
+            }
+      }
+
     },
     async selfSearch (args){
 

package/src/filiale/wuhai/BusinessManage.vue

@@ -0,0 +1,171 @@
+<template>
+  <!--  <div v-if="listpage">-->
+  <tab-button v-ref:list :active="-1">
+    <tabs header="收费查询" v-if="permission('收费查询')">
+      <charge-query v-if="show.includes('收费查询')" @deal-msg="dealMsg" :data="data"></charge-query>
+    </tabs>
+    <tabs header="换表查询" v-if="permission('换表查询')">
+      <change-meter-query v-if="show.includes('换表查询')" @deal-msg="dealMsg" :data="data"></change-meter-query>
+    </tabs>
+    <tabs header="物联网抄表查询" v-if="permission('物联网抄表查询')">
+      <handplan-query v-if="show.includes('物联网抄表查询')" @deal-msg="dealMsg" :data="data"></handplan-query>
+    </tabs>
+    <tabs header="过户查询" v-if="permission('过户查询')">
+      <transfer-query v-if="show.includes('过户查询')" @deal-msg="dealMsg" :data="data"></transfer-query>
+    </tabs>
+    <tabs header="其他收费查询" v-if="permission('其他收费查询')">
+      <other-charge-query v-if="show.includes('其他收费查询')" @deal-msg="dealMsg" :data="data"></other-charge-query>
+    </tabs>
+    <tabs header="冲正查询" v-if="permission('冲正查询')">
+      <reverse-query v-if="show.includes('冲正查询')" @deal-msg="dealMsg" :data="data"></reverse-query>
+    </tabs>
+    <tabs header="补卡查询" v-if="permission('补卡查询')">
+      <fill-card-query v-if="show.includes('补卡查询')" @deal-msg="dealMsg" :data="data"></fill-card-query>
+    </tabs>
+    <tabs header="补气查询" v-if="permission('补气查询')">
+      <fill-gas-query v-if="show.includes('补气查询')" @deal-msg="dealMsg" :data="data"></fill-gas-query>
+    </tabs>
+    <tabs header="启用查询" v-if="permission('启用查询')">
+      <enable-query v-if="show.includes('启用查询')" @deal-msg="dealMsg" :data="data" :residentialarea="residentialArea"></enable-query>
+    </tabs>
+    <tabs header="停用查询" v-if="permission('停用查询')">
+      <disable-query v-if="show.includes('停用查询')" @deal-msg="dealMsg" :data="data" :residentialarea="residentialArea"></disable-query>
+    </tabs>
+    <tabs header="销户查询" v-if="permission('销户查询')">
+      <cancellation-query v-if="show.includes('销户查询')" @deal-msg="dealMsg" :data="data"></cancellation-query>
+    </tabs>
+    <tabs header="减免优惠查询" v-if="permission('减免优惠查询')">
+      <over-due-query v-if="show.includes('减免优惠查询')" @deal-msg="dealMsg" :data="data"></over-due-query>
+    </tabs>
+    <tabs header="调价补差查询" v-if="permission('调价补差查询')">
+      <priceadjust-query v-if="show.includes('调价补差查询')" @deal-msg="dealMsg" :data="data"></priceadjust-query>
+    </tabs>
+    <tabs header="迁表查询" v-if="permission('迁表查询')">
+      <movemeter-query v-if="show.includes('迁表查询')" @deal-msg="dealMsg" :data="data"></movemeter-query>
+    </tabs>
+    <tabs header="卡表抄表查询" v-if="permission('卡表抄表查询')">
+      <card-handplan-query v-if="show.includes('卡表抄表查询')" @deal-msg="dealMsg" :data="data"></card-handplan-query>
+    </tabs>
+    <tabs header="收据查询" v-if="permission('收据查询')">
+        <meter-receipt-query v-if="show.includes('收据查询')" @deal-msg="dealMsg" :data="data"></meter-receipt-query>
+    </tabs>
+    <!--      <tabs header="操作记录查询" v-if="permission('操作记录查询')">-->
+    <!--        <record-query v-if="show == '操作记录查询'" @deal-msg="dealMsg" :data="data"></record-query>-->
+    <!--      </tabs>-->
+    <tabs header="业务查询" v-if="permission('业务查询')">
+      <busines-query v-if="show.includes('业务查询')" @deal-msg="dealMsg" :data="data"></busines-query>
+    </tabs>
+    <tabs header="预存查询" v-if="permission('预存查询')">
+      <yucun-detailss v-if="show.includes('预存查询')" @deal-msg="dealMsg" :data="data"></yucun-detailss>
+    </tabs>
+    <tabs header="发折查询" v-if="permission('发折查询')">
+      <sendbook-query v-if="show.includes('发折查询')" @deal-msg="dealMsg" :data="data"></sendbook-query>
+    </tabs>
+    <tabs header="可疑用户查询" v-if="permission('可疑用户查询')">
+      <suspicious-user-query v-if="show.includes('可疑用户查询')" @deal-msg="dealMsg" :data="data"></suspicious-user-query>
+    </tabs>
+    <tabs header="气价变更查询" v-if="permission('气价变更查询')">
+      <price-change v-if="show.includes('气价变更查询')" @deal-msg="dealMsg" :data="data"></price-change>
+    </tabs>
+    <tabs header="扎帐查询" v-if="permission('扎帐查询')">
+      <prick-bill-query v-if="show.includes('扎帐查询')" @deal-msg="dealMsg" :data="data"></prick-bill-query>
+    </tabs>
+    <!--      <tabs header="资源操作记录查询" v-if="permission('资源操作记录查询')">-->
+    <!--        <resource-operating-query v-if="show == '资源操作记录查询'" @deal-msg="dealMsg" :data="data"></resource-operating-query>-->
+    <!--      </tabs>-->
+    <tabs header="调价记录查询" v-if="permission('调价记录查询')">
+      <pricechange-record v-if="show.includes('调价记录查询')" @deal-msg="dealMsg" :data="data"></pricechange-record>
+    </tabs>
+    <tabs header="维护记录查询" v-if="permission('维护记录查询')">
+      <infooperate-record v-if="show.includes('维护记录查询')" @deal-msg="dealMsg" :data="data"></infooperate-record>
+    </tabs>
+    <tabs header="气损收费查询" v-if="permission('气损收费查询')">
+      <gasloss-query v-if="show.includes('气损收费查询')" @deal-msg="dealMsg" :data="data"></gasloss-query>
+    </tabs>
+    <tabs header="气价信息查询" v-if="permission('气价信息查询')">
+      <gas-price-query v-if="show.includes('气价信息查询')" @deal-msg="dealMsg" :data="data"></gas-price-query>
+    </tabs>
+
+  </tab-button>
+  <!--  </div>-->
+  <!--  <div v-if="!listpage">-->
+  <!--    <meter-info-manage :row="rowData" :f_start_date="f_start_date" :f_end_date="f_end_date"></meter-info-manage>-->
+  <!--  </div>-->
+</template>
+
+<script>
+import TabButton from './common/TabButton'
+import Tabs from './common/Tabs'
+import ChargeQuery from './ChargeQuery'
+import { HttpResetClass } from 'vue-client'
+
+export default {
+  name: "BusinessQuery",
+  title: '业务查询',
+  data() {
+    return {// 页面开关
+      residentialArea: [],
+      f_start_date: '',
+      f_end_date: '',
+      listpage: true,
+      width: {
+        left: '100%',
+        right: '0%'
+      },
+      // searchNumber:'',
+      rowData: {},
+      show: [],
+      data: {
+        startDate: this.$login.toStandardDateString() + ' 00:00:00',
+        endDate: this.$login.toStandardDateString() + ' 23:59:59',
+        f_userinfo_code:''
+      }
+
+    }
+  },
+  components: {Tabs, TabButton, ChargeQuery},
+  ready() {
+    this.getaddress()
+    console.log(this.$refs.list)
+    console.log('业务查询')
+  },
+  methods: {
+    async  getaddress(){
+      let HttpReset = new HttpResetClass()
+      var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
+        data: {
+          condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
+        }
+      }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+      console.log('小区',data)
+      let house = []
+      for (let row of data.data){
+        house.push({label: row.f_residential_area, value: row.f_residential_area})
+      }
+      house.unshift({label: '全部', value: ''})
+      this.residentialArea = house
+    },
+    permission(name) {
+      if (this.$login.r.find(value => value == '综合查询')) {
+        if (!this.$login.r.find(value => value == name)) {
+          return false
+        }
+      }
+      return true
+    },
+    cancel(obj) {
+      this.listpage = true
+    },
+    dealMsg(obj) {
+      this.rowData = obj
+      this.listpage = false
+      this.f_start_date = obj.model.startDate
+      this.f_end_date = obj.model.endDate
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/filiale/wuhai/common/TabButton.vue

@@ -0,0 +1,155 @@
+<template>
+  <div class='flex foot_tabset1'>
+    <!-- Nav tabs -->
+    <ul class="nav nav-{{navStyle}}" role="tablist" style="margin-left: 1%">
+      <li style="margin-right: 10px"
+          :id="'vc-tabset-li-'+attach +'-'+$index"
+          v-for="r in renderData"
+          @click.prevent="handleTabListClick($index, r)"
+          :disabled="r.disabled"
+      >
+        <button class="button_new" style="width: max-content" v-bind:class="{
+            'btn-succ': ($index === active),
+            'disabled': r.disabled
+          }">
+          <slot name="header">
+            {{r.header}}
+          </slot>
+          <!-- 关闭按钮 -->
+          <span class="glyphicon glyphicon-remove" style="margin-left: 15px;" @click="deletetTab(r)" v-if="close" :id="'vc-tabset-close-'+attach +'-'+$index"></span>
+        </button>
+
+      </li>
+    </ul>
+
+    <!-- Tab panes -->
+    <div class="tab-content span" v-el:tab-content>
+      <slot></slot>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {remove} from 'vue-client/src/stores/Remove.js'
+
+  export default {
+    props: {
+      navStyle: {
+        type: String,
+        default: 'tabs'
+      },
+      effect: {
+        type: String,
+        default: 'fadein'
+      },
+      active: {
+        type: Number,
+        default: 0
+      },
+      close: {
+        type: Boolean,
+        default: false
+      },
+      attach: {
+        type: String,
+        default: 'vuestrap'
+      },
+      content: {}
+    },
+    ready () {
+      remove.$on('remove', (name) => {
+        console.log('tabset收$on 到的名字为：', name)
+        this.$removeTab(name)
+      })
+    },
+    data () {
+      return {
+        // 数据格式：{comp, header，disabled}
+        // - comp: 当前页签对应的tab组件
+        renderData: []
+      }
+    },
+    methods: {
+      handleTabListClick (index, el) {
+        // 没有打开过, 则添加显示
+        if (!this.$parent.show.includes(el.header)) {
+          this.$parent.show.push(el.header)
+        }
+        if (el.comp._scope && el.comp._scope.tab) {
+          this.$dispatch('tab-changed', el.comp._scope.tab.comp.name)
+        }
+        if (!el.disabled) this.active = index
+      },
+      // deletetab函数为自己添加
+      deletetTab (el) {
+        this.$removeTab(el.comp._scope.tab.comp.name)
+        remove.$emit('delete', el.comp._scope.tab.comp.name)
+      },
+      // 根据删除也下标，修改所有页签的下标
+      modifyAllIndex (index) {
+        let cur = this.active
+        this.$nextTick(() => {
+          // 关闭页签以后的多有页签的的下标向前挪动一位,之前的页签不动
+          for (var i = index; i < this.renderData.length; i++) {
+            this.renderData[i].comp.index -= 1
+          }
+          // 修改激活页
+          // 获取当前激活页签下标，关闭在当前激活页之后（包含当前激活页），当前激活页下标不变
+          // 当关闭当前激活页之前（激活页向前移动一位）
+          if (this.active > index || this.active === this.renderData.length) {
+            this.active = cur - 1
+          } else if (cur === 0) {
+            this.active = 0
+          } else {
+            this.active = cur
+          }
+          if (this.active === -1) {
+            this.$dispatch('tab-changed', null)
+          }else {
+            this.$dispatch('tab-changed', this.renderData[this.active].comp._scope.tab.comp.name)
+          }
+        })
+      }
+    },
+    events: {
+      'delete' (index) {
+        this.modifyAllIndex(index)
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  ul > li > a {
+    position: relative;
+  }
+  ul > li > a > span {
+    display: none;
+  }
+  /*ul > li > a:hover > span {*/
+  /*display: initial;*/
+  /*position: absolute;*/
+  /*right: 0;*/
+  /*top: 35%;*/
+  /*border: 1px solid #EAEAEA;*/
+  /*}*/
+  /*ul > li > a:hover > span:hover {*/
+  /*border: 1px solid #EAEAEA;*/
+  /*color: #5cb95c;*/
+  /*}*/
+  ul > li > button {
+    background-color: #FFFFFF;
+    border-radius: 4px;
+    color: #999;
+    border: 1px solid #5cb95c;
+  }
+  .btn-succ{
+    background-color: #6aa6e2;
+    border-radius: 4px;
+    color: #fff;
+  }
+  .foot_tabset1 > .nav {
+    overflow-x: scroll;
+    white-space: nowrap;
+  }
+</style>

package/src/filiale/wuhai/common/Tabs.vue

@@ -0,0 +1,67 @@
+<template>
+  <div role="tabpanel" class="tab-pane"
+       v-bind:class="{hide:!show}"
+       v-show="show"
+       :transition="transition"
+  >
+    <slot></slot>
+  </div>
+</template>
+
+<script>
+  import coerceBoolean from 'vue-client/src/vue-strap/src/utils/coerceBoolean.js'
+
+  export default {
+    props: {
+      header: {
+        type: String
+      },
+      disabled: {
+        type: Boolean,
+        coerce: coerceBoolean,
+        default: false
+      }
+    },
+    data () {
+      return {
+        index: 0,
+        show: false
+      }
+    },
+    watch: {
+      'header' (val) {
+        // header变化时，通知tabset
+        let data = this.$parent.renderData.find((v) => v.comp === this)
+        data.header = val
+      }
+    },
+    computed: {
+      show () {
+        return (this.$parent.active === this.index)
+      },
+      transition () {
+        return this.$parent.effect
+      }
+    },
+    created () {
+      this.$parent.renderData.push({
+        comp: this,
+        header: this.header,
+        disabled: this.disabled
+      })
+    },
+    ready () {
+      // 找到当前tab的索引
+      this.index = this.$parent.$children.findIndex((v) => v.$el === this.$el)
+    },
+    beforeDestroy () {
+      this.$parent.renderData.splice(this.index, 1)
+    }
+  }
+</script>
+
+<style scoped>
+  .tab-content > .tab-pane {
+    display: block;
+  }
+</style>

package/src/filiale/wuhai/sale.js

@@ -1,10 +1,12 @@
-// 分公司特殊组件页面注册
-let specialComp = {
-  // 收费查询
-  'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) }
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+let specialComp = {
+  // 收费查询
+  'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
+  // 业务查询
+  'business-manage': (resolve) => { require(['./BusinessManage'], resolve)}
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/main.js

@@ -1,66 +1,66 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-
-// import { sale } from 'sale-client'
-import { system } from 'system-clients'
-import { ldap } from 'ldap-clients'
-import saleManage from './saleManage'
-import webmeterManage from './webmeterManage'
-import reportManage from './reportManage'
-import newmanage from './newmanage'
-import ManageHome from './ManageHome'
-import echarts from 'echarts'
-import AMap from 'vue-amap'
-
-Vue.config.silent = true
-// Vue.mmType = 'AES'
-
-Vue.use(AMap);
-
-// 初始化vue-amap
-AMap.initAMapApiLoader({
-  // 高德key
-  key: '3cec9ae8e2349207f7ac29279e3f4abe',
-  // 插件集合 （插件按需引入）
-  plugin: [
-    "AMap.Autocomplete", //输入提示插件
-    "AMap.PlaceSearch", //POI搜索插件
-    "AMap.Scale", //右下角缩略图插件 比例尺
-    "AMap.OverView", //地图鹰眼插件
-    "AMap.ToolBar", //地图工具条0
-    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
-    "AMap.PolyEditor", //编辑 折线多，边形
-    "AMap.CircleEditor", //圆形编辑器插件
-    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
-  ],
-  uiVersion: "1.0"
-});
-/** **************************通用组件******************************/
-
-Vue.prototype.$echarts = echarts
-all()
-// sale()
-ldap()
-system(false)
-saleManage()
-
-webmeterManage()
-ManageHome()
-newmanage()
-reportManage('tongchuan')
-require('system-clients/src/styles/less/bootstrap.less')
-require('./components/qinhua/Style/qinhuaStyle.less')
-// require('./bootstrap/less/manageStyle/manageChile.less')
-// require('./bootstrap/less/manageStyle/safeStyle.less')
-
-//大屏展示要放开的样式
-// require('system-clients/src/styles/less/manageStyle/manageChile.less')
-// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
-// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
-
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+
+// import { sale } from 'sale-client'
+import { system } from 'system-clients'
+import { ldap } from 'ldap-clients'
+import saleManage from './saleManage'
+import webmeterManage from './webmeterManage'
+import reportManage from './reportManage'
+import newmanage from './newmanage'
+import ManageHome from './ManageHome'
+import echarts from 'echarts'
+import AMap from 'vue-amap'
+
+Vue.config.silent = true
+// Vue.mmType = 'AES'
+
+Vue.use(AMap);
+
+// 初始化vue-amap
+AMap.initAMapApiLoader({
+  // 高德key
+  key: '3cec9ae8e2349207f7ac29279e3f4abe',
+  // 插件集合 （插件按需引入）
+  plugin: [
+    "AMap.Autocomplete", //输入提示插件
+    "AMap.PlaceSearch", //POI搜索插件
+    "AMap.Scale", //右下角缩略图插件 比例尺
+    "AMap.OverView", //地图鹰眼插件
+    "AMap.ToolBar", //地图工具条0
+    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
+    "AMap.PolyEditor", //编辑 折线多，边形
+    "AMap.CircleEditor", //圆形编辑器插件
+    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
+  ],
+  uiVersion: "1.0"
+});
+/** **************************通用组件******************************/
+
+Vue.prototype.$echarts = echarts
+all()
+// sale()
+ldap()
+system(false)
+saleManage('wuhai')
+
+webmeterManage()
+ManageHome()
+newmanage()
+reportManage('tongchuan')
+require('system-clients/src/styles/less/bootstrap.less')
+require('./components/qinhua/Style/qinhuaStyle.less')
+// require('./bootstrap/less/manageStyle/manageChile.less')
+// require('./bootstrap/less/manageStyle/safeStyle.less')
+
+//大屏展示要放开的样式
+// require('system-clients/src/styles/less/manageStyle/manageChile.less')
+// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
+// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})
+

package/src/reportManage.js

@@ -488,6 +488,10 @@ export default function (filiale) {
   Vue.component('public-other-report', (resolve) => {
     require(['./components/SellReport/OtherChargePublicReport'], resolve)
   })
+  // 其他收费通用报表
+  Vue.component('price-report-wh', (resolve) => {
+    require(['./components/SellReport/PriceReportWH'], resolve)
+  })
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/reportManage`).specialComp
     Vue.filialeInfo = Vue.prototype.$filialeInfo = filiale