sale-client 4.2.124 → 4.2.125
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/dev-server.js +5 -5
- package/package.json +1 -1
- package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ResetMeter.vue +9 -1
- package/src/filiale/ronghao/ChangeMeter.vue +3 -1
- package/src/filiale/xihu/ResetMeter.vue +1276 -0
- package/src/filiale/xihu/sale.js +2 -1
- package/src/main.js +1 -1
package/build/dev-server.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
var path = require('path')
|
|
2
2
|
var checkVersion = require('./versionCheck.js')
|
|
3
3
|
checkVersion()
|
|
4
|
-
const [ serverRul, localUrl ] = ['http://
|
|
4
|
+
const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
|
|
5
5
|
var merge = require('webpack-merge')
|
|
6
6
|
var baseConfig = require('./webpack.dev.conf')
|
|
7
7
|
var devConfig = {
|
|
@@ -51,10 +51,10 @@ var devConfig = {
|
|
|
51
51
|
target: 'http://localhost:8080'
|
|
52
52
|
},
|
|
53
53
|
'/api/af-revenue': {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
target:
|
|
54
|
+
pathRewrite: {
|
|
55
|
+
'/api/af-revenue': '/af-revenue'
|
|
56
|
+
},
|
|
57
|
+
target: "http://localhost:8080"
|
|
58
58
|
},
|
|
59
59
|
'/api': {
|
|
60
60
|
target: serverRul
|
package/package.json
CHANGED
|
@@ -33,7 +33,14 @@
|
|
|
33
33
|
v-validate:f_using_base_old='{required: true, dctest: [-1, ">" ] }'
|
|
34
34
|
@blur="pregasChange()">
|
|
35
35
|
</div>
|
|
36
|
-
|
|
36
|
+
<div class="col-sm-4 form-group"
|
|
37
|
+
:class="[$v.f_meter_base_new.required || $v.f_meter_base_new.dctest ? 'has-error' : 'has-success']">
|
|
38
|
+
<label for="f_meter_base_new" class=" font_normal_body">清零后档案底数</label>
|
|
39
|
+
<input class="input_search" style="width:60%" type="number"
|
|
40
|
+
v-model="model.f_meter_base_new"
|
|
41
|
+
placeholder="请输入清零后档案底数"
|
|
42
|
+
v-validate:f_meter_base_new='{required: true, dctest: [-1, ">" ] }'>
|
|
43
|
+
</div>
|
|
37
44
|
<div class="row auto" v-if="changeType == 'gasToGas'">
|
|
38
45
|
<!-- 气量转气量 -->
|
|
39
46
|
<div class="col-sm-4 form-group"
|
|
@@ -422,6 +429,7 @@ export default {
|
|
|
422
429
|
// 旧表底数
|
|
423
430
|
f_ladder_sync: '同步',
|
|
424
431
|
f_using_base_old: '',
|
|
432
|
+
f_meter_base_new: '',
|
|
425
433
|
// 换表补气量
|
|
426
434
|
f_remanent_gas: 0,
|
|
427
435
|
// 换表补气单价
|
|
@@ -459,6 +459,7 @@ export default {
|
|
|
459
459
|
meterbookoptions: [],
|
|
460
460
|
// 控制气量和金额的转换显示
|
|
461
461
|
changeType: '',
|
|
462
|
+
updategas: true,
|
|
462
463
|
config: {
|
|
463
464
|
hasPrint: false, // 默认打票
|
|
464
465
|
hasBillManage: false, // 默认不启用发票管理
|
|
@@ -1192,6 +1193,7 @@ export default {
|
|
|
1192
1193
|
|
|
1193
1194
|
remanentChange () {
|
|
1194
1195
|
this.commitflag = true
|
|
1196
|
+
this.updategas = false
|
|
1195
1197
|
// 气量转金额 或者 金额转气量的时候对气量和金额不做限制， 可以修改， 但是只变单价
|
|
1196
1198
|
this.model.f_remanent_price = ((this.model.f_remanent_money) / (this.model.f_remanent_gas)).toFixed(4)
|
|
1197
1199
|
if (this.model.f_remanent_price == 'NaN') {
|
|
@@ -1253,7 +1255,7 @@ export default {
|
|
|
1253
1255
|
}
|
|
1254
1256
|
},
|
|
1255
1257
|
'model.f_remanent_gas' (val) {
|
|
1256
|
-
if (this.isGas) {
|
|
1258
|
+
if (this.isGas && this.updategas) {
|
|
1257
1259
|
this.model.f_remanent_money = (val * this.model.f_remanent_price).toFixed(4)
|
|
1258
1260
|
}
|
|
1259
1261
|
if (this.model.f_using_base_old) {
|