sale-client 3.6.214 → 3.6.216

package/package.json

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

package/src/components/FilesManage/FileUserAddress.vue

@@ -73,6 +73,15 @@
                       close-on-select v-ref:slice>
             </v-select>
           </div>
+          <div class="col-sm-6 form-group " v-if="!usertype">
+            <label class="font_normal_body">地区类型</label>
+            <v-select
+              :value.sync="model.f_iscity" :value-single="true"
+              :options='iscity' placeholder='请选择'
+              @change="changecity"
+              close-on-select>
+            </v-select>
+          </div>
           <div v-if="!usertype" class="col-sm-6 form-group ">
             <label for="f_address" class="font_normal_body">楼&emsp;&emsp;号</label>
             <input type="text" style="width:40%" v-model="model.f_building" class="input_search"
@@ -299,6 +308,7 @@
           f_floor_suffix: '层',
           f_room_suffix: '室'
         },
+        iscity:[{label:'市区',value:'市区'},{label:'乡镇',value:'乡镇'},{label:'全部',value:''}],
         model: {
           f_pcd_id: '',
           f_street_id: '',
@@ -350,6 +360,27 @@
       getAreaConfig(this)
     },
     methods: {
+      async changecity(){
+        this.areaslist = []
+        // this.model.f_residential_area_id = null
+        // this.model.f_residential_area = null
+        let condition = `isnull(f_iscity,'') = isnull('${this.model.f_iscity}','') and  a.f_orgid = '${this.$login.f.orgid}'`
+        let req = await this.$resetpost('rs/sql/address_getresidential', {
+          data: {
+            condition: condition
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        let redata = []
+        req.data.forEach((row) => {
+          redata.push({
+            label: row.f_residential_area,
+            value: row.id,
+            data: row,
+            id: row.id
+          })
+        })
+        this.areaslist=redata
+      },
       async initdata () {
         this.model.f_address_state = '未通气'
         this.initAreas(this.f_filialeids)

package/src/components/revenue/comprehen/Bill/Eticket/EticketOpenPage.vue

@@ -151,7 +151,7 @@
           <div class="col-sm-12 form-group form-input-group" :class="[!row.f_buy_phone ? 'has-error' : '']">
             <label class="control-label">开票电话:</label>
             <input class="form-control col-sm-2"
-                   v-model="row.f_buy_phone" placeholder="开票地址">
+                   v-model="row.f_buy_phone" placeholder="开票电话">
           </div>
           <div class="col-sm-12 form-group form-input-group">
             <label class="control-label">邮箱推送:</label>

package/src/filiale/tongchuan/EticketOpenJBPage.vue

@@ -162,7 +162,7 @@
           <div class="col-sm-12 form-group form-input-group" :class="[!row.f_buy_phone ? 'has-error' : '']">
             <label class="control-label">开票电话:</label>
             <input class="form-control col-sm-2"
-                   v-model="row.f_buy_phone" placeholder="开票地址">
+                   v-model="row.f_buy_phone" placeholder="开票电话">
           </div>
           <div class="col-sm-12 form-group form-input-group">
             <label class="control-label">邮箱推送:</label>

package/src/filiale/tongchuan/IOTMeterCenter.vue

@@ -233,7 +233,7 @@
           <div class="col-sm-12 form-group form-input-group" :class="[!row.f_buy_phone ? 'has-error' : '']">
             <label class="control-label">开票电话:</label>
             <input class="form-control col-sm-2"
-                   v-model="row.f_buy_phone" placeholder="开票地址">
+                   v-model="row.f_buy_phone" placeholder="开票电话">
           </div>
           <div class="col-sm-12 form-group form-input-group">
             <label class="control-label">邮箱推送:</label>

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

@@ -207,7 +207,7 @@
             <label class="control-label">开票电话:</label>
             <input class="form-control col-sm-2"
                    :disabled="diytick"
-                   v-model="row.f_buy_phone" placeholder="开票地址">
+                   v-model="row.f_buy_phone" placeholder="开票电话">
           </div>
           <div class="col-sm-12 form-group form-input-group">
             <label class="control-label">邮箱推送:</label>

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

@@ -43,7 +43,7 @@
             <div class="col-sm-12 form-group form-input-group" :class="[!row.f_buy_phone ? 'has-error' : '']">
               <label class="control-label">开票电话:</label>
               <input class="form-control col-sm-2"
-                     v-model="row.f_buy_phone" placeholder="开票地址">
+                     v-model="row.f_buy_phone" placeholder="开票电话">
             </div>
             <div class="col-sm-12 form-group form-input-group">
               <label class="control-label">邮箱推送:</label>

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

@@ -58,7 +58,7 @@ export default {
     async openETicket (sellId, row, show_gas, is_pax, type, invoice_kind = '电子发票', retry = false) {
       try {
         let model = {
-          id: sellId[0],
+          id: sellId,
           charge_item: type,
           invoice_type: 0,
           invoice_kind,
@@ -124,7 +124,7 @@ export default {
         }
         // TODO 组织开票数据并保存
         const res = await this.$resetpost('/invoice/rs/logic/getInvoice', model, {resolveMsg: null, rejectMsg: '开票请求失败'})
-        if (res.data.code == '0000') {
+        if (res.data.code === 200 && res.data.data.code == '0000') {
           this.return_msg = '发票开具成功，请稍后到发票管理页面查看或打印'
         } else {
           this.return_msg = '发票开具失败，请稍后到发票管理页面补打或重开'

package/src/filiale/yuncheng/gasmove.vue

@@ -0,0 +1,260 @@
+<template>
+    <div class="auto">
+        <validator name='v'>
+            <form novalidate class="form-horizontal">
+                <div class="row">
+                    <div class="col-sm-4 form-group">
+                        <label class="font_normal_body">用户编号</label>
+                        <input class="input_search" style="width:60%" type="text" placeholder='目标用户编号'
+                               v-model="model.f_userinfo_code" @blur="getuser(model.f_userinfo_code)">
+                    </div>
+                    <div class="col-sm-4 form-group" >
+                        <label for="f_user_name" class="font_normal_body">用户姓名</label>
+                        <input class="input_search" style="width:60%" type="text" placeholder='目标用户姓名'
+                               v-model="model.f_user_name" readonly >
+                    </div>
+
+                    <div class="col-sm-4 form-group" >
+                        <label class="font_normal_body">气表类型</label>
+                        <input class="input_search" style="width:60%" type="text" placeholder='目标用户气表类型'
+                               v-model="model.f_meter_type" readonly >
+                    </div>
+                </div>
+                <div class="row">
+
+                    <div class="col-sm-4 form-group" v-if="row.f_meter_type =='机表'" >
+                        <label class="font_normal_body">当前余额</label>
+                        <input class="input_search" style="width:60%" type="text" placeholder='当前余额'
+                               v-model="row.f_balance" readonly >
+                    </div>
+                    <div class="col-sm-4 form-group" v-if="row.f_meter_type =='物联网表'" >
+                        <label class="font_normal_body">当前余额</label>
+                        <input class="input_search" style="width:60%" type="text" placeholder='当前余额'
+                               v-model="row.f_balance_amount" readonly >
+                    </div>
+                    <div class="col-sm-4 form-group" v-if="row.f_meter_type == '气量卡表' || row.f_meter_type == '金额卡表'"
+                         :class="[$v.f_meter_base.required || $v.f_meter_base.dctest ? 'has-error' : 'has-success']">
+                        <label class="font_normal_body">当前底数</label>
+                        <input class="input_search" style="width:60%" type="text" placeholder='当前表已用气量'
+                               @blur="meterBaseChange()"
+                               v-validate:f_meter_base='{required: true}'  v-model="model.f_meter_base" >
+                    </div>
+                    <div class="col-sm-4 form-group" v-if="model.f_meter_type!='' && model.f_meter_type!='气量卡表'"
+                         :class="[$v.f_move_fee.required || $v.f_move_fee.dctest ? 'has-error' : 'has-success']">
+                        <label class="font_normal_body">转气金额</label>
+                        <input class="input_search" style="width:60%" type="number" v-model="model.f_move_fee"
+                                @blur="preamount()"
+                               v-validate:f_move_fee='{required: true}' placeholder="转气金额">
+                    </div>
+                    <div class="col-sm-4 form-group" v-if="model.f_meter_type!='' && model.f_meter_type=='气量卡表'"
+                         :class="[$v.f_move_fee.required || $v.f_move_fee.dctest ? 'has-error' : 'has-success']">
+                        <label class="font_normal_body">转气金额</label>
+                        <input class="input_search" style="width:60%" type="number" v-model="model.f_move_fee"
+
+                               v-validate:f_move_fee='{required: true}' placeholder="转气金额">
+                    </div>
+                    <div class="col-sm-4 form-group" v-if="model.f_meter_type!='' && model.f_meter_type=='气量卡表'"
+                         :class="[$v.f_move_gas.required || $v.f_move_gas.dctest ? 'has-error' : 'has-success']">
+                        <label class="font_normal_body">转气气量</label>
+                        <input class="input_search" style="width:60%" type="number" v-model="model.f_move_gas"
+                               @blur="pregas()"
+                               v-validate:f_move_gas='{required: true}' placeholder="转气气量">
+                    </div>
+                    <div class="col-sm-4 form-group" v-if="model.f_meter_type!='' && model.f_meter_type!='气量卡表'"
+                         :class="[$v.f_move_gas.required || $v.f_move_gas.dctest ? 'has-error' : 'has-success']">
+                        <label class="font_normal_body">转气气量</label>
+                        <input class="input_search" style="width:60%" type="number" v-model="model.f_move_gas"
+                               v-validate:f_move_gas='{required: true}' placeholder="转气气量">
+                    </div>
+                </div>
+
+                <div class="row">
+                    <div class="col-sm-8">
+                        <label for="f_paper_account" class="font_normal_body ">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
+                        <input class="input_search" style="width:80%"  v-model="model.f_comments">
+                    </div>
+
+                </div>
+            </form>
+            <div style="text-align:right;">
+                <button class="button_search btn-gn" @click="confirm()" :disabled='!$v.valid'>确认</button>
+                <button class="button_clear btn-gn" @click="clean()">取消</button>
+            </div>
+        </validator>
+      <upload :blodid="row.f_userinfo_id" v-if="config.showupload" :businessid="randomBusinessId" isremark="true" fusetype="转气"></upload>
+        <!--<print-bill :show="print" :bill-manager='config.hasBillManage' v-ref:printbill :bill-url='billUrl' v-on:toggle="clean" @printok="printok" :data='printModel'></print-bill>-->
+    </div>
+</template>
+
+
+<script>
+    let preamountGen = async function (self) {
+      let calFee = self.model.f_move_fee
+      let getGas = await self.$CommonService.feeCalculate(self.model, calFee)
+      if (getGas.data.gas) {
+        self.model.f_move_gas = (getGas.data.gas - 0).toFixed(2)
+      }
+    }
+    let pregasGen = async function (self) {
+      self.model.f_move_gas = (self.model.f_move_gas - 0).toFixed(2)
+      self.model.f_reverse = self.model.f_move_gas
+      let getAmount = await self.$CommonService.gasCalculate(self.model, self.model.f_move_gas)
+      self.model.f_move_fee = getAmount.data.chargenum
+    }
+    export default {
+      title: '转气',
+      data () {
+        return {
+          model: {
+            f_refund_fee: '',
+            f_comments: '',
+            f_meter_type: '',
+            f_user_name: '',
+            f_userfiles_id: '',
+            f_move_fee: 0,
+            f_move_gas: 0
+          },
+          config: {
+            showupload: true  // 默认显示附件上传组件
+          },
+          blodid: '',
+          randomBusinessId: '',
+          hasValidateBill: false,
+          validateOk: false,
+
+          printModel: {},
+          print: false,
+          billUrl: '',
+          billData: {
+            url: 'rs/report/refund_sell',
+            bill: ''
+          },
+
+                // 下拉框值
+          paytype: this.$appdata.getParam('付款方式'),
+          printstyle: this.$appdata.getParam('打印格式')
+        }
+      },
+      props: ['row'],
+      ready () {
+        this.getRandomId()
+      },
+      methods: {
+        getRandomId () {
+          this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+            let res = Math.random() * 16 | 0
+            let v = c == 'x' ? res : (res & 0x3 | 0x8)
+            return v.toString(16)
+          })
+        },
+        meterBaseChange () {
+          if (this.model.f_meter_base && this.model.f_meter_base > 0 && this.model.f_meter_base <= this.row.f_total_gas) {
+            this.model.f_move_gas = (this.row.f_total_gas - this.model.f_meter_base).toFixed(2)
+          }
+          if (this.model.f_meter_base > this.row.f_total_gas) {
+            this.$showAlert('转气底数不能大于总购气量', 'warning', 1500)
+            this.model.f_meter_base = ''
+            return
+          }
+          if (this.model.f_move_gas && this.model.f_move_gas > 0) {
+            try {
+              pregasGen(this)
+            } catch (error) {
+              this.$showAlert(`划价错误，错误类型：${error}`, 'danger', 0)
+            }
+          } else {
+            this.model.f_move_gas = 0
+          }
+        },
+        preamount () {
+          try {
+            preamountGen(this)
+          } catch (error) {
+            this.$showAlert(`发卡售气划价错误，错误类型：${error}`, 'danger', 0)
+          }
+        },
+        pregas () {
+          if (this.model.f_move_gas && this.model.f_move_gas > 0) {
+            try {
+              pregasGen(this)
+            } catch (error) {
+              this.$showAlert(`划价错误，错误类型：${error}`, 'danger', 0)
+            }
+          } else {
+            this.model.f_move_gas = 0
+          }
+        },
+        async getuser (val) {
+          if (val == this.row.f_userinfo_code) {
+            this.$showAlert('不能给自己转气', 'warning', 1500)
+            return
+          }
+          let res = await this.$resetpost('rs/sql/sale_getUser',
+                    {data: {condition: `i.f_userinfo_code='${val}' and i.f_orgid='${this.$login.f.orgid}'`}}, {resolveMsg: null, rejectMsg: null})
+          console.log(res.data)
+          if (res.data.length > 0) {
+            this.model.f_user_name = res.data[0].f_user_name
+            this.model.f_meter_type = res.data[0].f_meter_type
+            this.model.f_userfiles_id = res.data[0].f_userfiles_id
+          } else {
+            this.$showAlert('输入的用户编号不正确', 'warning', 1500)
+          }
+        },
+        async confirm () {
+          if (this.model.f_move_fee <= 0) {
+            this.$showAlert('转气金额和气量不能为0或小于0', 'warning', 1500)
+            return
+          }
+          if (this.row.f_meter_type == '机表' && this.row.f_balance < this.model.f_move_fee) {
+            this.$showAlert('转气金额不能大于余额', 'warning', 1500)
+            return
+          }
+          if (this.row.f_meter_type == '物联网表' && this.row.f_balance_amount < this.model.f_move_fee) {
+            this.$showAlert('转气金额不能大于余额', 'warning', 1500)
+            return
+          }
+          if (!this.model.f_meter_type) {
+            this.$showAlert('请先输入目标用户信息', 'warning', 1500)
+            return
+          }
+
+          let param = {
+            f_user_id: this.row.f_user_id,
+            f_userfiles_id: this.row.f_userfiles_id,
+            userfilesid: this.model.f_userfiles_id,
+            version: this.row.version,
+            f_move_fee: this.model.f_move_fee,
+            f_meter_base: this.model.f_meter_base,
+            f_move_gas: this.model.f_move_gas,
+            f_comments: this.model.f_comments,
+            f_billing: this.row.f_billing,
+            f_userinfo_code: this.model.f_userinfo_code,
+            f_price_id: this.row.f_price_id,
+            f_orgid: this.$login.f.orgid,
+            f_stairprice_id: this.row.f_stairprice_id,
+            operInfo: {
+              f_operator: this.$login.f.name,
+              f_operatorid: this.$login.f.id,
+              f_orgid: this.$login.f.orgid,
+              f_orgname: this.$login.f.orgs,
+              f_depid: this.$login.f.depids,
+              f_depname: this.$login.f.deps
+            }
+          }
+
+          let res = await this.$resetpost('rs/logic/movegas', {data: param}, {warnMsg: `确定要进行转气吗？`, resolveMsg: '转气成功！！', rejectMsg: '转气失败！！请重试！！'})
+          this.$dispatch('success')
+        },
+        clean () {
+          this.$dispatch('refresh')
+        },
+        printok () {
+          this.$dispatch('success')
+        },
+        validateBill (val) {
+          this.validateOk = !val.isOk
+          this.billData.bill = val.bill
+        }
+      }
+    }
+</script>

package/src/filiale/yuncheng/sale.js

@@ -30,4 +30,6 @@ export default function () {
   Vue.component('card-list', (resolve) => { require(['./CardList'], resolve) })
   // 机表抄表审核
   Vue.component('machine-hand-audit', (resolve) => { require(['./machineHandAudit'], resolve) })
+  // 转气
+  Vue.component('gas-move', (resolve) => { require(['./gasmove'], resolve) })
 }

package/src/plugins/CardService.js

@@ -691,7 +691,7 @@ let sendCardSaleGasGenremanent = async function (model, row) {
       let cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
         resolveMsg: null,
         rejectMsg: '开户卡服务错误'
-      })
+      },80000)
       if (!cardParams || ((model.f_pregas > model.f_remanent_gas) && !result) || cardRes.data.Err || cardRes.data.Exception) {
         // 写卡异常
         // 数据回滚操作
@@ -798,7 +798,7 @@ let resetsendCardSaleGasGen = async function (model, row) {
       let cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
         resolveMsg: null,
         rejectMsg: '重开户卡服务错误'
-      })
+      },80000)
       if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
         // 写卡异常
         // 数据回滚操作
@@ -907,7 +907,7 @@ let sendCardSaleGasGen = async function (model, row) {
       let cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
         resolveMsg: null,
         rejectMsg: '开户卡服务错误'
-      })
+      },80000)
       if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
         // 写卡异常
         // 数据回滚操作
@@ -1116,7 +1116,7 @@ let replaceCardGenJB = function * (model, row) {
       let cardRes = yield co(Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
         resolveMsg: null,
         rejectMsg: '补卡卡服务错误'
-      }))
+      },80000))
       // 卡服务写卡异常，业务逻辑回滚
       if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
         Vue.$showAlert('机表补卡失败!!', 'danger', 0)
@@ -1204,7 +1204,7 @@ let replaceXq = function * (model, row) {
     let cardRes = yield co(Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
       resolveMsg: null,
       rejectMsg: '擦虚气服务错误'
-    }))
+    },80000))
     if (cardRes.data.Err || cardRes.data.Exception) {
       return {status: 1}
     } else {
@@ -1290,7 +1290,7 @@ let replaceCardGen = function * (model, row, allot) {
       let cardRes = yield co(Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
         resolveMsg: null,
         rejectMsg: '补卡卡服务错误'
-      }))
+      },80000))
       // 卡服务写卡异常，业务逻辑回滚
       if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
         Vue.$showAlert('补卡失败!!', 'danger', 0)
@@ -1424,14 +1424,14 @@ let offlineWriteGen = async function (row) {
         param.kzt = result.data.ispick === '未过表' && result.data.lastsell_oper === '发卡售气' ? '0' : '1'
         param.cs = row.cardInfo.Times + 1
         param.bkcs = param.bkcs + 1
-        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', param, {resolveMsg: null, rejectMsg: '写卡失败'})
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', param, {resolveMsg: null, rejectMsg: '写卡失败'},80000)
       } else if (row.states === '换表') {
         param.kzt = '0'
         param.bkcs = param.bkcs + 1
         param.cs = 1
-        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', param, {resolveMsg: null, rejectMsg: '写卡失败'})
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', param, {resolveMsg: null, rejectMsg: '写卡失败'},80000)
       } else {
-        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', param, {resolveMsg: null, rejectMsg: '写卡失败'})
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', param, {resolveMsg: null, rejectMsg: '写卡失败'},80000)
       }
       if (!cardParams || cardRes.data.Err || cardRes.data.Exception) {
         let sql = `update t_sellinggas set
@@ -1706,27 +1706,57 @@ let marginGen = async function (model, row) {
         params2.kzt = result.data.ispick === '未过表' && result.data.lastsell_oper === '发卡售气' ? '0' : '1'
         cardparam = JSON.stringify(params2)
         cardpost = 'WriteNewCard'
-        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params2, {resolveMsg: null, rejectMsg: '卡表收费失败'})
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params2, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
       } else if (result.data.last_oper === '换表') {
         console.log('我走的是写新卡换表')
         cardparam = JSON.stringify(params3)
         cardpost = 'WriteNewCard'
-        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params3, {resolveMsg: null, rejectMsg: '卡表收费失败'})
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params3, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
       } else if (result.data.last_oper === '换表补气') {
         // 累购金额需要将上次购气金额加上
         console.log('我走的是正常的收费', params)
         cardparam = JSON.stringify(params)
         cardpost = 'WriteGasCard'
-        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'})
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
       } else {
         console.log('我走的是正常的收费', params)
         cardparam = JSON.stringify(params)
         cardpost = 'WriteGasCard'
-        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'})
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
       }
       console.log('卡表收费返回写卡参数值', cardRes)
       // 卡服务写卡异常，业务逻辑回滚
       if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
+        if (result) {
+          let data = {
+            cardparam: cardparam,
+            cardpost: cardpost,
+            id: result.data.id,
+            userinfo: {
+              f_userinfo_id: row.f_userinfo_id,
+              version: row.userinfo_version + 1,
+              f_balance: row.f_balance,
+              userfiles: {
+                f_user_id: model.f_user_id,
+                f_userfiles_id: row.f_userfiles_id,
+                f_total_gas: row.f_total_gas,
+                f_write_totalgas: row.f_write_totalgas,
+                f_write_totalfee: row.f_write_totalfee,
+                f_total_fee: row.f_total_fee,
+                f_card_id: row.f_card_id,
+                f_times: row.cardInfo.Times,
+                version: row.version + 1
+              }
+            }
+          }
+          if (row.f_tag) {
+            data.userinfo.userfiles.f_tag = row.f_tag
+          }
+          if (!(row.f_hascard == null) && !(row.f_share_times == null) && row.f_meter_type === '物联网表' && row.f_hascard === '是' && row.f_share_times === '是') {
+            data.userinfo.userfiles.f_times = row.f_times
+          }
+          await Vue.resetpost('rs/logic/cardChargeRollback', {data: data}, {resolveMsg: '卡表收费失败', rejectMsg: '卡表收费失败'})
+        }
         throw `卡服务错误：${cardRes.data.Err}${cardRes.data.Exception}，请联系开发人员处理！！`
       } else {
         // 调用读卡进行校验
@@ -1754,36 +1784,6 @@ let marginGen = async function (model, row) {
       throw new Error(`请检查卡是否插好！！`)
     }
   } catch (error) {
-    if (result) {
-      let data = {
-        cardparam: cardparam,
-        cardpost: cardpost,
-        id: result.data.id,
-        userinfo: {
-          f_userinfo_id: row.f_userinfo_id,
-          version: row.userinfo_version + 1,
-          f_balance: row.f_balance,
-          userfiles: {
-            f_user_id: model.f_user_id,
-            f_userfiles_id: row.f_userfiles_id,
-            f_total_gas: row.f_total_gas,
-            f_write_totalgas: row.f_write_totalgas,
-            f_write_totalfee: row.f_write_totalfee,
-            f_total_fee: row.f_total_fee,
-            f_card_id: row.f_card_id,
-            f_times: row.cardInfo.Times,
-            version: row.version + 1
-          }
-        }
-      }
-      if (row.f_tag) {
-        data.userinfo.userfiles.f_tag = row.f_tag
-      }
-      if (!(row.f_hascard == null) && !(row.f_share_times == null) && row.f_meter_type === '物联网表' && row.f_hascard === '是' && row.f_share_times === '是') {
-        data.userinfo.userfiles.f_times = row.f_times
-      }
-      await Vue.resetpost('rs/logic/cardChargeRollback', {data: data}, {resolveMsg: '卡表收费失败', rejectMsg: '卡表收费失败'})
-    }
     throw error
   }
 }
@@ -1902,27 +1902,57 @@ let sellgasGen = async function (model, row) {
         params2.kzt = result.data.ispick === '未过表' && result.data.lastsell_oper === '发卡售气' ? '0' : '1'
         cardparam = JSON.stringify(params2)
         cardpost = 'WriteNewCard'
-        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params2, {resolveMsg: null, rejectMsg: '卡表收费失败'})
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params2, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
       } else if (result.data.last_oper === '换表') {
         console.log('我走的是写新卡换表')
         cardparam = JSON.stringify(params3)
         cardpost = 'WriteNewCard'
-        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params3, {resolveMsg: null, rejectMsg: '卡表收费失败'})
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params3, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
       } else if (result.data.last_oper === '换表补气') {
         // 累购金额需要将上次购气金额加上
         console.log('我走的是正常的收费', params)
         cardparam = JSON.stringify(params)
         cardpost = 'WriteGasCard'
-        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'})
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
       } else {
         console.log('我走的是正常的收费', params)
         cardparam = JSON.stringify(params)
         cardpost = 'WriteGasCard'
-        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'})
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
       }
       console.log('卡表收费返回写卡参数值', cardRes)
       // 卡服务写卡异常，业务逻辑回滚
       if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
+        if (result) {
+          let data = {
+            cardparam: cardparam,
+            cardpost: cardpost,
+            id: result.data.id,
+            userinfo: {
+              f_userinfo_id: row.f_userinfo_id,
+              version: row.userinfo_version + 1,
+              f_balance: row.f_balance,
+              userfiles: {
+                f_user_id: model.f_user_id,
+                f_userfiles_id: row.f_userfiles_id,
+                f_total_gas: row.f_total_gas,
+                f_write_totalgas: row.f_write_totalgas,
+                f_write_totalfee: row.f_write_totalfee,
+                f_total_fee: row.f_total_fee,
+                f_card_id: row.f_card_id,
+                f_times: row.cardInfo.Times,
+                version: row.version + 1
+              }
+            }
+          }
+          if (row.f_tag) {
+            data.userinfo.userfiles.f_tag = row.f_tag
+          }
+          if (!(row.f_hascard == null) && !(row.f_share_times == null) && row.f_meter_type === '物联网表' && row.f_hascard === '是' && row.f_share_times === '是') {
+            data.userinfo.userfiles.f_times = row.f_times
+          }
+          await Vue.resetpost('rs/logic/cardChargeRollback', {data: data}, {resolveMsg: '卡表收费失败', rejectMsg: '卡表收费失败'})
+        }
         throw `卡服务错误：${cardRes.data.Err}${cardRes.data.Exception}，请联系开发人员处理！！`
       } else {
         // 调用读卡进行校验
@@ -1950,36 +1980,6 @@ let sellgasGen = async function (model, row) {
       throw new Error(`请检查卡是否插好！！`)
     }
   } catch (error) {
-    if (result) {
-      let data = {
-        cardparam: cardparam,
-        cardpost: cardpost,
-        id: result.data.id,
-        userinfo: {
-          f_userinfo_id: row.f_userinfo_id,
-          version: row.userinfo_version + 1,
-          f_balance: row.f_balance,
-          userfiles: {
-            f_user_id: model.f_user_id,
-            f_userfiles_id: row.f_userfiles_id,
-            f_total_gas: row.f_total_gas,
-            f_write_totalgas: row.f_write_totalgas,
-            f_write_totalfee: row.f_write_totalfee,
-            f_total_fee: row.f_total_fee,
-            f_card_id: row.f_card_id,
-            f_times: row.cardInfo.Times,
-            version: row.version + 1
-          }
-        }
-      }
-      if (row.f_tag) {
-        data.userinfo.userfiles.f_tag = row.f_tag
-      }
-      if (!(row.f_hascard == null) && !(row.f_share_times == null) && row.f_meter_type === '物联网表' && row.f_hascard === '是' && row.f_share_times === '是') {
-        data.userinfo.userfiles.f_times = row.f_times
-      }
-      await Vue.resetpost('rs/logic/cardChargeRollback', {data: data}, {resolveMsg: '卡表收费失败', rejectMsg: '卡表收费失败'})
-    }
     throw error
   }
 }