sale-client 3.5.190 → 3.5.192

package/build/dev-server.js

@@ -1,150 +1,36 @@
-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')
+const express = require('express')
+const webpack = require('webpack')
+const config = require('./webpack.dev.conf')
+const proxyMiddleware = require('http-proxy-middleware')
+const app = express()
+const compiler = webpack(config)
 
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
+// 自己改了这里不要提交 来回覆盖挺麻烦的
+const [local, server] = ['http://127.0.0.1:8080', 'http://192.168.50.4:8400']
+const port = 8089
 
-// 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:8450'
-// 梅河口
-// var fuwu = 'http://139.214.92.34:8301'
-// 单县
-// var fuwu = 'http://119.187.112.234:8400'
-// 中盛
-// var fuwu = 'http://39.99.85.14:8400'
-// 燎原
-// var fuwu = 'http://121.36.106.17:8400'
-// 葛华
- var fuwu = 'http://219.138.226.181:8401'
-// 乌海
-// var fuwu = 'http://203.57.101.233:8400'
-// 铜川
-//  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
+const proxyTable = {
+  '/text': {
+    target: local
   },
   '/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
+    target: server
   },
   '/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
+    target: server
   },
   '/webmeter': {
-    target: 'http://192.168.50.4:8450'
+    target: server
+  },
+  '/rs/logic': {
+    target: server
   },
   '/rs': {
-    // target: 'http://192.168.30.63:8081/'
-    // target: 'http://121.36.106.17:8400/'
-    target: fuwu
+    target: server
   }
 }
 
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
+const devMiddleware = require('webpack-dev-middleware')(compiler, {
   publicPath: config.output.publicPath,
   stats: {
     colors: true,
@@ -152,8 +38,7 @@ var devMiddleware = require('webpack-dev-middleware')(compiler, {
   }
 })
 
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
+const hotMiddleware = require('webpack-hot-middleware')(compiler)
 compiler.plugin('compilation', function (compilation) {
   compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
     hotMiddleware.publish({action: 'reload'})
@@ -161,41 +46,22 @@ compiler.plugin('compilation', function (compilation) {
   })
 })
 
-// proxy api requests
 Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
+  let 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) {
+module.exports = app.listen(port, function (err) {
   if (err) {
     console.log(err)
     return
   }
-  console.log('Listening at http://localhost:8089')
+  console.log('Listening at http://localhost:' + port)
 })

package/package.json

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

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -93,7 +93,7 @@
         </div>
         <div class="row">
           <div class="col-sm-2"></div>
-          <input v-if="fileSaveData.reason==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
+          <input v-if="fileSaveData.reason ==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">

package/src/components/FilesManageNew/UserGeneralInfoTest.vue

@@ -57,7 +57,7 @@
       <footer slot="modal-footer" class="modal-footer">
       </footer>
     </modal>
-  <high-meter-idcard :show.sync="highmetershow" v-if="highmetershow"  @photo-finish="newPhoto()" v-on:confirminfo="confirmIdCard"></high-meter-idcard>
+  <high-meter-idcard :show.sync="highmetershow" v-if="highmetershow"  @photo-finish="newPhoto" v-on:confirminfo="confirmIdCard"></high-meter-idcard>
   <user-flow-sheet :show="printflag" :bill-config='configs' :bill-data='billData' :data='newdata' v-on:toggle="close" @printok="printok" v-ref:printbill></user-flow-sheet>
 
 
@@ -111,6 +111,7 @@ export default {
         f_floor_suffix: '层',
         f_room_suffix: '室'
       },
+      headers: {'username': this.$login.f.name, 'blodid': '', 'fremarks': '', 'defname': '', 'fusetype': '档案信息'},
       data: {
         baseinfo: {
           base: {
@@ -337,6 +338,7 @@ export default {
       return new Blob([bytesCode], {type: 'image/jpeg'})
     },
     newPhoto (Imgbase64) {
+      //console.log('imgbase----->',Imgbase64)
       let form = new FormData()
       let xhr = new XMLHttpRequest()
       let formDataBoundary = '----WebkitFormBoundary' + 'GaoPaiYi'
@@ -345,6 +347,8 @@ export default {
       xhr.open('POST', 'rs/file/uploadFile')
 
       if (this.headers) {
+        console.log('this.blodid----->',this.blodid)
+        this.headers.blodid = this.blodid
         for (var header in this.headers) {
           xhr.setRequestHeader(header, encodeURIComponent(this.headers[header]))
         }

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

@@ -17,7 +17,7 @@
             <div class="col-sm-4" v-if="row.f_collection_type == '按气量'"
                  :class="[$v.f_pregas.required || $v.f_pregas.dctest? 'has-error' : 'has-success']">
               <label for="f_pregas" class=" font_normal_body">*预购气量</label>
-              <input class="input_search" style="width:60%" type="number"
+              <input class="input_search" style="width:60%" type="number" :disabled="config.calculatePreByCollection"
                      @blur="pregas()" v-model="model.f_pregas" v-el:fpregas
                      v-validate:f_pregas='{required: true, dctest: [maxgas, "<=" ]}' placeholder="预购气量"
                      v-next-el='fcollection'>
@@ -26,13 +26,14 @@
               <label for="f_pregas" class=" font_normal_body">*预购气量</label>
               <input class="input_search" style="width:60%" type="number" v-el:fpregas
                      @blur="pregas()" v-model="model.f_pregas" placeholder="预购气量"
-                     v-next-el='fcollection'>
+                     v-next-el='fcollection' :disabled="config.calculatePreByCollection"/>
             </div>
             <div class="col-sm-4"
                  :class="[$v.f_pregas.required || $v.f_pregas.dctest? 'has-error' : 'has-success']">
               <label for="f_pregas" class=" font_normal_body">*预购金额</label>
               <input class="input_search" style="width:60%" type="number"
                      @blur="preamount()" v-model="model.f_preamount"
+                     :disabled="config.calculatePreByCollection"
                      v-validate:f_preamount='{required: true, dctest: [maxmoney, "<=" ],dctest: [0, ">"]}' placeholder="预购金额"
                      v-next-el='fcollection'>
             </div><!--
@@ -99,17 +100,20 @@
               <label for="f_collection" class=" font_normal_body">*收&emsp;&emsp;款</label>
               <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
                      v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'
+                     @blur="config.calculatePreByCollection && calculatePreByCollection()"
                      v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, 4]" :disabled="$refs.givechange.promptText != ''">
             </div>
             <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment=='赠气' && row.f_meter_type.includes('卡表')"
                  :class="[$v.f_collection.required  || $v.f_collection.dctest ? 'has-error' : 'has-success']">
               <label for="f_collection" class=" font_normal_body"><font size="4px" style="font-weight:bold">*收&emsp;款</font></label>
               <input id="f_collection" class="input_search" style="width:60%;font-size: 18px;font-weight:bold;" type="number" v-model="model.f_collection"
+                     @blur="config.calculatePreByCollection && calculatePreByCollection()"
                      v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, 4]" :disabled="$refs.givechange.promptText != ''">
             </div>
             <div class="col-sm-3" v-if="row.f_collection_type === '按金额' && row.f_meter_type.includes('卡表')">
               <label for="f_collection" class=" font_normal_body"><font size="4px" style="font-weight:bold">*收&emsp;款</font></label>
               <input id="f_collection" class="input_search" style="width:50%;font-size: 18px;font-weight:bold;" type="number" v-model="model.f_collection"
+                     @blur="config.calculatePreByCollection && calculatePreByCollection()"
                      v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_collection, 4]" :disabled="$refs.givechange.promptText != ''">
             </div>
             <div class="col-sm-4" v-if="!row.f_meter_type.includes('卡表')">
@@ -118,6 +122,7 @@
               <input id="f_collection" class="input_search" style="width:50%;font-size: 18px;font-weight:bold;"
                      type="number" v-model="model.f_collection"
                      v-el:fcollection
+                     @blur="config.calculatePreByCollection && calculatePreByCollection()"
                      @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
                      v-scale="[model.f_collection, 4]" disabled>
             </div>
@@ -203,12 +208,12 @@
         <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/>
-          <payment-code-button :clickable="!$v.valid || validateOk || !islegal || clickConfirm"
+          <payment-code-button :clickable="!$v.valid || validateOk || !islegal || clickConfirm|| model.f_preamount === 0"
                                :payment.sync="model.f_payment" :payment-data="paytype"
                                @confirm-payment="confirm()">
           </payment-code-button>
           <button class="button_search btn-gn" type="submit" @click="checkInvoiceMsg()"
-                  :disabled='!$v.valid || validateOk || !islegal || clickConfirm'>确认
+                  :disabled='!$v.valid || validateOk || !islegal || clickConfirm || model.f_preamount === 0'>确认
           </button>
           <button class="button_clear btn-gn" @click="clean()">取消</button>
         </div>
@@ -486,6 +491,7 @@
         serialShow: false,
         resid: [],  // 存放新增的f_files表中id
         config: {
+          calculatePreByCollection: true, // 可以更具收款来反向计算预购
           notShowFormula: false, // 不显示计算公式,默认显示
           autoCollection: true, // 自动填写收款
           showupload: true, // 显示上传
@@ -631,6 +637,26 @@
       }
     },
     methods: {
+      // 根据收款金额计算划价信息
+      // 需要配置 calculatePreByCollection = true
+      async calculatePreByCollection() {
+        try {
+          this.model.f_collection = (this.model.f_collection - 0)
+          let calFee = ((this.model.f_collection - 0) + (this.row.f_balance)).toFixed(4)
+          // 通过收款进行划价
+          let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
+          this.model.f_pregas = parseInt(getGas.data.gas)
+          let dymoney2 = await this.$CommonService.gasCalculate(this.model, this.model.f_pregas)
+          this.model.chargeprice = dymoney2.data.chargeprice
+          Object.assign(this.model, this.model, dymoney2.data)
+          this.model.f_totalcost = dymoney2.data.chargenum
+          this.model.f_preamount = dymoney2.data.chargenum
+          this.calText(dymoney2.data.chargeprice)
+        } catch (error) {
+          this.$showAlert(`发卡售气划价错误，错误类型：${error}`, 'danger', 0)
+          this.$dispatch('error', '发卡售气', this.model, error)
+        }
+      },
       // 校验发票信息
       checkInvoiceMsg (flag) {
         // 校验是否超出最大透支余额
@@ -865,6 +891,9 @@
           return this.model.f_balance
         }
         if (this.model.f_preamount) {
+          if (this.config.calculatePreByCollection) {
+            return ((this.model.f_collection - 0) + (this.row.f_balance - 0) - this.model.f_preamount).toFixed(4)
+          }
           // if (this.row.f_collection_type === '按金额') {
           //   return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(4)
           // } else {

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

@@ -18,7 +18,7 @@
                  :class="[$v.f_pregas.required || $v.f_pregas.dctest? 'has-error' : 'has-success']">
               <label for="f_pregas" class=" font_normal_body">*预购气量</label>
               <input class="input_search" style="width:60%" type="number" id="fouces"
-                     @blur="pregas()" v-model="model.f_pregas"
+                     @blur="pregas()" v-model="model.f_pregas" :disabled="config.calculatePreByCollection"
                      v-validate:f_pregas='{required: true, dctest: [maxgas, "<=" ]}' placeholder="预购气量"
                      v-next-el='sk'>
             </div>
@@ -28,7 +28,7 @@
               <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="预购金额"
+                     placeholder="预购金额" :disabled="config.calculatePreByCollection"
                      v-scale="[model.f_preamount, 4]" placeholder="预购金额">
             </div>
           </div>
@@ -88,12 +88,14 @@
                  :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error' : 'has-success']">
               <label for="f_collection" class=" font_normal_body">*收&emsp;&emsp;款</label>
               <input class="input_search" style="width:60%" type="number" v-model="model.f_collection"
+                     @blur="config.calculatePreByCollection && calculatePreByCollection()"
                      v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0) + (openFee - 0), ">=" ] }'
                      v-el:sk v-scale="[model.f_collection, 4]" :disabled="$refs.givechange.promptText != ''">
             </div>
             <div class="col-sm-3 form-group" v-if="row.f_collection_type === '按金额'">
               <label for="f_collection" class=" font_normal_body">*收&emsp;&emsp;款</label>
               <input class="input_search" style="width:50%" type="number" v-model="model.f_collection"
+                     @blur="config.calculatePreByCollection && calculatePreByCollection()"
                      v-el:sk v-scale="[model.f_collection, 4]" :disabled="$refs.givechange.promptText != ''">
             </div>
             <div class="col-sm-1 form-group">
@@ -185,12 +187,12 @@
           <strong style="color:red;margin-right: 5px">{{ $refs.givechange.promptText }}</strong>
           <strong style="font-size: large"
                   v-if="!config.notShowFormula">计算公式:{{ calculatedetail ? calculatedetail : ' 暂无' }}</strong><br/>
-          <payment-code-button :clickable="!$v.valid || validateOk || !islegal || clickConfirm"
+          <payment-code-button :clickable="!$v.valid || validateOk || !islegal || clickConfirm || model.f_preamount === 0"
                                :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'>确认
+                  :disabled='!$v.valid || validateOk || !islegal || clickConfirm || model.f_preamount === 0'>确认
           </button>
           <button class="button_clear btn-gn" @click="clean()">取消</button>
         </div>
@@ -461,6 +463,7 @@ export default {
       resid: [],
       config: {
         notShowFormula: false, // 不显示计算公式,默认显示
+        calculatePreByCollection: true, // 可以更具收款来反向计算预购
         showupload: true,  // 默认不显示上传附件
         hasPrint: false,  // 默认打票
         floor: true,  // 是否取整收费
@@ -629,6 +632,26 @@ export default {
     }
   },
   methods: {
+    // 根据收款金额计算划价信息
+    // 需要配置 calculatePreByCollection = true
+    async calculatePreByCollection() {
+      try {
+        this.model.f_collection = (this.model.f_collection - 0)
+        let calFee = ((this.model.f_collection - 0) + (this.row.f_balance)).toFixed(4)
+        // 通过收款进行划价
+        let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
+        this.model.f_pregas = parseInt(getGas.data.gas)
+        let dymoney2 = await this.$CommonService.gasCalculate(this.model, this.model.f_pregas)
+        this.model.chargeprice = dymoney2.data.chargeprice
+        Object.assign(this.model, this.model, dymoney2.data)
+        this.model.f_totalcost = dymoney2.data.chargenum
+        this.model.f_preamount = dymoney2.data.chargenum
+        this.calText(dymoney2.data.chargeprice)
+      } catch (error) {
+        this.$showAlert(`发卡售气划价错误，错误类型：${error}`, 'danger', 0)
+        this.$dispatch('error', '发卡售气', this.model, error)
+      }
+    },
     // 校验发票信息
     checkInvoiceMsg() {
       console.log(this.model.f_print[0])
@@ -858,6 +881,9 @@ export default {
       if (this.model.f_payment === '赠气') {
         return this.model.f_balance
       }
+      if (this.config.calculatePreByCollection) {
+        return ((this.model.f_collection - 0) + (this.row.f_balance - 0) - this.model.f_preamount).toFixed(4)
+      }
       if (this.model.f_preamount) {
         if ((this.row.f_balance - 0) > (this.model.f_preamount - 0)) {
           return ((this.row.f_balance - 0) - (this.model.f_preamount - 0) + (this.model.f_collection - 0)).toFixed(4)

package/src/components/revenue/machineHandManage/machineHandAudit.vue

@@ -394,7 +394,7 @@
   import * as Util from '../../../Util'
 
   let readyGen = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate =  self.$login.toStartAndEndDateString()[0]
+    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStartAndEndDateString()[0]
     self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
     await self.$LoadParams.loadMeterBook(self.f_filialeid)
     self.loadMeterBooks()
@@ -414,12 +414,13 @@
           dep: [],
           user: []
         },
-        config:{
-          examine: false,
+        config: {
+          examine: false
         },
         imgfilename: '',
         // 小区
         residentialArea: [],
+        inputtouPerson: [],
         imgshow: false,
         criteriaShow: false,
         orgCondtionStr: '',
@@ -444,8 +445,8 @@
           'f_adjustable_name': '调压箱名称',
           'f_inputtor': '抄表员'
         },
-        auditState:[{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
-        auditState1:[{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
+        auditState: [{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
+        auditState1: [{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
         meters: [{label: '全部', value: ''}, {label: '机表', value: '机表'}, {label: '物联网表', value: '物联网表'}],
         resultstate: this.$appdata.getParam('抄表结果状态'),
         meterstates: this.$appdata.getParam('抄表状态') ? [{
@@ -475,7 +476,7 @@
     methods: {
       // 修正本期底数
       amend (row) {
-        let tablebase = window.prompt('请输入你要修正的底数值，上期底数：'+ row.f_meter_base)
+        let tablebase = window.prompt('请输入你要修正的底数值，上期底数：' + row.f_meter_base)
         if (!tablebase) return
         if (tablebase < 0) {
           this.$showAlert(`底数不能小于0，请注意!`, 'warning', 2000)
@@ -596,9 +597,9 @@
         this.imgshow = false
       },
       imgShow (val) {
-        console.log("-----------val2:",val)
+        console.log('-----------val2:', val)
         this.imgfilename = `rs/image/file/` + val
-        console.log("-----------imgfilename2:",this.imgfilename)
+        console.log('-----------imgfilename2:', this.imgfilename)
         this.imgshow = true
       },
       async getaddress () {
@@ -632,6 +633,17 @@
         } else {
           args.condition = `${args.condition}` + this.orgCondtionStr
         }
+        // 抄表员查询条件
+        this.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
+        if (this.inputtouPerson.length !== 0) {
+          let str = JSON.stringify(this.inputtouPerson)
+          str = str.replace(/"/g, `'`)
+          str = str.replace(/\[/g, ``)
+          str = str.replace(/\]/g, ``)
+          console.log('=====抄表员model22222222222绑定====', str)
+          // 查询多个抄表员时条件
+          args.condition += ` and f_inputtor in  ( ${str} )`
+        }
         this.excelCondition = args.condition
         this.$refs.paged.$refs.grid.selectInit()
         this.model.search(args.condition, args.model)
@@ -696,7 +708,7 @@
       },
       loadMeterBooks () {
         this.meterbooks = this.$GetSaleParam.getMeterBooks()
-      },
+      }
 
     },
     computed: {