manage-client 3.2.27 → 3.2.31

package/build/dev-server.js

@@ -1,174 +1,174 @@
-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://127.0.0.1:8084/', fuwu_login = 'http://192.168.50.4:8400'
-var fuwu = 'http://192.168.50.4:8400'
-var system = '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: fuwu
-  },
-  '/files': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: fuwu
-  },
-  '/rs/logic/getSaleInitData':{
-    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/report': {
-    target: fuwu
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/rs/file': {
-    target: fuwu
-  },
-  '/rs/logic/SumSettleFileImport': {
-    target: 'http://127.0.0.1:8080'
-  },
-  '/rs': {
-    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'))
-
-// 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(8085, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8085')
-})
+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://127.0.0.1:8084/', fuwu_login = 'http://192.168.50.4:8400'
+var fuwu = 'http://139.214.92.34:8301/'
+var system = '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: fuwu
+  },
+  '/files': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: fuwu
+  },
+  '/rs/logic/getSaleInitData':{
+    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/report': {
+    target: fuwu
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/rs/file': {
+    target: fuwu
+  },
+  '/rs/logic/SumSettleFileImport': {
+    target: fuwu
+  },
+  '/rs': {
+    target: fuwu
+  }
+}
+
+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(8085, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8085')
+})

package/package.json

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

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

@@ -65,6 +65,16 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_operator"
                          condition=" f_operator like '%{}%'" placeholder='操作人'>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meter_number"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">卡&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
+                         condition="f_card_id = '{}'" placeholder='卡号'>
+                </div>
               </div>
 
             </div>

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

@@ -111,14 +111,9 @@
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">新表卡号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_newcard_id"
-                         condition="f_newcard_id = '{}'" placeholder='新表卡号'>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">旧表卡号</label>
+                  <label class="font_normal_body">卡&emsp;&emsp;号</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
-                         condition="f_card_id = '{}'" placeholder='旧表卡号'>
+                         condition="f_card_id = '{}'" placeholder='卡号'>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">换表状态</label>
@@ -163,6 +158,11 @@
                             close-on-select clear-button>
                   </v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">表&ensp;封&ensp;号</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_metertitles"

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

@@ -63,7 +63,16 @@
                                     <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
                                            condition="f_user_phone like '%{}%'" placeholder="客户电话">
                                 </div>
-
+                              <div class="col-sm-2 form-group">
+                                <label class="font_normal_body">表&emsp;&emsp;号</label>
+                                <input type="text" style="width:60%" class="input_search" v-model="model.f_meter_number"
+                                       condition="f_meternumber = '{}'" placeholder='表号'>
+                              </div>
+                              <div class="col-sm-2 form-group">
+                                <label class="font_normal_body">卡&emsp;&emsp;号</label>
+                                <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
+                                       condition="f_card_id = '{}'" placeholder='卡号'>
+                              </div>
                                 <div class="col-sm-2 form-group">
                                     <label class="font_normal_body">更改内容</label>
                                     <v-select :value.sync="model.f_field_name"

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

@@ -157,6 +157,16 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_id"
                          condition="f_user_id = '{}'" placeholder='表编号'>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">卡&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
+                         condition="f_card_id = '{}'" placeholder='卡号'>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">气表类型</label>
                   <v-select :value.sync="model.f_meter_type" multiple

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

@@ -75,6 +75,16 @@
                             <!--condition="f_operat_type = '{}'"-->
                             <!--close-on-select></v-select>-->
                 <!--</div>-->
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">卡&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
+                         condition="f_card_id = '{}'" placeholder='卡号'>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">停用原因</label>
                   <v-select :value.sync="model.f_disable_reason"

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

@@ -72,6 +72,16 @@
                             close-on-select></v-select>
                 </div>
               </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">表&emsp;&emsp;号</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                       condition="f_meternumber = '{}'" placeholder='表号'>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">卡&emsp;&emsp;号</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
+                       condition="f_card_id = '{}'" placeholder='卡号'>
+              </div>
               <div class="row">
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">小&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;区</label>

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

@@ -73,10 +73,15 @@
                 </div>
 
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;卡号&nbsp;&nbsp;&nbsp;</label>
+                  <label class="font_normal_body">卡&emsp;&emsp;号</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
                          condition="f_card_id like '%{}%'" placeholder='卡号'>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">气表品牌</label>
                   <v-select :value.sync="model.f_meter_brand"

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

@@ -80,10 +80,15 @@
                 </div>
 
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;卡号&nbsp;&nbsp;&nbsp;</label>
+                  <label class="font_normal_body">卡&emsp;&emsp;号</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
                          condition="f_card_id like '%{}%'" placeholder='卡号'>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">气表类型</label>
                   <v-select :value.sync="model.f_meter_type" multiple

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

@@ -93,6 +93,16 @@
                             close-on-select clear-button>
                   </v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">卡&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
+                         condition="f_card_id = '{}'" placeholder='卡号'>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">用户类型</label>
                   <v-select id="f_user_type"

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

@@ -76,6 +76,16 @@
                             condition="f_user_type = '{}'"
                             close-on-select></v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">卡&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
+                         condition="f_card_id = '{}'" placeholder='卡号'>
+                </div>
               </div>
             </div>
           </criteria>

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

@@ -54,6 +54,16 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
                          condition="f_address like '%{}%'" placeholder='客户地址'>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">卡&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
+                         condition="f_card_id = '{}'" placeholder='卡号'>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">过户状态</label>
                   <v-select :value.sync="model.f_state"

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

@@ -9,6 +9,9 @@
     <tabs header="表具设备查询" v-if="permission('表具设备查询')">
       <equipment-query v-if="show.includes('表具设备查询')"></equipment-query>
     </tabs>
+    <tabs header="点火查询" v-if="permission('点火查询')">
+      <fire-query v-if="show.includes('点火查询')"></fire-query>
+    </tabs>
     <tabs header="综合档案信息查询" v-if="permission('综合档案信息查询')">
       <record-info-query v-if="show.includes('综合档案信息查询')"></record-info-query>
     </tabs>

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

@@ -90,6 +90,16 @@
                               condition="f_pipe_type = '{}'"
                               close-on-select></v-select>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">表&emsp;&emsp;号</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_meter_number"
+                           condition="f_meternumber = '{}'" placeholder='表号'>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">卡&emsp;&emsp;号</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
+                           condition="f_card_id = '{}'" placeholder='卡号'>
+                  </div>
                   <div class="col-sm-2 form-group" >
                     <label class="font_normal_body">设备编号</label>
                     <input  type="text" style="width:60%" class="input_search" v-model="model.f_devices_no"