sale-client 3.5.183 → 3.5.184

package/build/dev-server.js

@@ -1,67 +1,73 @@
-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)
-
-// 自己改了这里不要提交 来回覆盖挺麻烦的
-const [local, server] = ['http://127.0.0.1:8080', 'http://192.168.50.4:8400']
-const port = 8089
-
-const proxyTable = {
-  '/text': {
-    target: local
-  },
-  '/files': {
-    target: server
-  },
-  '/excel': {
-    target: server
-  },
-  '/webmeter': {
-    target: server
-  },
-  '/rs/logic': {
-    target: server
-  },
-  '/rs': {
-    target: server
-  }
-}
-
-const devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-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'})
-    cb()
-  })
-})
-
-Object.keys(proxyTable).forEach(function (context) {
-  let options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-app.use(require('connect-history-api-fallback')())
-app.use(devMiddleware)
-app.use(hotMiddleware)
-app.use('/static', express.static('./static'))
-
-module.exports = app.listen(port, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:' + port)
-})
+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)
+
+// 自己改了这里不要提交 来回覆盖挺麻烦的
+const [local, server] = ['http://127.0.0.1:8080', 'http://192.168.50.4:8400']
+const port = 8089
+
+const proxyTable = {
+  '/rs/report/hand_bill': {
+    target: 'http://127.0.0.1:8084'
+  },
+  '/rs/sql/open_eticket_JBquery': {
+    target: local
+  },
+  '/text': {
+    target: local
+  },
+  '/files': {
+    target: server
+  },
+  '/excel': {
+    target: server
+  },
+  '/webmeter': {
+    target: server
+  },
+  '/rs/logic': {
+    target: server
+  },
+  '/rs': {
+    target: server
+  }
+}
+
+const devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+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'})
+    cb()
+  })
+})
+
+Object.keys(proxyTable).forEach(function (context) {
+  let options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+app.use(require('connect-history-api-fallback')())
+app.use(devMiddleware)
+app.use(hotMiddleware)
+app.use('/static', express.static('./static'))
+
+module.exports = app.listen(port, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:' + port)
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.183",
+  "version": "3.5.184",
   "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/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: {

package/src/filiale/gehua/sale.js

@@ -1,48 +1,48 @@
-// 分公司特殊组件页面注册
-
-const Vue = require("vue");
-let specialComp = {
-  'sale-handplan-query': (resolve) => { require(['./machineHandManage/HandplanQuery'], resolve) },
-  // 高拍仪
-  'high-meter': (resolve) => { require(['./HighMeterIdCard'], resolve) },
-  'high-meter-idcard': (resolve) => { require(['./HighMeterIdCard'], resolve) },
-  // 物联网表收费
-  'iot-meter-center': (resolve) => { require(['./IOTMeterCenter'], resolve) },
-  // MISPOS支付
-  'mis-pos-pay': (resolve) => { require(['./MisPosPay'], resolve) },
-  // 购气撤销
-  'card-meter-charge-cancel': (resolve) => { require(['./CardMeterChargeCancel'], resolve) },
-  // 换表补卡
-  'change_fill_sendcard': (resolve) => { require(['./ChangeSendCard'], resolve) },
-  // 发卡售气
-  'show-card-sell-gas': (resolve) => { require(['./ShowCardSellGas'], resolve) },
-  // 卡表收费
-  'card-meter-center': (resolve) => { require(['./CardMeterCenter'], resolve) },
-  // 机表收费
-  'machine-meter-center': (resolve) => { require(['./MachineMeterCenter'], resolve) },
-  // 预存收费
-  'deposit-charge': (resolve) => { require(['./DepositCharge'], resolve) },
-  // 超用收费
-  'over-use-charge': (resolve) => { require(['./OverUseCharge'], resolve) },
-  // 补卡管理
-  'replace-card-manage': (resolve) => { require(['./ReplaceCardManage'], resolve) },
-  // 换表
-  'change-meter': (resolve) => { require(['./ChangeMeter'], resolve) },
-  //收费
-  'charge-list': (resolve) => { require(['./ChargeList'], resolve) },
-  // 银行对账
-  'bank-payment': (resolve) => { require(['./BankPayment'], resolve) },
-  //自助机对账
-  'wechat-validate-manage': (resolve) => { require(['./wechatValidateManage'], resolve) },
-  // 其他收费xin
-  'other-charge-new': (resolve) => { require(['./OtherChargeNew'], resolve) },
-  'file-meter-info': (resolve) => { require(['./MeterinfoTest'], resolve) },
-  'file-user-files': (resolve) => { require(['./FileUserFiles'], resolve) },
-  // 用户基本信息
-  'user-base-info-new': (resolve) => { require(['./UserBaseInfoNew'], resolve) },
-  //预备户建档
-  'file-user-files-new': (resolve) => { require(['./FileManageNew/FileUserFiles'], resolve) },
-  // 用户综合信息
-  'file-user-general-info-new': (resolve) => { require(['./UserGeneralInfoTest'], resolve) }
-}
-exports.specialComp = specialComp
+// 分公司特殊组件页面注册
+
+const Vue = require("vue");
+let specialComp = {
+  'sale-handplan-query': (resolve) => { require(['./machineHandManage/HandplanQuery'], resolve) },
+  // 高拍仪
+  'high-meter': (resolve) => { require(['./HighMeterIdCard'], resolve) },
+  'high-meter-idcard': (resolve) => { require(['./HighMeterIdCard'], resolve) },
+  // 物联网表收费
+  'iot-meter-center': (resolve) => { require(['./IOTMeterCenter'], resolve) },
+  // MISPOS支付
+  'mis-pos-pay': (resolve) => { require(['./MisPosPay'], resolve) },
+  // 购气撤销
+  'card-meter-charge-cancel': (resolve) => { require(['./CardMeterChargeCancel'], resolve) },
+  // 换表补卡
+  'change_fill_sendcard': (resolve) => { require(['./ChangeSendCard'], resolve) },
+  // 发卡售气
+  'show-card-sell-gas': (resolve) => { require(['./ShowCardSellGas'], resolve) },
+  // 卡表收费
+  'card-meter-center': (resolve) => { require(['./CardMeterCenter'], resolve) },
+  // 机表收费
+  'machine-meter-center': (resolve) => { require(['./MachineMeterCenter'], resolve) },
+  // 预存收费
+  'deposit-charge': (resolve) => { require(['./DepositCharge'], resolve) },
+  // 超用收费
+  'over-use-charge': (resolve) => { require(['./OverUseCharge'], resolve) },
+  // 补卡管理
+  'replace-card-manage': (resolve) => { require(['./ReplaceCardManage'], resolve) },
+  // 换表
+  'change-meter': (resolve) => { require(['./ChangeMeter'], resolve) },
+  //收费
+  'charge-list': (resolve) => { require(['./ChargeList'], resolve) },
+  // 银行对账
+  'bank-payment': (resolve) => { require(['./BankPayment'], resolve) },
+  //自助机对账
+  'wechat-validate-manage': (resolve) => { require(['./wechatValidateManage'], resolve) },
+  // 其他收费xin
+  'other-charge-new': (resolve) => { require(['./OtherChargeNew'], resolve) },
+  'file-meter-info': (resolve) => { require(['./MeterinfoTest'], resolve) },
+  'file-user-files': (resolve) => { require(['./FileUserFiles'], resolve) },
+  // 用户基本信息
+  'user-base-info-new': (resolve) => { require(['./UserBaseInfoNew'], resolve) },
+  //预备户建档
+  'file-user-files-new': (resolve) => { require(['./FileManageNew/FileUserFiles'], resolve) },
+  // 用户综合信息
+  'file-user-general-info-new': (resolve) => { require(['./UserGeneralInfoTest'], resolve) }
+}
+exports.specialComp = specialComp

package/src/filiale/qianneng/eticket/EticketPrint.vue

@@ -132,11 +132,12 @@ export default {
             id: ticket_id,
             f_bill_code: req.fpDm,
             f_bill_number: req.fpHm,
-            f_bill_url: req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', ''),
-            f_sign_result: req.msg,
+            f_bill_url: req.fileUrl.replace('d:\\qianNengInvoiceFile', '/Download'),
+            f_sign_url: req.shareurl,
+            f_sign_result: req.sharecode,
             f_bill_state: req.status
           }
-          this.eticket_src = req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', '')
+          this.eticket_src = 'https://qnjtkf.cn:7400' + model.f_bill_url
         } else if (req.status === '开票中') {
           model = {
             id: ticket_id,
@@ -303,11 +304,12 @@ export default {
                   f_eticket_id: ticket_id,
                   f_bill_code: req.fpDm,
                   f_bill_number: req.fpHm,
-                  f_bill_url: req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', ''),
-                  f_sign_result: req.msg,
+                  f_bill_url: req.fileUrl.replace('d:\\qianNengInvoiceFile', '/Download'),
+                  f_sign_url: req.shareurl,
+                  f_sign_result: req.sharecode,
                   f_bill_state: req.status
                 })
-                this.eticket_src = req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', '')
+                this.eticket_src = 'https://qnjtkf.cn:7400' + req.fileUrl.replace('d:\\qianNengInvoiceFile', '/Download')
               } else if (req && req.status !== '开票中') {
                 clearInterval(interval)
                 // TODO 失败后保存发票详情

package/src/filiale/tongchuan/EticketOpenJBPage.vue

@@ -50,10 +50,31 @@
               </div>
               <div style="float: right">
                 <button class="button_search" @click="search()">查 询</button>
+                <button class="button_search" @click="$parent.$parent.open_report()">打印收据</button>
                 <button class="button_search" @click="$parent.$parent.open_eTicket()">开票</button>
               </div>
             </div>
           </div>
+          <div class="row">
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">气表类型</label>
+              <v-select :value.sync="model.f_meter_type"
+                        :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
+                        condition="f_meter_classify = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">是否有收据</label>
+              <v-select
+                v-model="model.is_report"
+                placeholder='是否有收据'
+                :search="false"
+                condition=" f_is_report {} "
+                :value.sync="model.is_report"
+                :options='$parent.$parent.is_report'
+                close-on-select></v-select>
+            </div>
+          </div>
         </div>
       </criteria>
       <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
@@ -71,8 +92,8 @@
             <th>应交金额</th>
             <th>上期底数</th>
             <th>本期底数</th>
-            <th>是否开过票</th>
-            <th>是否打过收据</th>
+            <th>是否开过发票</th>
+            <th>是否开过票据</th>
             <th>缴费时间</th>
           </tr>
         </template>
@@ -91,7 +112,7 @@
             <th style="text-align:center">{{ row.f_last_tablebase }}</th>
             <th style="text-align:center">{{ row.f_tablebase }}</th>
             <th style="text-align:center">{{ row.is_bill }}</th>
-            <th style="text-align:center">{{ row.is_report }}</th>
+            <th style="text-align:center">{{ row.f_is_report }}</th>
             <th style="text-align:center">{{ row.f_hand_date }}</th>
           </tr>
         </template>
@@ -149,15 +170,40 @@
     <footer slot="modal-footer" class="modal-footer">
       <button type="button" class="btn button_search"
               :disabled="!(row.f_paper_name&&row.f_address_phone)"
-              @click='confirm'>确认开票
+              @click='confirm'>确认收费
       </button>
     </footer>
   </modal>
   <ticket-print :show="eticket_show" @toggle="eticket_toggle" v-ref:eticketbill></ticket-print>
+  <reissue-bill :data="reissue_data" :show.sync="reissue_show" @cancel="reissueOper()" @reissue-success="reissueSucc()"
+                v-if="reissue_show"></reissue-bill>
 </template>
 <script>
 import {HttpResetClass, PagedList} from 'vue-client'
 import * as Util from '../../Util'
+import co from 'co'
+let reprintGen = function* (self, row, type) {
+  try {
+    row.f_report = type
+    row.f_bill_type = '普通收据'
+    row.f_bill_style = '普通收据'
+    row.f_operator = self.$login.f.name
+    row.operator = self.$login.f.name
+    row.f_operatorid = self.$login.f.id
+    row.f_orgid = self.$login.f.orgid
+    row.f_orgname = self.$login.f.orgs
+    row.f_depid = self.$login.f.depids
+    row.f_depname = self.$login.f.deps
+    row.billUrl = 'rs/report/hand_bill'
+    self.reissue_data = row
+    self.reissue_show = true
+  } catch (error) {
+    if (error.status) {
+      self.$warn(`加载数据出错, ${JSON.stringify(error)}`, 'CardList')
+    }
+    throw error
+  }
+}
 let asyncReadyGen = async function (self) {
   self.$refs.paged.$refs.cri.model.f_start_date = Util.toStandardDateString().substr(0, 5) + '01-01'
   self.$refs.paged.$refs.cri.model.f_end_date = Util.toStandardDateString()
@@ -190,11 +236,14 @@ export default {
       msg: [],
       orgname: [],
       depname: [],
+      is_report: [{label: '是', value: ` = '是'`}, {label: '否', value: ' is null'}],
       eticket_msg: false,
       invoice_show_gas: '否',
       show_gas: [{label: '是', value: '是'}, {label: '否', value: '否'}],
       row: {},
-      mid: [{label: '全部', value: ''}, {label: '是', value: ' > 0 '}, {label: '否', value: ' is null'}]
+      mid: [{label: '全部', value: ''}, {label: '是', value: ' > 0 '}, {label: '否', value: ' is null'}],
+      reissue_data: null,
+      reissue_show: false
     }
   },
   ready () {
@@ -202,6 +251,21 @@ export default {
     asyncReadyGen(this)
   },
   methods: {
+    reissueOper () {
+      this.reissue_data = null
+      this.reissue_show = false
+    },
+    async reissueSucc () {
+      // 把选中的记录改成已经打票
+      let sql = `update t_handplan set f_is_report = '是' where id in ${this.$login.convertToIn(this.selecteds.map(item => item.id))}`
+      let data = {
+        sql: sql
+      }
+      await this.$resetpost('rs/logic/runSQL', data)
+      // 重新查询页面
+      this.reissue_show = false
+      this.search()
+    },
     search () {
       this.$refs.paged.$refs.cri.search()
     },
@@ -239,6 +303,27 @@ export default {
       }
       this.eticket_msg = true
     },
+    async open_report () {
+      if ([...new Set(this.selecteds.map(item => item.f_userinfo_code))].length > 1) {
+        this.$showAlert('所选择用户不是同一用户！！', 'warning', 2000)
+        return
+      }
+      let isReports = [...new Set(this.selecteds.map(item => item.f_is_report))]
+      if (isReports.length > 1) {
+        this.$showAlert('所选择记录中打印票据状态不一致，请重新选择！！', 'warning', 2000)
+        return
+      }
+      let data = {
+        id: this.$login.convertToIn(this.selecteds.map(item => item.id)).replace(/'/g, '')
+      }
+      let reprint
+      if (isReports[0] === '是') {
+        reprint = reprintGen(this, data, '补打')
+      } else {
+        reprint = reprintGen(this, data, ' ')
+      }
+      return co(reprint)
+    },
     confirm () {
       this.eticket_msg = false
       this.eticket_show = true
@@ -285,6 +370,9 @@ export default {
     }
   },
   computed: {
+    metertypes () {
+      return [{label: ' 全部 ', value: ''}, {label: ' 机表 ', value: '机表'}, {label: '物联网表', value: '物联网表'}]
+    },
     getPayee () {
       return this.$GetSaleParam.getPayee()
     },

package/src/filiale/tongchuan/HandList.vue

@@ -16,21 +16,21 @@
                   <span class="col-sm-3" title="是否欠费">{{ row.f_whether_pay === '是' ? '已缴' : '欠费' }}</span>
                 </div>
               </div>
-               <div class="col-sm-1">
-                <dropdown class="auto">
-                  <button data-toggle="dropdown" style="border: 0px;background: none;" type="button">
-                    <span class="glyphicon glyphicon-th-list"></span>
-                  </button>
-                  <ul class="dropdown-menu dropdown-menu-right" slot="dropdown-menu" style=" min-width: 60px;">
-                    <li>
-                      <a @click.stop="$parent.$parent.$parent.operate('票据补打', row)" href="#">票据补打</a>
-                    </li>
-                    <li>
-                      <a @click.stop="$parent.$parent.$parent.operate('电子票补打', row)" href="#">电子票补打</a>
-                    </li>
-                  </ul>
-                </dropdown>
-              </div>
+<!--               <div class="col-sm-1">-->
+<!--                <dropdown class="auto">-->
+<!--                  <button data-toggle="dropdown" style="border: 0px;background: none;" type="button">-->
+<!--                    <span class="glyphicon glyphicon-th-list"></span>-->
+<!--                  </button>-->
+<!--                  <ul class="dropdown-menu dropdown-menu-right" slot="dropdown-menu" style=" min-width: 60px;">-->
+<!--                    <li>-->
+<!--                      <a @click.stop="$parent.$parent.$parent.operate('票据补打', row)" href="#">票据补打</a>-->
+<!--                    </li>-->
+<!--                    <li>-->
+<!--                      <a @click.stop="$parent.$parent.$parent.operate('电子票补打', row)" href="#">电子票补打</a>-->
+<!--                    </li>-->
+<!--                  </ul>-->
+<!--                </dropdown>-->
+<!--              </div>-->
 
             </span>
             <div class="panel-body" v-if="$parent.$parent.$parent.isSelected(row)">

package/src/filiale/tongchuan/bill/ReissueBill.vue

@@ -196,7 +196,7 @@
    */
   let getBillData = async function (self) {
     // 显示票据
-    self.bill = new DataModel(self.data.billUrl, {reprint: "'补打'",operator: `'${self.$login.f.name}'`,})
+    self.bill = new DataModel(self.data.billUrl, {reprint: "'补打'", operator: `'${self.$login.f.name}'`})
     await self.bill.search(self.data.id)
     // self.bill.data = '我是补打发票'
     await getBillGen(self)
@@ -259,16 +259,21 @@
         }
         // 进行补打
         try {
+          if (this.data.id.includes('(')) {
+            this.data.id = this.data.id.replace('(', '')
+            this.data.id = this.data.id.replace(')', '')
+            this.data.id = this.data.id.split(',')[0]
+          }
           let param = {
             items: '*',
             tablename: 't_billdetail',
-            condition: ` 1=1 and f_charge_id = ${this.data.id} and f_type = '${this.data.f_bill_type}'`,
+            condition: ` 1=1 and f_charge_id = '${this.data.id}' and f_type = '${this.data.f_bill_type}'`,
             orderitem: 'id'
           }
           let res = await this.$resetpost('rs/sql/singleTable_OrderBy', {data: param}, {resolveMsg: null, rejectMsg: '获取补票数据出错！！'})
-          if (res.data.length>0){
-            let confirm = await this.$showMessage(`这是第${res.data.length+1}次打印,确认要补打票据吗?`, ['confirm', 'cancel'])
-            if (confirm === 'confirm'){
+          if (res.data.length > 0) {
+            let confirm = await this.$showMessage(`这是第${res.data.length + 1}次打印,确认要补打票据吗?`, ['confirm', 'cancel'])
+            if (confirm === 'confirm') {
               console.log('开具收据的参数：', this.data.id, this.data.f_bill_type)
               if (this.config.hasBillManage) {
                 await this.$CommonService.reissuePaperBill(this.data.id, this.data.f_bill_type, this.model)
@@ -282,10 +287,8 @@
               } else {
                 this.$refs.reportprint.print()
               }
-            }else {
-
             }
-          }else {
+          } else {
             console.log('开具收据的参数：', this.data.id, this.data.f_bill_type)
             if (this.config.hasBillManage) {
               await this.$CommonService.reissuePaperBill(this.data.id, this.data.f_bill_type, this.model)