sale-client 4.2.40 → 4.2.41

package/src/filiale/ronghao/InsuranceManage.vue

@@ -1,58 +1,58 @@
-<template>
-  <!--  <div v-if="listpage">-->
-  <tab-button v-ref:list>
-    <tabs header="添加保险" v-if="permission('添加保险页面')">
-      <user-insurance></user-insurance>
-    </tabs>
-    <tabs header="保险记录维护" v-if="permission('保险记录维护页面')">
-      <insurance-guanl></insurance-guanl>
-    </tabs>
-    <tabs header="保险收费明细" v-if="permission('保险收费明细页面')">
-      <insurance-harges-details></insurance-harges-details>
-    </tabs>
-  </tab-button>
-  <!--  </div>-->
-  <!--  <div v-if="!listpage">-->
-  <!--    <meter-info-manage :row="rowData" :f_start_date="f_start_date" :f_end_date="f_end_date"></meter-info-manage>-->
-  <!--  </div>-->
-</template>
-
-<script>
-import TabButton from '../../components/revenue/comprehen/common/TabButton'
-import Tabs from '../../components/revenue/comprehen/common/Tabs'
-
-export default {
-  name: 'InsuranceManage',
-  title: '保险管理',
-  data () {
-    return {// 页面开关
-      f_start_date: '',
-      f_end_date: '',
-      listpage: true,
-      width: {
-        left: '100%',
-        right: '0%'
-      },
-      // searchNumber:'',
-      rowData: {},
-      show: [true]
-    }
-  },
-  components: {Tabs, TabButton },
-  ready () {
-  },
-  methods: {
-    permission (name) {
-      if (!this.$login.r.find(value => value == name)) {
-        return false
-      } else {
-        return true
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <!--  <div v-if="listpage">-->
+  <tab-button v-ref:list>
+    <tabs header="添加保险" v-if="permission('添加保险页面')">
+      <user-insurance></user-insurance>
+    </tabs>
+    <tabs header="保险记录维护" v-if="permission('保险记录维护页面')">
+      <insurance-guanl></insurance-guanl>
+    </tabs>
+    <tabs header="保险收费明细" v-if="permission('保险收费明细页面')">
+      <insurance-harges-details></insurance-harges-details>
+    </tabs>
+  </tab-button>
+  <!--  </div>-->
+  <!--  <div v-if="!listpage">-->
+  <!--    <meter-info-manage :row="rowData" :f_start_date="f_start_date" :f_end_date="f_end_date"></meter-info-manage>-->
+  <!--  </div>-->
+</template>
+
+<script>
+import TabButton from '../../components/revenue/comprehen/common/TabButton'
+import Tabs from '../../components/revenue/comprehen/common/Tabs'
+
+export default {
+  name: 'InsuranceManage',
+  title: '保险管理',
+  data () {
+    return {// 页面开关
+      f_start_date: '',
+      f_end_date: '',
+      listpage: true,
+      width: {
+        left: '100%',
+        right: '0%'
+      },
+      // searchNumber:'',
+      rowData: {},
+      show: [true]
+    }
+  },
+  components: {Tabs, TabButton },
+  ready () {
+  },
+  methods: {
+    permission (name) {
+      if (!this.$login.r.find(value => value == name)) {
+        return false
+      } else {
+        return true
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/filiale/ronghao/MachineChargeService.js

@@ -1,149 +1,149 @@
-import Vue from 'vue'
-
-let MachineChargeService = {
-  install (Vue, options) {
-    // 给vue增添对话框显示方法
-    Vue.MachineChargeService = Vue.prototype.$MachineChargeService = MachineChargeService
-  },
-
-  // 按表收费
-  async marchineCharge (model, model2, row, floor) {
-    console.log('保存收费。。。', model, model2, row)
-    let f_serial_number = ''
-    if (model.f_serial_number) {
-      f_serial_number = model.f_serial_number
-    }
-    let f_serial_id = ''
-    if (model2 && model2.f_serial_id) {
-      f_serial_id = model2.f_serial_id
-    }
-    if (!model2 || !model2.garbage_number) {
-      model2 = {
-        // garbage_number: 0,
-        // garbage_money: 0
-      }
-    }
-    let param = {
-      garbage_number: model2.garbage_number,
-      garbage_money: model2.garbage_money,
-      f_serial_id: f_serial_id,
-      f_userinfo_id: row.f_userinfo_id,
-      f_user_id: row.f_user_id,
-      handids: model.handids,
-      f_serial_number: f_serial_number,
-      f_balance: row.f_balance,
-      f_overdue: model.f_overdue,
-      userinfo_version: row.userinfo_version,
-      version: row.version,
-      f_collection: model.f_collection - model.f_garbage_fee,
-      f_preamount: model.f_totalcost,
-      f_payment: model.f_payment[0],
-      f_print: model.f_print[0],
-      f_comments: model.f_comments,
-      // 优惠金额
-      f_privilege_money: model.f_privilege_money,
-      f_after_discount: model.f_after_discount,
-      isBreakOverdue: model.isBreakOverdue,
-      floor: floor,
-      operInfo: {
-        f_operator: model.f_operator ? model.f_operator : Vue.$login.f.name,
-        f_operatorid: Vue.$login.f.id,
-        f_orgid: Vue.$login.f.orgid,
-        f_orgname: Vue.$login.f.orgs,
-        f_depid: Vue.$login.f.depids,
-        f_depname: Vue.$login.f.deps,
-        f_zoneid: Vue.$login.f.zoneid,
-        f_zones: Vue.$login.f.zones
-      },
-      other: {
-        f_grade_type: row.f_grade_fee,
-        f_collection: model.f_garbage_fee,
-        f_comments: model.f_comments,
-        f_payment: model.f_payment[0],
-        f_voucher_number: '',
-        f_print: model.f_print[0],
-        f_service_person: Vue.$login.f.name,
-        t_userfees: '',
-        f_fee_type: ['0'],
-        f_fee_time: ['12'],
-        otherdetail: [{f_brand_spec: ['生活垃圾'], f_unitprice: '5', f_number: model.f_garbage_fee / 5}]
-      }
-    }
-    if (model.selectedids) {
-      param.selectedids = model.selectedids
-    }
-    if (model.f_serial_id) {
-      param.f_serial_id = model.f_serial_id
-    }
-    if (model.isBreakOverdue) {
-      param.breakOverdue = model.breakOverdue
-    }
-    // if (model.f_collection - model.f_garbage_fee <= 0 && (model.f_totalcost - (model.f_collection + row.f_balance)) >= 0) {
-    //   param.f_collection = 0
-    // }
-    try {
-      return await Vue.resetpost('api/af-revenue/logic/machineChargePay', {data: param}, {resolveMsg: '机表收费成功', rejectMsg: '收费失败'})
-    } catch (error) {
-      console.log('这里进来了吗？', param)
-      if (param.f_payment.indexOf('扫码枪支付') > -1) {
-        Vue.resetpost('weixin2/rs/pay/jsApiRefund', {
-          data: {
-            out_trade_no: param.f_serial_id,
-            f_total_fee: param.f_collection,
-            flag: 'microPayRongHaoJsbc'
-          }
-        }, {resolveMsg: null, rejectMsg: '调用银行退费接口失败'})
-      }
-      throw error
-    }
-  },
-  // 保存预存收费
-  async depositCharge (model, row, floor) {
-    console.log('保存收费。。。', model, row)
-    let param = {
-      f_serial_id: model.f_serial_id,
-      f_userinfo_id: row.f_userinfo_id,
-      f_userfiles_id: row.f_userfiles_id,
-      f_balance: row.f_balance,
-      f_meter_type: row.f_meter_type,
-      f_overdue: model.f_overdue,
-      f_collection: model.f_collection - model.f_garbage_fee,
-      f_preamount: model.f_totalcost,
-      f_payment: model.f_payment[0],
-      f_print: model.f_print[0],
-      f_comments: model.f_comments,
-      // 优惠金额
-      f_privilege_money: model.f_privilege_money,
-      f_after_discount: model.f_after_discount,
-      isBreakOverdue: model.isBreakOverdue,
-      f_serial_number: model.f_serial_number,
-      floor: floor,
-      operInfo: {
-        f_operator: Vue.$login.f.name,
-        f_operatorid: Vue.$login.f.id,
-        f_orgid: Vue.$login.f.orgid,
-        f_orgname: Vue.$login.f.orgs,
-        f_depid: Vue.$login.f.depids,
-        f_depname: Vue.$login.f.deps,
-        f_zoneid: Vue.$login.f.zoneid,
-        f_zones: Vue.$login.f.zones
-      }
-    }
-    try {
-      return await Vue.resetpost('api/af-revenue/logic/depositCharge', {data: param}, {resolveMsg: '预存收费成功', rejectMsg: '预存收费失败'})
-    } catch (error) {
-      if (param.f_payment.indexOf('扫码枪支付') > -1) {
-        Vue.resetpost('weixin2/rs/pay/jsApiRefund', {
-          data: {
-            out_trade_no: param.f_serial_id,
-            f_total_fee: param.f_collection,
-            flag: 'microPayRongHaoJsbc'
-          }
-        }, {resolveMsg: null, rejectMsg: '调用银行退费接口失败'})
-      }
-      throw error
-    }
-  }
-}
-
-export default MachineChargeService
+import Vue from 'vue'
+
+let MachineChargeService = {
+  install (Vue, options) {
+    // 给vue增添对话框显示方法
+    Vue.MachineChargeService = Vue.prototype.$MachineChargeService = MachineChargeService
+  },
+
+  // 按表收费
+  async marchineCharge (model, model2, row, floor) {
+    console.log('保存收费。。。', model, model2, row)
+    let f_serial_number = ''
+    if (model.f_serial_number) {
+      f_serial_number = model.f_serial_number
+    }
+    let f_serial_id = ''
+    if (model2 && model2.f_serial_id) {
+      f_serial_id = model2.f_serial_id
+    }
+    if (!model2 || !model2.garbage_number) {
+      model2 = {
+        // garbage_number: 0,
+        // garbage_money: 0
+      }
+    }
+    let param = {
+      garbage_number: model2.garbage_number,
+      garbage_money: model2.garbage_money,
+      f_serial_id: f_serial_id,
+      f_userinfo_id: row.f_userinfo_id,
+      f_user_id: row.f_user_id,
+      handids: model.handids,
+      f_serial_number: f_serial_number,
+      f_balance: row.f_balance,
+      f_overdue: model.f_overdue,
+      userinfo_version: row.userinfo_version,
+      version: row.version,
+      f_collection: model.f_collection - model.f_garbage_fee,
+      f_preamount: model.f_totalcost,
+      f_payment: model.f_payment[0],
+      f_print: model.f_print[0],
+      f_comments: model.f_comments,
+      // 优惠金额
+      f_privilege_money: model.f_privilege_money,
+      f_after_discount: model.f_after_discount,
+      isBreakOverdue: model.isBreakOverdue,
+      floor: floor,
+      operInfo: {
+        f_operator: model.f_operator ? model.f_operator : Vue.$login.f.name,
+        f_operatorid: Vue.$login.f.id,
+        f_orgid: Vue.$login.f.orgid,
+        f_orgname: Vue.$login.f.orgs,
+        f_depid: Vue.$login.f.depids,
+        f_depname: Vue.$login.f.deps,
+        f_zoneid: Vue.$login.f.zoneid,
+        f_zones: Vue.$login.f.zones
+      },
+      other: {
+        f_grade_type: row.f_grade_fee,
+        f_collection: model.f_garbage_fee,
+        f_comments: model.f_comments,
+        f_payment: model.f_payment[0],
+        f_voucher_number: '',
+        f_print: model.f_print[0],
+        f_service_person: Vue.$login.f.name,
+        t_userfees: '',
+        f_fee_type: ['0'],
+        f_fee_time: ['12'],
+        otherdetail: [{f_brand_spec: ['生活垃圾'], f_unitprice: '5', f_number: model.f_garbage_fee / 5}]
+      }
+    }
+    if (model.selectedids) {
+      param.selectedids = model.selectedids
+    }
+    if (model.f_serial_id) {
+      param.f_serial_id = model.f_serial_id
+    }
+    if (model.isBreakOverdue) {
+      param.breakOverdue = model.breakOverdue
+    }
+    // if (model.f_collection - model.f_garbage_fee <= 0 && (model.f_totalcost - (model.f_collection + row.f_balance)) >= 0) {
+    //   param.f_collection = 0
+    // }
+    try {
+      return await Vue.resetpost('api/af-revenue/logic/machineChargePay', {data: param}, {resolveMsg: '机表收费成功', rejectMsg: '收费失败'})
+    } catch (error) {
+      console.log('这里进来了吗？', param)
+      if (param.f_payment.indexOf('扫码枪支付') > -1) {
+        Vue.resetpost('weixin2/rs/pay/jsApiRefund', {
+          data: {
+            out_trade_no: param.f_serial_id,
+            f_total_fee: param.f_collection,
+            flag: 'microPayRongHaoJsbc'
+          }
+        }, {resolveMsg: null, rejectMsg: '调用银行退费接口失败'})
+      }
+      throw error
+    }
+  },
+  // 保存预存收费
+  async depositCharge (model, row, floor) {
+    console.log('保存收费。。。', model, row)
+    let param = {
+      f_serial_id: model.f_serial_id,
+      f_userinfo_id: row.f_userinfo_id,
+      f_userfiles_id: row.f_userfiles_id,
+      f_balance: row.f_balance,
+      f_meter_type: row.f_meter_type,
+      f_overdue: model.f_overdue,
+      f_collection: model.f_collection - model.f_garbage_fee,
+      f_preamount: model.f_totalcost,
+      f_payment: model.f_payment[0],
+      f_print: model.f_print[0],
+      f_comments: model.f_comments,
+      // 优惠金额
+      f_privilege_money: model.f_privilege_money,
+      f_after_discount: model.f_after_discount,
+      isBreakOverdue: model.isBreakOverdue,
+      f_serial_number: model.f_serial_number,
+      floor: floor,
+      operInfo: {
+        f_operator: Vue.$login.f.name,
+        f_operatorid: Vue.$login.f.id,
+        f_orgid: Vue.$login.f.orgid,
+        f_orgname: Vue.$login.f.orgs,
+        f_depid: Vue.$login.f.depids,
+        f_depname: Vue.$login.f.deps,
+        f_zoneid: Vue.$login.f.zoneid,
+        f_zones: Vue.$login.f.zones
+      }
+    }
+    try {
+      return await Vue.resetpost('api/af-revenue/logic/depositCharge', {data: param}, {resolveMsg: '预存收费成功', rejectMsg: '预存收费失败'})
+    } catch (error) {
+      if (param.f_payment.indexOf('扫码枪支付') > -1) {
+        Vue.resetpost('weixin2/rs/pay/jsApiRefund', {
+          data: {
+            out_trade_no: param.f_serial_id,
+            f_total_fee: param.f_collection,
+            flag: 'microPayRongHaoJsbc'
+          }
+        }, {resolveMsg: null, rejectMsg: '调用银行退费接口失败'})
+      }
+      throw error
+    }
+  }
+}
+
+export default MachineChargeService