manage-client 3.2.250 → 3.2.251

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://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 = {
-  '/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.250",
+  "version": "3.2.251",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/App.vue

@@ -1,32 +1,29 @@
-<template>
-  <div>
-    <app-base class="bg">
-      <div class='flex'>
-        <article>
-          <!--<route :comp="{name: 'liaoyuan-manage-home'}"></route>-->
-          <!--<route :comp="{name: 'meter-reading'}"></route>-->
-          <!--<route :comp="{name: 'Gasproperties'}"></route>-->
-          <!--<route :comp="{name: 'vender-management'}"></route>-->
-          <!--<route :comp="{name: 'malfunction-home'}"></route>-->
-          <route :comp="{name: 'login'}"></route>
-<!--          <route :comp="{name: 'call-report-main-page'}"></route>-->
-          <!-- <route :comp="{name: 'load-data'}"></route> -->
-           <!--<route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route>-->
-          <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
-        </article>
-      </div>
-    </app-base>
-  </div>
-</template>
-
-<script>
-
-import Vue from 'vue'
-export default {
-
-  ready() {
-    Vue.timeout = 90000
-  },
-
-}
-</script>
+<template>
+  <div>
+    <app-base class="bg">
+      <div class='flex'>
+        <article>
+          <!--<route :comp="{name: 'liaoyuan-manage-home'}"></route>-->
+          <!--<route :comp="{name: 'meter-reading'}"></route>-->
+          <!--<route :comp="{name: 'Gasproperties'}"></route>-->
+          <!--<route :comp="{name: 'vender-management'}"></route>-->
+          <!--<route :comp="{name: 'malfunction-home'}"></route>-->
+          <route :comp="{name: 'login'}"></route>
+<!--          <route :comp="{name: 'call-report-main-page'}"></route>-->
+          <!-- <route :comp="{name: 'load-data'}"></route> -->
+           <!--<route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route>-->
+          <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
+        </article>
+      </div>
+    </app-base>
+  </div>
+</template>
+
+<script>
+
+
+export default {
+
+
+}
+</script>

package/src/filiale/WEINAN/NewAccountQuery.vue

@@ -174,7 +174,7 @@
                 <nobr>{{row.f_operator}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_open_date}}</nobr>
+                <nobr>{{row.f_open_person}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.depname}}</nobr>

package/src/filiale/WEINAN/UserGasAll.vue

@@ -122,23 +122,22 @@
                     <label class="font_normal_body">时间区间</label>
                     <datepicker  :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'"
                                 :show-reset-button="reset"
-                                :value.sync="model.startDate1"
+                                :value.sync="$parent.$parent.startDate1"
                                 id="startDate"
                                 style="width:60%"
                                 placeholder="开始时间"
-                                v-model="model.startDate1">
+                                v-model="$parent.$parent.startDate1">
                     </datepicker>
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body" style="word-break:keep-all;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;</label>
                     <datepicker  :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'"
                                 :show-reset-button="reset"
-                                :value.sync="model.endDate1"
+                                :value.sync="$parent.$parent.endDate1"
                                 style="width:60%"
                                 id="endDate"
-                                style="width:60%"
                                 placeholder="结束日期"
-                                v-model="model.endDate1">
+                                v-model="$parent.$parent.endDate1">
                     </datepicker>
                   </div>
                   <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
@@ -416,6 +415,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
       console.log('444444444', Util.addDate(new Date(),-6).substring(0,10))
       this.$refs.paged.$refs.cri.model.startDate = Util.addDate(new Date(),-4).substring(0,10) + ' 00:00:00'
         this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
+      this.startDate1 = Util.addDate(new Date(),-4).substring(0,10)
+      this.endDate1 = Util.toStandardDateString()
         this.$refs.paged.$refs.cri.search()
         this.getfield = this.config.excelHeaders
     },
@@ -454,6 +455,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
       },
       clearmsg() {
         this.$refs.paged.$refs.cri.model = {}
+        this.startDate1 = ''
+        this.endDate1 = ''
       },
       initParams() {
         // 初始化气表品牌
@@ -470,9 +473,11 @@ import {HttpResetClass, PagedList} from 'vue-client'
       search(args) {
         // this.startDate = this.$refs.paged.$refs.cri.model.startDate
         // this.endDate = this.$refs.paged.$refs.cri.model.endDate
+        this.$refs.paged.$refs.cri.model.startDate = this.startDate1 + ' 00:00:00'
+        this.$refs.paged.$refs.cri.model.endDate = this.endDate1 + ' 23:59:59'
         console.log('--------------------', args)
         console.log('--------------------', this)
-        if (this.endDate == '' || this.startDate == '') {
+        if (this.endDate1 == '' || this.startDate1 == '') {
           return this.$showMessage("时间区间的开始和结束时间不能为空！")
         }
         // this.condition = this.$refs.paged.$refs.cri.condition + ` ${this.orgCondtionStr}`
@@ -559,29 +564,4 @@ import {HttpResetClass, PagedList} from 'vue-client'
   }
 </script>
 <style>
-  .mystyle {
-    float: right;
-    padding-right: 10%;
-  }
-
-  .mystyle1 {
-    padding-top: 10px;
-
-  }
-
-  .mystyle2 {
-    width: 100%;
-    height: 35px;
-    /*background: #00A3F0;*/
-    padding-left: 15px;
-    float: left;
-  }
-
-  .datapanel {
-    color: #333;
-    background-color: white;
-    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
-    padding: 10px 10px 10px 10px;
-    border-radius: 15px;
-  }
 </style>

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

@@ -452,7 +452,7 @@ monthGasConfig: {
   NewAccountConfig:{
     'f_userinfo_code':'用户编号','f_user_name':'用户姓名','f_user_phone':'用户电话','f_idnumber':'身份证号','f_address': '客户地址','f_price_name':'气价名称',
     'f_open_date':'开户时间','f_meternumber':'表号', 'f_gas_person':'置换员','f_gas_date':'通气时间',
-    'f_total_gas':'累购气量','f_meter_brand':'气表品牌','isbgl':'是否有壁挂炉','f_operator':'操作员'
+    'f_total_gas':'累购气量','f_meter_brand':'气表品牌','isbgl':'是否有壁挂炉','f_operator':'操作员','f_open_person':'办理人'
   },
   Wrongquery:{
     'f_userinfo_code':'用户编号','f_meternumber':'表号','f_operator_date':'抄表时间','f_operator_type':'错误类型','f_error_type':'错误原因','f_bankname':'银行名称','f_msg':'错误信息',