manage-client 3.2.237 → 3.2.239

package/build/dev-server.js

@@ -1,180 +1,180 @@
-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: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 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: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://119.187.112.234:8400/'
-var wode = 'http://192.168.50.4: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 = {
-  '/rs/logic/exportfile': {
-    target: bendi
-  },
-  '/files': {
-    target: bendi
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: bendi
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: bendi
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: bendi
-  },
-  '/rs/logic/getSaleInitData': {
-    target: bendi
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: bendi
-  },
-  '/rs/path/getParams': {
-    target: bendi
-  },
-  '/rs/data': {
-    target: bendi
-  },
-  '/rs/license': {
-    target: bendi
-  },
-  '/rs/db': {
-    target: bendi
-  },
-  '/excel': {
-    target: bendi
-  },
-  '/rs/config': {
-    target: bendi
-  },
-  '/rs/sql/getLicenseById': {
-    target: bendi
-  },
-  '/rs/report': {
-    target: bendi
-  },
-  '/rs/vue': {
-    target: bendi
-  },
-  '/rs/file': {
-    target: bendi
-  },
-  '/rs/sql/singleTable': {
-    target: bendi
-  },
-  '/rs': {
-    target: wode
-  }
-}
-
-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'))
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/reports'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/ldap'
-//   })
-// })
-// app.all('/excel/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/charge'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82/charge'
-//   })
-// })
-
-// app.all('/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-// app.all('/rs/user', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-
-module.exports = app.listen(8015, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8015')
-})
+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: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 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: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://119.187.112.234:8400/'
+var wode = 'http://127.0.0.1:8080'
+// 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 = {
+  '/rs/logic/exportfile': {
+    target: bendi
+  },
+  '/files': {
+    target: bendi
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: bendi
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: bendi
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: bendi
+  },
+  '/rs/logic/getSaleInitData': {
+    target: bendi
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: bendi
+  },
+  '/rs/path/getParams': {
+    target: bendi
+  },
+  '/rs/data': {
+    target: bendi
+  },
+  '/rs/license': {
+    target: bendi
+  },
+  '/rs/db': {
+    target: bendi
+  },
+  '/excel': {
+    target: bendi
+  },
+  '/rs/config': {
+    target: bendi
+  },
+  '/rs/sql/getLicenseById': {
+    target: bendi
+  },
+  '/rs/report': {
+    target: bendi
+  },
+  '/rs/vue': {
+    target: bendi
+  },
+  '/rs/file': {
+    target: bendi
+  },
+  '/rs/sql/singleTable': {
+    target: bendi
+  },
+  '/rs': {
+    target: wode
+  }
+}
+
+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'))
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/reports'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/ldap'
+//   })
+// })
+// app.all('/excel/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/charge'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82/charge'
+//   })
+// })
+
+// app.all('/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+// app.all('/rs/user', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+
+module.exports = app.listen(8015, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8015')
+})

package/package.json

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

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

@@ -204,6 +204,18 @@
                 <th>
                   <nobr>付款方式</nobr>
                 </th>
+                <th>
+                  <nobr>气表底数</nobr>
+                </th>
+                <th>
+                  <nobr>表上余额</nobr>
+                </th>
+                <th>
+                  <nobr>累购气量</nobr>
+                </th>
+                <th>
+                  <nobr>累购金额</nobr>
+                </th>
                 <th>
                   <!--<nobr>客户地址</nobr>-->
                   <data-order field="f_address" name="客户地址"
@@ -281,6 +293,18 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_payment}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_base}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_balance_amount}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.leigougas}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.leigoumoney}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_address}}</nobr>
               </td>
@@ -358,6 +382,9 @@
               style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
               汇总信息
             </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              表上余额合计:&emsp;{{sumsmodel.f_balance_amount}}
+            </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               换表费合计:&emsp;{{sumsmodel.f_changemeter_fee}}
             </td>
@@ -436,7 +463,7 @@
         footer:[],
         meterbrands: [],
         pricenames: [],
-        model: new PagedList('rs/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0,hushu:0}),
+        model: new PagedList('rs/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_balance_amount: 0,f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0,hushu:0}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],

package/src/components/sale/config/exportConfig.js

@@ -256,7 +256,7 @@ export default{
     'f_type': '换表类型', 'f_changemeter_fee': '换表费', 'f_meternumber_old': '旧表号', 'f_meternumber': '新表号',
     'f_meter_brand_old': '旧气表品牌', 'f_meter_brand': '新气表品牌', 'f_remanent_gas': '补气量', 'f_remanent_money': '补气金额',
     'f_comments': '备注', 'f_change_operator': '换表人', 'f_state': '状态', 'f_operate_date': '操作日期', 'f_payment': '付款方式', 'f_othereason': '换表原因',
-    'f_operator': '人员', 'f_depname': '部门', 'f_orgname': '公司'
+    'f_operator': '人员', 'f_depname': '部门', 'f_orgname': '公司', 'f_meter_base': '气表底数', 'f_balance_amount': '表上余额', 'leigougas': '累购气量', 'leigoumoney': '累购金额'
   },
   changemeterprintConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_address': '客户地址',

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

@@ -194,14 +194,6 @@
                        <!--condition="new_days <= {}" v-next-el='new_days' v-el:new_days-->
                 <!--&gt;-->
               <!--</div>-->
-            <div class="col-sm-2 form-group">
-              <label class="font_normal_body">小区</label>
-              <input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_residential_area"
-                     placeholder='请输入小区'
-                     condition="f_residential_area like '%{}%'"
-              >
-            </div>
-
           </div>
 
 

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

@@ -115,12 +115,9 @@
             <div class="col-sm-2 form-group">
               <label class="font_normal_body">用户状态</label>
               <v-select
-                placeholder='用户状态'
-                value-single
+                placeholder='正常'
                 style="width:60%"
-                :value.sync="model.f_user_state"
-                v-model="model.f_user_state"
-                :options='$parent.$parent.userstate'
+                :value.sync="f_user_state"
                 close-on-select condition="f_user_state ='{}'">
               </v-select>
             </div>
@@ -145,13 +142,6 @@
                         close-on-select>
               </v-select>
             </div>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">小区</label>
-                <input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_residential_area"
-                       placeholder='请输入小区'
-                       condition="f_residential_area like '%{}%'"
-                >
-              </div>
 
           </div>
 
@@ -372,7 +362,8 @@
           {label: '用气性质', value: 'f_gasproperties'},
           {label: '分公司', value: 'f_orgname'},
           {label: '最长失联天数', value: 'max_days_type'},
-        ]
+        ],
+        f_user_state:'正常'
       }
     },
     ready() {

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

@@ -176,13 +176,6 @@
                                       close-on-select>
                             </v-select>
                           </div>
-                          <div class="col-sm-2 form-group">
-                            <label class="font_normal_body">小区</label>
-                            <input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_residential_area"
-                                   placeholder='请输入小区'
-                                   condition="f_residential_area like '%{}%'"
-                            >
-                          </div>
                         </div>
                     </div>
                 </criteria>

package/src/filiale/WEINAN/NewAccountQuery.vue

@@ -14,7 +14,7 @@
                               :value.sync="model.startDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                              condition="f_operate_date >= '{} 00:00:00'">
+                              condition="f_open_date >= '{} 00:00:00'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -24,7 +24,7 @@
                               :value.sync="model.endDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                              condition="f_operate_date <= '{} 23:59:59'">
+                              condition="f_open_date <= '{} 23:59:59'">
                   </datepicker>
                 </div>
                 <div class="span" style="float:right;">
@@ -171,10 +171,10 @@
                 <nobr>{{row.isbgl}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.operator}}</nobr>
+                <nobr>{{row.f_operator}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_operate_date}}</nobr>
+                <nobr>{{row.f_open_date}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.depname}}</nobr>

package/src/filiale/qianneng/QnJgqGshzbb.vue

@@ -15,7 +15,7 @@
                   <v-select :value.sync="model.a_jfyf"
                             :options='$parent.$parent.jfyfArray' placeholder='请选择' v-model="model.a_jfyf"
                             condition="a_jfyf in {}"
-                            close-on-select></v-select>
+                            multiple></v-select>
                 </div>
 
                   <div class="col-sm-2 form-group">
@@ -270,20 +270,21 @@
         this.residentialArea = house
       },
       async  getjfyf(){
-        console.log('开始获取交费月份')
         let HttpReset = new HttpResetClass()
-        var data = await HttpReset.load('POST', 'rs/sql/qnJgqgetjfyf', {
+        var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
           data: {
-            condition: `1=1 `
+            condition: '1=1',
+            tablename: 'qn_jgq_hzb',
+            groupitem: 'a_jfyf',
+            orderitem: 'a_jfyf',
+            items: 'a_jfyf'
           }
-        }, {resolveMsg: null, rejectMsg: '获取交费月份失败!'})
-        console.log('交费月份',data)
-        let a_jfyf = []
+        }, {resolveMsg: null, rejectMsg: '获取失败!'})
+        let nameArr = [{label: '全部', value: ''}]
         for (let row of data.data){
-          console.log('开始保存交费月份')
-          a_jfyf.push({label: row.a_jfyf, value: row.a_jfyf})
+          nameArr.push({label: row.a_jfyf, value: row.a_jfyf})
         }
-        this.jfyfArray = a_jfyf
+        this.jfyfArray = nameArr
       },