sale-client 3.5.45 → 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.45",
+  "version": "3.5.47",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

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

@@ -123,7 +123,7 @@
         </div>
         <div  class="col-sm-4">
           <label class="font_normal_body_new">是否自动阀控</label>
-          <input class="input-underline" style="width:45%" :value="row.f_network_valve == '1' ? '是' : '否'" readonly>
+          <input class="input-underline" style="width:45%" :value="row.f_network_valve == '1' ? '否' : '是'" readonly>
         </div>
       </div>
       <div v-if="row.f_collection_type == '按气量'" >

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/components/revenue/HandManager/MbpeopleList.vue

@@ -156,12 +156,12 @@
         </div>
         </div>
       </criteria>
-      <data-grid class="list_area table_sy" :model="model" partial='list' v-ref:grid>
+      <data-grid class="list_area table_sy" :model="model" partial='list' v-ref:grid :optional="true">
         <template partial='head'>
-          <th>
-            <input type="checkbox" id="f_operator" v-model="$parent.$parent.$parent.all[model.pageIndex-1]"
-                   @change="$parent.$parent.$parent.select()"/>
-          </th>
+          <!--<th>-->
+            <!--<input type="checkbox" id="f_operator" v-model="$parent.$parent.$parent.all[model.pageIndex-1]"-->
+                   <!--@change="$parent.$parent.$parent.select()"/>-->
+          <!--</th>-->
           <th><nobr>序号</nobr></th>
           <th><nobr>客户编号</nobr></th>
           <th><nobr>客户名称</nobr></th>
@@ -175,10 +175,10 @@
           <th><nobr>表底数</nobr></th>
         </template>
         <template partial='body'>
-          <td>
-            <input :id="'body'+model.pageIndex" type='checkbox' @change="$parent.$parent.$parent.selectOne($event,row,$index)"
-                   :checked="$parent.$parent.$parent.ischecked(model.pageIndex-1,$index)"/>
-          </td>
+          <!--<td>-->
+            <!--<input :id="'body'+model.pageIndex" type='checkbox' @change="$parent.$parent.$parent.selectOne($event,row,$index)"-->
+                   <!--:checked="$parent.$parent.$parent.ischecked(model.pageIndex-1,$index)"/>-->
+          <!--</td>-->
           <td>{{$index+1}}</td>
           <td>{{row.f_userinfo_code}}</td>
           <td>{{row.f_user_name}}</td>

package/src/components/revenue/HandManager/meterbookEntry.vue

@@ -47,13 +47,18 @@
       },
       'add-tobook-confirm' (model) {
         model.userfilesids = []
+        this.rowsdata = this.$refs.mbpeople_list.$refs.paged.$refs.grid.getRowData()
         let msg = '确认将选中的用户全部移入表册？'
         var alluser=[]
         if (this.rowsdata === null || this.rowsdata.length == 0) {
           this.$showAlert('请勾选用户！！', 'warning', 3000)
         } else {
-          model.userfilesids = this.rowsdata
-          alluser = this.$refs.mbpeople_list.rowsdata[0]
+          let userfilesids = []
+          this.rowsdata.forEach((row) => {
+            userfilesids.push(row.f_userfiles_id + '')
+          })
+          model.userfilesids = userfilesids
+          alluser = this.rowsdata
           // 变成可以直接使用的格式
           this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {

package/src/filiale/guangxi/OtherGas.vue

@@ -9,6 +9,15 @@
               <input class="input_search" style="width:60%" type="number" @blur="pregas"
                      v-validate:f_pregas='{ dctest: [0, ">=" ]}' v-model="model.f_pregas" placeholder="应补气量" v-ref:f_pregas>
             </div>
+            <div class="col-sm-4">
+              <label class=" font_normal_body">上次气量是否上表:</label>
+              <div style="display: inline-block;padding-top: 7px">
+                <input type="radio" id="true1" name="filllast" value="1" v-model="filllast">
+                <label for="true1">是</label>
+                <input type="radio" id="false1" name="filllast" value="0" v-model="filllast">
+                <label for="false1">否</label>
+              </div>
+            </div>
             <div class="col-sm-4">
               <label for="f_add_gas" class="font_normal_body">是否入累计</label>
               <v-select id="f_add_gas"
@@ -35,6 +44,15 @@
               <label for="f_preamount" class=" font_normal_body">应补金额:</label>
               <input  class="input_search" style="width:60%" type="number" min = "0" v-model="model.f_preamount" placeholder="金额">
             </div>
+            <div class="col-sm-4">
+              <label class=" font_normal_body">上次气量是否上表:</label>
+              <div style="display: inline-block;padding-top: 7px">
+                <input type="radio" id="true2" name="filllast" value="1" v-model="filllast">
+                <label for="true2">是</label>
+                <input type="radio" id="false2" name="filllast" value="0" v-model="filllast">
+                <label for="false2">否</label>
+              </div>
+            </div>
             <div class="col-sm-4">
               <label for="f_add_gas" class="font_normal_body">是否入累计:</label>
               <v-select v-model="model.f_add_gas"
@@ -180,6 +198,16 @@ let otherGasGen = async function (self) {
       if (!(self.row.f_hascard == null) && !(self.row.f_share_times == null) && self.row.f_meter_type == '物联网表' && self.row.f_hascard == '是' && self.row.f_share_times == '是') {
         params.cs = self.row.f_times + 1
       }
+      // 如果上次气量上表，就把上次气量变成上上次气量，上上次变为上上上次
+      if(self.filllast == '1'){
+        params.csql = params.ccsql
+        params.lastmoney = params.lastlastmoney
+        params.ccsql = params.cccsql
+        params.lastlastmoney = params.lastlastlastmoney
+      }
+      // 删除多余参数
+      delete params.cccsql
+      delete params.lastlastlastmoney
       console.log('获取其他补气写卡参数，，', params)
 
       let url = (getLastOper.data.last_oper === '补卡' || getLastOper.data.last_oper === '换表')
@@ -223,6 +251,7 @@ export default {
   data () {
     return {
       isGas: false,
+      filllast: '0',
       config: {
         hasPrint: false,  // 默认打票
         hasBillManage: false,  // 默认不启用发票管理