sale-client 3.5.32 → 3.5.33

package/build/dev-server.js

@@ -1,161 +1,161 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-var bendi = 'http://117.33.181.102:8400/', bendi1 = 'http://121.36.106.17:8400/'
-// 公司测试服务
-var fuwu = 'http://117.33.181.102:8400/'
-// var fuwu = 'http://121.36.106.17:8400/'
-// 铜川正式
-//  var fuwu = 'http://61.134.55.234:9999/'
-// 铜川测试
-// var fuwu = 'http://61.134.55.234:9999/'
-// var fuwu = 'http://60.222.250.39:8300/'
-// 韶关
-// var fuwu = 'http://119.146.1.106:8300/'
-// 巩义测试服务
-// var fuwu = 'http://192.168.0.227:8400'
-// 燎原测试服务
-// var fuwu = 'http://121.41.19.238:8400  '
-// var fuwu = 'http://121.41.19.238:9001/'
-
-// var fuwu = 'http://139.214.92.34:8301/'
-
-var proxyTable = {
-  '/rs/logic/saleExport': {
-    target: fuwu
-  },
-  '/rs/logic/saleGetExportProgress': {
-    target: fuwu
-  },
-  '/files': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: fuwu
-  },
-  '/rs/logic/getSaleInitData': {
-    target: fuwu
-  },
-  '/invoice': {
-    target: fuwu
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: fuwu
-  },
-  '/rs/path/getParams': {
-    target: fuwu
-  },
-  '/rs/data': {
-    target: fuwu
-  },
-  '/rs/license': {
-    target: fuwu
-  },
-  '/rs/db': {
-    target: fuwu
-  },
-  '/excel': {
-    target: fuwu
-  },
-  '/rs/config': {
-    target: fuwu
-  },
-  '/rs/sql/getLicenseById': {
-    target: fuwu
-  },
-  '/rs/sql/manage_getarealist': {
-    target: fuwu
-  },
-  '/rs/sql/manage_getstreetlist': {
-    target: fuwu
-  },
-  '/rs/report': {
-    target: 'http://121.36.106.17:8400/'
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/webmeter': {
-    target: 'http://192.168.50.4:8450'
-  },
-  '/rs': {
-    // target: 'http://192.168.30.63:8081/'
-    // target: 'http://121.36.106.17:8400/'
-    target: bendi
-  }
-}
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// serve pure static assets
-app.use('/static', express.static('./static'))
-
-module.exports = app.listen(8089, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8089')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+
+// Define HTTP proxies to your custom API backend
+// https://github.com/chimurai/http-proxy-middleware
+var bendi = 'http://127.0.0.1:8080', bendi1 = 'http://121.36.106.17:8400/'
+// 公司测试服务
+var fuwu = 'http://192.168.50.4:8400'
+// var fuwu = 'http://121.36.106.17:8400/'
+// 铜川正式
+//  var fuwu = 'http://61.134.55.234:9999/'
+// 铜川测试
+// var fuwu = 'http://61.134.55.234:9999/'
+// var fuwu = 'http://60.222.250.39:8300/'
+// 韶关
+// var fuwu = 'http://119.146.1.106:8300/'
+// 巩义测试服务
+// var fuwu = 'http://192.168.0.227:8400'
+// 燎原测试服务
+// var fuwu = 'http://121.41.19.238:8400  '
+// var fuwu = 'http://121.41.19.238:9001/'
+
+// var fuwu = 'http://139.214.92.34:8301/'
+
+var proxyTable = {
+  '/rs/logic/saleExport': {
+    target: fuwu
+  },
+  '/rs/logic/saleGetExportProgress': {
+    target: fuwu
+  },
+  '/files': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: fuwu
+  },
+  '/rs/logic/getSaleInitData': {
+    target: fuwu
+  },
+  '/invoice': {
+    target: fuwu
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: fuwu
+  },
+  '/rs/path/getParams': {
+    target: fuwu
+  },
+  '/rs/data': {
+    target: fuwu
+  },
+  '/rs/license': {
+    target: fuwu
+  },
+  '/rs/db': {
+    target: fuwu
+  },
+  '/excel': {
+    target: fuwu
+  },
+  '/rs/config': {
+    target: fuwu
+  },
+  '/rs/sql/getLicenseById': {
+    target: fuwu
+  },
+  '/rs/sql/manage_getarealist': {
+    target: fuwu
+  },
+  '/rs/sql/manage_getstreetlist': {
+    target: fuwu
+  },
+  '/rs/report': {
+    target: 'http://121.36.106.17:8400/'
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/webmeter': {
+    target: 'http://192.168.50.4:8450'
+  },
+  '/rs': {
+    // target: 'http://192.168.30.63:8081/'
+    // target: 'http://121.36.106.17:8400/'
+    target: bendi
+  }
+}
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
+// serve pure static assets
+app.use('/static', express.static('./static'))
+
+module.exports = app.listen(8089, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8089')
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.32",
+  "version": "3.5.33",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/revenue/Common/Movemeter.vue

@@ -373,7 +373,7 @@
         let res = await this.$resetpost('rs/sql/singleTable_OrderBy', {data: {orderitem: 'f_userinfo_id',
           items: '*',
           tablename: 't_user_address',
-          condition: 'f_userinfo_id = ' + this.row.f_userinfo_id}})
+          condition: 'f_userinfo_id = ' + this.row.f_userinfo_id}},{resolveMsg: null,rejectMsg: null})
         console.log('=============', res.data[0])
         let data = {
           f_pcd: res.data[0].f_pcd,

package/src/components/revenue/comprehen/ComprehenOperation/OverCharge/OverUseCharge.vue

@@ -244,6 +244,12 @@ let overChargeGen = async function (self) {
       self.$dispatch('success')
     }
   } catch (error) {
+    console.log('捕获到异常', error)
+    if (error instanceof Object) {
+      self.$showAlert(error.data, 'danger', 0)
+    } else {
+      self.$showAlert(error, 'danger', 0)
+    }
     self.$showAlert(error, 'danger', 0)
     self.$dispatch('refresh')
   }

package/src/components/revenue/comprehen/StairPrice/GasPriceUser.vue

@@ -74,6 +74,16 @@
               >
               </v-select>
             </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">小区名称</label>
+              <v-select :value.sync="model.f_residential_area_id" v-model="model.f_residential_area_id"
+                        :options='$parent.$parent.areaList' placeholder='小区名称'
+                        close-on-select   @select-search="$parent.$parent.getAreaList"
+                        condition="f_residential_area_id = '{}'"
+                        style="width: 60%"
+              >
+              </v-select>
+            </div>
           </div>
         </div>
       </criteria>
@@ -216,7 +226,7 @@
         model: new PagedList('rs/sql/getGasUser', 20, {}),
         condition: '',
         criteriaShow2: false,
-        gasproperties1:[],
+        gasproperties1: [],
         getfield: {},
         show: false,
         gasproperties: [],
@@ -228,18 +238,19 @@
           pricename: '',
           f_comments: ''
         },
-        oldinfo:{
-          f_user_type:'',
-          f_gasproperties:'',
-          f_price_type:'',
-          f_price_name:'',
-          f_price_id:'',
-          f_stairprice_id:''
+        oldinfo: {
+          f_user_type: '',
+          f_gasproperties: '',
+          f_price_type: '',
+          f_price_name: '',
+          f_price_id: '',
+          f_stairprice_id: ''
         },
-        gongyetype: this.$appdata.getParam('用气类别')?[{label: '全部', value: ''}, ...this.$appdata.getParam('用气类别')] : [],
+        areaList: [],
+        gongyetype: this.$appdata.getParam('用气类别') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类别')] : [],
         usertypes: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : [],
         pricetypes: this.$appdata.getParam('气价类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')] : [],
-        meters: this.$appdata.getParam('气表类型') ? [{label: '全部',value: ''}, ...this.$appdata.getParam('气表类型')] : [],
+        meters: this.$appdata.getParam('气表类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')] : [],
         adjustpricereasons: this.$appdata.getParam('批量调价原因'),
         config: {
           excelHeaders: {
@@ -258,8 +269,33 @@
       this.search()
       this.getfield = this.config.excelHeaders
       loadParamGem(this)
+      this.getAreaList()
     },
     methods: {
+      getAreaList (searchText) {
+        let condition = ' 1 = 1 '
+        if (searchText) {
+          condition = ` f_residential_area like '%${searchText}%' `
+        }
+        let HttpReset = new HttpResetClass()
+        HttpReset.load('POST', 'rs/sql/saleSingleTable?pageNo=1&pageSize=100', {
+          data: {
+            items: 'f_residential_area, id',
+            tablename: 't_area',
+            orderitem: 'id desc',
+            condition: condition
+          }
+        }, {resolveMsg: null, rejectMsg: '获取小区信息失败!'}).then((req) => {
+          let redata = []
+          req.data.forEach((row, n) => {
+            redata[n] = {
+              label: row.f_residential_area,
+              value: row.id
+            }
+          })
+          this.areaList = [{label: '全部', value: ''}, ...redata]
+        })
+      },
       userTypeChange1 () {
         this.gasproperties1 = []
         if (this.$refs.paged.$refs.criteria.model !== null) {
@@ -304,7 +340,7 @@
           condition: condition,
           fileuploadid: fileuploadid
         }
-        if(this.priceid){
+        if (this.priceid) {
           if (this.newinfo.pricename[0].f_price_id == this.model.rows[0].f_price_id) {
             this.$showMessage('选择的气价和当前气价相同, 请重新选择')
             return
@@ -318,9 +354,8 @@
           param.f_stairprice_id_old = this.model.rows[0].f_stairprice_id
           let res = await this.$resetpost('rs/logic/pricechangeall', {data: param}, {resolveMsg: '更新成功', rejectMsg: '更新失败'})
           this.$showMessage(`成功批量修改了${res.data}位用户的气价`)
-
-        }else{
-          param.oldinfo=this.param
+        } else {
+          param.oldinfo = this.param
           let res = await this.$resetpost('rs/logic/pricechangebatch', {data: param}, {resolveMsg: '更新成功', rejectMsg: '更新失败'})
           this.$showMessage(`成功批量修改了${res.data}位用户的气价`)
         }
@@ -338,47 +373,45 @@
         this.$refs.paged.$refs.criteria.search()
       },
       changeprice () {
-        let rowdata = this.$refs.paged.$refs.grid.getRowData().length>0? this.$refs.paged.$refs.grid.getRowData():this.model.rows
-          if(this.priceid && this.model.rows.length>0){
-            this.oldinfo = {
-              f_user_type : this.model.rows[0].f_user_type,
-              f_gasproperties : this.model.rows[0].f_gasproperties,
-              f_price_type : this.model.rows[0].f_price_type,
-              f_price_name : this.model.rows[0].f_price_name,
-              f_price_id : this.model.rows[0].f_price_id,
-              f_stairprice_id : this.model.rows[0].f_stairprice_id
-            }
-          } else
-          {
-            this.oldinfo={
-              f_user_type : rowdata[0].f_user_type,
-              f_gasproperties : rowdata[0].f_gasproperties,
-              f_price_type : rowdata[0].f_price_type,
-              f_price_name : rowdata[0].f_price_name
-            }
-          for ( var i = 1 ; i < rowdata.length ; i++ ) {
-            if (rowdata[i].f_user_type !== rowdata[i-1].f_user_type) {
+        let rowdata = this.$refs.paged.$refs.grid.getRowData().length > 0 ? this.$refs.paged.$refs.grid.getRowData() : this.model.rows
+        if (this.priceid && this.model.rows.length > 0) {
+          this.oldinfo = {
+            f_user_type: this.model.rows[0].f_user_type,
+            f_gasproperties: this.model.rows[0].f_gasproperties,
+            f_price_type: this.model.rows[0].f_price_type,
+            f_price_name: this.model.rows[0].f_price_name,
+            f_price_id: this.model.rows[0].f_price_id,
+            f_stairprice_id: this.model.rows[0].f_stairprice_id
+          }
+        } else {
+          this.oldinfo = {
+            f_user_type: rowdata[0].f_user_type,
+            f_gasproperties: rowdata[0].f_gasproperties,
+            f_price_type: rowdata[0].f_price_type,
+            f_price_name: rowdata[0].f_price_name
+          }
+          for (var i = 1; i < rowdata.length; i++) {
+            if (rowdata[i].f_user_type !== rowdata[i - 1].f_user_type) {
               this.oldinfo.f_user_type = ''
             }
-            if (rowdata[i].f_gasproperties !== rowdata[i-1].f_gasproperties) {
+            if (rowdata[i].f_gasproperties !== rowdata[i - 1].f_gasproperties) {
               this.oldinfo.f_gasproperties = ''
             }
-            if (rowdata[i].f_price_type !== rowdata[i-1].f_price_type) {
+            if (rowdata[i].f_price_type !== rowdata[i - 1].f_price_type) {
               this.oldinfo.f_price_type = ''
             }
-            if (rowdata[i].f_price_name != rowdata[i-1].f_price_name) {
+            if (rowdata[i].f_price_name != rowdata[i - 1].f_price_name) {
               this.oldinfo.f_price_name = ''
             }
           }
-
         }
         this.show = true
       },
       selfSearch (args) {
         this.$refs.paged.$refs.grid.selectInit()
-        if(this.priceid){
+        if (this.priceid) {
           args.condition = `${args.condition} and f_price_id = '${this.priceid}'`
-        }else{
+        } else {
           args.condition = `${args.condition} and f_orgid = '${this.$login.f.orgid}'`
         }
         this.condition = args.condition