sale-client 4.0.86 → 4.0.87-preview

package/package.json

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

package/src/components/MaterialsManage/MaterialsBase.vue

@@ -62,7 +62,7 @@
 </template>
 
 <script>
-
+import Vue from 'vue'
 export default {
   title: '功能',
   props: ['parent', 'data', 'look', 'title'],
@@ -73,7 +73,8 @@ export default {
         menu_name: '',
         parent_id: '0',
         component: null,
-        create_by: '',
+        create_by: this.$login.f.name,
+        org_id: this.$login.f.orgid,
         depict: '',
         type: ''
       },
@@ -107,7 +108,8 @@ export default {
         id: null,
         name: '',
         parent_id: '0',
-        create_by: '',
+        create_by: this.$login.f.name,
+        org_id: this.$login.f.orgid,
         type: ''
       }
       this.model = Object.assign({}, this.model, this.data)

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,18 +195,8 @@ 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)

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}, {

package/.gradle/buildOutputCleanup/cache.properties

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