sale-client 3.4.153 → 3.4.156

package/build/dev-server.js

@@ -1,162 +1,160 @@
-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://121.36.106.17:8400',bendi1 = 'http://121.36.106.17: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: 'https://qnjtkf.cn:7400/rs/logic/getLogin'
-  },
-  // 查找资源服务数据
-  '/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: 'https://qnjtkf.cn:7400'
-    target: fuwu
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/webmeter': {
-    // target: 'https://qnjtkf.cn:7400'
-    target: fuwu
-  },
-  '/rs': {
-    // target: 'http://192.168.30.63:8081/'
-    // target: 'https://qnjtkf.cn:7400'
-    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'))
-
-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://121.36.106.17:8400/',bendi1 = 'http://121.36.106.17: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: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'))
+
+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.4.153",
+  "version": "3.4.156",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -622,6 +622,7 @@ export default {
           f_user_type: row.f_user_type,
           f_gasproperties: row.f_gasproperties,
           f_position: row.f_position,
+          f_install_date: row.f_install_date,
           f_inputtor: row.f_inputtor,
           f_hand_month: row.f_hand_month
         }

package/src/components/charge/HandList.vue

@@ -110,6 +110,12 @@
       isSelected (row) {
         return this.row === row
       }
+    },
+    watch: {
+      'f_userfiles_id'(){
+        let condition = `f_userfiles_id = '${this.f_userfiles_id}' `
+        this.model.search(condition)
+      },
     }
   }
 </script>

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

@@ -362,6 +362,11 @@
       // 开始打票
       if (self.config.hasPrint) {
         if (self.model.f_print.indexOf('电子发票') == -1) {
+          if(self.$login.r.includes('非民用纸质票据拆分')){
+            if(self.row.f_user_type === '非民用'){
+              self.billData.url = 'rs/report/fmy_sendCard_bill'
+            }
+          }
           if (self.config.hasBillManage) {
             // 启用发票管理，获取票据管理中的票号并存储记录 d
             self.row.id = res.data.id

package/src/components/charge/gasloss/gasLossOperate.vue

@@ -104,12 +104,12 @@
                               close-on-select clear-button>
                     </v-select>
                   </div>
-                  <div class="col-sm-4 auto" style="text-align:right;">
-                    <label for="f_collection" ><font size="6px" style="font-weight:bold;color:darkred">收&emsp;款&emsp;:&emsp;{{model.f_collection}}</font></label>
+                  <div class="col-sm-4 auto">
+                    <label for="f_collection" style="text-align:right;"><font size="6px" style="font-weight:bold;color:darkred">收&emsp;款:{{model.f_collection}}</font></label>
                   </div>
-                  <div class="col-sm-12 form-group">
+                  <div class="col-sm-9 form-group">
                     <label class=" font_normal_body">&emsp;备&emsp;&emsp;注</label>
-                    <input class="input_search" style="width:87%"
+                    <input class="input_search" style="width:70%"
                            v-model="model.f_comments"
                            placeholder="备注">
                   </div>
@@ -335,7 +335,7 @@
         })
 
         if (money != 0) {
-          this.model.f_collection = money.toFixed(4)
+          this.model.f_collection = money.toFixed(2)
         }
       },
       addadetail () {

package/src/components/revenue/base/rightview/CardList.vue

@@ -411,7 +411,11 @@ and  th.f_userfiles_id = '${row.f_userfiles_id}' and tsh.f_state='有效'`
         } else if (type === '补卡') {
           name = 'rs/report/replace_sell'
         } else if (type === '发卡售气') {
-          name = 'rs/report/sendCard_bill'
+          if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')){
+            name = 'rs/report/fmy_sendCard_bill'
+          } else {
+            name = 'rs/report/sendCard_bill'
+          }
         } else if (type === '卡表收费' || type === '卡表赠气' || type === '卡表收费撤销') {
           if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')){
             name = 'rs/report/fmy_card_bill'
@@ -426,6 +430,8 @@ and  th.f_userfiles_id = '${row.f_userfiles_id}' and tsh.f_state='有效'`
           name = 'rs/report/compensation_bill'
         } else if (type === '数码表收费') {
           name = 'rs/report/digtial_bill'
+        } else if (type === '气损收费') {
+          name = 'rs/report/gasloss_bill'
         }
         return name
       },

package/src/components/webMeter/paramSave/ParamHistory.vue

@@ -22,7 +22,7 @@
         </thead>
         <tbody>
         <tr v-for="row in history">
-          <td><nobr>{{row.msg}}'</nobr></td>
+          <td><nobr>{{row.msg}}</nobr></td>
           <td><nobr>{{row.f_instruct_state}}</nobr></td>
           <!--          <td><nobr>{{row.f_user_type}}</nobr></td>-->
           <!--          <td><nobr>{{row.f_meter_brand}}</nobr></td>-->