sale-client 3.5.193 → 3.5.195

package/build/dev-server.js

@@ -1,67 +1,73 @@
-const express = require('express')
-const webpack = require('webpack')
-const config = require('./webpack.dev.conf')
-const proxyMiddleware = require('http-proxy-middleware')
-const app = express()
-const compiler = webpack(config)
-
-// 自己改了这里不要提交 来回覆盖挺麻烦的
-const [local, server] = ['http://127.0.0.1:8080', 'http://192.168.50.4:8400']
-const port = 8089
-
-const proxyTable = {
-  '/text': {
-    target: local
-  },
-  '/files': {
-    target: server
-  },
-  '/excel': {
-    target: server
-  },
-  '/webmeter': {
-    target: server
-  },
-  '/rs/logic': {
-    target: server
-  },
-  '/rs': {
-    target: server
-  }
-}
-
-const devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-const hotMiddleware = require('webpack-hot-middleware')(compiler)
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-Object.keys(proxyTable).forEach(function (context) {
-  let options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-app.use(require('connect-history-api-fallback')())
-app.use(devMiddleware)
-app.use(hotMiddleware)
-app.use('/static', express.static('./static'))
-
-module.exports = app.listen(port, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:' + port)
-})
+const express = require('express')
+const webpack = require('webpack')
+const config = require('./webpack.dev.conf')
+const proxyMiddleware = require('http-proxy-middleware')
+const app = express()
+const compiler = webpack(config)
+
+// 自己改了这里不要提交 来回覆盖挺麻烦的
+const [local, server] = ['http://127.0.0.1:8080', 'http://192.168.50.4:8400']
+const port = 8089
+
+const proxyTable = {
+  '/text': {
+    target: local,
+    // changeOrigin: true //https请求需要加
+  },
+  '/files': {
+    target: server,
+    // changeOrigin: true
+  },
+  '/excel': {
+    target: server,
+    // changeOrigin: true
+  },
+  '/webmeter': {
+    target: server,
+    // changeOrigin: true
+  },
+  '/rs/logic': {
+    target: server,
+    // changeOrigin: true
+  },
+  '/rs': {
+    target: server,
+    // changeOrigin: true
+  }
+}
+
+const devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+const hotMiddleware = require('webpack-hot-middleware')(compiler)
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+
+Object.keys(proxyTable).forEach(function (context) {
+  let options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+app.use(require('connect-history-api-fallback')())
+app.use(devMiddleware)
+app.use(hotMiddleware)
+app.use('/static', express.static('./static'))
+
+module.exports = app.listen(port, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:' + port)
+})

package/package.json

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

package/src/components/charge/business/CardMeterCenter.vue

@@ -491,7 +491,7 @@
         serialShow: false,
         resid: [],  // 存放新增的f_files表中id
         config: {
-          calculatePreByCollection: true, // 可以更具收款来反向计算预购
+          calculatePreByCollection: false, // 可以更具收款来反向计算预购
           notShowFormula: false, // 不显示计算公式,默认显示
           autoCollection: true, // 自动填写收款
           showupload: true, // 显示上传

package/src/components/charge/business/ShowCardSellGas.vue

@@ -463,7 +463,7 @@ export default {
       resid: [],
       config: {
         notShowFormula: false, // 不显示计算公式,默认显示
-        calculatePreByCollection: true, // 可以更具收款来反向计算预购
+        calculatePreByCollection: false, // 可以更具收款来反向计算预购
         showupload: true,  // 默认不显示上传附件
         hasPrint: false,  // 默认打票
         floor: true,  // 是否取整收费

package/src/components/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -9,21 +9,30 @@
         <saletab header="机表流水查询" v-if="permission('机表流水查询')&&row.f_meter_type.includes('机表')">
           <machine-record-query :row="row" v-if="show == '机表流水查询'" @deal-msg="dealMsg"></machine-record-query>
         </saletab>
-        <saletab header="收费查询" v-if="permission('收费查询')">
+        <saletab header="收费查询" v-if="!newWebHand && permission('收费查询')">
+          <charge-query-user  :row="row" v-if="show == '收费查询'" @deal-msg="dealMsg"></charge-query-user>
+        </saletab>
+        <saletab header="收费查询" v-if="newWebHand && permission('收费查询')">
           <charge-query-user  :row="row" v-if="show == '收费查询'" @deal-msg="dealMsg"></charge-query-user>
         </saletab>
         <saletab header="累购查询" v-if="permission('累购查询')">
           <Repurchase  :row="row" v-if="show == '累购查询'" @deal-msg="dealMsg"></Repurchase>
         </saletab>
-        <saletab header="下账查询" v-if="row.f_meter_type.includes('物联网表')&&permission('自动下账查询')">
+        <saletab header="下账查询" v-if="!newWebHand && row.f_meter_type.includes('物联网表')&&permission('自动下账查询')">
           <automatic-purse  :row="row"   @deal-msg="dealMsg"></automatic-purse>
         </saletab>
+        <saletab header="下账查询" v-if="newWebHand && row.f_meter_type.includes('物联网表')&&permission('自动下账查询')">
+          <web-automatic-purse  :row="row"   @deal-msg="dealMsg"></web-automatic-purse>
+        </saletab>
         <saletab header="抄表记录" v-if="row.f_meter_type.includes('卡表')&&permission('抄表记录')">
           <card-hand-record :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></card-hand-record>
         </saletab>
-        <saletab header="抄表记录" v-if="!row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+        <saletab header="抄表记录" v-if="!newWebHand && !row.f_meter_type.includes('卡表')&&permission('抄表记录')">
           <hand-query-user  :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></hand-query-user>
         </saletab>
+        <saletab header="抄表记录" v-if="newWebHand && !row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+          <web-hand-query-user  :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></web-hand-query-user>
+        </saletab>
         <saletab header="补卡查询" v-if="row.f_meter_type.includes('卡表')&&permission('补卡查询')">
           <fill-card-query-user :row="row" v-if="show == '补卡查询'" @deal-msg="dealMsg"></fill-card-query-user>
         </saletab>
@@ -92,6 +101,10 @@
   import AutomaticPurse from './ic_detail/AutomaticPurse'
   import Repurchase from './ic_detail/Repurchase'
   import MachineRecordQuery from './ic_detail/MachineRecordQuery'
+  import WebAutomaticPurse from './ic_detail/WebAutomaticPurse'
+  import WebChargeQueryUser from './ic_detail/WebChargeQueryUser'
+  import WebHandQueryUser from './ic_detail/WebHandQueryUser'
+
   // 导入物联网相关查询
   import QueryInstruct from './iot_detail/QueryInstruct'
   import QueryHistoryInstruct from './iot_detail/QueryHistoryInstruct'
@@ -109,6 +122,9 @@ export default {
       PriceAdjustmentQueryUser,
       PriceChangeQueryUser,
       AutomaticPurse,
+      WebAutomaticPurse,
+      WebChargeQueryUser,
+      WebHandQueryUser,
       Repurchase,
       ChangeMeterQueryUser,
       ChargeQueryUser,
@@ -132,6 +148,7 @@ export default {
       return {
         row: null,
         name: '自动下账查询',
+        newWebHand: this.$appdata.getSingleValue('新抄表'),
         show: ''
       }
     },