sale-client 4.2.141 → 4.2.143

package/.project

@@ -5,11 +5,6 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
 			<arguments>
@@ -17,7 +12,6 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 	<filteredResources>

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://127.0.0.1:9026/']
+const [ serverRul, localUrl ] = ['http://123.180.154.5:31467/', 'http://123.180.154.5:31467/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -50,12 +50,6 @@ var devConfig = {
       '/rs/pay': {
         target: 'http://localhost:8080'
       },
-      '/api/af-revenue': {
-        pathRewrite: {
-          '/api/af-revenue': ''
-        },
-        target: "http://localhost:9026"
-      },
       '/api': {
         target: serverRul
       },

package/package.json

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

package/src/components/common/userinfo_detail/ic_detail/OtherChargeQueryUser.vue

@@ -67,7 +67,7 @@
               <th style="text-align:center">{{row.f_typenumber}}</th>
               <th style="text-align:center">{{row.f_number}}</th>
               <th style="text-align:center">{{row.f_unitprice}}</th>
-              <th style="text-align:center">{{row.f_unitprice*row.f_number}}</th>
+              <th style="text-align:center">{{row.f_collection.toFixed(2)}}</th>
               <th style="text-align:center">{{row.f_operator}}</th>
               <th style="text-align:center">{{row.f_operate_date}}</th>
               <td style="text-align: center;">{{row.f_state}}</td>

package/src/components/webMeter/MeterManage/WebMeterBatchOperationValve.vue

@@ -289,7 +289,7 @@
     </div>
     <modal :show.sync="batchMeterShow" width="570px" title="文件导入" v-ref:modal large backdrop="false">
       <article slot="modal-body" class="modal-body">
-        <file-upload class="my-file-uploader col-sm-9" name="meterNUmberUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        <file-upload class="my-file-uploader col-sm-9" name="meterNUmberUploadFile" action="api/af-revenue/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
       </article>
       <footer slot="modal-footer" class="modal-footer">
       </footer>
@@ -485,7 +485,7 @@ import axios from 'axios'
       'onFileUpload': async function (file, res) {
         this.iswork = true
         let param = {
-          filepath: res.f_downloadpath,
+          filepath: res.f_realpath,
           importJson: this.importJson,
           logicName: this.logicName,
           f_operator: this.$login.f.name,

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 @@
-#Tue Dec 30 10:04:44 CST 2025
-gradle.version=5.2.1