sale-client 4.3.51 → 4.3.53

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Fri May 08 17:34:18 CST 2026
+#Wed Mar 18 10:18:57 CST 2026
 gradle.version=5.2.1

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
+const [ serverRul, localUrl ] = ['http://222.83.114.229:31785/', 'http://127.0.0.1:9026/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -56,6 +56,24 @@ var devConfig = {
       //   },
       //   target: "http://localhost:8080"
       // },
+      '/api/af-revenue/file': {
+        pathRewrite: {
+          '/api/af-revenue': '/'
+        },
+        target: localUrl
+      },
+      '/api/af-revenue/handPlanAudit': {
+        pathRewrite: {
+          '/api/af-revenue': '/'
+        },
+        target: localUrl
+      },
+      '/api/af-revenue/logic/getBatchOperaPro': {
+        pathRewrite: {
+          '/api/af-revenue': '/'
+        },
+        target: localUrl
+      },
       '/api': {
         target: serverRul
       },

package/package.json

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

package/src/filiale/dexin/cardsHand.vue

@@ -860,7 +860,7 @@ export default {
       console.log('进入了抄表上传')
       let uuid = this.$login.guid()
       let data1 = {
-        filepath: res.f_downloadpath,
+        filepath: res.f_realpath,
         f_operator: this.$login.f.name,
         f_operatorid: this.$login.f.id,
         f_orgid: this.$login.f.orgid,

package/src/filiale/hongYa/Stairinfo.vue

@@ -0,0 +1,156 @@
+<template>
+  <!--<partial-view v-ref:pv>-->
+    <div  id="stair" class="panel panel-info auto;" style="height:auto">
+      <div class="panel-heading" style="height: 35px;">
+        <h4 style="margin-top: auto">阶梯使用情况</h4>
+      </div>
+    	<div class="progress" id="srair" style="margin-top:auto; margin-bottom: auto;">
+        <div class="progress-bar" :class="cls[n]"  :style="{width: widths[n]}" v-for="n in jt">{{content[n]}}</div>
+    	</div>
+      <table class="table table-bordered self-table " id="table1" >
+         <thead>
+           <th><nobr>气阶</nobr></th><th><nobr>上限</nobr></th><th><nobr>已用</nobr></th><th><nobr>未用</nobr></th><th><nobr>单价</nobr></th>
+         </thead>
+         <tbody>
+           <tr>
+             <td>一阶</td>
+             <td>{{(mydata.f_stair1ceiling - 0).toFixed(2)}}</td>
+             <td>{{mydata.f_hasuse1 > 0 ? mydata.f_hasuse1 : 0}}</td>
+             <td>{{((mydata.f_stair1ceiling - 0) - mydata.f_hasuse1).toFixed(2)}}</td>
+              <td>{{(mydata.f_stair1price - 0)}}</td>
+           </tr>
+           <tr v-if="jt === 2">
+             <td>二阶</td>
+             <td>无上限</td>
+             <td>{{mydata.f_hasuse2 > 0 ? mydata.f_hasuse2 : 0}}</td>
+             <td>无上限</td><td>{{(mydata.f_stair2price - 0)}}</td>
+           </tr>
+           <tr v-if="jt > 2">
+             <td>二阶</td>
+             <td>{{(mydata.f_stair2ceiling - 0).toFixed(2)}}</td>
+             <td>{{mydata.f_hasuse2 > 0 ? mydata.f_hasuse2 : 0}}</td>
+             <td>{{((mydata.f_stair2ceiling - 0) - (mydata.f_stair1ceiling - 0)- (mydata.f_hasuse2 > 0 ? mydata.f_hasuse2 : 0)).toFixed(2) }}</td>
+             <td>{{(mydata.f_stair2price - 0)}}</td>
+           </tr>
+           <tr v-if="jt === 3">
+             <td>三阶</td>
+             <td>无上限</td>
+             <td>{{mydata.f_hasuse3 > 0 ? mydata.f_hasuse3 : 0}}</td>
+             <td>无上限</td>
+             <td>{{(mydata.f_stair3price- 0)}}</td>
+           </tr>
+           <tr v-if=" jt > 3">
+             <td>三阶</td>
+             <td>{{mydata.f_stair3ceiling.toFixed(2)}}</td>
+             <td>{{mydata.f_hasuse3 > 0 ? mydata.f_hasuse3 : 0}}</td>
+             <td>{{((mydata.f_stair3ceiling- 0) - (mydata.f_stair2ceiling -0) - (mydata.f_hasuse3 > 0 ? mydata.f_hasuse3 : 0)).toFixed(2)}}</td>
+             <td>{{mydata.f_stair3price}}</td>
+           </tr>
+           <tr v-if="jt === 4">
+             <td>四阶</td>
+             <td>无上限</td>
+             <td>{{mydata.f_hasuse4 > 0 ? mydata.f_hasuse4 : 0}}</td>
+             <td>无上限</td>
+             <td>{{(mydata.f_stair4price - 0)}}</td>
+           </tr>
+           <tr v-if="jt > 4">
+             <td>四阶</td>
+             <td>{{(mydata.f_stair4ceiling-0).toFixed(2)}}</td>
+             <td>{{mydata.f_hasuse4 > 0 ? mydata.f_hasuse4 : 0}}</td>
+             <td>{{((mydata.f_stair4ceiling-0) - (mydata.f_stair3ceiling-0) - (mydata.f_hasuse4 > 0 ? mydata.f_hasuse4 : 0)).toFixed(2)}}</td>
+             <td>{{(mydata.f_stair4ceiling-0)}}</td>
+           </tr>
+         </tbody>
+       </table>
+    </div>
+  <!--</partial-view>-->
+</template>
+
+<script>
+/**
+*阶梯气价相关信息组件
+*/
+import co from 'co'
+import {HttpResetClass} from 'vue-client'
+
+let getdata = function * (self) {
+  self.data.f_userinfo_id = self.data.f_userinfo_id + ''
+  let http = new HttpResetClass()
+  let a = yield http.load('POST', 'api/af-revenue/logic/commonCal', {data: {model: self.data, isGasValue: 0, value: 0}}, {resolveMsg: null, rejectMsg: '获取阶梯使用情况出错'})
+  self.jt = a.data.chargeprice.length
+  self.mydata = a.data
+  self.calhasuse(self.mydata)
+  if (self.jt === 1) {
+    self.cls = ['progress-bar-success']
+    self.widths = ['100%']
+    self.content = [self.mydata.f_stair1price + '元/m³']
+  } else if (self.jt === 2) {
+    self.cls = ['progress-bar-success', 'progress-bar-danger']
+    self.widths = ['50%', '50%']
+    self.content = [self.mydata.f_stair1price + '元/m³', self.mydata.f_stair2price + '元/m³']
+  } else if (self.jt === 3) {
+    self.cls = ['progress-bar-success', 'progress-bar-warning', 'progress-bar-danger']
+    self.widths = ['33%', '34%', '33%']
+    self.content = [self.mydata.f_stair1price + '元/m³', self.mydata.f_stair2price + '元/m³', self.mydata.f_stair3price + '元/m³']
+  } else if (self.jt === 4) {
+    self.cls = ['progress-bar-success', ' progress-bar-info', 'progress-bar-warning', 'progress-bar-danger']
+    self.widths = ['25%', '25%', '25%', '25%']
+    self.content = [self.mydata.f_stair1price + '元/m³', self.mydata.f_stair2price + '元/m³', self.mydata.f_stair3price + '元/m³', self.mydata.f_stair4price + '元/m³']
+  }
+}
+
+export default {
+  props: ['data'],
+  data () {
+    return {
+      myChart: {},
+      jt: 0,
+      width: 0,
+      widths: [],
+      cls: [],
+      length: 0,
+      mydata: '',
+      values: 0
+    }
+  },
+  methods: {
+    getd () {
+      this.mydata = ''
+      let gen = getdata(this)
+      co(gen)
+    },
+    calhasuse (value) {
+      value.f_hasuse1 = ((value.sumamount - 0) >= (value.f_stair1ceiling - 0) ? (value.f_stair1ceiling - 0) : (value.sumamount - 0)).toFixed(2)
+      value.f_hasuse2 = ((value.sumamount - 0) >= (value.f_stair2ceiling - 0) ? (value.f_stair2ceiling - 0) - (value.f_stair1ceiling - 0) : (value.sumamount - 0) - (value.f_stair1ceiling - 0)).toFixed(2)
+      value.f_hasuse3 = ((value.sumamount - 0) >= (value.f_stair3ceiling - 0) ? (value.f_stair3ceiling - 0) - (value.f_stair2ceiling - 0) : (value.sumamount - 0) - (value.f_stair2ceiling - 0)).toFixed(2)
+      value.f_hasuse4 = ((value.sumamount - 0) >= (value.f_stair4ceiling - 0) ? (value.f_stair4ceiling - 0) - (value.f_stair3ceiling - 0) : (value.sumamount - 0) - (value.f_stair3ceiling - 0)).toFixed(2)
+    }
+  },
+  watch: {
+
+    'data' (val) {
+      this.getd()
+    }
+  },
+  ready () {
+    this.getd()
+  }
+}
+</script>
+<style media="screen">
+  #srair{
+	height: 30px;
+  margin-top:10px;
+  margin-bottom: 10px;
+  }
+  #srair .progress-bar {
+  line-height: 25px !important;
+  }
+  #table1{
+    text-align:center;
+  }
+  .self-table > tbody > tr > td {
+    padding: 3px;
+    text-align: center;
+  }
+</style>

package/src/filiale/hongYa/sale.js

@@ -39,4 +39,5 @@ export default function () {
     require(['./components/charge/business/machine/MachineMeterCenter'], resolve)
   })
   Vue.component('user-info-detail-manage-new', (resolve) => { require(['./UserInfoDetailManageNew'], resolve) })
+  Vue.component('stairinfo', (resolve) => { require(['./Stairinfo'], 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/jinhuang/sale'
+import FilialeSale from './filiale/dexin/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'