sale-client 3.6.204 → 3.6.205

package/package.json

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

package/src/components/revenue/comprehen/ComprehenOperation/OtherGas/OtherGas.vue

@@ -119,8 +119,8 @@
       f_times: self.row.cardInfo.Times + 1,
       f_total_gas: data.f_add_gas === '计入' ? (self.row.f_total_gas - 0) + (self.model.f_pregas - 0) : (self.row.f_total_gas - 0),
       f_total_fee: data.f_add_gas === '计入' ? (self.row.f_total_fee - 0) + (self.model.f_preamount - 0) : (self.row.f_total_fee - 0),
-      f_write_totalgas: data.f_add_gas === '计入' ? (self.row.f_write_totalgas - 0) + (self.model.f_pregas - 0) : (self.row.f_write_totalgas - 0),
-      f_write_totalfee: data.f_add_gas === '计入' ? (self.row.f_write_totalfee - 0) + (self.model.f_preamount - 0) : (self.row.f_write_totalfee - 0),
+      f_write_totalgas: (self.row.f_write_totalgas - 0) + (self.model.f_pregas - 0),
+      f_write_totalfee: (self.row.f_write_totalfee - 0) + (self.model.f_preamount - 0),
       f_balance_gas: 0,
       f_balance_amount: 0
     }
@@ -152,15 +152,15 @@
 
     // 保存表类型
     data.f_meter_type = self.row.f_meter_type
-    if(!(self.row.f_hascard==null)  &&  !(self.row.f_share_times==null)  && self.row.f_meter_type =='物联网表' && self.row.f_hascard == '是' &&  self.row.f_share_times == '是'){
-      data.f_times = self.row.f_times+1
-    }else{
+    if (!(self.row.f_hascard == null) && !(self.row.f_share_times == null) && self.row.f_meter_type == '物联网表' && self.row.f_hascard == '是' && self.row.f_share_times == '是') {
+      data.f_times = self.row.f_times + 1
+    } else {
       data.f_times = self.row.cardInfo.Times + 1
     }
 
     let result = await self.$resetpost('rs/logic/sale_fillGas', data, {resolveMsg: null, rejectMsg: '补气报错！！！'})
 
-    if (self.row.f_meter_type == '机表' || self.model.f_write_card ==='不写卡') {
+    if (self.row.f_meter_type == '机表' || self.model.f_write_card === '不写卡') {
       self.$showAlert('补气成功', 'success', 2000)
       return result.data.id
     } else {
@@ -172,8 +172,8 @@
         let params = self.getWriteCard(cardParams, self.row, data)
         params.kh = cardId
         params.kzt = getLastOper.data.ispick === '未过表' && getLastOper.data.lastsell_oper === '发卡售气' ? '0' : '1'
-        if(!(self.row.f_hascard==null)  &&  !(self.row.f_share_times==null)  && self.row.f_meter_type =='物联网表' && self.row.f_hascard == '是' &&  self.row.f_share_times == '是'){
-          params.cs = self.row.f_times+1
+        if (!(self.row.f_hascard == null) && !(self.row.f_share_times == null) && self.row.f_meter_type == '物联网表' && self.row.f_hascard == '是' && self.row.f_share_times == '是') {
+          params.cs = self.row.f_times + 1
         }
         console.log('获取其他补气写卡参数，，', params)
 
@@ -210,7 +210,7 @@
     await self.$getConfig(self, 'OtherGas')
     console.log('其他补气config', self.config)
     self.model.f_add_gas = [self.config.addGas]
-    self.model.f_write_card=self.config.writeCard
+    self.model.f_write_card = self.config.writeCard
   }
 
   export default {
@@ -250,7 +250,7 @@
           url: 'rs/report/acceptOtherGas_bill',
           billnumber: ''
         },
-        writecard: [{label: '写卡',value:'写卡'},{label: '不写卡',value:'不写卡'}],
+        writecard: [{label: '写卡', value: '写卡'}, {label: '不写卡', value: '不写卡'}],
         blodid: '',
         addTaskModel: {
           f_task_name: '',
@@ -454,6 +454,8 @@
           klx: row.f_coding,
           kzt: '1',
           dqdm: row.f_area_code,
+          ljgql: (row.f_write_totalgas - 0) + (data.f_pregas - 0),                              // 当前累计购气量
+          ljgqje: (row.f_write_totalfee - 0) + (data.f_preamount - 0),                           // 累计购气金额
           meterid: row.f_meternumber ? row.f_meternumber : 0                  // 表号
           // meternumber: row.f_meternumber ? row.f_meternumber : 0
         }