sale-client 4.2.123 → 4.2.125

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://139.9.204.64:31467/', 'http://139.9.204.64: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 = {
@@ -51,10 +51,10 @@ var devConfig = {
         target: 'http://localhost:8080'
       },
       '/api/af-revenue': {
-        // pathRewrite: {
-        //   '/api/af-revenue': '/af-revenue'
-        // },
-        target: serverRul
+        pathRewrite: {
+          '/api/af-revenue': '/af-revenue'
+        },
+        target: "http://localhost:8080"
       },
       '/api': {
         target: serverRul

package/package.json

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

package/src/components/charge/ChargeModal.vue

@@ -5,7 +5,7 @@
         <p>{{warninginfo.data.msgData}}</p>
         <div  style="font-size: 15px;padding: 10px">
           <span style="float: right">
-            <button class="button_search" v-show="!warninginfo.data.state.info"  @click="operational('files_complete')" style="width: max-content;">完善信息</button>
+            <button class="button_search" v-show="!warninginfo.data.state.info"  @click="operational('files-complete')" style="width: max-content;">完善信息</button>
             <button class="button_search" v-show="warninginfo.data.state.blacklist&&!warninginfo.data.state.dibao" @click="operational('basic-living')" style="width: max-content;">低保续保</button>
             <button class="button_search" v-show="warninginfo.data.state.blacklist&&!warninginfo.data.state.dibao && warninginfo.data.state.dibaoend" @click="operational('stop-basic-living')" style="width: max-content;">停止续保</button>
             <button class="button_search" v-show="!(!warninginfo.data.state.dibao&&warninginfo.data.state.dibaoend) && warninginfo.data.state.chargeAccount" @click="success()">确认</button>

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ResetMeter.vue

@@ -33,7 +33,14 @@
                    v-validate:f_using_base_old='{required: true, dctest: [-1, ">" ] }'
                    @blur="pregasChange()">
           </div>
-
+          <div class="col-sm-4 form-group"
+               :class="[$v.f_meter_base_new.required || $v.f_meter_base_new.dctest ? 'has-error' : 'has-success']">
+            <label for="f_meter_base_new" class=" font_normal_body">清零后档案底数</label>
+            <input class="input_search" style="width:60%" type="number"
+                   v-model="model.f_meter_base_new"
+                   placeholder="请输入清零后档案底数"
+                   v-validate:f_meter_base_new='{required: true, dctest: [-1, ">" ] }'>
+          </div>
           <div class="row auto" v-if="changeType == 'gasToGas'">
             <!-- 气量转气量 -->
             <div class="col-sm-4 form-group"
@@ -422,6 +429,7 @@ export default {
         // 旧表底数
         f_ladder_sync: '同步',
         f_using_base_old: '',
+        f_meter_base_new: '',
         // 换表补气量
         f_remanent_gas: 0,
         // 换表补气单价

package/src/filiale/fugou/ChargeModal.vue

@@ -5,7 +5,7 @@
         <p>{{warninginfo.data.msgData}}</p>
         <div  style="font-size: 15px;padding: 10px">
           <span style="float: right">
-            <button class="button_search" v-show="!warninginfo.data.state.info"  @click="operational('files_complete')" style="width: max-content;">完善信息</button>
+            <button class="button_search" v-show="!warninginfo.data.state.info"  @click="operational('files-complete')" style="width: max-content;">完善信息</button>
             <button class="button_search" v-show="warninginfo.data.state.blacklist&&!warninginfo.data.state.dibao" @click="operational('basic-living')" style="width: max-content;">低保续保</button>
             <button class="button_search" v-show="warninginfo.data.state.blacklist&&!warninginfo.data.state.dibao && warninginfo.data.state.dibaoend" @click="operational('stop-basic-living')" style="width: max-content;">停止续保</button>
             <button class="button_search" v-show="!(!warninginfo.data.state.dibao&&warninginfo.data.state.dibaoend) && warninginfo.data.canCharge" @click="success()">确认</button>

package/src/filiale/jingyang/charge/ChargeModal.vue

@@ -5,7 +5,7 @@
         <p>{{ warninginfo.data.msgData }}</p>
         <div style="font-size: 15px;padding: 10px">
           <span style="float: right">
-            <button class="button_search" v-show="!warninginfo.data.state.info" @click="operational('files_complete')"
+            <button class="button_search" v-show="!warninginfo.data.state.info" @click="operational('files-complete')"
                     style="width: max-content;">完善信息</button>
             <button class="button_search" v-show="warninginfo.data.state.blacklist&&!warninginfo.data.state.dibao"
                     @click="operational('basic-living')" style="width: max-content;">低保续保</button>

package/src/filiale/jinhong/sale.js

@@ -59,5 +59,5 @@ export default function () {
   // 历史抄表
   Vue.component('hand-list', (resolve) => { require(['./HandList'], resolve) })
   // 档案完善
-  Vue.component('files_complete', (resolve) => { require(['./FilesComplete'], resolve) })
+  Vue.component('files-complete', (resolve) => { require(['./FilesComplete'], resolve) })
 }

package/src/filiale/kelai/ChargeModal.vue

@@ -6,7 +6,7 @@
         <p>用户号：{{row.f_userinfo_code}}&nbsp;&nbsp;&nbsp;用户姓名：{{row.f_user_name}}&nbsp;&nbsp;&nbsp;用户地址：{{row.f_address}}</p>
         <div  style="font-size: 15px;padding: 10px">
           <span style="float: right">
-            <button class="button_search" v-show="!warninginfo.data.state.info"  @click="operational('files_complete')" style="width: max-content;">完善信息</button>
+            <button class="button_search" v-show="!warninginfo.data.state.info"  @click="operational('files-complete')" style="width: max-content;">完善信息</button>
             <button class="button_search" v-show="warninginfo.data.state.blacklist&&!warninginfo.data.state.dibao" @click="operational('basic-living')" style="width: max-content;">低保续保</button>
             <button class="button_search" v-show="warninginfo.data.state.blacklist&&!warninginfo.data.state.dibao && warninginfo.data.state.dibaoend" @click="operational('stop-basic-living')" style="width: max-content;">停止续保</button>
             <button class="button_search" v-show="!(!warninginfo.data.state.dibao&&warninginfo.data.state.dibaoend)" @click="success()">确认</button>

package/src/filiale/liaoyuan/ChargeModal.vue

@@ -5,7 +5,7 @@
         <p>{{warninginfo.data.msgData}}</p>
         <div  style="font-size: 15px;padding: 10px">
           <span style="float: right">
-            <button class="button_search" v-show="!warninginfo.data.state.info"  @click="operational('files_complete')" style="width: max-content;">完善信息</button>
+            <button class="button_search" v-show="!warninginfo.data.state.info"  @click="operational('files-complete')" style="width: max-content;">完善信息</button>
             <button class="button_search" v-show="warninginfo.data.state.blacklist&&!warninginfo.data.state.dibao" @click="operational('basic-living')" style="width: max-content;">低保续保</button>
             <button class="button_search" v-show="warninginfo.data.state.blacklist&&!warninginfo.data.state.dibao && warninginfo.data.state.dibaoend" @click="operational('stop-basic-living')" style="width: max-content;">停止续保</button>
             <button class="button_search" v-show="!(!warninginfo.data.state.dibao&&warninginfo.data.state.dibaoend) && warninginfo.data.canCharge" @click="success()">确认</button>

package/src/filiale/qingjian/ChargeModal.vue

@@ -5,7 +5,7 @@
         <p>{{warninginfo.data.msgData}}</p>
         <div  style="font-size: 15px;padding: 10px">
           <span style="float: right">
-            <button class="button_search" v-show="!warninginfo.data.state.info"  @click="operational('files_complete')" style="width: max-content;">完善信息</button>
+            <button class="button_search" v-show="!warninginfo.data.state.info"  @click="operational('files-complete')" style="width: max-content;">完善信息</button>
             <button class="button_search" v-show="warninginfo.data.state.blacklist&&!warninginfo.data.state.dibao" @click="operational('basic-living')" style="width: max-content;">低保续保</button>
             <button class="button_search" v-show="warninginfo.data.state.blacklist&&!warninginfo.data.state.dibao && warninginfo.data.state.dibaoend" @click="operational('stop-basic-living')" style="width: max-content;">停止续保</button>
             <button class="button_search" v-show="!(!warninginfo.data.state.dibao&&warninginfo.data.state.dibaoend) && warninginfo.data.canCharge" @click="success()">确认</button>

package/src/filiale/rongcheng/ChargeModal.vue

@@ -4,7 +4,7 @@
       <div style="width:98%;margin: auto" v-show="showInformation">
         <div v-show="filesNotComplete" style="font-size: 15px;padding: 10px"> 用户档案信息不全，请完善
           <span style="float: right">
-            <button class="button_search" @click="operational('files_complete')"
+            <button class="button_search" @click="operational('files-complete')"
                     style="width: max-content;">完善信息</button>
             <button class="button_search" @click="close">取消</button>
           </span>

package/src/filiale/rongcheng/sale.js

@@ -69,7 +69,7 @@ export default function () {
   // 预存收费
   Vue.component('deposit-charge', (resolve) => { require(['./business/depositCharge/DepositCharge'], resolve) })
   // 档案完善
-  Vue.component('files_complete', (resolve) => { require(['./business/FilesComplete'], resolve) })
+  Vue.component('files-complete', (resolve) => { require(['./business/FilesComplete'], resolve) })
 // 找零组件
   Vue.component('give-change', (resolve) => { require(['./business/GiveChange'], resolve) })
 // 换表补卡

package/src/filiale/ronghao/ChangeMeter.vue

@@ -459,6 +459,7 @@ export default {
       meterbookoptions: [],
       // 控制气量和金额的转换显示
       changeType: '',
+      updategas: true,
       config: {
         hasPrint: false,  // 默认打票
         hasBillManage: false,  // 默认不启用发票管理
@@ -1192,6 +1193,7 @@ export default {
 
     remanentChange () {
       this.commitflag = true
+      this.updategas = false
       // 气量转金额 或者 金额转气量的时候对气量和金额不做限制， 可以修改， 但是只变单价
       this.model.f_remanent_price = ((this.model.f_remanent_money) / (this.model.f_remanent_gas)).toFixed(4)
       if (this.model.f_remanent_price == 'NaN') {
@@ -1253,7 +1255,7 @@ export default {
       }
     },
     'model.f_remanent_gas' (val) {
-      if (this.isGas) {
+      if (this.isGas && this.updategas) {
         this.model.f_remanent_money = (val * this.model.f_remanent_price).toFixed(4)
       }
       if (this.model.f_using_base_old) {

package/src/filiale/tongchuan/ChargeModal.vue

@@ -5,7 +5,7 @@
         <p>{{warninginfo.data.msgData}}</p>
         <div  style="font-size: 15px;padding: 10px">
           <span style="float: right">
-            <button class="button_search" v-show="!warninginfo.data.state.info"  @click="operational('files_complete')" style="width: max-content;">完善信息</button>
+            <button class="button_search" v-show="!warninginfo.data.state.info"  @click="operational('files-complete')" style="width: max-content;">完善信息</button>
             <button class="button_search" v-show="warninginfo.data.state.blacklist&&!warninginfo.data.state.dibao" @click="operational('basic-living')" style="width: max-content;">低保续保</button>
             <button class="button_search" v-show="warninginfo.data.state.blacklist&&!warninginfo.data.state.dibao && warninginfo.data.state.dibaoend" @click="operational('stop-basic-living')" style="width: max-content;">停止续保</button>
             <button class="button_search" v-show="!(!warninginfo.data.state.dibao&&warninginfo.data.state.dibaoend) && warninginfo.data.canCharge" @click="success()">确认</button>