sale-client 3.5.122 → 3.5.124

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/build/dev-server.js

@@ -1,193 +1,193 @@
-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://39.99.85.14: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/stopBasicLivingNew':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/logic/getBatchOperaPro':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/sql/sale_getUser':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/logic/getOperBtns':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/file/uploadFile':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/business/batchRunExcelDefault/filemanage_fileSave/newSettleFileImport':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/business/batchRunNew/BatchmachineDownHand/machineDownHand':{
-  //   target:'http:127.0.0.1:8080'
-  // },
-  // '/rs/sql/getDownPlan':{
-  //   target:'http:127.0.0.1:8080'
-  // },
-  // '/rs/logic/saleExport': {
-  //   target: fuwu
-  // },
-  // '/rs/logic/saleGetExportProgress': {
-  //   target: fuwu
-  // },
-  // '/rs/logic/getWarningMsg': {
-  //   target: 'http://localhost:8080/'
-  // },
-  '/rs/file': {
-    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(8085, 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://192.168.50.4:8400'
+var fuwu = 'http://39.99.85.14: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/stopBasicLivingNew':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/logic/getBatchOperaPro':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/sql/sale_getUser':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/logic/getOperBtns':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/file/uploadFile':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/business/batchRunExcelDefault/filemanage_fileSave/newSettleFileImport':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/business/batchRunNew/BatchmachineDownHand/machineDownHand':{
+  //   target:'http:127.0.0.1:8080'
+  // },
+  // '/rs/sql/getDownPlan':{
+  //   target:'http:127.0.0.1:8080'
+  // },
+  // '/rs/logic/saleExport': {
+  //   target: fuwu
+  // },
+  // '/rs/logic/saleGetExportProgress': {
+  //   target: fuwu
+  // },
+  // '/rs/logic/getWarningMsg': {
+  //   target: 'http://localhost:8080/'
+  // },
+  '/rs/file': {
+    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(8085, 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.122",
+  "version": "3.5.124",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/charge/business/PriceChangeCompensation/IotCompensation.vue

@@ -274,6 +274,7 @@
         // 先调用付款码支付组件流程
         let ss = await this.$refs.paymentcode.flowPath()
         console.log('付款码操作返回', ss)
+        this.$refs.paymentcode.paymentCodeShow = false
         if (!ss.result) return
         compensationChargeGen(this)
       },

package/src/components/charge/business/PriceChangeCompensation/JbCompensation.vue

@@ -300,6 +300,7 @@
         this.model.f_depname = this.$login.f.deps
         // 先调用付款码支付组件流程
         let ss = await this.$refs.paymentcode.flowPath()
+        this.$refs.paymentcode.paymentCodeShow = false
         console.log('付款码操作返回', ss)
         if (!ss.result) return
         compensationChargeGen(this)

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

@@ -6,7 +6,8 @@
           <div class="row" style="margin-top:5px;">
             <div class="col-sm-4 form-group" :class="[$v.payment.required ? 'has-error' : '']">
               <label for="f_paytype" class=" font_normal_body" title="参数名称：付款方式">收款方式</label>
-              <input type="text" v-show="false" v-model="$refs.payment.selectedItems"  v-validate:payment='{required: true }'>
+              <input type="text" v-show="false" v-model="$refs.payment.selectedItems"
+                     v-validate:payment='{required: true }'>
               <v-select id="f_payment"
                         v-model="f_payment"
                         placeholder='请选择'
@@ -19,15 +20,16 @@
               <input class="input_search" style="width:60%" type="number" id="fouces"
                      @blur="pregas()" v-model="model.f_pregas"
                      v-validate:f_pregas='{required: true, dctest: [maxgas, "<=" ]}' placeholder="预购气量"
-                     v-next-el='sk' >
+                     v-next-el='sk'>
             </div>
 
             <div class="col-sm-4 form-group"
                  :class="[$v.f_preamount.required || $v.f_preamount.dctest? 'has-error' : 'has-success']">
-              <label for="f_preamount" class=" font_normal_body" >*预购金额</label>
-              <input  class="input_search" style="width:60%" type="number" v-model="model.f_preamount"
-                     @blur="preamount()" v-validate:f_preamount='{required: true, dctest: [maxmoney, "<=" ]}' placeholder="预购金额"
-                     v-scale="[model.f_preamount, 4]" placeholder="预购金额" >
+              <label for="f_preamount" class=" font_normal_body">*预购金额</label>
+              <input class="input_search" style="width:60%" type="number" v-model="model.f_preamount"
+                     @blur="preamount()" v-validate:f_preamount='{required: true, dctest: [maxmoney, "<=" ]}'
+                     placeholder="预购金额"
+                     v-scale="[model.f_preamount, 4]" placeholder="预购金额">
             </div>
           </div>
           <div class="row" style="margin-top:5px;">
@@ -57,15 +59,15 @@
             </div>
             <div class="col-sm-4 form-group" v-if="!hasLimit">
             </div>
-            <div class="col-sm-4 form-group" >
+            <div class="col-sm-4 form-group">
               <label for="f_temp_amount" v-if="row.f_collection_type === '按气量'"
                      class=" font_normal_body">&nbsp;应收金额</label>
               <label for="f_temp_amount" v-if="row.f_collection_type === '按金额'"
                      class=" font_normal_body">*本次缴费</label>
               <input class="input_search" style="width:60%" type="number"
-                      v-model="model.f_totalcost"
+                     v-model="model.f_totalcost"
                      v-validate:f_totalcost='{required: true, dctest: [(openFee - 0), ">=" ] }' placeholder="应收金额"
-                     v-next-el='sk' v-scale="[model.f_totalcost, 4]" disabled >
+                     v-next-el='sk' v-scale="[model.f_totalcost, 4]" disabled>
             </div>
           </div>
 
@@ -95,7 +97,8 @@
                      v-el:sk v-scale="[model.f_collection, 4]" :disabled="$refs.givechange.promptText != ''">
             </div>
             <div class="col-sm-1 form-group">
-              <give-change :curbalance="curbalance" :collection.sync="model.f_collection" v-ref:givechange></give-change>
+              <give-change :curbalance="curbalance" :collection.sync="model.f_collection"
+                           v-ref:givechange></give-change>
             </div>
           </div>
           <div class="row" style="margin-top:5px;" v-show="authArr.includes('优惠权限')">
@@ -121,7 +124,8 @@
           <div class="row" v-if="openFee > 0">
             <div class="col-sm-4 form-group">
               <label class="font_normal_body">&nbsp;&nbsp;&nbsp;开卡费</label>
-              <input class="input_search" style="width:60%" style="width:60%" type="number" v-model="openFee" placeholder='开卡费' disabled>
+              <input class="input_search" style="width:60%" style="width:60%" type="number" v-model="openFee"
+                     placeholder='开卡费' disabled>
             </div>
           </div>
           <div class="row" style="margin-top:5px;">
@@ -134,19 +138,21 @@
           <div class="row" v-if="model.f_payment[0].includes('POS')">
             <div class="col-sm-4 form-group">
               <label for="f_voucher_number" class="font_normal_body">&nbsp;&nbsp;&nbsp;凭证号</label>
-              <input type="text" class="input_search" style="width:60%" v-model="model.f_voucher_number" placeholder="凭证号">
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_voucher_number"
+                     placeholder="凭证号">
             </div>
           </div>
           <div class="row" style="padding-top: 0.5em;">
 
-            <div class="col-sm-4" v-if="!mjshow" >
+            <div class="col-sm-4" v-if="!mjshow">
               <label for="f_serial_number" class=" font_normal_body">业务单号</label>
-              <input class="input_search" style="width:60%"  type="text"
+              <input class="input_search" style="width:60%" type="text"
                      v-model="model.f_serial_number" placeholder="业务单号">
             </div>
-            <div class="col-sm-4" v-if="mjshow" :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
+            <div class="col-sm-4" v-if="mjshow"
+                 :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
               <label for="f_serial_number" class=" font_normal_body">业务单号</label>
-              <input class="input_search" style="width:60%"  type="text" v-validate:f_serial_number='{required: true }'
+              <input class="input_search" style="width:60%" type="text" v-validate:f_serial_number='{required: true }'
                      v-model="model.f_serial_number" placeholder="业务单号">
             </div>
 
@@ -157,12 +163,13 @@
             </div>
           </div>
           <div v-if="paymentModel.length >1">
-            <div class="row" style="margin-top:10px;" >
-              <p class="col-sm-2 text-left" style="padding: 10px;"><img src="../../../../static/juxing.png"/><strong style="margin-left: 4%">付款明细</strong></p>
+            <div class="row" style="margin-top:10px;">
+              <p class="col-sm-2 text-left" style="padding: 10px;"><img src="../../../../static/juxing.png"/><strong
+                style="margin-left: 4%">付款明细</strong></p>
             </div>
-            <div class="row" style="margin-top:10px;" >
-              <div class="col-sm-4 form-group " v-for="pay in paymentModel" >
-                <label class="font_normal_body">{{pay.f_payment}}:</label>
+            <div class="row" style="margin-top:10px;">
+              <div class="col-sm-4 form-group " v-for="pay in paymentModel">
+                <label class="font_normal_body">{{ pay.f_payment }}:</label>
                 <input id="f_money" type="text" class="input_search" style="width:60%" v-model="pay.f_money">
               </div>
               <div class="col-sm-4 form-group ">
@@ -176,14 +183,17 @@
                     :data='row' @printok="printok" v-ref:printbill></print-bill>
         <div style="text-align:right; height: 25%">
           <strong style="color:red;margin-right: 5px">{{ $refs.givechange.promptText }}</strong>
-          <strong style="font-size: large" v-if="!config.notShowFormula">计算公式:{{calculatedetail ? calculatedetail : ' 暂无'}}</strong><br/>
+          <strong style="font-size: large"
+                  v-if="!config.notShowFormula">计算公式:{{ calculatedetail ? calculatedetail : ' 暂无' }}</strong><br/>
           <payment-code-button :clickable="!$v.valid || validateOk || !islegal || clickConfirm"
                                :payment.sync="model.f_payment" :payment-data="paytype"
                                @confirm-payment="confirm()">
           </payment-code-button>
-          <button class="button_search btn-gn" @click="checkInvoiceMsg()" :disabled='!$v.valid || validateOk || !islegal || clickConfirm'>确认</button>
-          <button class="button_clear btn-gn" @click="clean()" >取消</button>
-                 </div>
+          <button class="button_search btn-gn" @click="checkInvoiceMsg()"
+                  :disabled='!$v.valid || validateOk || !islegal || clickConfirm'>确认
+          </button>
+          <button class="button_clear btn-gn" @click="clean()">取消</button>
+        </div>
         <modal :show.sync="eticket_msg" v-ref:modal large backdrop="false" :width="900">
           <header slot="modal-header" class="modal-header">
             <button type="button" class="close" @click="eticket_msg = false"><span>&times;</span></button>
@@ -214,7 +224,7 @@
                   <input class="form-control col-sm-2"
                          v-model="row.f_paper_account" placeholder="购方开户行及账号">
                 </div>
-                <div class="col-sm-12 form-group form-input-group" >
+                <div class="col-sm-12 form-group form-input-group">
                   <label class="control-label">纳税人识别号:</label>
                   <input class="form-control col-sm-2"
                          v-model="row.f_taxpayer_id" placeholder="纳税人识别号">
@@ -239,12 +249,13 @@
             </button>
           </footer>
         </modal>
-        <ticket-print  :show="eticket_show" @toggle="eticket_toggle"  v-ref:eticketbill></ticket-print>
+        <ticket-print :show="eticket_show" @toggle="eticket_toggle" v-ref:eticketbill></ticket-print>
 
       </validator>
     </div>
 
-    <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_after_discount"></payment-code>
+    <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row"
+                  :money="model.f_after_discount"></payment-code>
   </div>
   <upload v-if="config.showupload" isremark="true" fusetype="发卡售气"></upload>
 </template>
@@ -285,10 +296,10 @@ let preamountGen = async function (self) {
       self.model.f_pregas = Math.floor(getGas.data.gas - 0)
     }
   }
-  self.model.f_totalcost = ((self.row.f_balance - 0) > (calFee - 0) ? 0 : ((calFee - 0) - (self.row.f_balance - 0)).toFixed(2))
+  self.model.f_totalcost = ((self.row.f_balance - 0) >= (calFee - 0) ? 0 : ((calFee - 0) - (self.row.f_balance - 0)).toFixed(2))
   self.model.chargeprice = getGas.data.chargeprice
   Object.assign(self.model, self.model, getGas.data)
-  self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0)).toFixed(2)
+  self.model.f_totalcost = ((self.dymoney - 0) >= (self.model.f_totalcost - 0) ? 0 : (self.model.f_totalcost - 0) - (self.dymoney - 0).toFixed(2))
   self.model.f_collection = self.model.f_totalcost
   if (self.config.floor) {
     self.model.f_collection = Math.ceil(self.model.f_collection)
@@ -444,7 +455,7 @@ let asyncShowCardSellGas = async function (self) {
 
 export default {
   title: '发卡售气',
-  data () {
+  data() {
     return {
       serialShow: false,
       resid: [],
@@ -515,7 +526,7 @@ export default {
     }
   },
   props: ['row'],
-  ready () {
+  ready() {
     console.log('==>' + this.$refs.valid)
     if (this.authArr.includes('余额写卡限定')) {
       this.paytype = [{label: '余额写卡', value: '余额写卡'}]
@@ -555,20 +566,20 @@ export default {
   },
   events: {
     // 删除Resid数组元素
-    'delResid' (val) {
+    'delResid'(val) {
       this.resid.$remove({id: val, f_biobid: ''})
       // this.resid.splice(this.resid.indexOf({id:val,f_biobid:''}),1);
     },
     // 增加Resid数组元素
-    'resid' (val) {
+    'resid'(val) {
       this.resid.push({id: val, f_biobid: ''})
     }
   },
   watch: {
-    'row' (val) {
+    'row'(val) {
       this.model.f_balance = val.f_balance
     },
-    'model.f_payment.length' (val) {
+    'model.f_payment.length'(val) {
       console.log('付款方式多选。。', val)
       if (val > 3) {
         this.$showAlert('目前只支持三种支付方式', 'warning', 2000)
@@ -591,18 +602,18 @@ export default {
         this.getPrivilegeList()
       }
     },
-    'model.f_payment' (val) {
+    'model.f_payment'(val) {
       if (val == '免交') {
         this.mjshow = true
       } else {
         this.mjshow = false
       }
     },
-    'model.f_collection' (val) {
+    'model.f_collection'(val) {
       // 获取计算优惠
       this.getPrivilegeList()
     },
-    '$v' (val) {
+    '$v'(val) {
     },
     '$v': {
       handler: function (val) {
@@ -614,12 +625,12 @@ export default {
       },
       deep: true
     },
-    '$v.f_serial_number.valid' (val) {
+    '$v.f_serial_number.valid'(val) {
     }
   },
   methods: {
     // 校验发票信息
-    checkInvoiceMsg () {
+    checkInvoiceMsg() {
       console.log(this.model.f_print[0])
       if (this.model.f_print[0] === '电子发票') {
         if (!this.row.f_taxpayer_id) {
@@ -639,11 +650,11 @@ export default {
         this.confirm()
       }
     },
-    eticket_toggle () {
+    eticket_toggle() {
       this.eticket_show = false
       this.$dispatch('success')
     },
-    async confirm () {
+    async confirm() {
       this.eticket_msg = false
       if (this.$appdata.getSingleValue('开卡费')) {
         let sql = `select od.* from t_othercharge oc
@@ -690,11 +701,11 @@ export default {
         }
       })
     },
-    clean () {
+    clean() {
       this.$info('取消操作')
       this.$dispatch('refresh', this.row)
     },
-    pregas () {
+    pregas() {
       this.dymoney = 0
       if (this.model.f_pregas && this.model.f_pregas > 0) {
         try {
@@ -713,7 +724,7 @@ export default {
         this.model.f_pregas = 0
       }
     },
-    preamount () {
+    preamount() {
       this.dymoney = 0
       // if ((this.model.f_totalcost && this.model.f_totalcost > 0) || this.row.f_balance > 0) {
       // if ((this.model.f_totalcost && this.model.f_totalcost > 0) || this.row.f_balance > 0) {
@@ -728,11 +739,11 @@ export default {
       // }
     },
 
-    validateBill (val) {
+    validateBill(val) {
       this.validateOk = !val.isOk
       this.billData.bill = val.bill
     },
-    printok () {
+    printok() {
       // 收据打完，判断是否还有其他票据进行请求
       for (let i = 0; i < this.model.f_print.length; i++) {
         if (this.model.f_print[i] === '电子发票') {
@@ -741,7 +752,7 @@ export default {
       }
       this.$dispatch('success')
     },
-    calText (val) {
+    calText(val) {
       let str = ''
       let num = 0
       val.forEach((item) => {
@@ -764,13 +775,13 @@ export default {
         }
       }
     },
-    close () {
+    close() {
       this.showprint = false
       this.print = false
       this.clean()
     },
     // 根据选择的付款方式 获取优惠列表
-    async getPrivilegeList () {
+    async getPrivilegeList() {
       // 初始化下拉选择列表
       this.privilegeList = [{label: '无优惠', value: '0'}]
       // 初始为无优惠
@@ -796,7 +807,7 @@ export default {
       }
     },
     // 优惠计算
-    async privilegeCalculate () {
+    async privilegeCalculate() {
       // 初始化减免金额
       this.model.f_privilege_money = 0
       this.model.f_after_discount = this.model.f_collection
@@ -837,13 +848,13 @@ export default {
     }
   },
   computed: {
-    'invoice_show_gas' () {
+    'invoice_show_gas'() {
       return this.row.f_collection_type === '按气量' ? '是' : '否'
     },
-    authArr () {
+    authArr() {
       return this.$login.r ? this.$login.r : []
     },
-    'curbalance' () {
+    'curbalance'() {
       if (this.model.f_payment === '赠气') {
         return this.model.f_balance
       }
@@ -857,7 +868,7 @@ export default {
         return this.row.f_balance
       }
     },
-    'islegal' () {
+    'islegal'() {
       if (this.paymentModel.length > 1 && this.model.f_collection) {
         let sum = 0
         this.paymentModel.forEach((res) => {
@@ -875,13 +886,13 @@ export default {
 
 
 <style>
-  input::-webkit-outer-spin-button,
-  input::-webkit-inner-spin-button {
-    -webkit-appearance: none;
-  }
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+}
 
-  input[type="number"] {
-    -moz-appearance: textfield;
-  }
+input[type="number"] {
+  -moz-appearance: textfield;
+}
 </style>
 

package/src/components/revenue/Common/PaymentCode.vue

@@ -72,6 +72,8 @@
       },
       // 付款码支付流程
       async ConfirmCode () {
+        // 扫完一次码之后失去焦点，避免重复扫码
+        this.paymentCodeShow = false
         let data = {
           f_userinfo_id: this.row ? this.row.f_userinfo_id : null,
           f_user_id: this.row ? this.row.f_user_id : null,

package/src/components/revenue/comprehen/ComprehenOperation/removeTable.vue

@@ -174,6 +174,8 @@ export default {
               f_userfiles_id: this.row.f_userfiles_id,
               f_meterbase: this.model.f_using_base_old,
               f_meter_brand: this.row.f_meter_brand,
+              f_meter_type: this.row.f_meter_type,
+              f_meter_classify: this.row.f_meter_type,
               f_price_id: this.row.f_price_id
             }
             //划价

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

@@ -18,7 +18,7 @@
         <div class="col-sm-12"  style="height: auto">时间区间2：{{row['readperiodusegasAlarmparam'].bak_val.timesection2||'暂无数据'}}</div>
         <div class="col-sm-12"  style="height: auto">区间2用气量：{{row['readperiodusegasAlarmparam'].bak_val.usegas2||'暂无数据'}}</div>
         <div class="col-sm-12"  style="height: auto">时间区间3：{{row['readperiodusegasAlarmparam'].bak_val.timesection3||'暂无数据'}}</div>
-        <div class="col-sm-12"  style="height: auto">区间3用气量：{{row['readperiodusegasAlarmparam'].bak_val.timesection3||'暂无数据'}}</div>
+        <div class="col-sm-12"  style="height: auto">区间3用气量：{{row['readperiodusegasAlarmparam'].bak_val.usegas3||'暂无数据'}}</div>
         <div class="col-sm-12"  style="height: auto">上次报警区间：{{row['readperiodusegasAlarmparam'].bak_val.realusegas1||'暂无数据'}}</div>
         <div class="col-sm-12"  style="height: auto">上次报警区间：{{row['readperiodusegasAlarmparam'].bak_val.realusegas2||'暂无数据'}}</div>
         <div class="col-sm-12"  style="height: auto">上次报警区间：{{row['readperiodusegasAlarmparam'].bak_val.realusegas3||'暂无数据'}}</div>

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

@@ -237,9 +237,11 @@
       </div>
     </article>
     <footer slot="modal-footer" class="modal-footer">
-      <button  type="button" class="button_search btn-ln fr"  @click='valveoperate(true)'>开阀</button>
+      <button  type="button" class="btn btn-info btn-ln fr"  @click='valveoperate("权限关阀")'>权限关阀</button>
       &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-      <button  type="button" class="btn btn-info btn-ln fr"  @click='valveoperate(false)'>关阀</button>
+      <button  type="button" class="button_search btn-ln fr"  @click='valveoperate("开阀")'>开阀</button>
+      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      <button  type="button" class="btn btn-info btn-ln fr"  @click='valveoperate("关阀")'>关阀</button>
     </footer>
   </modal>
 <!-- 销户-->
@@ -410,18 +412,31 @@
       },
       // 开关阀操作
       async valveoperate (oper) {
-        let msg = oper ? '开阀' : '关阀'
+        console.log('oper----------------',oper)
+        let msg = ''
+        let nnum
+        if (oper === '权限关阀'){
+          msg = '权限关阀'
+          nnum = 2
+        } else if (oper === '关阀') {
+          msg = '手动关阀'
+          nnum = 0
+        }else {
+          msg = '手动开阀'
+          nnum = 1
+        }
         let datas = {
           instructType: '阀门控制',
-          instructTitle: `手动${msg}`,
+          instructTitle: `${msg}`,
           condition: `t_userfiles.f_userfiles_id='${this.row.f_userfiles_id}'`,
           meterBrandName: this.row.f_alias,
           f_instruct_state: '待发送',
           inputtor: Vue.$login.f.name,
           reasonInfo: this.operateReason,
           meternumberf: this.row.f_meternumber,
-          contentData: {isOpen: oper ? 1 : 0}
+          contentData: {isOpen: nnum}
         }
+        console.log('-------------------->{data}',datas)
         await this.$resetpost('rs/logic/iot_saveInstruct', {data: datas},
           {warnMsg: `确定要进行${msg}操作吗？`, resolveMsg: `${msg}成功`, rejectMsg: `${msg}失败`}).then(res => {
             this.valve = false

package/src/filiale/gehua/BankPayment.vue

@@ -0,0 +1,281 @@
+<template>
+  <div class="basic-main" style="height: 98%">
+    <div class="flex">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div
+              :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+              class="form-group">
+              <label class="font_normal_body">组织机构</label>
+              <res-select :initresid='$parent.$parent.curorgid'
+                          @res-select="$parent.$parent.getorg"
+                          class="select select_list"
+                          restype='organization'
+                          style="width: 60%">
+              </res-select>
+            </div>
+              <div class="col-sm-2  form-group">
+                <label for="f_bank_name"  class="font_normal_body">银行名称:</label>
+                <v-select id="f_bank_name"
+                          v-model="model.f_bank_name"
+                          placeholder='银行名称'
+                          condition="(s.f_bank_name= '{}' or s.bankname='{}') "
+                          :value.sync="model.f_bank_name"
+                          :options='$parent.$parent.bankname'
+                          close-on-select ></v-select>
+              </div>
+              <div class="col-sm-2  form-group">
+                <label for="msg"  class="font_normal_body" title="对账信息">对账信息:</label>
+                <v-select id="msg"
+                          v-model="model.msg"
+                          placeholder='对账信息'
+                          condition="msg = '{}' "
+                          :value.sync="model.msg"
+                          :options='$parent.$parent.msg'
+                          close-on-select ></v-select>
+              </div>
+              <div class="col-sm-2  form-group">
+                <label for="startDate"  class="font_normal_body">开始日期:</label>
+                <datepicker id="startDate" placeholder="开始日期"
+                            v-model="model.startDate"  style="width: 55%"
+                            :value.sync="model.startDate"
+                            condition="(f_trade_date >= '{} 00:00:00' or s.f_operate_date >= '{} 00:00:00')"
+                            :disabled-days-of-Week="[]"
+                            :format="'yyyy-MM-dd'"
+                            :show-reset-button="reset">
+                </datepicker>
+              </div>
+              <div class="col-sm-2  form-group">
+                <label for="endDate"  class="font_normal_body"> 结束日期:</label>
+                <datepicker id="endDate" placeholder="结束日期"
+                            v-model="model.endDate"  style="width: 55%"
+                            :value.sync="model.endDate"
+                            condition="(f_trade_date < '{} 23:59:59' or s.f_operate_date < '{} 23:59:59' )"
+                            :disabled-days-of-Week="[]"
+                            :format="'yyyy-MM-dd'"
+                            :show-reset-button="reset">
+                </datepicker>
+
+              </div>
+            <div class="form-group button-range" style="float: right">
+              <button class="button_search button_spacing width-60" @click="search()" v-el:cx>查询</button>
+              <!--                <export-excel :data="{orderitem: 'msg_id,f_delivery_date DESC',condition: condition,startDate: this.model.startDate,endDate: this.model.endDate,bankname: this.model.f_bank_name[0]}"-->
+              <!--                              bean="银行对账查询导出" sqlurl="rs/logic/exportfile"></export-excel>-->
+              <export-excel :data="$parent.$parent.getCondition"  sql-name="bankPayment"
+                            template-name="银行对账查询导出" sqlurl="rs/logic/saleExport"
+                            :field="$parent.$parent.getfield" :choose-col="true"></export-excel>
+              <div style="float: right" class="button_spacing"
+                   :class="{'button_shrink_top': $parent.$parent.criteriaShow,'button_shrink_bottom': !$parent.$parent.criteriaShow}"
+                   @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"></div>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">用户编号:</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code"
+                     condition="f_userinfo_code = '{}'" placeholder='用户编号'>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">&emsp;订单号:</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_serial_id"
+                     condition="(f_serial_id = '{}' or f_trade_number = '{}')" placeholder='订单号'>
+            </div>
+
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list'  class="list_area table_sy" v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>序号</th>
+            <th>用户编号</th>
+            <th>银行名称</th>
+            <th>燃气方订单号</th>
+            <th>银行方订单号</th>
+            <th>燃气方金额</th>
+            <th>银行金额</th>
+            <th>燃气方日期</th>
+            <th>银行日期</th>
+            <th>燃气方记录是否有效</th>
+            <th>对账信息</th>
+            <th>操作</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td style="text-align: center;">{{$index+1}}</td>
+          <td>{{row.f_userinfo_code}}</td>
+          <th>{{row.f_bank_name?row.f_bank_name:row.bankname}}</th>
+          <td>{{row.f_serial_id}}</td>
+          <td>{{row.f_trade_number}}</td>
+          <td>{{row.f_collection}}</td>
+          <td>{{row.f_total_charge}}</td>
+          <td>{{row.f_operate_date}}</td>
+          <td>{{row.f_trade_date}}</td>
+          <td>{{row.f_state}}</td>
+          <td>{{row.msg}}</td>
+          <td>
+            <button type="button" name="button" class="button_search button_spacing width-60" @click="$parent.$parent.$parent.chargecal(row)"
+                    v-if="row.msg === '燃气方单方面账单' && row.maxid !== '' && row.maxid!== null">冲正</button>
+<!--            <button type="button" name="button" class="button_search button_spacing width-60" @click="$parent.$parent.$parent.charge(row)"-->
+<!--                    v-if="row.msg === '银行方单方面账单'&& row.f_userinfo_id !=='' && row.f_userinfo_id !==null" >缴费</button>-->
+            <button type="button" name="button" class="button_search button_spacing width-60" @click="$parent.$parent.$parent.charge(row)"
+                    v-if="row.msg === '银行方单方面账单'" >缴费</button>
+<!--            <span v-if="row.f_type !== 1 && row.msg !== '对账成功' && row.msg !== '燃气方单方面账单'">需人工处理</span>-->
+            <span v-if="row.msg === '对账成功'">正常</span>
+          </td>
+        </template>
+        <!--<template partial='foot'>-->
+          <!--<td style="text-align: center;">合计</td>-->
+          <!--<td style="text-align: center;"></td>-->
+          <!--<td style="text-align: center;"></td>-->
+          <!--<td style="text-align: center;"></td>-->
+          <!--<td style="text-align: center;"></td>-->
+          <!--<td style="text-align: center;">{{model.sums.f_collection.toFixed(2)}}</td>-->
+          <!--<td style="text-align: center;">{{model.sums.f_total_charge.toFixed(2)}}</td>-->
+          <!--<td style="text-align: center;"></td>-->
+          <!--<td style="text-align: center;"></td>-->
+          <!--<td style="text-align: center;"></td>-->
+          <!--<td style="text-align: center;"></td>-->
+          <!--<td style="text-align: center;"></td>-->
+        <!--</template>-->
+      </data-grid>
+    </criteria-paged>
+    <table class="table-hover">
+      <tr style="position: relative" class="table-bordered">
+        <td
+          style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
+          汇总信息
+        </td>
+        <td
+          style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+          燃气方金额汇总:&emsp;{{model.sums.f_collection.toFixed(2)}}
+        </td>
+        <td
+          style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+          银行金额汇总:&emsp;{{model.sums.f_total_charge.toFixed(2)}}
+        </td>
+        <td
+          style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+          差额汇总:&emsp;{{((model.sums.f_total_charge -0) - (model.sums.f_collection.toFixed(2) -0)).toFixed(2)}}
+        </td>
+      </tr>
+    </table>
+    </div>
+  </div>
+</template>
+<script>
+  import { PagedList } from 'vue-client'
+  import Vue from 'vue'
+
+  export default {
+    title: '银行对账',
+    data () {
+      return {
+        resid: [],  // 存放新增的f_files表中id
+        criteriaShow:false,
+        curorgid: [this.$login.f.orgid],
+        model: new PagedList('rs/sql/bankPayment', 20, {bankname: 'this.model.f_bank_name[0]', startDate: 'this.model.startDate', endDate: 'this.model.endDate', orderitem: '"delivery_date DESC "'}, {f_collection: '', f_total_charge: ''}),
+        bodydata: ['f_userinfo_code', 'f_bank_name', 'f_serial_id', 'f_trade_number', 'f_collection', 'f_total_charge', 'f_operate_date', 'f_state', 'msg'],
+        header: ['用户编号', '银行名称', '燃气方流水号', '银行流水号', '燃气方金额', '银行金额', '燃气方日期', '银行日期', '燃气方记录是否有效', '对账信息']
+
+      }
+    },
+    props: [],
+    ready () {
+    },
+    methods: {
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+      selfSearch (args) {
+        if (!this.f_orgid) {
+          this.getorg([this.$login.f.orgid])
+        }
+        console.log('查询。。。', this.f_orgid)
+        if (this.f_orgid) {
+          args.condition = `${args.condition} and f_orgid  in ${this.f_orgid}`
+        }
+        this.model.search(args.condition, args.model)
+      },
+      async chargecal (row) {
+        let param = {
+          f_sell_id: row.maxid,
+          f_cancel_reason: '',
+          f_orgid: Vue.$login.f.orgid,
+          f_orgname: Vue.$login.f.orgs,
+          f_depid: Vue.$login.f.depids,
+          f_depname: Vue.$login.f.deps,
+          f_zoneid: Vue.$login.f.zoneid,
+          f_zones: Vue.$login.f.zones
+        }
+        await Vue.resetpost('rs/logic/commonCancel', {data: param}, {resolveMsg: '撤销成功', rejectMsg: '撤销失败'})
+        this.$refs.paged.$refs.cri.search()
+      },
+      getorg (val) {
+        this.f_orgid = this.$login.convertToIn(val)
+        this.f_filialeid = val[0]
+      },
+      // 微信单方账单，系统可缴费
+      async charge (row) {
+          row.f_operator=Vue.$login.f.name,
+          row.f_operatorid= Vue.$login.f.id,
+          row.f_orgid= Vue.$login.f.orgid,
+          row.f_orgname= Vue.$login.f.orgs,
+          row.f_depid= Vue.$login.f.depids,
+          row. f_depname= Vue.$login.f.deps,
+          row. f_zoneid= Vue.$login.f.zoneid,
+          row. f_zones= Vue.$login.f.zones
+            let res = await this.$resetpost('rs/logic/cardOneBank',row,{resolveMsg:'缴费成功',rejectMsg:'缴费失败'})
+          let param = []
+          for (let row of this.resid) {
+            param.push({id: row.id})
+          }
+          let data = {
+            param: param,
+            f_blobid: res.data
+          }
+
+          await this.$resetpost('rs/logic/updatefiles', data)
+          this.$refs.paged.$refs.cri.search()
+      }
+        // })
+    },
+    events: {
+      // 删除Resid数组元素
+      'delResid' (val) {
+        this.resid.$remove({id: val, f_biobid: ''})
+      // this.resid.splice(this.resid.indexOf({id:val,f_biobid:''}),1);
+      },
+      // 增加Resid数组元素
+      'resid' (val) {
+        console.log('-=', val)
+        this.resid.push({id: val, f_biobid: ''})
+      }
+    },
+    computed: {
+      bankname () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('银行名称')]
+      },
+      msg () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('对账信息')]
+      },
+      filiales () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('分公司')]
+      },
+      getCondition () {
+        return {condition: this.$refs.paged.$refs.cri.condition, orderitem: 'delivery_date DESC ' }
+      },
+      getfield () {
+        let data = {}
+        this.bodydata.forEach((value, index) => {
+          data[this.bodydata[index]] = this.header[index]
+        })
+        return data
+        console.log('field' + data)
+      }
+    }
+  }
+</script>

package/src/filiale/gehua/sale.js

@@ -25,6 +25,9 @@ let specialComp = {
   // 补卡管理
   'replace-card-manage': (resolve) => { require(['./ReplaceCardManage'], resolve) },
   // 换表
-  'change-meter': (resolve) => { require(['./ChangeMeter'], resolve) }
+  'change-meter': (resolve) => { require(['./ChangeMeter'], resolve) },
+
+  'bank-payment': (resolve) => { require(['./BankPayment'], resolve) },
+
 }
 exports.specialComp = specialComp

package/src/filiale/macheng/FilesManageNew/UserGeneralInfoTest.vue

@@ -460,7 +460,7 @@ export default {
         this.data = {
           baseinfo: {
             base: {
-              f_user_state: '预备',
+              f_user_state: '正常',
               f_print_dh: '暂不选择',
               f_print_lc: '否',
               f_is_mgq: '',

package/src/filiale/tongchuan/MeterinfoTest.vue

@@ -659,13 +659,23 @@ let meterBookGen = function * (self) {
               return
             }
           }
+          console.log("***表计信息校验",this.row.gasbrand[0].f_meterverification)
           // 表计信息验证
-          if (this.row.gasbrand[0].f_meterverification == '是') {
+          if (this.row.gasbrand[0].f_meterverification === '是') {
+            console.log("********返回值信息长度：",res1.data.length)
             if (res1.data.length <= 0) {
               this.$showAlert(`当前表号: ${this.row.f_meternumber}在表计信息中无记录, 请核实!!!`, 'warning', 3000)
               this.row.f_meternumber = ''
               return
             }
+          }else{
+            if ( this.row.gasbrand[0].f_meter_type === '物联网表'){
+              if (res1.data.length <= 0) {
+                this.$showAlert(`当前表号: ${this.row.f_meternumber}在表计信息中无记录, 请核实!!!`, 'warning', 3000)
+                this.row.f_meternumber = ''
+                return
+              }
+            }
           }
           let param = {
             f_meternumber: this.row.f_meternumber,

package/src/main.js

@@ -1,22 +1,22 @@
-import Vue from 'vue'
-import { all } from 'vue-client'
-import App from './App'
-import { system } from 'system-clients'
-import sale from './sale'
-import { address } from 'address-client'
-import { ldap } from 'ldap-clients'
-import VueClipboard from 'vue-clipboard2'
-Vue.use(VueClipboard)
-Vue.config.silent = true
-
-all()
-system(false)
-sale('qianneng')
-address()
-ldap()
-require('system-clients/src/styles/less/bootstrap.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import { all } from 'vue-client'
+import App from './App'
+import { system } from 'system-clients'
+import sale from './sale'
+import { address } from 'address-client'
+import { ldap } from 'ldap-clients'
+import VueClipboard from 'vue-clipboard2'
+Vue.use(VueClipboard)
+Vue.config.silent = true
+
+all()
+system(false)
+sale()
+address()
+ldap()
+require('system-clients/src/styles/less/bootstrap.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})

package/.gradle/buildOutputCleanup/cache.properties

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

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

@@ -1 +0,0 @@
-