manage-client 3.3.225-kelai → 3.3.226

package/build/dev-server.js

@@ -19,21 +19,13 @@ var qtx= 'http://36.103.222.144:6300/'
 // var bendi = 'http://203.57.101.233:8400/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://192.168.50.4:8400/'
+var bendi = 'http://203.57.101.233:8400/'
 // var bendi = 'http://119.187.112.234:8400/'
 var wode = 'http://203.57.101.233:8400/'
 // 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'
 var proxyTable = {
-  '/api/af-revenue/sql/compreQuery': {
-    pathRewrite: {'^/api/af-revenue': '/rs/sql/compreQuery'},
-    target: 'http://localhost:8080'
-  },
-  'api/af-revenue/sql/queryGasRecord': {
-    pathRewrite: {'^/api/af-revenue': '/rs/sql/queryGasRecord'},
-    target: 'http://localhost:8080'
-  },
   '/rs/logic/exportfile': {
     target: bendi
   },
@@ -65,9 +57,6 @@ var proxyTable = {
   '/rs/logic/getSaleInitData': {
     target: bendi
   },
-  '/rs/logic': {
-    target: 'http://localhost:8080'
-  },
   // 用户登录服务地址
   '/rs/user': {
     target: bendi
@@ -106,7 +95,7 @@ var proxyTable = {
     target: bendi
   },
   '/rs': {
-    target: bendi
+    target: wode
   }
 }
 

package/package.json

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

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

@@ -59,6 +59,16 @@
               <right-tree @re-res="$parent.$parent.getorg" width="60%"
                           :initresid='$parent.$parent.org'></right-tree>
             </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body" for="dep" >部&emsp;&emsp;门</label>
+              <res-select id="dep" restype='department' style="width: 60%"
+                          is-mul="false"
+                          @res-select="$parent.$parent.getdep"
+                          :parentresid="$parent.$parent.depresid"
+                          :initresid='$parent.$parent.depid' >
+              </res-select>
+
+            </div>
             <div class="col-sm-2 form-group">
               <label class="font_normal_body">客户类型</label>
               <v-select style="width:60%" id="f_user_type"
@@ -419,6 +429,13 @@
         endDate: '',
         criteriaShow:false,
         outlets: [],
+        depresid: [],
+        queryData: {
+          f_orgid: [],
+          f_depid: [],
+          f_operatorid: [],
+          f_payment: []
+        },
         gasproperties:[{label: '全部', value: ''}],
         operator: [],
         WarningType: [
@@ -564,12 +581,36 @@
       },
       getorg(obj) {
         if (obj.resids.length>0) {
+          this.depresid = obj.resids
           this.orgCondtionStr = " and f_orgid in " + plugin.convertToIn(obj.resids)
         }else
         {
+          this.depresid = obj.resids
           this.orgCondtionStr = " and f_orgid = " + this.$login.f.orgid
         }
       },
+      getdep(obj, val) {
+        this.orgCondtionStr = ""
+
+        this.depname = val[0]
+        this.userresid = obj
+        this.queryData.f_depid = obj
+        console.log(this.queryData.f_depid)
+
+        if (obj.length > 0) {
+          this.orgCondtionStr += " and f_depid in " + plugin.convertToIn(obj)
+        } else {
+          this.orgCondtionStr += " and f_depid = " + this.$login.f.depid
+        }
+
+        if (this.depresid && this.depresid.length > 0) {
+          this.orgCondtionStr = " and f_orgid in " + plugin.convertToIn(this.depresid) + this.orgCondtionStr
+        } else {
+          this.orgCondtionStr = " and f_orgid = " + this.$login.f.orgid + this.orgCondtionStr
+        }
+
+        console.log(this.orgCondtionStr);
+      },
       // SaveAsFile(str) {
       //   this.$showMessage('您是否需要导出本页数据？', ['confirm', 'cancel']).then((res) => {
       //     if (res === 'confirm') {

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

@@ -60,6 +60,16 @@
               <right-tree @re-res="$parent.$parent.getorg"
                           :initresid='$parent.$parent.org'></right-tree>
             </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body" for="dep" >部&emsp;&emsp;门</label>
+                <res-select id="dep" restype='department' style="width: 60%"
+                            is-mul="false"
+                            @res-select="$parent.$parent.getdep"
+                            :parentresid="$parent.$parent.depresid"
+                            :initresid='$parent.$parent.depid' >
+                </res-select>
+
+              </div>
             <div class="col-sm-2 form-group">
               <label class="font_normal_body">客户类型</label>
               <v-select style="width:60%" id="f_user_type"
@@ -375,6 +385,14 @@
         rowdata:{},
         criteriaShow:false,
         outlets: [],
+        depresid: [],
+        queryData: {
+          f_orgid: [],
+          f_depid: [],
+          f_operatorid: [],
+          f_payment: []
+        },
+        depid: [],
         operator: [],
         other: [],
         sumsmodel: {},
@@ -387,7 +405,7 @@
         ],
         styles:false,
         org:[this.$login.f.orgid],
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid} `,
         echarts: false,
         searchshow: false,
         isActiveTotalForm: false,
@@ -496,13 +514,38 @@
         this.model.search(args.condition, args.model)
       },
       getorg(obj) {
-        if (obj.resids.length>0) {
+        if (obj.resids.length > 0) {
+          this.depresid = obj.resids
           this.orgCondtionStr = " and f_orgid in " + plugin.convertToIn(obj.resids)
-        }else
-        {
+        } else {
+          this.depresid = obj.resids
           this.orgCondtionStr = " and f_orgid = " + this.$login.f.orgid
         }
+        console.log(this.orgCondtionStr);
       },
+      getdep(obj, val) {
+        this.orgCondtionStr = ""
+
+        this.depname = val[0]
+        this.userresid = obj
+        this.queryData.f_depid = obj
+        console.log(this.queryData.f_depid)
+
+        if (obj.length > 0) {
+          this.orgCondtionStr += " and f_depid in " + plugin.convertToIn(obj)
+        } else {
+          this.orgCondtionStr += " and f_depid = " + this.$login.f.depid
+        }
+
+        if (this.depresid && this.depresid.length > 0) {
+          this.orgCondtionStr = " and f_orgid in " + plugin.convertToIn(this.depresid) + this.orgCondtionStr
+        } else {
+          this.orgCondtionStr = " and f_orgid = " + this.$login.f.orgid + this.orgCondtionStr
+        }
+
+        console.log(this.orgCondtionStr);
+      },
+
       // SaveAsFile(str) {
       //   this.$showMessage('您是否需要导出本页数据？', ['confirm', 'cancel']).then((res) => {
       //     if (res === 'confirm') {

package/src/filiale/kelai/WebmeterQuery.vue

@@ -1,77 +0,0 @@
-<template>
-  <tab-button class="foot_tabset" :active="-1">
-    <tabs header="指令查询" v-if="permission('指令查询')">
-      <instruct-manage v-if="show.includes('指令查询')"></instruct-manage>
-    </tabs>
-    <tabs header="历史指令查询" v-if="permission('历史指令查询')">
-      <instruct-manage-history v-if="show.includes('历史指令查询')"></instruct-manage-history>
-    </tabs>
-    <tabs header="上报查询" v-if="permission('上报查询')">
-      <report-list v-if="show.includes('上报查询')"></report-list>
-    </tabs>
-    <tabs header="结算查询" v-if="permission('结算查询')">
-      <report-data-query v-if="show.includes('结算查询')"></report-data-query>
-    </tabs>
-    <tabs header="缴费查询" v-if="permission('缴费查询')">
-      <recharge-instruct-query v-if="show.includes('缴费查询')"></recharge-instruct-query>
-    </tabs>
-    <tabs header="异常查询" v-if="permission('异常查询')">
-      <meter-exception-list v-if="show.includes('异常查询')"></meter-exception-list>
-    </tabs>
-    <tabs header="用户失联" v-if="permission('用户失联')">
-      <user-lost-contact-analysis v-if="show.includes('用户失联')"></user-lost-contact-analysis>
-    </tabs>
-    <tabs header="失联查询" v-if="permission('失联查询')">
-      <lost-contact-analysis-list v-if="show.includes('失联查询')"></lost-contact-analysis-list>
-    </tabs>
-    <tabs header="用气查询" v-if="!newWebHand && permission('用气查询')">
-      <use-gas-statistics v-if="show.includes('用气查询')"></use-gas-statistics>
-    </tabs>
-    <tabs header="新用气查询" v-if="permission('用气查询')">
-      <new-use-gas-statistics v-if="show.includes('用气查询')"></new-use-gas-statistics>
-    </tabs>
-    <tabs header="未用气查询" v-if="permission('未用气查询')">
-      <get-no-meteread-query v-if="show.includes('未用气查询')"></get-no-meteread-query>
-    </tabs>
-    <tabs header="物联网表结算分析" v-if="!newWebHand && permission('物联网表结算分析')">
-      <webmeter-settlement-analysis v-if="show.includes('物联网表结算分析')"></webmeter-settlement-analysis>
-    </tabs>
-    <tabs header="物联网表结算分析" v-if="newWebHand &&permission('物联网表结算分析')">
-      <new-webmeter-settlement-analysis v-if="show.includes('物联网表结算分析')"></new-webmeter-settlement-analysis>
-    </tabs>
-    <tabs header="物联用户月度结算查询" v-if="permission('物联用户月度结算查询')">
-      <webhand-month-gas v-if="show.includes('物联用户月度结算查询')"></webhand-month-gas>
-    </tabs>
-  </tab-button>
-
-</template>
-
-<script>
-import TabButton from '../../components/sale/common/TabButton'
-import Tabs from '../../components/sale/common/Tabs'
-
-export default {
-  title: '物联查询',
-  data () {
-    return {
-      newWebHand: this.$appdata.getSingleValue('新抄表'),
-      show: []
-    }
-  },
-  components: {Tabs, TabButton},
-  methods: {
-    permission (name) {
-      // 保留是为了后面可能也会和综合查询一样加权限
-      if (this.$login.r.find(value => value === '物联查询') || name === '历史指令查询') {
-        if (!this.$login.r.find(value => value === name)) {
-          return false
-        }
-      }
-      return true
-    }
-  }
-}
-</script>
-
-<style scoped>
-</style>