sale-client 4.0.85 → 4.0.87

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Mon Dec 30 14:38:17 CST 2024
+gradle.version=5.2.1

package/package.json

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

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ResetMeter.vue

@@ -452,7 +452,7 @@ export default {
         payment: '现金缴费',
         open_way: '发卡开户',
         showupload: true, //
-        hasAudit: true, // 是否审核
+        hasAudit: false, // 是否审核
         dispatch: false, // 是否派工
         approve: false
       },

package/src/filiale/xihu/CardService.js

@@ -195,20 +195,13 @@ let CardService = {
       f_comments: model.f_comments
     }
 
-    if (row.f_remanent_type === 1) {
-      param.f_total_gas = (row.f_total_gas - 0) + (model.f_pregas - 0)
-      param.f_total_fee = (row.f_total_fee - 0) + (model.f_preamount - 0)
-    } else {
-      if ((model.f_pregas - 0) > (model.f_fill_gas - 0)) {
-        param.f_total_gas = (row.f_total_gas - 0) + ((model.f_pregas - 0) - (model.f_fill_gas - 0))
-        param.f_total_fee = (row.f_total_fee - 0) + (model.f_preamount - 0)
-      } else {
-        param.f_total_gas = (row.f_total_gas - 0)
-        param.f_total_fee = (row.f_total_fee - 0)
-      }
-    }
+    param.f_total_gas = (row.f_total_gas - 0) + (model.f_pregas - 0)
+    param.f_total_fee = (row.f_total_fee - 0) + (model.f_preamount - 0)
+    // console.log(row, model)
     param.f_write_totalgas = (row.f_write_totalgas - 0) + (model.f_pregas - 0)
     param.f_write_totalfee = (row.f_write_totalfee - 0) + (model.f_preamount - 0)
+    // console.log(row.f_write_totalfee, model.f_preamount,param.f_write_totalfee)
+    // console.log(param)
     return sendCardSaleGasGenremanent(param, row)
   },
 
@@ -640,7 +633,9 @@ let sendCardSaleGasGenremanent = async function (model, row) {
       if (!row.f_card_id) {
         getCardNumber = await Vue.resetpost('api/af-revenue/logic/getCardNumber', {data: {id: row.brand_id}}, {resolveMsg: null, rejectMsg: '发卡售气获取卡号失败！！'})
         console.log('获取卡号、、', getCardNumber)
-        model.f_write_totalfee = (row.f_remanent_gas * row.f_remanent_price).toFixed(4)
+        if (!model.f_write_totalfee) {
+          model.f_write_totalfee = (row.f_remanent_gas * row.f_remanent_price).toFixed(4)
+        }
       } else {
         getCardNumber.data.cardNumber = row.f_card_id
         console.log('档案自带卡号、、', getCardNumber)
@@ -761,6 +756,12 @@ let resetsendCardSaleGasGen = async function (model, row) {
       } else {
         throw new Error('获取卡号失败！请核实参数管理中的卡号重新发卡售气。')
       }
+      console.log(1111+ JSON.stringify(row))
+      // 判断是否是累购表
+      if (row.f_support_purchase === '是') {
+        console.log(122233 + row)
+        model.f_total_fee = (row.f_total_fee - 0) + (model.f_pregas - 0)
+      }
       // 存库
       result = await Vue.resetpost('api/af-revenue/logic/sale_resetsendCardSaleGas_logic', {data: model}, {resolveMsg: null, rejectMsg: '重发卡售气存库失败'})
       console.log('重发卡售气存库返回', result)

package/src/filiale/xihu/IotChangeFill.vue

@@ -235,20 +235,20 @@
         f_collection_type: self.row.f_collection_type,
         f_calculation: self.row.f_calculation
       }
-
-      if (self.row.f_remanent_type == 1) {
-        // 换新表
-        param.f_total_gas = (self.row.f_total_gas - 0) + (self.model.f_pregas - 0)
-        param.f_total_fee = (self.row.f_total_fee - 0) + (self.model.f_preamount - 0)
-      } else {
-        // 清零换表 （不考虑，物联网不存在清零换表）
-        if (self.model.f_fill_gas > 0 && !self.showGas) {
-          param.f_total_fee = (self.row.f_total_fee - 0) + (self.model.f_preamount - 0) - (self.model.f_fill_money - 0)
-        } else {
-          param.f_total_gas = (self.row.f_total_gas - 0) + (self.model.f_pregas - self.model.f_fill_gas)
-          param.f_total_fee = (self.row.f_total_fee - 0) + (self.model.f_preamount - 0) - (self.model.f_fill_money - 0)
-        }
-      }
+      // 换新表
+      param.f_total_gas = (self.row.f_total_gas - 0) + (self.model.f_pregas - 0)
+      param.f_total_fee = (self.row.f_total_fee - 0) + (self.model.f_preamount - 0)
+      // if (self.row.f_remanent_type == 1) {
+      //
+      // } else {
+      //   // 清零换表 （不考虑，物联网不存在清零换表）
+      //   if (self.model.f_fill_gas > 0 && !self.showGas) {
+      //     param.f_total_fee = (self.row.f_total_fee - 0) + (self.model.f_preamount - 0) - (self.model.f_fill_money - 0)
+      //   } else {
+      //     param.f_total_gas = (self.row.f_total_gas - 0) + (self.model.f_pregas - self.model.f_fill_gas)
+      //     param.f_total_fee = (self.row.f_total_fee - 0) + (self.model.f_preamount - 0) - (self.model.f_fill_money - 0)
+      //   }
+      // }
       // 加入扫码盒付款码支付流水号
       param.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
       let res = await self.$resetpost('api/af-revenue/logic/sale_iotRemanentGas', {data: param}, {