sale-client 4.1.7 → 4.1.9

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Wed Apr 02 14:48:19 CST 2025
+#Thu May 15 14:43:19 CST 2025
 gradle.version=5.2.1

package/build/dev-server.js

@@ -19,12 +19,6 @@ var devConfig = {
       children: false // 不输出子模块构建信息
     },
     proxy: {
-      '/api/af-revenue/report': {
-        pathRewrite: {
-          '/api/af-revenue/report': '/report'
-        },
-        target: localUrl
-      },
     '/api/af-revenue/batchdeduction/all': {
       pathRewrite: {
         '/api/af-revenue/batchdeduction/all': '/batchdeduction/all'
@@ -37,10 +31,10 @@ var devConfig = {
         },
         target: localUrl
       },
-      '/api/af-revenue/downloadfile/file': {
-        pathRewrite: {
-          '/api/af-revenue/downloadfile/file': 'downloadfile/file'
-        },
+      '/api/af-revenue/file': {
+        // pathRewrite: {
+        //   '/api/af-revenue/file': '/file'
+        // },
         target: localUrl
       },
       '/weixin2/rs':{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "4.1.7",
+  "version": "4.1.9",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -32,7 +32,7 @@
     "less-loader": "^2.2.3",
     "system-clients": "3.3.2",
     "ldap-clients": "3.0.96",
-    "address-client": "4.0.11",
+    "address-client": "4.0.1-yunChengV4",
     "manage-client": "3.1.8-88",
     "axios": "0.15.3",
     "babel-core": "^6.0.0",

package/src/filiale/fugou/FileUserFiles.vue

@@ -1374,7 +1374,7 @@ export default {
     },
     async communityChange (val) {
       console.log(val)
-      if (val) {
+      if (val && val !== '[object Event]') {
         await this.initareas(` f_filialeid = '${this.f_filialeids}' and f_community_id ='${val}' `)
       }
     }

package/src/filiale/jinhong/GarbageCharge.vue

@@ -0,0 +1,213 @@
+<template>
+  <div class="flex" style="overflow-y: auto!important;">
+    <div  class="auto" style="height: 50%; overflow: auto">
+      <div  v-for="owe of list" >
+        <garbagefees-list :row='owe' :floor="config.floor" :charge="config.charge" @garbage-center="refreshCenter"></garbagefees-list>
+      </div>
+    </div>
+    <div class="span">
+      <validator name='v'>
+          <div class="row" style="height: 20vh">
+            <div class="col-sm-4 form-group" :class="[$v.payment.required ? 'select-error' : '']">
+              <label class="font_normal_body" title="参数名称：付款方式">收款方式</label>
+              <input type="text" v-show="false" v-model="$refs.payment.selectedItems"
+                     v-validate:payment='{required: true }'>
+              <v-select v-model="model.f_payment"
+                        placeholder='请选择'
+                        style="width:60%"
+                        :value-single = 'true'
+                        :value.sync="model.f_payment"
+                        :options='paytype'
+                        v-ref:payment
+                        close-on-select clear-button>
+              </v-select>
+            </div>
+            <div class="col-sm-4 form-group">
+              <label for="f_print" class="font_normal_body">打印格式</label>
+              <v-select id="print"
+                        v-model="f_print"
+                        style="width:60%"
+                        :value-single = 'true'
+                        placeholder='请选择'
+                        :value.sync="model.f_print"
+                        :options='printstyle'
+                        close-on-select clear-button>
+              </v-select>
+            </div>
+            <div class="col-sm-4 form-group">
+              <label class="font_normal_body">总&ensp;欠&ensp;费</label>
+              <input class="input_search" style="width:60%"  type="number" v-model="garbagefee" placeholder="总欠费" disabled>
+            </div>
+          </div>
+        <div style="text-align:right;">
+          <button class="button_search btn-gn" @click="confirm()" :disabled='!$v.valid'>确认</button>
+          <button class="button_clear btn-gn" @click="clean()">取消</button>
+        </div>
+      </validator>
+      <validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>
+      <print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="clean" @printok="printok"
+                  :data='row' v-ref:printbill></print-bill>
+      <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="garbagefee"></payment-code>
+    </div>
+  </div>
+</template>
+<script>
+import {HttpResetClass} from 'vue-client'
+
+let loadGen = async function (self) {
+  await self.$getConfig(self, 'GarbageCharge')
+  // 默认打印格式
+  self.model.f_print = self.config.printType instanceof Array ? self.config.printType[0] : self.config.printType
+  self.model.f_payment = self.config.payment
+  self.model.f_use_type = self.config.billType
+  self.model.f_bill_type = self.model.f_print
+  self.hasValidateBill = self.config.hasBillManage
+  let http = new HttpResetClass()
+  let res = await http.load('POST', 'api/af-revenue/sql/getFlotsamprice', {data: {f_userinfo_id: self.row.f_userinfo_id}}, {resolveMsg: null, rejectMsg: '获取欠费出错！！', newly: true})
+  if (res.data.length > 0) {
+    let list = [{
+      f_userinfo_id: res.data[0].f_userinfo_id,
+      rows: res.data
+    }]
+    self.list = list
+    let owes = res.data
+    self.refreshCenter(owes)
+  }
+}
+/**
+ *售气收费
+ *机表收费组合组件，包括抄表列表以及机表收费主组件
+ */
+export default {
+  title: '收费',
+  data () {
+    return {
+      config: {
+        showupload: false, // 默认不上传附件
+        hasPrint: false,  // 默认打票
+        hasBillManage: false,  // 默认不启用发票管理
+        overBalance: false,   // 为true时退费金额可以大于余额
+        printType: '普通收据', // 收据/电子票/专用发票/国税发票
+        payment: '现金',
+        billType: '燃气费'
+      },
+      print:false,
+      paytype: this.$appdata.getParam('付款方式'),
+      printstyle: this.$appdata.getParam('打印格式'),
+      printInvoiceType: this.$appdata.getSingleValue('电子票打印类型') ? this.$appdata.getSingleValue('电子票打印类型') : '电子发票',
+      garbagelist: [],
+      billData: {
+        url: 'api/af-revenue/report/sendCard_bill',
+        bill: ''
+      },
+      garbagefee: 0,
+      blodid: '',
+      oweArr: [],
+      model: {},
+      list: [],
+      splitAllgas: 0,
+      chargeView: false
+    }
+  },
+  props: ['row','cardData'],
+  ready () {
+    this.initData(this.row)
+    this.blodid = this.row.f_userinfo_id
+    loadGen(this)
+  },
+  methods: {
+    clean () {
+      this.$info('取消操作')
+      this.$dispatch('refresh', this.row)
+    },
+    async confirm () {
+      if (this.money <= 0) {
+        this.$showMessage('收费金额不能小于等于0')
+        return
+      }
+      let ss = await this.$refs.paymentcode.flowPath()
+      this.$refs.paymentcode.paymentCodeShow = false
+      console.log('付款码操作返回', ss)
+      if (!ss.result) return
+      let param = {
+        f_userfiles_id: this.row.f_userfiles_id,
+        money: this.garbagefee,
+        garbagelist: this.garbagelist,
+        f_operator: this.$login.f.name,
+        f_operatorid: this.$login.f.id,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps,
+        f_payment: this.model.f_payment[0]
+      }
+      console.log('垃圾费收费', param)
+      let res = await this.$resetpost('api/af-revenue/logic/savegarbageFee', {data: param}, {warnMsg: `确定要对用户${this.row.f_user_name}进行垃圾费收费吗？`, resolveMsg: '收费成功！！', rejectMsg: '收费失败！！请重试！！'})
+      console.log('垃圾费收费', res)
+      if (this.config.hasPrint) {
+        if (this.model.f_print.indexOf('电子发票') == -1) {
+          console.log('this.config.hasBillManage', this.config.hasBillManage)
+          if (this.config.hasBillManage) {
+            // 启用发票管理，获取票据管理中的票号并存储记录
+            this.row.id = res.data.recordId
+            this.row.f_bill_type = '垃圾费'
+            this.row.f_bill_style = this.model.f_print
+            this.billData.url = 'api/af-revenue/report/garbageChargeReport'
+            this.print = true
+          } else {
+            this.row.id = res.data.recordId
+            this.billData.url = 'api/af-revenue/report/garbageChargeReport'
+            this.print = true
+          }
+        } else if (this.config.printType === '国税发票') {
+          // TODO
+          this.$dispatch('success')
+        } else if (this.config.printType === '电子发票') {
+          // TODO
+          this.$dispatch('success')
+        }
+      } else {
+        this.$dispatch('success')
+      }
+    },
+    refreshCenter (val) {
+      this.garbagelist = val
+      this.garbagefee = 0
+      for (let i = 0; i < val.length; i++) {
+        if (val[i]) {
+          this.garbagefee += val[i].f_money
+        }
+      }
+    },
+    initData (row) {
+      let temp = {
+        f_payment: '现金缴费',
+        f_user_id: row.f_user_id,
+        f_userinfo_id: row.f_userinfo_id,
+        f_userfiles_id: row.f_userfiles_id,
+        f_balance: row.f_balance,
+        otherprice: '',
+        f_pregas: 0,
+        f_preamount: 0,
+        f_totalcost: 0,
+        f_curbalance: 0,
+        f_collection: '',
+        f_garbage_fee: 0,
+        f_overdue: 0,
+        f_lowest: 0,
+        f_print: '普通收据',
+        f_privilege_id: 0,
+        f_privilege_money: 0,
+        f_privilege_gas: 0,
+        f_after_discount: 0
+      }
+      this.model = Object.assign({}, this.model, temp)
+    }
+  }
+}
+</script>
+<style lang="less">
+#tooltip div {
+  height: auto;
+}
+</style>

package/src/filiale/jinhong/sale.js

@@ -7,6 +7,7 @@ export default function () {
   Vue.use(MachineChargeService)
   // 垃圾费
   Vue.component('garbagefees-list', (resolve) => { require(['./GarbagefeesList.vue'], resolve) })
+  Vue.component('garbage-charge', (resolve) => { require(['./GarbageCharge.vue'], resolve) })
   // 保险收费
   Vue.component('insurance-temp', (resolve) => { require(['./InsuranceAdd.vue'], resolve) })
   // 物联网表收费引导
@@ -25,7 +26,8 @@ export default function () {
   Vue.component('machine-charge', (resolve) => { require(['./MachineCharge.vue'], resolve) })
   // 机表收费引导
   Vue.component('machine-meter-center', (resolve) => { require(['./MachineMeterCenter.vue'], resolve) })
-
+  // 机表收费引导
+  Vue.component('garbage-charge', (resolve) => { require(['./GarbageCharge.vue'], resolve) })
   // 机表收费引导
   Vue.component('sale-userinfo', (resolve) => { require(['./Userinfo.vue'], resolve) })
 }

package/src/main.js

@@ -2,8 +2,8 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
+import FilialeSale from './filiale/fugu/sale'
 import sale from './sale'
-import FilialeSale from './filiale/yangchun/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'
@@ -22,7 +22,7 @@ Vue.config.silent = true
 all()
 system(false)
 sale()
-address('yangchun')
+address()
 ldap()
 FilialeSale()
 require('system-clients/src/styles/less/bootstrap.less')