sale-client 3.5.46 → 3.5.47

package/.babelrc

@@ -1,5 +1,5 @@
-{
-  "presets": ["es2015", "stage-2"],
-  "plugins": ["transform-runtime"],
-  "comments": false
-}
+{
+  "presets": ["es2015", "stage-2"],
+  "plugins": ["transform-runtime"],
+  "comments": false
+}

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Fri Apr 02 10:09:16 CST 2021
+gradle.version=3.5.1

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -0,0 +1 @@
+

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://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')
-})
+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://127.0.0.1:8082'
+  },
+  '/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.46",
+  "version": "3.5.47",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/common/userinfo_detail/ic_detail/MachineRecordQuery.vue

@@ -61,6 +61,8 @@
               <th><nobr>住址</nobr></th>
               <th><nobr>气量</nobr></th>
               <th><nobr>应交</nobr></th>
+              <th><nobr>缴费金额 </nobr></th>
+              <th><nobr>剩余未交 </nobr></th>
               <th><nobr>上期结余</nobr></th>
               <th><nobr>本期结余</nobr></th>
               <th><nobr>操作类型</nobr></th>
@@ -77,6 +79,8 @@
               <td style="text-align:center">{{row.f_address}}</td>
               <td style="text-align:center">{{row.gas}}</td>
               <td style="text-align:center;white-space:nowrap;">{{row.fee}}</td>
+              <td style="text-align:center;white-space:nowrap;">{{row.f_collection}}</td>
+              <td style="text-align:center;white-space:nowrap;">{{row.f_oughtfee}}</td>
               <td style="text-align:center;white-space:nowrap;">{{row.f_balance}}</td>
               <td style="text-align:center;white-space:nowrap;">{{row.f_curbalance}}</td>
               <td style="text-align:center">{{row.f_type}}</td>

package/src/filiale/guangxi/UnWriteCardCenter.vue

@@ -1,112 +1,112 @@
-<template>
-  <div class="auto">
-    <validator name='v'>
-      <form novalidate class="form-horizontal">
-        <div class="row">
-          <div class="col-sm-4">
-            <label for="f_paytype" class=" font_normal_body">付款方式:</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_payment" disabled/>
-          </div>
-
-          <div class="col-sm-4">
-            <label for="f_pregas" class=" font_normal_body">预购气量:</label>
-            <input type="number" class="input_search" style="width: 60%" v-model="model.f_pregas" disabled>
-          </div>
-
-          <div class="col-sm-4">
-            <label for="f_preamount" class=" font_normal_body">预购金额:</label>
-            <input type="number" class="input_search" style="width: 60%" v-model="model.f_preamount" disabled>
-          </div>
-        </div>
-        <div class="row" style="margin-top:6px;">
-          <div class="col-sm-4">
-            <label for="f_print" class="font_normal_body">收&ensp;款&ensp;人:</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_operator" disabled>
-          </div>
-          <div class="col-sm-4">
-            <label for="f_print" class="font_normal_body">部&emsp;&emsp;门:</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_depname" disabled>
-          </div>
-          <div class="col-sm-4">
-            <label for="f_print" class="font_normal_body">收费时间:</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_operate_date" disabled>
-          </div>
-        </div>
-
-        <div class="row" style="margin-top:6px;">
-
-          <div class="col-sm-12">
-            <label for="f_comments" class="font_normal_body">备&emsp;&emsp;注</label>
-            <input type="text" class="input_search" style="width:87%" v-model="model.f_comments" placeholder="备注"/>
-          </div>
-        </div>
-      </form>
-      <print-bill :show="print" :bill-manager='config.hasBillManage' v-ref:printbill :bill-url='billUrl' v-on:toggle="close" @printok="printok" :data='row'></print-bill>
-      <div style="text-align:right;margin-top:80px;margin-right:50px;">
-        <button class="button_search" @click="confirm()" v-if="jurisdiction.includes('线下写卡')" :disabled='clickConfirm'>写卡</button>
-        <button class="button_clear" @click="clean()">取消</button>
-      </div>
-    </validator>
-  </div>
-</template>
-<script>
-/**
- *综合业务
- *卡表收费组件
- */
-import CardService from './CardService'
-
- // 执行保存逻辑
-let sellgasGen = async function (self) {
-  try {
-    self.row.cardInfo = self.cardData
-    self.row.f_write_comments = self.model.f_comments
-    await CardService.offlineWrite(self.row)
-      // 开始打票
-    self.clickConfirm = false
-    self.$dispatch('success')
-  } catch (error) {
-    self.$showAlert(error, 'danger', 0)
-    self.$dispatch('refresh')
-    self.clickConfirm = false
-  }
-}
-
-export default {
-  title: '线下写卡',
-  data () {
-    return {
-      model: {},
-      clickConfirm: false,
-      jurisdiction: this.$login.r
-    }
-  },
-  props: ['row', 'cardData'],
-  ready () {
-    if (this.row.unWriteSell) {
-      this.model = this.row.unWriteSell[0]
-    }
-  },
-  methods: {
-    confirm () {
-      if (!this.cardData) {
-        this.$showAlert('请先进行读卡再进行线下写卡', 'warning', 3000)
-        return
-      }
-
-      this.clickConfirm = true
-      this.$showMessage(`对用户${this.row.f_user_name}进行写卡操作。该操作只做写卡操作。确定要进行该操作吗？`, ['confirm', 'cancel']).then((res) => {
-        if (res === 'confirm') {
-          sellgasGen(this)
-        }
-      })
-    },
-    clean () {
-      this.$dispatch('refresh', this.row)
-    }
-  }
-}
-</script>
-
-<style>
-</style>
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-4">
+            <label for="f_paytype" class=" font_normal_body">付款方式:</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_payment" disabled/>
+          </div>
+
+          <div class="col-sm-4">
+            <label for="f_pregas" class=" font_normal_body">预购气量:</label>
+            <input type="number" class="input_search" style="width: 60%" v-model="model.f_pregas" disabled>
+          </div>
+
+          <div class="col-sm-4">
+            <label for="f_preamount" class=" font_normal_body">预购金额:</label>
+            <input type="number" class="input_search" style="width: 60%" v-model="model.f_preamount" disabled>
+          </div>
+        </div>
+        <div class="row" style="margin-top:6px;">
+          <div class="col-sm-4">
+            <label for="f_print" class="font_normal_body">收&ensp;款&ensp;人:</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_operator" disabled>
+          </div>
+          <div class="col-sm-4">
+            <label for="f_print" class="font_normal_body">部&emsp;&emsp;门:</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_depname" disabled>
+          </div>
+          <div class="col-sm-4">
+            <label for="f_print" class="font_normal_body">收费时间:</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_operate_date" disabled>
+          </div>
+        </div>
+
+        <div class="row" style="margin-top:6px;">
+
+          <div class="col-sm-12">
+            <label for="f_comments" class="font_normal_body">备&emsp;&emsp;注</label>
+            <input type="text" class="input_search" style="width:87%" v-model="model.f_comments" placeholder="备注"/>
+          </div>
+        </div>
+      </form>
+      <print-bill :show="print" :bill-manager='config.hasBillManage' v-ref:printbill :bill-url='billUrl' v-on:toggle="close" @printok="printok" :data='row'></print-bill>
+      <div style="text-align:right;margin-top:80px;margin-right:50px;">
+        <button class="button_search" @click="confirm()" v-if="jurisdiction.includes('线下写卡')" :disabled='clickConfirm'>写卡</button>
+        <button class="button_clear" @click="clean()">取消</button>
+      </div>
+    </validator>
+  </div>
+</template>
+<script>
+/**
+ *综合业务
+ *卡表收费组件
+ */
+import CardService from './CardService'
+
+ // 执行保存逻辑
+let sellgasGen = async function (self) {
+  try {
+    self.row.cardInfo = self.cardData
+    self.row.f_write_comments = self.model.f_comments
+    await CardService.offlineWrite(self.row)
+      // 开始打票
+    self.clickConfirm = false
+    self.$dispatch('success')
+  } catch (error) {
+    self.$showAlert(error, 'danger', 0)
+    self.$dispatch('refresh')
+    self.clickConfirm = false
+  }
+}
+
+export default {
+  title: '线下写卡',
+  data () {
+    return {
+      model: {},
+      clickConfirm: false,
+      jurisdiction: this.$login.r
+    }
+  },
+  props: ['row', 'cardData'],
+  ready () {
+    if (this.row.unWriteSell) {
+      this.model = this.row.unWriteSell[0]
+    }
+  },
+  methods: {
+    confirm () {
+      if (!this.cardData) {
+        this.$showAlert('请先进行读卡再进行线下写卡', 'warning', 3000)
+        return
+      }
+
+      this.clickConfirm = true
+      this.$showMessage(`对用户${this.row.f_user_name}进行写卡操作。该操作只做写卡操作。确定要进行该操作吗？`, ['confirm', 'cancel']).then((res) => {
+        if (res === 'confirm') {
+          sellgasGen(this)
+        }
+      })
+    },
+    clean () {
+      this.$dispatch('refresh', this.row)
+    }
+  }
+}
+</script>
+
+<style>
+</style>