sale-client 3.5.36 → 3.5.38

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://39.108.82.124:8400/', bendi1 = 'http://121.36.106.17:8400/'
-// 公司测试服务
-var fuwu = 'http://39.108.82.124: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: fuwu
-  },
-  '/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.36",
+  "version": "3.5.38",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -150,7 +150,7 @@ export default {
       data: {
         baseinfo: {
           base: {
-            f_user_name:'',
+            f_user_name: '',
             f_user_state: '',
             f_credentials: '',
             f_cost_type: '',
@@ -440,7 +440,7 @@ export default {
         } else if (row.f_fire_state === '0') {
           row.f_fire_state1 = false
         }
-        row.f_install_date = row.f_install_date ? row.f_install_date : ''
+        row.f_install_date = row.f_install_date ? row.f_install_date : null
         row.f_gas_date = row.f_gas_date ? row.f_gas_date : null
         row.f_changetube_date = row.f_changetube_date ? row.f_changetube_date : null
         row.f_aroundmeter = row.f_aroundmeter ? row.f_aroundmeter : ''
@@ -583,7 +583,9 @@ export default {
           f_hand_month: '', // 抄表月份
           fireinfo: {}, // 用气信息
           f_meter_book_num: '',
-          f_use_limit:''
+          f_use_limit: '',
+          f_gas_date: this.$login.toStandardDateString(),
+          f_install_date: this.$login.toStandardDateString()
         }],
         devicesinfo: []
       }
@@ -644,6 +646,9 @@ export default {
           f_hand_month: row.f_hand_month,
           f_usetype: ''
         }
+        if (!temp.f_install_date) {
+          delete temp.f_install_date
+        }
         Object.assign(this.data.meterinfo[0], this.data.meterinfo[0], temp)
         console.log('====1.=====', temp, row)
         this.checkout('area')

package/src/components/webMeter/MeterManage/WebMeterBatchOperationValve.vue

@@ -8,6 +8,7 @@
               <div class="row">
                 <res-select-group :initres="$parent.$parent.initres"  :show-component="['company','department','operator','slicearea']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                 <div class="span" style="float:right">
+                  <button v-if="$parent.$parent.importMeterNumber === '开关阀导入表号'" class="button_new" style="margin-right: 10px"  @click="$parent.$parent.showUploadCodeCondition()">导入表号</button>
                 <import-excel v-if="$parent.$parent.batchImport === '批量开关阀导入'" template-name="批量开关阀导入Excel模板" logic-name="importBatchValue" import-json="importBatchValue.json"></import-excel>
                 <button class="button_search button_spacing"  @click="search()" v-el:cba>查询</button>
                 <button class="button_clear button_spacing"  @click="$parent.$parent.clearmsg">清空</button>
@@ -281,6 +282,13 @@
         </criteria-paged>
       </div>
     </div>
+    <modal :show.sync="batchMeterShow" width="570px" title="文件导入" v-ref:modal large backdrop="false">
+      <article slot="modal-body" class="modal-body">
+        <file-upload class="my-file-uploader col-sm-9" name="meterNUmberUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
     <div style="height: 98%;width: 40%" class="binary-right" v-if="selectRow">
       <sale-web-meter-operate v-if="selectRow" :row="selectRow" @research = research()></sale-web-meter-operate>
     </div>
@@ -318,6 +326,7 @@
 import Vue from 'vue'
 import * as Util from '../../../Util'
 import {HttpResetClass} from 'vue-client'
+import axios from 'axios'
 
   let fun = (json) => {
     let array = []
@@ -393,6 +402,9 @@ import {HttpResetClass} from 'vue-client'
         },
         // 开关阀权限
         valveLimit: false,
+        uploadCodeCondition: '', // 导入表号条件
+        batchMeterShow: '', // 导入表号弹框
+        importMeterNumber: '', // 开关阀导入权限
         // 设置参数权限
         Setarameterermissions: false,
         parameterType: '',
@@ -413,13 +425,79 @@ import {HttpResetClass} from 'vue-client'
       'dblclick' (row) {
         console.log('看看这个row', row)
         this.selectRow = row
+      },
+      'onFileUpload': async function (file, res) {
+        this.iswork = true
+        let param = {
+          filepath: res.f_downloadpath,
+          importJson: this.importJson,
+          logicName: this.logicName,
+          f_operator: this.$login.f.name,
+          f_operatorid: this.$login.f.id,
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.orgs,
+          f_depid: this.$login.f.depids,
+          f_depname: this.$login.f.deps
+        }
+        this.batchMeterShow = false
+        let self = this
+        try {
+          await axios.post('rs/logic/importData',
+            {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
+              if (res.data) {
+                this.uploadCodeCondition = self.convertToIn(res.data.dataArr)
+                this.uploadCodeCondition = ' and f_meternumber in' + this.uploadCodeCondition
+              }
+            })
+        } catch (error) {
+          if (error.response) {
+            if (error.response.status == 500) {
+              this.$showAlert('服务繁忙,请重试!!!', 'danger', 3000)
+            } else if (error.response.status == 404) {
+              this.$showAlert('服务运行中,请耐心等待后进行重试!!', 'danger', 3000)
+            } else {
+              this.$showAlert(error.response.data, 'danger', 2000)
+            }
+            console.log(error.response.data)
+            console.log(error.response.status)
+            console.log(error.response.headers)
+          } else if (error.request) {
+            console.log(error.request)
+            this.$showAlert(error.request, 'danger', 2000)
+          } else {
+            console.log('Error', error.message)
+            this.$showAlert(error.message, 'danger', 2000)
+          }
+          this.iswork = false
+        }
+        this.batchShow = false
       }
     },
     methods: {
+      // 数组转in
+      convertToIn (val) {
+        let temp = ''
+        if (val instanceof Array) {
+          if (val.length >= 1) {
+            temp = '('
+            val.forEach((res) => {
+              temp += `'${res}',`
+            })
+            temp = temp.substr(0, temp.length - 1) + ')'
+          }
+        }
+        return temp
+      },
+      showUploadCodeCondition () {
+        this.batchMeterShow = true
+      },
       getAuthority () {
         if (this.$login.r.find(value => value == '批量开关阀导入')) {
           this.batchImport = '批量开关阀导入'
         }
+        if (this.$login.r.find(value => value == '开关阀导入表号')) {
+          this.importMeterNumber = '开关阀导入表号'
+        }
       },
       research () {
         this.selectRow = null
@@ -461,6 +539,7 @@ import {HttpResetClass} from 'vue-client'
             args.condition = `${args.condition} ` + `and f_gasbrand_id = ${this.$refs.paged.$refs.criteria.model.f_meter_brand[0].id}`
           }
         }
+        args.condition = `${args.condition} ` + this.uploadCodeCondition
         this.condition = args.condition
         await this.model.search(args.condition, args.model)
 
@@ -491,6 +570,8 @@ import {HttpResetClass} from 'vue-client'
       },
       clearmsg () {
         this.$refs.paged.$refs.criteria.model = {}
+        // 清空表号
+        this.uploadCodeCondition = ''
       },
       clickshow () {
         this.searchshow = !this.searchshow

package/src/components/webMeter/paramSaveNew/ParamSet.vue

@@ -205,7 +205,7 @@
         <h3 class="modal-title" style="text-align: center;">参数设置</h3>
       </header>
       <article slot="modal-body" class="flex-row" >
-        <param-set-form :data="map" :condition="conditionMsg" @showparam="showparam" @clear="clear" :gasbrandid="f_gasbrand_id" :user="user" :checked1 ="checked1" v-ref:form></param-set-form>
+        <param-set-form-new :data="map" :condition="conditionMsg" @showparam="showparam" @clear="clear" :gasbrandid="f_gasbrand_id" :user="user" :checked1 ="checked1" v-ref:form></param-set-form-new>
       </article>
       <footer slot="modal-footer" class="modal-footer">
       </footer>
@@ -216,7 +216,7 @@
         <h3 class="modal-title" style="text-align: center;">参数设置记录</h3>
       </header>
       <article slot="modal-body" class="flex-row" >
-        <param-history @clear="clear" :gasbrandid="f_gasbrand_id" :user="row" v-ref:history></param-history>
+        <param-history-new @clear="clear" :gasbrandid="f_gasbrand_id" :user="row" v-ref:history></param-history-new>
       </article>
       <footer slot="modal-footer" class="modal-footer">
         <!--        <button type="button" class="btn btn-primary"  @click='confirm()'>确认</button>-->