sale-client 4.3.42 → 4.3.44

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://36.134.191.191:31467/', 'http://36.134.191.191:31467/']
+const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/filiale/HuaiLai/SafeCheck.vue

@@ -74,7 +74,7 @@
         <td style="margin: auto;text-align: center">
           <div class="container" style="background: #FFFFFF;margin:0;width:100%;">
             <div class="img" v-for="img in model.f_overall_imgs">
-              <img-self v-if="img.f_overall_path!='' && img.f_overall_path!=null" :src="'rs/image/file/'+img.f_overall_path" style="float: left"  width="100" height="150"></img-self>
+              <img-self v-if="img.f_overall_path!='' && img.f_overall_path!=null" :src="img.f_overall_path" style="float: left"  width="100" height="150"></img-self>
             </div>
 
           </div>

package/src/filiale/hongYa/components/charge/business/machine/MachineCharge.vue

@@ -0,0 +1,179 @@
+<template>
+  <div class="flex" style="overflow-y: auto!important;">
+    <div  class="auto" style="height: 50%; overflow: auto">
+      <div  v-for="owe of list" >
+        <owe-list :row='owe' :floor="config.floor" :charge="config.charge" @refresh-center="refreshCenter"></owe-list>
+      </div>
+    </div>
+    <div class="span" v-if="chargeView">
+      <p v-if="row.f_totalsplit_type === '总表'"><strong>分表承担总量 (单位: 方): {{splitAllgas}}</strong></p>
+      <machine-meter-center :data='model' :owelist="list[0].rows" :charge="config.charge" :row='row' :floor="config.floor" :ceil="config.ceil" v-ref:mainche></machine-meter-center>
+    </div>
+    <div class="span" v-if="!chargeView">
+      <work-busy-small :is-busy="!chargeView"></work-busy-small>
+    </div>
+  </div>
+  <upload :blodid="blodid" v-if="config.showupload" isremark="true" fusetype="机表收费"></upload>
+</template>
+<script>
+  import OweList from './OweList'
+  import WorkBusySmall from './WorkBusySmall'
+  import {HttpResetClass} from 'vue-client'
+
+  let loadGen = async function (self) {
+    await self.$getConfig(self, 'MachineCharge')
+    let http = new HttpResetClass()
+    let res = await http.load('POST', 'api/af-revenue/logic/sale_getOwe', {data: {f_userinfo_id: self.row.f_userinfo_id}}, {resolveMsg: null, rejectMsg: '获取欠费出错！！', newly: true})
+    self.list = res.data
+
+    let owes = []
+    for (let i = 0; i < res.data.length; i++) {
+      for (let j = 0; j < res.data[i].rows.length; j++) {
+        owes.push(res.data[i].rows[j])
+      }
+    }
+    self.refreshCenter(owes)
+    // let res = await self.$refs.pv.load('api/af-revenue/sql/getOverdue', {data: {f_user_id: self.row.f_user_id}})
+    // if (res.data) {
+    //   for (let i = 0; i < res.data.length; i++) {
+    //     res.data[i].f_totalsplit_type = self.row.f_totalsplit_type
+    //     res.data[i].f_user_id = res.data[i].f_user_id + ''
+    //     let getSplit = await self.$resetpost('api/af-revenue/logic/splitInfo', {data: {totalInfo: res.data[i]}}, {resolveMsg: null, rejectMsg: '获取分表抄表信息出错!!!'})
+    //     if (getSplit.data.length > 0) {
+    //       for (let j = 0; j < getSplit.data.length; j++) {
+    //         self.splitAllgas = self.splitAllgas + (getSplit.data[j].f_oughtamount - 0)
+    //       }
+    //     }
+    //   }
+    //   self.list.metertitle = self.row.f_user_id
+    //   self.list.rows = self.model.rows = [...self.model.rows, ...res.data]
+    //   // 控制欠费列表承担量的显示
+    //   self.model.f_totalsplit_type = self.row.f_totalsplit_type
+    // }
+    self.chargeView = true
+  }
+
+  /**
+   *售气收费
+   *机表收费组合组件，包括抄表列表以及机表收费主组件
+   */
+  export default {
+    title: '收费',
+    components: {OweList, WorkBusySmall},
+    data () {
+      return {
+        config: {
+          showupload: false, // 控制附件显示
+          floor: false, // 向下取整
+          ceil: false, // 向上取整
+          charge: true  // 是否需要缴清欠费
+        },
+        blodid: '',
+        oweArr: [],
+        model: {},
+        list: [],
+        splitAllgas: 0,
+        chargeView: false
+      }
+    },
+    props: ['row'],
+    ready () {
+      this.blodid = this.row.f_userinfo_id
+      loadGen(this)
+    },
+    methods: {
+      refreshCenter (val, rows, f_userfiles_id) {
+        console.log(f_userfiles_id)
+        if (f_userfiles_id) {
+          console.log(f_userfiles_id)
+          this.oweArr[f_userfiles_id] = val
+        }
+        this.initData(this.row)
+        let arr = Object.values(this.oweArr).reduce((acc, val) => acc.concat(val), [])
+        this.getRows(arr)
+      },
+      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)
+      },
+      getRows (val) {
+        this.model.selectedids = []
+        for (let i = 0; i < val.length; i++) {
+          if (val[i]) {
+            this.model.f_pregas = this.model.f_pregas + val[i].f_oughtamount
+            this.model.f_preamount = this.model.f_preamount + val[i].f_oughtfee
+            this.model.f_overdue = this.model.f_overdue + val[i].overdue
+            this.model.f_garbage_fee = this.model.f_garbage_fee + val[i].f_garbage_fee
+            this.model.selectedids.push({id: val[i].handplan_id})
+          }
+        }
+        if (val.length == 0) {
+          this.model.f_overdue = 0
+          this.model.f_totalcost = 0
+          this.model.f_collection = 0
+          this.model.f_pregas = 0
+          this.model.f_preamount = 0
+          this.model.f_garbage_fee = 0
+        }
+        this.model.f_overdue = this.model.f_overdue.toFixed(2)
+        this.model.f_totalcost = (this.model.f_preamount - 0) + (this.model.f_overdue - 0)
+        /* if (this.model.f_totalcost === 0) {
+          this.model.f_totalcost = this.row.f_balance < 0 ? (0 - this.row.f_balance) : 0
+        } */
+        this.model.f_totalcost += this.model.f_garbage_fee
+        if (this.config.floor) {
+          this.model.f_collection = Math.floor((this.model.f_totalcost - 0) - (this.model.f_balance - 0))
+        } else if (this.config.ceil) {
+          this.model.f_collection = Math.ceil((this.model.f_totalcost - 0) - (this.model.f_balance - 0))
+        } else {
+          this.model.f_collection = (this.model.f_totalcost - 0) - (this.model.f_balance - 0)
+        }
+        this.model.f_collection = this.model.f_collection < 0 ? 0 : this.model.f_collection
+      },
+      // 获取欠费里面有违约金的最大的一笔欠费的角标
+      getMaxIndex (val) {
+        if (val.findIndex((item) => { return item.f_oughtfee < 0 }) !== -1) {
+          return val.findIndex((item) => { return item.f_oughtfee < 0 })
+        } else {
+          let firstOverdue = val.findIndex((item) => { return item.overdue > 0 })
+          if (firstOverdue === -1) {
+            return 0
+          } else {
+            let lastOverdue = val.slice(firstOverdue).findIndex((item) => { return item.overdue === 0 }) - 1
+            return lastOverdue < 0 ? val.length - 1 : firstOverdue + lastOverdue
+          }
+        }
+      }
+    },
+    watch: {
+      chargeView () {
+        // this.$refs.mainche && this.$refs.mainche.checkOverdue()
+      }
+    }
+  }
+</script>
+<style lang="less">
+  #tooltip div {
+    height: auto;
+  }
+</style>

package/src/filiale/hongYa/components/charge/{machine → business/machine}/OweDetailList.vue

@@ -17,11 +17,11 @@
               <th><nobr>总气量</nobr></th>
               <th><nobr>用气金额</nobr></th>
               <th><nobr>已交气费</nobr></th>
-              <th><nobr>已交违约金</nobr></th>
+<!--              <th><nobr>已交违约金</nobr></th>-->
               <th><nobr>实欠气费</nobr></th>
               <th><nobr>是否缴费</nobr></th>
-              <th><nobr>违约金</nobr></th>
-              <th><nobr>违约天数</nobr></th>
+<!--              <th><nobr>违约金</nobr></th>-->
+<!--              <th><nobr>违约天数</nobr></th>-->
             </tr>
           </template>
           <template partial='body'>
@@ -33,11 +33,11 @@
               <td>{{row.f_oughtamount}}</td>
               <td>{{row.f_allfee}}</td>
               <td>{{row.f_debt_money}}</td>
-              <td>{{row.f_selloverdue}}</td>
+<!--              <td>{{row.f_selloverdue}}</td>-->
               <td>{{row.f_oughtfee}}</td>
               <td>{{row.f_whether_pay}}</td>
-              <td>{{row.overdue}}</td>
-              <td>{{row.overduedays}}</td>
+<!--              <td>{{row.overdue}}</td>-->
+<!--              <td>{{row.overduedays}}</td>-->
               <td v-if="row.splitnum > 0">
                 <button class="btn btn-info" @click="$parent.$parent.getSplitInfo(row)">分表详情</button>
               </td>

package/src/filiale/hongYa/components/charge/{machine → business/machine}/OweList.vue

@@ -22,9 +22,9 @@
               <th><nobr>已交气费</nobr></th>
               <!--<th><nobr>已交违约金</nobr></th>-->
               <!--<th><nobr>是否缴费</nobr></th>-->
-              <th><nobr>违约金</nobr></th>
+<!--              <th><nobr>违约金</nobr></th>-->
               <th><nobr>总欠费</nobr></th>
-              <th><nobr>违约天数</nobr></th>
+<!--              <th><nobr>违约天数</nobr></th>-->
             </tr>
           </template>
           <template partial='body'>
@@ -42,9 +42,9 @@
               <td>{{row.f_debt_money}}</td>
               <!--<td>{{row.f_selloverdue}}</td>-->
               <!--<td>{{row.f_whether_pay}}</td>-->
-              <td>{{row.overdue}}</td>
+<!--              <td>{{row.overdue}}</td>-->
               <td>{{((row.f_oughtfee - 0) + (row.overdue - 0)).toFixed(2)}}</td>
-              <td>{{row.overduedays}}</td>
+<!--              <td>{{row.overduedays}}</td>-->
               <td v-if="row.splitnum > 0">
                 <button class="btn btn-info" @click="$parent.$parent.getSplitInfo(row)">分表详情</button>
               </td>

package/src/filiale/hongYa/components/charge/business/machine/WorkBusySmall.vue

@@ -0,0 +1,127 @@
+<template>
+  <div id="loadering_small" class="" v-if="isBusy">
+    <div class="content">
+      <div id="loader">
+        <div id="dot1" class="dot"></div>
+        <div id="dot2" class="dot"></div>
+        <div id="dot3" class="dot"></div>
+        <div id="dot4" class="dot"></div>
+      </div>
+      <h4 class="loadmessage">正在工作，请等待！</h4>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: 'busy',
+  props: ['isBusy'],
+  data() {
+    return {
+      isBusy: false
+    }
+  }
+}
+</script>
+
+<style>
+#loadering_small {
+  bottom: 0;
+  right: 0;
+  left: 0;
+  z-index: 9999;
+  display: flex;
+  text-align: center;
+  margin: 15% auto;
+  flex-direction: column;
+  position: relative;
+  align-items: center;
+  background: rgba(255, 255, 255, 0.8);
+}
+
+#loader {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: rgba(255, 255, 255, 0.8);
+  height: auto;
+}
+
+.dot {
+  height: 20px;
+  width: 20px;
+  border-radius: 10px;
+  display: inline-block;
+  position: relative;
+  margin-left: 2em;
+}
+
+.bg-white {
+  height: 100%;
+  width: 100%;
+  background-color: rgba(255, 255, 255, 0.8);
+}
+
+#dot1 {
+  background: #ea4335;
+  animation-name: dotloader;
+  animation-duration: 1s;
+  animation-delay: 0.1s;
+  animation-iteration-count: infinite;
+}
+
+#dot2 {
+  background: #34a853;
+  animation-name: dotloader;
+  animation-duration: 1s;
+  animation-delay: 0.2s;
+  animation-iteration-count: infinite;
+}
+
+.content {
+  top: 50%;
+  position: relative;
+}
+
+#dot3 {
+  background: #4285f4;
+  animation-name: dotloader;
+  animation-duration: 1s;
+  animation-delay: 0.3s;
+  animation-iteration-count: infinite;
+}
+
+#dot4 {
+  background: #fbbc05;
+  animation-name: dotloader;
+  animation-duration: 1s;
+  animation-delay: 0.4s;
+  animation-iteration-count: infinite;
+}
+
+#loader h4 {
+  width: 100%;
+  text-align: center;
+}
+
+.loadmessage {
+  text-align: center;
+  margin-left: 2em;
+}
+
+@keyframes dotloader {
+  0% {
+    top: 0px;
+  }
+  15% {
+    top: 10px;
+  }
+  30% {
+    top: 0px;
+  }
+  100% {
+    top: 0px;
+  }
+
+}
+</style>

package/src/filiale/hongYa/sale.js

@@ -32,6 +32,8 @@ export default function () {
   Vue.component('user-pricechange-manage', (resolve) => {
     require(['./UserPriceChangeManage'], resolve)
   })
+  // 机表收费引导
+  Vue.component('machine-charge', (resolve) => { require(['./components/charge/business/machine/MachineCharge'], resolve) })
   // 机表收费
   Vue.component('machine-meter-center', (resolve) => {
     require(['./components/charge/business/machine/MachineMeterCenter'], resolve)

package/src/main.js

@@ -2,7 +2,7 @@ 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/hongYa/sale'
+import FilialeSale from './filiale/meihekou/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Mon Mar 09 11:40:35 CST 2026
-gradle.version=5.2.1