manage-client 4.1.22-yangchun → 4.1.180-linshi-jinhong

package/build/dev-server.js

@@ -12,16 +12,16 @@ var compiler = webpack(config)
 // 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 qtx = 'http://36.103.222.144:6300/'
 // 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://192.168.50.4:8400/'
+// 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://192.168.50.67:30785/'
+var bendi = 'http://218.77.35.25:30785/'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://192.168.50.67:30785/'
+var wode = 'http://218.77.35.25:30785/'
 // 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'
@@ -29,8 +29,24 @@ var proxyTable = {
   '/rs/logic/exportfile': {
     target: bendi
   },
+  '/dataManage': {
+    target: 'http://203.57.101.233:9001/'
+
+  },
+  '/api/af-revenue/sql/': {
+    pathRewrite: {
+      '^/api/af-revenue': '/'
+    },
+    target: 'http://127.0.0.1:9026/'
+  },
+  '/api/af-revenue/sql/WeChatPayment': {
+    pathRewrite: {
+      '^/api/af-revenue': '/rs'
+    },
+    target: 'http://127.0.0.1:8080/'
+  },
   '/api': {
-    target: 'http://192.168.50.67:30785'
+    target: 'http://192.168.50.67:31567/'
 
   },
   '/rs/sql/chargeQuery_by_gasproperties': {
@@ -44,7 +60,7 @@ var proxyTable = {
   },
   // 查找资源服务数据
   '/rs/search': {
-    target: bendi
+    target: 'http://218.77.35.25:30785/'
   },
   // 查找资源服务数据
   '/rs/logic/getLogin': {
@@ -86,7 +102,7 @@ var proxyTable = {
     target: bendi
   },
   '/rs/vue': {
-    target: bendi
+    target: 'http://218.77.35.25:30785/'
   },
   '/rs/file': {
     target: bendi

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "4.1.22-yangchun",
+    "version": "4.1.180-linshi-jinhong",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {
@@ -67,7 +67,7 @@
         "style": "0.0.3",
         "style-loader": "^0.20.3",
         "swiper": "^5.4.5",
-        "system-clients": "4.0.12",
+        "system-clients": "3.3.2",
         "ldap-clients": "3.0.96",
         "url-loader": "^0.5.7",
         "vue-amap": "0.5.10",

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

@@ -921,8 +921,8 @@
 
       getCondition() {
         return {
-          startDate: this.$refs.paged.$refs.cri.model.handStartDate,
-          endDate: this.$refs.paged.$refs.cri.model.handEndDate,
+          startDate: this.$refs.paged.$refs.cri.model.startDate,
+          endDate: this.$refs.paged.$refs.cri.model.endDate,
           condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr }
       },
       getfield() {

package/src/components/sale/filesquery/UserQuery.vue

@@ -799,6 +799,19 @@
         }
       },
       selfSearch(args) {
+        //小区查询条件
+        this.area =  this.$refs.paged.$refs.cri.model.f_residential_area
+        console.log("=====小区model绑定====",this.area)
+        if(this.area.length !== 0){
+          let str = JSON.stringify(this.area)
+          str = str.replace(/"/g,`'`)
+          str = str.replace(/\[/g,``)
+          str = str.replace(/\]/g,``)
+          console.log("=====小区model22222222222绑定====",str)
+          //查询多个小区时条件
+          args.condition += ` and f_residential_area in  ( ${str} )`
+        }
+
         if (!this.orgCondtionStr) {
           args.condition = `${args.condition}` + " and f_orgid = " + this.$login.f.orgid
         } else {

package/src/filiale/fugou/sale.js

@@ -24,13 +24,6 @@ export default function () {
   Vue.component('handplan-query', (resolve) => {
     require(['./HandplanQuery'], resolve)
   })
-
-  Vue.component('report-list', (resolve) => {
-    require(['./ReportList'], resolve)
-  })
-  Vue.component('webmeter-query', (resolve) => {
-    require(['./WebmeterQuery'], resolve)
-  })
   // 用户失联
   Vue.component('user-lost-contact-analysis', (resolve) => { require(['./UserLostContactAnalysis'], resolve) })
 }

package/src/filiale/jingyang/MeterQuery.vue

@@ -860,7 +860,7 @@ export default {
       let data = {
         filepath: res.f_downloadpath
       }
-      new HttpResetClass().load('POST','/rs/logic/meter_GetUserInfoFromExcel', {data: data}, {
+      new HttpResetClass().load('POST','/rs/logic/safe_GetUserInfoFromExcel', {data: data}, {
         resolveMsg: '导入成功！已生成条件，若要去除导入条件请点击旁边 ‘清空用户编号’ 按钮。',
         rejectMsg: '导入失败'
       }).then((res) => {
@@ -954,11 +954,7 @@ export default {
       }
     },
     getCondition() {
-      let condition = `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr;
-      if (this.uploadCodeCondition) {
-        condition += ` and ${this.uploadCodeCondition}`;
-      }
-      return {condition, orderitem: this.orderitem}
+      return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr, orderitem: this.orderitem}
     },
     getfield() {
       let data = {}

package/src/filiale/ruihua/webmeterManage.js

@@ -11,9 +11,4 @@ export default function () {
   Vue.use(MagGetSaleParam)
   // 异常汇总分析
   Vue.component('meter-exception-list', (resolve) => { require(['./MeterExceptionList'], resolve) })
-
-  // 综合档案信息查询
-  Vue.component('record-info-query', (resolve) => {
-    require(['./RecordInfoQuery'], resolve)
-  })
 }

package/src/filiale/wuhai/UserGasList.vue

@@ -496,7 +496,7 @@
           con= `${this.$refs.paged.$refs.cri.condition} `
         }
         return {
-          condition: this.condition,
+          condition: con  ,
           startDate:`${this.$refs.paged.$refs.cri.model.startDate}`,
           endDate:`${this.$refs.paged.$refs.cri.model.endDate}`
         }

package/src/filiale/yangchun/ArrearsQuery.vue

@@ -56,7 +56,6 @@
                                 sqlurl="api/af-revenue/logic/openapi/exportfile"
                                 sql-name="arrearsQuery"
                                 template-name='用户欠费查询导出'
-                                v-if="this.$login.r.includes('用户欠费查询导出')
                                 :choose-col="true"></export-excel>
 
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model"

package/src/filiale/yangchun/HandPeopleQuery.vue

@@ -48,7 +48,6 @@
                                 sqlurl="api/af-revenue/logic/openapi/exportfile"
                                 sql-name="handPeopleQuery"
                                 template-name='抄表员统计查询导出'
-                                v-if="this.$login.r.includes('抄表员统计查询导出')
                                 :choose-col="true"></export-excel>
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
                                :defaultfield="$parent.$parent.defaultfield"

package/src/main.js

@@ -6,7 +6,7 @@ import { all } from 'vue-client'
 import { system } from 'system-clients'
 import { ldap } from 'ldap-clients'
 import saleManage from './saleManage'
-import ShanXianSaleManage from './filiale/fugou/sale'
+import ShanXianSaleManage from './filiale/rizhao/sale'
  // import ShanXianwebSaleManage from './filiale/rongcheng/webmeterManage'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'