sale-client 4.2.54 → 4.2.56

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://111.229.34.22:31467/', 'http://127.0.0.1:9026/']
+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 = {
@@ -25,12 +25,12 @@ var devConfig = {
     //   },
     //   target: localUrl
     // },
-      '/api/af-revenue/logic': {
-        pathRewrite: {
-          '/api': '/singlepage/api'
-        },
-        target: serverRul
-      },
+    //   '/api/af-revenue/logic': {
+    //     pathRewrite: {
+    //       '/api/af-revenue/logic': '/logic'
+    //     },
+    //     target: localUrl
+    //   },
       // '/api/af-revenue/file': {
       //   // pathRewrite: {
       //   //   '/api/af-revenue/file': '/file'
@@ -41,32 +41,23 @@ var devConfig = {
       //
       //   target: 'http://410663id1ia4.vicp.fun'
       // },
-      '/api/af-revenue/sql': {
-        pathRewrite: {
-          '/api': '/singlepage/api'
-        },
-        target: serverRul
-      },
-      '/rs/pay': {
-        target: 'http://localhost:8080'
-      },
-      // '/api/af-revenue': {
+      // '/api/af-revenue/sql': {
       //   pathRewrite: {
-      //     '/api/af-revenue': '/af-revenue'
+      //     '/api/af-revenue/sql': '/sql'
       //   },
-      //   target: "http://localhost:8080"
+      //   target: localUrl
       // },
-      '/api/af-revenue/logic/getOperBtns': {
+      '/rs/pay': {
+        target: 'http://localhost:8080'
+      },
+      '/api/af-revenue': {
         pathRewrite: {
-          '/api/af-revenue': '/rs'
+          '/api/af-revenue': '/af-revenue'
         },
-        target: 'http://127.0.0.1:8080'
+        target: "http://localhost:8080"
       },
       '/api': {
-        target: serverRul,
-        pathRewrite: {
-          '/api/af-revenue': '/singlepage/rs'
-        }
+        target: serverRul
       },
       '/rs': {
         target: serverRul

package/package.json

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

package/src/components/revenue/base/leftview/meterinfodetail.vue

@@ -107,7 +107,11 @@
         </div>
         <div class="row" v-if="data.f_meter_type.includes('卡表')">
           <label class = "col-sm-5 " style="color: brown">累购写卡金额</label>
-          <span class = "col-sm-7" style="color: brown">{{data?data.f_write_totalfee:dafault.f_total_fee}}</span>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_write_totalfee:dafault.f_total_fee}}
+            <span v-if="data && this.$login.r.includes('收费页面修改累购')" @click.stop="changeMeterWriteFee"
+                            class="glyphicon glyphicon-pencil  click-change"  title="修改累购写卡金额">
+            </span>
+          </span>
         </div>
         <div class="row">
           <label class = "col-sm-5 " >气表表号</label>
@@ -223,16 +227,16 @@
             <div class="form-horizontal">
               <div class="row">
                 <div class="col-sm-12 form-group">
-                  <label class="font_normal_body">旧表累购金额</label>
+                  <label class="font_normal_body">原累购金额</label>
                   <input readonly type="text" style="width:80%" class="input_search"
-                         v-model="data.f_total_fee" placeholder='旧表累购金额'>
+                         v-model="data.f_total_fee" placeholder='原累购金额' disabled>
                 </div>
               </div>
               <div class="row">
                 <div class="col-sm-12 form-group">
-                  <label class="font_normal_body">旧表累购金额</label>
+                  <label class="font_normal_body">修改后累购金额</label>
                   <input type="text" style="width:80%" class="input_search" v-model="newMeterFee"
-                         placeholder='旧表累购金额'>
+                         placeholder='修改后累购金额'>
                 </div>
               </div>
             </div>
@@ -242,20 +246,45 @@
             <button type="button" class="button_clear" @click='close'>取消</button>
           </footer>
         </modal>
+        <modal v-if="showSelectUserWriteFee" :show.sync="showSelectUserWriteFee" width="40%" title="修正表累购写卡金额"
+               v-ref:modal large backdrop="false">
+          <article slot="modal-body" class="modal-body">
+            <div class="form-horizontal">
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">原表累购写卡金额</label>
+                  <input readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_write_totalfee" placeholder='原表累购写卡金额' disabled>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">修改后累购写卡金额</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="newMeterWriteFee"
+                         placeholder='修改后累购写卡金额'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyUserFile('累购写卡金额')">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
         <modal v-if="showSelectUserGas" :show.sync="showSelectUserGas" width="40%" title="修正表累购气量"
                v-ref:modal large backdrop="false">
           <article slot="modal-body" class="modal-body">
             <div class="form-horizontal">
               <div class="row">
                 <div class="col-sm-12 form-group">
-                  <label class="font_normal_body">旧表累购气量</label>
+                  <label class="font_normal_body">原表累购气量</label>
                   <input readonly type="text" style="width:80%" class="input_search"
-                         v-model="data.f_total_gas" placeholder='旧表累购气量'>
+                         v-model="data.f_total_gas" placeholder='原表累购气量' disabled>
                 </div>
               </div>
               <div class="row">
                 <div class="col-sm-12 form-group">
-                  <label class="font_normal_body">新表累购气量</label>
+                  <label class="font_normal_body">修改后累购气量</label>
                   <input type="text" style="width:80%" class="input_search" v-model="newMeterGas"
                          placeholder='新表累购气量'>
                 </div>
@@ -313,13 +342,14 @@ export default {
         },
         f_arrears_fee: 0,
         model: null,
-        f_arrears_fee: 0,
         showselectncuserfile: false,
         showSelectUserFee: false,
+        showSelectUserWriteFee: false,
         showSelectUserGas: false,
         newmetertitles: '',
         newMeterGas: 0,
-        newMeterFee: 0
+        newMeterFee: 0,
+        newMeterWriteFee: 0
       }
     },
     props: ['data'],
@@ -364,6 +394,10 @@ export default {
         // 修改累购金额
         this.showSelectUserFee = true
       },
+      changeMeterWriteFee () {
+        // 修改累购写卡金额
+        this.showSelectUserWriteFee = true
+      },
       async modifyUserFile (type) {
         let param = {
           f_userinfo_id: this.data.f_userinfo_id,
@@ -376,21 +410,25 @@ export default {
           f_depid: this.$login.f.depids,
           f_depname: this.$login.f.deps
         }
-        if (type == '表封号') {
+        if (type === '表封号') {
           param.new_metertitles = this.newmetertitles
-        } else if (type == '累购气量') {
+        } else if (type === '累购气量') {
           param.new_metergas = this.newMeterGas
-        } else if (type == '累购金额') {
+        } else if (type === '累购金额') {
           param.new_meterfee = this.newMeterFee
+        } else if (type === '累购写卡金额') {
+          param.new_meterwritefee = this.newMeterWriteFee
         }
         await this.$resetpost('/api/af-revenue/logic/changeuserfilesmetertitles', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
         this.data.f_metertitles = this.newmetertitles
-        if (type == '表封号') {
+        if (type === '表封号') {
           this.data.f_metertitles = this.newmetertitles
-        } else if (type == '累购气量') {
+        } else if (type === '累购气量') {
           this.data.f_total_gas = this.newMeterGas
-        } else if (type == '累购金额') {
+        } else if (type === '累购金额') {
           this.data.f_total_fee = this.newMeterFee
+        } else if (type === '累购写卡金额') {
+          this.data.f_write_totalfee = this.newMeterWriteFee
         }
         this.$parent.$parent.close()
         this.$parent.$parent.clean()
@@ -404,6 +442,7 @@ export default {
         this.newmetertitles = 0
         this.newMeterGas = 0
         this.newMeterFee = 0
+        this.newMeterWriteFee = 0
       }
     },
     watch: {

package/src/components/revenue/machineHandManage/machineHand.vue

@@ -1967,7 +1967,7 @@
               f_depname: this.$login.f.deps
             },
             uuid: uuid,
-            filepath: res.f_downloadpath
+            filepath: res.f_realpath
           }
           try {
             await this.HttpReset.load('POST', 'api/af-revenue/logic/batchSettleFileupdate', data, {resolveMsg: null, rejectMsg: null}, 1000)

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/beifangshiye/sale'
+import FilialeSale from './filiale/yuncheng/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 @@
-#Sat Sep 13 14:19:54 CST 2025
-gradle.version=5.2.1

package/.npmignore

@@ -1,12 +0,0 @@
-src/bootstrap
-.idea/
-.DS_Store
-node_modules/
-dist/
-examples/
-gradle/
-npm-debug.log
-selenium-debug.log
-test/unit/coverage
-test/e2e/reports
-lib/**/lib

package/src/.npmignore

@@ -1 +0,0 @@
-