sale-client 3.6.164 → 3.6.166

package/package.json

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

package/src/components/FilesManage/MeterinfoTest.vue

@@ -67,63 +67,65 @@
           <div class="col-sm-4 form-group" v-if="getConfigShowItem('f_meter_base')"
                v-show="(formconfig && formconfig.f_meter_base && formconfig.f_meter_base.required) || !onlyshowmust">
             <label for="f_meter_base" class="font_normal_body">&ensp;表&ensp;读&ensp;数</label>
-            <input type="number" class="input_search" style="width:60%" v-model="row.f_meter_base" placeholder='表底数'
-                   :disabled="!jurisdiction.includes('档案信息查询修改')" :readonly="!row.f_userfiles_id">
+            <input type="text" class="input_search" style="width:60%" v-model="row.f_meter_base" placeholder='表底数'
+                   :disabled="!jurisdiction.includes('档案信息查询修改')" :readonly="!row.f_userfiles_id"
+                   v-on:keyup="validateInput($event, 'f_meter_base')" >
           </div>
           <div class="col-sm-4 form-group" title="涉及权限:【档案信息查询修改】" v-if="getConfigShowItem('f_initial_base')"
                v-show="(formconfig && formconfig.f_initial_base && formconfig.f_initial_base.required) || !onlyshowmust">
             <label for="f_meter_base" class="font_normal_body">&ensp;初始底数</label>
-            <input type="number" class="input_search" style="width:60%" v-model="row.f_initial_base" placeholder='表底数'
-                   :disabled="!jurisdiction.includes('档案信息查询修改')">
+            <input type="text" class="input_search" style="width:60%" v-model="row.f_initial_base" placeholder='表底数'
+                   :disabled="!jurisdiction.includes('档案信息查询修改')" v-on:keyup="validateInput($event, 'f_initial_base')">
           </div>
 
           <div class="col-sm-4 form-group" title="涉及权限:【档案信息查询修改】" v-if="getConfigShowItem('f_total_gas')"
                v-show="(formconfig && formconfig.f_total_gas && formconfig.f_total_gas.required) || !onlyshowmust">
             <label for="f_meter_base" class="font_normal_body">&ensp;累购气量</label>
-            <input type="number" class="input_search" style="width:60%" v-model="row.f_total_gas" placeholder='累购气量'
-                   :disabled="!jurisdiction.includes('档案信息查询修改')">
+            <input type="text" class="input_search" style="width:60%" v-model="row.f_total_gas" placeholder='累购气量'
+                   :disabled="!jurisdiction.includes('档案信息查询修改')" v-on:keyup="validateInput($event, 'f_total_gas')">
           </div>
           <div class="col-sm-4 form-group" title="涉及权限:【档案信息查询修改】" v-if="getConfigShowItem('f_write_totalgas')"
                v-show="(formconfig && formconfig.f_write_totalgas && formconfig.f_write_totalgas.required) || !onlyshowmust">
             <label for="f_meter_base" class="font_normal_body">表写卡累购气量</label>
-            <input type="number" class="input_search" style="width:60%" v-model="row.f_write_totalgas" placeholder='表写卡累购气量'
-                   :disabled="!jurisdiction.includes('档案信息查询修改')">
+            <input type="text" class="input_search" style="width:60%" v-model="row.f_write_totalgas" placeholder='表写卡累购气量'
+                   :disabled="!jurisdiction.includes('档案信息查询修改')" v-on:keyup="validateInput($event, 'f_write_totalgas')" >
           </div>
           <div class="col-sm-4 form-group" title="涉及权限:【档案信息查询修改】" v-if="getConfigShowItem('f_total_fee')"
                v-show="(formconfig && formconfig.f_total_fee && formconfig.f_total_fee.required) || !onlyshowmust">
             <label for="f_meter_base" class="font_normal_body">&ensp;累购金额</label>
-            <input type="number" class="input_search" style="width:60%" v-model="row.f_total_fee" placeholder='累购金额'
-                   :disabled="!jurisdiction.includes('档案信息查询修改')">
+            <input type="text" class="input_search" style="width:60%" v-model="row.f_total_fee" placeholder='累购金额'
+                   :disabled="!jurisdiction.includes('档案信息查询修改')" v-on:keyup="validateInput($event, 'f_total_fee')">
           </div>
           <div class="col-sm-4 form-group" title="涉及权限:【档案信息查询修改】" v-if="getConfigShowItem('f_write_totalfee')"
                v-show="(formconfig && formconfig.f_write_totalfee && formconfig.f_write_totalfee.required) || !onlyshowmust">
             <label for="f_meter_base" class="font_normal_body">表写卡累购金额</label>
-            <input type="number" class="input_search" style="width:60%" v-model="row.f_write_totalfee" placeholder='表写卡累购金额'
-                   :disabled="!jurisdiction.includes('档案信息查询修改')">
+            <input type="text" class="input_search" style="width:60%" v-model="row.f_write_totalfee" placeholder='表写卡累购金额'
+                   :disabled="!jurisdiction.includes('档案信息查询修改')" v-on:keyup="validateInput($event, 'f_write_totalfee')">
           </div>
           <div class="col-sm-4 form-group" v-show="row.f_meter_classify != '机表' && ((formconfig && formconfig.f_times && formconfig.f_times.required) || !onlyshowmust)" title="涉及权限:【档案信息查询修改】"
                v-if="getConfigShowItem('f_times')">
             <label for="f_times" class="font_normal_body">&ensp;写卡次数</label>
-            <input type="number" class="input_search" style="width:60%" v-model="row.f_times" placeholder='写卡次数'
-                   :disabled="!jurisdiction.includes('档案信息查询修改')">
+            <input type="text" class="input_search" style="width:60%" v-model="row.f_times" placeholder='写卡次数'
+                   :disabled="!jurisdiction.includes('档案信息查询修改')" v-on:keyup="validateInput($event, 'f_times')">
           </div>
           <div class="col-sm-4 form-group" v-show="row.f_meter_classify == '物联网表' && ((formconfig && formconfig.f_iot_times && formconfig.f_iot_times.required) || !onlyshowmust)" title="涉及权限:【档案信息查询修改】"
               v-if="getConfigShowItem('f_iot_times')">
             <label for="f_times" class="font_normal_body">物联网次数</label>
-            <input type="number" class="input_search" style="width:60%" v-model="row.f_iot_times" placeholder='物联网次数'
-                   :disabled="!jurisdiction.includes('档案信息查询修改')">
+            <input type="text" class="input_search" style="width:60%" v-model="row.f_iot_times" placeholder='物联网次数'
+                   :disabled="!jurisdiction.includes('档案信息查询修改')" v-on:keyup="validateInput($event, 'f_iot_times')">
           </div>
           <div class="col-sm-4 form-group"  v-show="false">
             <label for="f_remanent_gas" class="font_normal_body">剩余气量</label>
-            <input type="number" class="input_search" style="width:60%"  v-model="row.f_remanent_gas"
+            <input type="text" class="input_search" style="width:60%"  v-model="row.f_remanent_gas"
                    placeholder='剩余气量'
-                   :disabled="f_userinfo_id"></input>
+                   :disabled="f_userinfo_id" v-on:keyup="validateInput($event, 'f_remanent_gas')"></input>
             <!--<button type="button" name="button" class="btn btn-link" @click="modefiy('f_remanent_gas')" v-if="f_userinfo_id">修改</button>-->
           </div>
           <div class="col-sm-4 form-group" v-if="getConfigShowItem('f_capacity')"
                v-show="(formconfig && formconfig.f_capacity && formconfig.f_capacity.required) || !onlyshowmust">
             <label for="f_times" class="font_normal_body">&ensp;最大量程</label>
-            <input type="number" class="input_search" style="width:60%" v-model="row.f_capacity" placeholder='最大量程'>
+            <input type="text" class="input_search" style="width:60%" v-model="row.f_capacity" placeholder='最大量程'
+                   v-on:keyup="validateInput($event, 'f_capacity')">
           </div>
           <div class="col-sm-4 form-group" v-show="row.f_meter_classify == '物联网表' && (formconfig && formconfig.f_valve_state.required || !onlyshowmust)" v-if="getConfigShowItem('f_valve_state')">
             <label for="gasmodel" class="font_normal_body">&ensp;阀门状态</label>
@@ -613,7 +615,6 @@
   import co from 'co'
   import {HttpResetClass} from 'vue-client'
   import Vue from 'vue'
-
   let meterBookGen = function * (self) {
     if (self.$login.r.find(value => value == '抄表册建档')) {
       self.opteratormetrbook = true
@@ -744,8 +745,12 @@
       if (this.row.pricetype === '混合气价') {
         this.ratioshow = true
       }
-      if (this.row.f_force_measure[0]) {
-        this.row.f_force_measure = this.row.f_force_measure[0].split(',')
+      if (this.row) {
+        if (this.row.f_force_measure !== undefined && Object.prototype.toString.call(this.row.f_force_measure) === '[object Array]') {
+          if (this.row.f_force_measure[0]) {
+            this.row.f_force_measure = this.row.f_force_measure[0].split(',')
+          }
+        }
       }
       if (this.row.f_meternumber) {
         this.meterNumberDisabled = true
@@ -754,6 +759,11 @@
       co(meterBookGen(this))
     },
     methods: {
+      validateInput (event, key) {
+        const value = event.target.value
+        const sanitizedValue = value.replace(/[^0-9.]/g, '')
+        this.row[key] = sanitizedValue
+      },
       getConfigValidate (name, defaultVal) {
         this.$resetValidation()
         if (this.formconfig && this.formconfig[name]) {

package/src/components/FilesManageNew/MeterinfoTest.vue

@@ -487,8 +487,10 @@ let meterBookGen = function * (self) {
         console.log('this.row', this.row)
         console.log('this.row.f_force_measure', this.row.f_force_measure)
         if (this.row) {
-          if (this.row.f_force_measure[0]) {
-            this.row.f_force_measure = this.row.f_force_measure[0].split(',')
+          if (this.row.f_force_measure !== undefined && Object.prototype.toString.call(this.row.f_force_measure) === '[object Array]') {
+            if (this.row.f_force_measure[0]) {
+              this.row.f_force_measure = this.row.f_force_measure[0].split(',')
+            }
           }
         }
       })

package/src/components/SellGasCharge/MeterCharge/UnWriteCardCenter.vue

@@ -63,6 +63,7 @@
       await self.$CardService.offlineWrite(self.row)
       // 开始打票
       self.clickConfirm = false
+      await self.$showAlert('写卡成功', 'success', 2000)
       self.$dispatch('success')
     } catch (error) {
       self.$showAlert(error, 'danger', 0)

package/src/components/charge/ChargeManage.vue

@@ -134,7 +134,7 @@ export default {
         // 对此数据进行验证
           if (await this.validateRow(obj)) {
           // 获取未写卡或者写卡失败记录
-            let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
+            let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and (f_write_card = '未写卡' or (f_write_card = '写卡失败' and f_operate_date >= DATEADD(HOUR, -3, GETDATE()))) and f_userfiles_id = '${obj.f_userfiles_id}'`)
             console.log('获取未写卡记录', getUnWriteSell)
             if (getUnWriteSell.data.length > 1) {
               this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)

package/src/components/charge/ChargeOper.vue

@@ -17,6 +17,7 @@
 
 <script>
 import {HttpResetClass} from 'vue-client'
+import Vue from "vue";
 
 let getNewmetermsg = async function (self, row) {
   self.cardInfo = undefined
@@ -124,6 +125,18 @@ let getBtnsGen = async function (self) {
           'routeName': 'card-meter-charge-cancel'
         }
       })
+      if (self.data.unWriteSell.length > 0) {
+        // 过滤掉线下写卡
+        self.temp = self.temp.filter((item) => {
+          return item.name !== '线下写卡'
+        })
+        self.data.unWriteSell.forEach(
+          async (item) => {
+            let sql = `update t_sellinggas set f_write_card = null where id = '${item.id}' and f_write_card ='写卡失败'`
+            await self.$resetpost('rs/logic/runSQL', { sql: sql })
+          }
+        )
+      }
     }
     /*      // 如果是预备户,删除发卡售气按钮
           if (self.data.f_user_state == '预备') {

package/src/components/charge/ChargeOtherOper.vue

@@ -73,12 +73,26 @@
       }
 
       // 如果卡上有气，添加购气撤销按钮
-      if (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0) {
-        self.temp.push({name: '购气撤销',
+      if (self.cardInfo && (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是'))) {
+        self.temp.push({
+          name: '购气撤销',
           value: {
             'weight': 0,
             'routeName': 'card-meter-charge-cancel'
-  }})
+          }
+        })
+        if (self.data.unWriteSell.length > 0) {
+          // 过滤掉线下写卡
+          self.temp = self.temp.filter((item) => {
+            return item.name !== '线下写卡'
+          })
+          self.data.unWriteSell.forEach(
+            async (item) => {
+              let sql = `update t_sellinggas set f_write_card = null where id = '${item.id}' and f_write_card ='写卡失败'`
+              await self.$resetpost('rs/logic/runSQL', { sql: sql })
+            }
+          )
+        }
       }
       // 根据权重将业务按钮排序
       self.operBtns = self.temp.sort((a, b) => {

package/src/components/chargeNew/ChargeManageNew.vue

@@ -70,7 +70,7 @@ export default {
         // 对此数据进行验证
           if (await this.validateRow(obj)) {
           // 获取未写卡或者写卡失败记录
-            let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
+            let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and (f_write_card = '未写卡' or (f_write_card = '写卡失败' and f_operate_date >= DATEADD(HOUR, -3, GETDATE()))) and f_userfiles_id = '${obj.f_userfiles_id}'`)
             console.log('获取未写卡记录', getUnWriteSell)
             if (getUnWriteSell.data.length > 1) {
               this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)

package/src/components/chargeNew/ChargeOper.vue

@@ -99,12 +99,26 @@
         }
       }
       // 如果卡上有气，添加购气撤销按钮
-      if (self.cardInfo && (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是'))) {
-        self.temp.push({name: '购气撤销',
+      if (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0) {
+        self.temp.push({
+          name: '购气撤销',
           value: {
             'weight': 0,
             'routeName': 'card-meter-charge-cancel'
-  }})
+          }
+        })
+        if (self.data.unWriteSell.length > 0) {
+          // 过滤掉线下写卡
+          self.temp = self.temp.filter((item) => {
+            return item.name !== '线下写卡'
+          })
+          self.data.unWriteSell.forEach(
+            async (item) => {
+              let sql = `update t_sellinggas set f_write_card = null where id = '${item.id}' and f_write_card ='写卡失败'`
+              await self.$resetpost('rs/logic/runSQL', { sql: sql })
+            }
+          )
+        }
       }
       // 如果是预备户,删除发卡售气按钮
       if (self.data.f_user_state == '预备') {

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

@@ -339,6 +339,9 @@
                 </nobr>
 
               </th>
+              <th>
+                <nobr>册内排序</nobr>
+              </th>
               <th>
                 <nobr>调压箱名称</nobr>
               </th>
@@ -446,6 +449,7 @@
               </div>
             </td>
             <td>{{row.f_book_name}}</td>
+            <td>{{row.f_meter_book_sort}}</td>
             <td>{{row.f_adjustable_name}}</td>
             <td>{{row.f_inputtor}}</td>
             <td>{{row.f_input_person}}</td>
@@ -840,6 +844,7 @@
             'f_oughtamount': '应交气量',
             'f_whether_pay': '是否缴费',
             'f_book_name': '抄表册',
+            'f_meter_book_sort': '册内排序',
             'f_input_person': '录入人员',
             'f_operator': '下发人员',
             'f_meter_classify': '气表分类',

package/src/filiale/gaomi/components/charge/ChargeManage.vue

@@ -77,7 +77,7 @@ export default {
               this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
                 if (res === 'confirm') {
           // 获取未写卡或者写卡失败记录
-                  this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`).then((getUnWriteSell) => {
+                  this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and (f_write_card = '未写卡' or (f_write_card = '写卡失败' and f_operate_date >= DATEADD(HOUR, -3, GETDATE()))) and f_userfiles_id = '${obj.f_userfiles_id}'`).then((getUnWriteSell) => {
                     console.log('获取未写卡记录', getUnWriteSell)
                     if (getUnWriteSell.data.length > 1) {
                       this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)

package/src/filiale/gaomi/components/charge/ChargeOper.vue

@@ -93,11 +93,25 @@
       }
       // 如果卡上有气，添加购气撤销按钮
       if (self.cardInfo && (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是'))) {
-        self.temp.push({name: '购气撤销',
+        self.temp.push({
+          name: '购气撤销',
           value: {
             'weight': 0,
             'routeName': 'card-meter-charge-cancel'
-  }})
+          }
+        })
+        if (self.data.unWriteSell.length > 0) {
+          // 过滤掉线下写卡
+          self.temp = self.temp.filter((item) => {
+            return item.name !== '线下写卡'
+          })
+          self.data.unWriteSell.forEach(
+            async (item) => {
+              let sql = `update t_sellinggas set f_write_card = null where id = '${item.id}' and f_write_card ='写卡失败'`
+              await self.$resetpost('rs/logic/runSQL', { sql: sql })
+            }
+          )
+        }
       }
 /*      // 如果是预备户,删除发卡售气按钮
       if (self.data.f_user_state == '预备') {

package/src/filiale/guangxi/CardService.js

@@ -558,7 +558,7 @@ let offlineWriteGen = async function (row) {
           f_write_operator: Vue.$login.f.name,
           f_write_date: Vue.$login.toStandardTimeString()
         }
-        await Vue.resetpost('rs/logic/offlineWrite', update, {resolveMsg: '写卡成功', rejectMsg: '写卡成功，更新数据失败'})
+        await Vue.resetpost('rs/logic/offlineWrite', update, {resolveMsg: null, rejectMsg: '写卡成功，更新数据失败'})
 
         // 写卡失败，通知第三方
 

package/src/filiale/guangxi/ChargeManage.vue

@@ -83,7 +83,7 @@ export default {
         // 对此数据进行验证
           if (await this.validateRow(obj)) {
           // 获取未写卡或者写卡失败记录
-            let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
+            let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and (f_write_card = '未写卡' or (f_write_card = '写卡失败' and f_operate_date >= DATEADD(HOUR, -3, GETDATE()))) and f_userfiles_id = '${obj.f_userfiles_id}'`)
             console.log('获取未写卡记录', getUnWriteSell)
             if (getUnWriteSell.data.length > 1) {
               this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)

package/src/filiale/guangxi/ChargeOper.vue

@@ -108,11 +108,25 @@
       }
       // 如果卡上有气，添加购气撤销按钮
       if (self.cardInfo && (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是'))) {
-        self.temp.push({name: '购气撤销',
+        self.temp.push({
+          name: '购气撤销',
           value: {
             'weight': 0,
             'routeName': 'card-meter-charge-cancel'
-  }})
+          }
+        })
+        if (self.data.unWriteSell.length > 0) {
+          // 过滤掉线下写卡
+          self.temp = self.temp.filter((item) => {
+            return item.name !== '线下写卡'
+          })
+          self.data.unWriteSell.forEach(
+            async (item) => {
+              let sql = `update t_sellinggas set f_write_card = null where id = '${item.id}' and f_write_card ='写卡失败'`
+              await self.$resetpost('rs/logic/runSQL', { sql: sql })
+            }
+          )
+        }
       }
 /*      // 如果是预备户,删除发卡售气按钮
       if (self.data.f_user_state == '预备') {

package/src/filiale/kelai/ChargeManage.vue

@@ -83,7 +83,7 @@ export default {
         // 对此数据进行验证
           if (await this.validateRow(obj)) {
           // 获取未写卡或者写卡失败记录
-            let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
+            let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and (f_write_card = '未写卡' or (f_write_card = '写卡失败' and f_operate_date >= DATEADD(HOUR, -3, GETDATE()))) and f_userfiles_id = '${obj.f_userfiles_id}'`)
             console.log('获取未写卡记录', getUnWriteSell)
             if (getUnWriteSell.data.length > 1) {
               this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)

package/src/filiale/kelai/ChargeOper.vue

@@ -111,11 +111,25 @@
       }
       // 如果卡上有气，添加购气撤销按钮
       if (self.cardInfo && (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是'))) {
-        self.temp.push({name: '购气撤销',
+        self.temp.push({
+          name: '购气撤销',
           value: {
             'weight': 0,
             'routeName': 'card-meter-charge-cancel'
-  }})
+          }
+        })
+        if (self.data.unWriteSell.length > 0) {
+          // 过滤掉线下写卡
+          self.temp = self.temp.filter((item) => {
+            return item.name !== '线下写卡'
+          })
+          self.data.unWriteSell.forEach(
+            async (item) => {
+              let sql = `update t_sellinggas set f_write_card = null where id = '${item.id}' and f_write_card ='写卡失败'`
+              await self.$resetpost('rs/logic/runSQL', { sql: sql })
+            }
+          )
+        }
       }
 /*      // 如果是预备户,删除发卡售气按钮
       if (self.data.f_user_state == '预备') {

package/src/filiale/macheng/ChargeOper.vue

@@ -93,11 +93,25 @@
       }
       // 如果卡上有气，添加购气撤销按钮
       if (self.cardInfo && (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是'))) {
-        self.temp.push({name: '购气撤销',
+        self.temp.push({
+          name: '购气撤销',
           value: {
             'weight': 0,
             'routeName': 'card-meter-charge-cancel'
-  }})
+          }
+        })
+        if (self.data.unWriteSell.length > 0) {
+          // 过滤掉线下写卡
+          self.temp = self.temp.filter((item) => {
+            return item.name !== '线下写卡'
+          })
+          self.data.unWriteSell.forEach(
+            async (item) => {
+              let sql = `update t_sellinggas set f_write_card = null where id = '${item.id}' and f_write_card ='写卡失败'`
+              await self.$resetpost('rs/logic/runSQL', { sql: sql })
+            }
+          )
+        }
       }
 /*      // 如果是预备户,删除发卡售气按钮
       if (self.data.f_user_state == '预备') {

package/src/filiale/meihekou/ChargeManage.vue

@@ -87,7 +87,7 @@ export default {
             })
           } else {
           // 获取未写卡或者写卡失败记录
-            let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
+            let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and (f_write_card = '未写卡' or (f_write_card = '写卡失败' and f_operate_date >= DATEADD(HOUR, -3, GETDATE()))) and f_userfiles_id = '${obj.f_userfiles_id}'`)
             console.log('获取未写卡记录', getUnWriteSell)
             if (getUnWriteSell.data.length > 1) {
               this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)

package/src/filiale/meihekou/ChargeOper.vue

@@ -92,12 +92,26 @@
         }
       }
       // 如果卡上有气，添加购气撤销按钮
-      if (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0) {
-        self.temp.push({name: '购气撤销',
+      if (self.cardInfo && (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是'))) {
+        self.temp.push({
+          name: '购气撤销',
           value: {
             'weight': 0,
             'routeName': 'card-meter-charge-cancel'
-  }})
+          }
+        })
+        if (self.data.unWriteSell.length > 0) {
+          // 过滤掉线下写卡
+          self.temp = self.temp.filter((item) => {
+            return item.name !== '线下写卡'
+          })
+          self.data.unWriteSell.forEach(
+            async (item) => {
+              let sql = `update t_sellinggas set f_write_card = null where id = '${item.id}' and f_write_card ='写卡失败'`
+              await self.$resetpost('rs/logic/runSQL', { sql: sql })
+            }
+          )
+        }
       }
       // 如果是预备户,删除发卡售气按钮
       if (self.data.f_user_state == '预备') {

package/src/filiale/qianneng/revenue/ChargeManage.vue

@@ -142,7 +142,7 @@ export default {
         // 对此数据进行验证
         if (await this.validateRow(obj)) {
           // 获取未写卡或者写卡失败记录
-          let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
+          let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and (f_write_card = '未写卡' or (f_write_card = '写卡失败' and f_operate_date >= DATEADD(HOUR, -3, GETDATE()))) and f_userfiles_id = '${obj.f_userfiles_id}'`)
           if (getUnWriteSell.data.length > 1) {
             this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)
           } else {