sale-client 3.6.472 → 3.6.473

package/package.json

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

package/src/plugins/CardService.js

@@ -694,7 +694,7 @@ let sendCardSaleGasGenremanent = async function (model, row) {
       let cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
         resolveMsg: null,
         rejectMsg: '开户卡服务错误'
-      },80000)
+      }, 80000)
       if (!cardParams || ((model.f_pregas > model.f_remanent_gas) && !result) || cardRes.data.Err || cardRes.data.Exception) {
         // 写卡异常
         // 数据回滚操作
@@ -801,7 +801,7 @@ let resetsendCardSaleGasGen = async function (model, row) {
       let cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
         resolveMsg: null,
         rejectMsg: '重开户卡服务错误'
-      },80000)
+      }, 80000)
       if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
         // 写卡异常
         // 数据回滚操作
@@ -910,7 +910,7 @@ let sendCardSaleGasGen = async function (model, row) {
       let cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
         resolveMsg: null,
         rejectMsg: '开户卡服务错误'
-      },80000)
+      }, 80000)
       if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
         // 写卡异常
         // 数据回滚操作
@@ -1119,7 +1119,7 @@ let replaceCardGenJB = function * (model, row) {
       let cardRes = yield co(Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
         resolveMsg: null,
         rejectMsg: '补卡卡服务错误'
-      },80000))
+      }, 80000))
       // 卡服务写卡异常，业务逻辑回滚
       if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
         Vue.$showAlert('机表补卡失败!!', 'danger', 0)
@@ -1207,7 +1207,7 @@ let replaceXq = function * (model, row) {
     let cardRes = yield co(Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
       resolveMsg: null,
       rejectMsg: '擦虚气服务错误'
-    },80000))
+    }, 80000))
     if (cardRes.data.Err || cardRes.data.Exception) {
       return {status: 1}
     } else {
@@ -1293,7 +1293,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))
+      }, 80000))
       // 卡服务写卡异常，业务逻辑回滚
       if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
         Vue.$showAlert('补卡失败!!', 'danger', 0)
@@ -1427,14 +1427,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: '写卡失败'},80000)
+        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: '写卡失败'},80000)
+        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: '写卡失败'},80000)
+        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
@@ -1710,23 +1710,23 @@ 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: '卡表收费失败'},80000)
+        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: '卡表收费失败'},80000)
+        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: '卡表收费失败'},80000)
+        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: '卡表收费失败'},80000)
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'}, 80000)
       }
       console.log('卡表收费返回写卡参数值', cardRes)
       // 卡服务写卡异常，业务逻辑回滚
@@ -1801,7 +1801,7 @@ let sellgasGen = async function (model, row) {
     if (JSON.parse(cardState.data).state === 1) {
       // 将卡上次数写入数据库
       if (!(row.f_hascard == null) && !(row.f_share_times == null) && row.f_hascard === '是' && row.f_share_times === '是') {
-        row.cardInfo.Times = row.cardInfo.Times ? row.cardInfo.Times : row.f_times
+        row.cardInfo.Times = row.f_times
         model.f_times = row.f_times + 1
       } else {
         model.f_times = row.cardInfo.Times + 1
@@ -1907,23 +1907,23 @@ 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: '卡表收费失败'},80000)
+        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: '卡表收费失败'},80000)
+        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: '卡表收费失败'},80000)
+        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: '卡表收费失败'},80000)
+        cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'}, 80000)
       }
       console.log('卡表收费返回写卡参数值', cardRes)
       // 卡服务写卡异常，业务逻辑回滚