sale-client 4.0.54-preview → 4.0.56-preview
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/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +2 -0
- package/build/dev-server.js +20 -20
- package/package.json +1 -1
- package/src/filiale/fugou/components/revenue/cardHandManage/cardsHand.vue +6 -0
- package/src/filiale/xihu/CardService.js +1 -3
- package/src/filiale/xihu/IotChangeFill.vue +2 -2
- package/src/filiale/xihu/meterinfodetail.vue +411 -0
- package/src/filiale/xihu/sale.js +2 -0
- package/src/main.js +1 -1
- package/.gradle/8.5/fileChanges/last-build.bin +0 -0
- /package/.gradle/{8.5 → vcs-1}/gc.properties +0 -0
|
Binary file
|
|
Binary file
|
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, v4Url ] = ['http://
|
|
4
|
+
const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://localhost:8080', 'http://localhost:9026/']
|
|
5
5
|
var merge = require('webpack-merge')
|
|
6
6
|
var baseConfig = require('./webpack.dev.conf')
|
|
7
7
|
var devConfig = {
|
|
@@ -19,26 +19,26 @@ var devConfig = {
|
|
|
19
19
|
children: false // 不输出子模块构建信息
|
|
20
20
|
},
|
|
21
21
|
proxy: {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
22
|
+
'/api/af-revenue/logic': {
|
|
23
|
+
pathRewrite: {
|
|
24
|
+
'/api/af-revenue/logic': '/logic'
|
|
25
|
+
},
|
|
26
|
+
target: 'http://localhost:9026/'
|
|
27
|
+
},
|
|
28
|
+
'/api/af-revenue/file': {
|
|
29
|
+
pathRewrite: {
|
|
30
|
+
'/api/af-revenue/file': '/file'
|
|
31
|
+
},
|
|
32
|
+
target: 'http://localhost:9026/'
|
|
33
|
+
},
|
|
34
|
+
'/api/af-revenue/sql': {
|
|
35
|
+
pathRewrite: {
|
|
36
|
+
'/api/af-revenue/sql': '/sql'
|
|
37
|
+
},
|
|
38
|
+
target: 'http://localhost:9026/'
|
|
39
|
+
},
|
|
40
40
|
'/api': {
|
|
41
|
-
target: 'http://
|
|
41
|
+
target: 'http://192.168.50.67:31567'
|
|
42
42
|
},
|
|
43
43
|
'/invoice/rs/logic/getInvoice': {
|
|
44
44
|
target: serverRul
|
package/package.json
CHANGED
|
@@ -52,6 +52,7 @@
|
|
|
52
52
|
</div>
|
|
53
53
|
<div class="span" style="float:right;">
|
|
54
54
|
<button class="button_search button_spacing" @click="search()">查询</button>
|
|
55
|
+
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
55
56
|
<button class="button_search" style="width: 90px" @click="$parent.$parent.downloadFiles()">模板下载</button>
|
|
56
57
|
<button class="button_search button_spacing" @click="$parent.$parent.clickupshow()">抄表导入</button>
|
|
57
58
|
<export-excel
|
|
@@ -519,6 +520,11 @@ export default {
|
|
|
519
520
|
loadParamGem(this)
|
|
520
521
|
},
|
|
521
522
|
methods: {
|
|
523
|
+
clear () {
|
|
524
|
+
Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
|
|
525
|
+
this.$refs.paged.$refs.criteria.model[key] = []
|
|
526
|
+
})
|
|
527
|
+
},
|
|
522
528
|
downloadFiles () {
|
|
523
529
|
let downurl = 'api/af-revenue/downloadfile/file?filename=卡表批量抄表导入模板'
|
|
524
530
|
this.$downFile(downurl,'卡表批量抄表导入模板.xlsx')
|
|
@@ -640,8 +640,7 @@ let sendCardSaleGasGenremanent = async function (model, row) {
|
|
|
640
640
|
if (!row.f_card_id) {
|
|
641
641
|
getCardNumber = await Vue.resetpost('api/af-revenue/logic/getCardNumber', {data: {id: row.brand_id}}, {resolveMsg: null, rejectMsg: '发卡售气获取卡号失败！！'})
|
|
642
642
|
console.log('获取卡号、、', getCardNumber)
|
|
643
|
-
model.
|
|
644
|
-
model.f_total_fee = (row.f_remanent_gas * row.f_remanent_price).toFixed(4)
|
|
643
|
+
model.f_write_totalfee = (row.f_remanent_gas * row.f_remanent_price).toFixed(4)
|
|
645
644
|
} else {
|
|
646
645
|
getCardNumber.data.cardNumber = row.f_card_id
|
|
647
646
|
console.log('档案自带卡号、、', getCardNumber)
|
|
@@ -653,7 +652,6 @@ let sendCardSaleGasGenremanent = async function (model, row) {
|
|
|
653
652
|
} else {
|
|
654
653
|
throw new Error('获取卡号失败！请核实参数管理中的卡号重新换表发卡售气。')
|
|
655
654
|
}
|
|
656
|
-
|
|
657
655
|
result = await Vue.resetpost('api/af-revenue/logic/sendCardRemanentGas', {data: model}, {resolveMsg: null, rejectMsg: '发卡售气存库失败'})
|
|
658
656
|
// 存库
|
|
659
657
|
console.log('换表发卡存库返回', result)
|
|
@@ -245,8 +245,8 @@
|
|
|
245
245
|
if (self.model.f_fill_gas > 0 && !self.showGas) {
|
|
246
246
|
param.f_total_fee = (self.row.f_total_fee - 0) + (self.model.f_preamount - 0) - (self.model.f_fill_money - 0)
|
|
247
247
|
} else {
|
|
248
|
-
param.f_total_gas = (
|
|
249
|
-
param.f_total_fee = (
|
|
248
|
+
param.f_total_gas = (self.row.f_total_gas - 0) + (self.model.f_pregas - self.model.f_fill_gas)
|
|
249
|
+
param.f_total_fee = (self.row.f_total_fee - 0) + (self.model.f_preamount - 0) - (self.model.f_fill_money - 0)
|
|
250
250
|
}
|
|
251
251
|
}
|
|
252
252
|
// 加入扫码盒付款码支付流水号
|
|
@@ -0,0 +1,411 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<partial-view v-ref:pv>
|
|
3
|
+
<div class="panel panel-info auto" style="margin-top: auto">
|
|
4
|
+
<div class="panel-heading" style="height: 35px">
|
|
5
|
+
<h4 style="display:inline-block;margin-top: auto">表具信息</h4>
|
|
6
|
+
</div>
|
|
7
|
+
<div class="auto ">
|
|
8
|
+
<div class="row" v-if="data.f_customer">
|
|
9
|
+
<label class = "col-sm-5 " style="color: brown">团缴编号</label>
|
|
10
|
+
<span class = "col-sm-7" style="color: brown">{{data.f_customer?data.f_customer:'无'}}</span>
|
|
11
|
+
</div>
|
|
12
|
+
<div class="row">
|
|
13
|
+
<label class = "col-sm-5 " >气表类型</label>
|
|
14
|
+
<span class = "col-sm-7">{{data?data.f_meter_type:dafault.f_meter_brand}}</span>
|
|
15
|
+
</div>
|
|
16
|
+
<div class="row">
|
|
17
|
+
<label class = "col-sm-5 " >气表品牌</label>
|
|
18
|
+
<span class = "col-sm-7">{{data?data.f_meter_brand:dafault.f_meter_brand}}</span>
|
|
19
|
+
</div>
|
|
20
|
+
<div class="row">
|
|
21
|
+
<label class = "col-sm-5 " >气表型号</label>
|
|
22
|
+
<span class = "col-sm-7">{{data?data.f_meter_style:dafault.f_meter_style}}</span>
|
|
23
|
+
</div>
|
|
24
|
+
<div class="row" v-if="data.f_meter_type.includes('物联网')">
|
|
25
|
+
<label class = "col-sm-5 " >计费终端</label>
|
|
26
|
+
<span class = "col-sm-7" >{{data?data.f_calculation:dafault.f_calculation}}</span>
|
|
27
|
+
</div>
|
|
28
|
+
<div class="row" v-if="data.f_meter_type.includes('物联网')">
|
|
29
|
+
<label class = "col-sm-5 " >结算方式</label>
|
|
30
|
+
<span class = "col-sm-7" >{{data?data.f_collection_type:dafault.f_collection_type}}</span>
|
|
31
|
+
</div>
|
|
32
|
+
<div class="row">
|
|
33
|
+
<label class="col-sm-5" style="color: brown">表具状态</label>
|
|
34
|
+
<span class="col-sm-7" style="color: brown">{{data?data.f_table_state:dafault.f_table_state}}</span>
|
|
35
|
+
</div>
|
|
36
|
+
<div class="row" v-if="!data.f_calculation.includes('表端结算') && data.f_meter_type.includes('物联网') && data.f_collection_type === '按金额'">
|
|
37
|
+
<label class = "col-sm-5 " style="color: brown">系统余额</label>
|
|
38
|
+
<span class = "col-sm-7" style="color: brown">{{data?data.f_balance_amount:dafault.f_balance_amount}}</span>
|
|
39
|
+
</div>
|
|
40
|
+
<div class="row" v-if="!data.f_calculation.includes('表端结算') && data.f_meter_type.includes('物联网') && data.f_collection_type === '按气量'">
|
|
41
|
+
<label class = "col-sm-5 " style="color: brown">系统余量</label>
|
|
42
|
+
<span class = "col-sm-7" style="color: brown">{{data?data.f_balance_gas:dafault.f_balance_gas}}</span>
|
|
43
|
+
</div>
|
|
44
|
+
<div class="row" v-if="data.f_calculation.includes('表端结算') && data.f_meter_type.includes('物联网')">
|
|
45
|
+
<label class = "col-sm-5 " style="color: brown">表端上报余额</label>
|
|
46
|
+
<span class = "col-sm-7" style="color: brown">{{data?data.f_jval:dafault.f_jval}}</span>
|
|
47
|
+
</div>
|
|
48
|
+
<div class="row">
|
|
49
|
+
<label class = "col-sm-5 " >初始表底数</label>
|
|
50
|
+
<span class = "col-sm-7" >{{data?data.f_initial_base:dafault.f_initial_base}}</span>
|
|
51
|
+
</div>
|
|
52
|
+
<div class="row">
|
|
53
|
+
<label class = "col-sm-5 " >表当前底数</label>
|
|
54
|
+
<span class = "col-sm-7" >{{data?data.f_meter_base:dafault.f_meter_base}}</span>
|
|
55
|
+
</div>
|
|
56
|
+
<div class="row" v-show="data.f_times">
|
|
57
|
+
<label class = "col-sm-5 " >写卡次数</label>
|
|
58
|
+
<span class = "col-sm-7" >{{data?data.f_times:dafault.f_times}}</span>
|
|
59
|
+
</div>
|
|
60
|
+
<div class="row" v-if="data.f_meter_type.includes('物联网')">
|
|
61
|
+
<label class = "col-sm-5 ">指令上表次数</label>
|
|
62
|
+
<span class = "col-sm-7" >{{data?data.f_iot_times:dafault.f_iot_times}}</span>
|
|
63
|
+
</div>
|
|
64
|
+
<div class="row" v-if="data.f_meter_type.includes('物联网')">
|
|
65
|
+
<label class = "col-sm-5 ">表累购金额</label>
|
|
66
|
+
<span class = "col-sm-7" >{{data?data.f_write_totalfee:dafault.f_write_totalfee}}
|
|
67
|
+
<span v-if="data && this.$login.r.includes('收费页面修改累购')" @click.stop="changeMeterFee"
|
|
68
|
+
class="glyphicon glyphicon-pencil click-change" title="修改累购金额">
|
|
69
|
+
</span>
|
|
70
|
+
</span>
|
|
71
|
+
</div>
|
|
72
|
+
<div class="row" v-if="data.f_meter_type.includes('物联网')">
|
|
73
|
+
<label class = "col-sm-5 ">户累购金额</label>
|
|
74
|
+
<span class = "col-sm-7" >{{data?data.f_total_fee_all:dafault.f_total_fee_all}}</span>
|
|
75
|
+
</div>
|
|
76
|
+
<div class="row" v-if="(data.f_meter_type === '机表' || data.f_meter_type === '物联网表') && data.f_deduction_gas > 0">
|
|
77
|
+
<label class = "col-sm-5 " >剩余抵扣量</label>
|
|
78
|
+
<span class = "col-sm-7" >{{data?data.f_deduction_gas:dafault.f_deduction_gas}}</span>
|
|
79
|
+
</div>
|
|
80
|
+
<div class="row" v-if="data.f_meter_type.includes('卡表')">
|
|
81
|
+
<label class = "col-sm-5 " style="color: brown" >户累购气量</label>
|
|
82
|
+
<span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas_all:dafault.f_total_gas_all}}</span>
|
|
83
|
+
</div>
|
|
84
|
+
<div class="row" v-if="(data.f_meter_brand.includes('数码表'))">
|
|
85
|
+
<label class = "col-sm-5 " style="color: brown" >累购气量</label>
|
|
86
|
+
<span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas:dafault.f_total_gas}}</span>
|
|
87
|
+
</div>
|
|
88
|
+
<div class="row" v-if="data.f_meter_type.includes('卡表') && data.f_meter_type === '气量卡表'">
|
|
89
|
+
<label class = "col-sm-5 " style="color: brown" >累购气量</label>
|
|
90
|
+
<span class = "col-sm-7" style="color: brown">{{data?data.f_write_totalgas:dafault.f_write_totalgas}}
|
|
91
|
+
<span v-if="data && this.$login.r.includes('收费页面修改累购')" @click.stop="changeMeterGas"
|
|
92
|
+
class="glyphicon glyphicon-pencil click-change" title="修改累购气量">
|
|
93
|
+
</span>
|
|
94
|
+
</span>
|
|
95
|
+
</div>
|
|
96
|
+
<div class="row" v-if="data.f_meter_type.includes('卡表')">
|
|
97
|
+
<label class = "col-sm-5 " style="color: brown">累购金额</label>
|
|
98
|
+
<span class = "col-sm-7" style="color: brown">{{data?data.f_write_totalfee:dafault.f_write_totalfee}}
|
|
99
|
+
<span v-if="data && this.$login.r.includes('收费页面修改累购')" @click.stop="changeMeterFee"
|
|
100
|
+
class="glyphicon glyphicon-pencil click-change" title="修改累购金额">
|
|
101
|
+
</span>
|
|
102
|
+
</span>
|
|
103
|
+
</div>
|
|
104
|
+
<div class="row" v-if="data.f_meter_type.includes('卡表')">
|
|
105
|
+
<label class = "col-sm-5 " style="color: brown">累购写卡金额</label>
|
|
106
|
+
<span class = "col-sm-7" style="color: brown">{{data?data.f_write_totalfee:dafault.f_total_fee}}</span>
|
|
107
|
+
</div>
|
|
108
|
+
<div class="row">
|
|
109
|
+
<label class = "col-sm-5 " >气表表号</label>
|
|
110
|
+
<span class = "col-sm-7">{{data?data.f_meternumber:dafault.f_meternumber}}</span>
|
|
111
|
+
</div>
|
|
112
|
+
<div class="row" v-if="data.f_meter_type.includes('卡表') || (data.f_meter_type.includes('物联网表') && data.f_hascard==='是')">
|
|
113
|
+
<label class = "col-sm-5 " >卡  号</label>
|
|
114
|
+
<span class = "col-sm-7">{{data?data.f_card_id:dafault.f_card_id}}</span>
|
|
115
|
+
</div>
|
|
116
|
+
<div class="row">
|
|
117
|
+
<label class = "col-sm-5 " >表封号</label>
|
|
118
|
+
<span class="col-sm-7">{{data?data.f_metertitles:dafault.f_metertitles}}
|
|
119
|
+
<span v-if="data" @click.stop="changemetertitles"
|
|
120
|
+
class="glyphicon glyphicon-pencil click-change" title="修正表封号"></span>
|
|
121
|
+
</span>
|
|
122
|
+
</div>
|
|
123
|
+
<!-- <div class="row" v-if="data.f_meter_type.includes('卡表') || data.f_meter_type.includes('物联网表') && data.f_hascard==='是'">-->
|
|
124
|
+
<!-- <label class = "col-sm-5 " >写卡次数</label>-->
|
|
125
|
+
<!-- <span class = "col-sm-7">{{data?data.f_times:dafault.f_times}}</span>-->
|
|
126
|
+
<!-- </div>-->
|
|
127
|
+
<div class="row">
|
|
128
|
+
<label class = "col-sm-5 " >用气性质</label>
|
|
129
|
+
<span class = "col-sm-7">{{data?data.f_gasproperties:dafault.f_gasproperties}}</span>
|
|
130
|
+
</div>
|
|
131
|
+
<div class="row">
|
|
132
|
+
<label class = "col-sm-5 " >气价名称</label>
|
|
133
|
+
<span class = "col-sm-7">{{data?data.f_price_name:dafault.f_price_name}}</span>
|
|
134
|
+
</div>
|
|
135
|
+
<!--<div class="row" v-if="data.f_balance < 0">-->
|
|
136
|
+
<!--<label class = "col-sm-5 " >账户欠费</label>-->
|
|
137
|
+
<!--<span class = "col-sm-7" title="不包含违约金">{{data?0 - (data.f_balance - 0):dafault.f_balance}}</span>-->
|
|
138
|
+
<!--</div>-->
|
|
139
|
+
<!--<div class="row" v-else>-->
|
|
140
|
+
<!--<label class = "col-sm-5 " >账户余额</label>-->
|
|
141
|
+
<!--<span class = "col-sm-7">{{data?data.f_balance:dafault.f_balance}}</span>-->
|
|
142
|
+
<!--</div>-->
|
|
143
|
+
<div class="row" v-if="data.f_remanent_money > 0">
|
|
144
|
+
<label class = "col-sm-5 " >应补金额</label>
|
|
145
|
+
<span class = "col-sm-7">{{data?data.f_remanent_money:dafault.f_remanent_money}}</span>
|
|
146
|
+
</div>
|
|
147
|
+
<div class="row" v-if="data.f_remanent_gas > 0">
|
|
148
|
+
<label class = "col-sm-5 " >应补气量</label>
|
|
149
|
+
<span class = "col-sm-7">{{data?data.f_remanent_gas:dafault.f_remanent_gas}}</span>
|
|
150
|
+
</div>
|
|
151
|
+
<div class="row">
|
|
152
|
+
<label class = "col-sm-5 " >表  向</label>
|
|
153
|
+
<span class = "col-sm-7">{{data?data.f_aroundmeter:dafault.f_hand_date}}</span>
|
|
154
|
+
</div>
|
|
155
|
+
<div class="row" v-if="!data.f_meter_type.includes('物联网')">
|
|
156
|
+
<label class = "col-sm-5 " >抄表册名</label>
|
|
157
|
+
<span class = "col-sm-7">{{data?'['+data.f_book_code + '] '+ (data.f_book_name ? data.f_book_name:''):dafault.f_book_name}}</span>
|
|
158
|
+
</div>
|
|
159
|
+
<div class="row" v-if="!data.f_meter_type.includes('物联网')">
|
|
160
|
+
<label class = "col-sm-5 " >抄表册册序号</label>
|
|
161
|
+
<span class = "col-sm-7">{{data?data.f_meter_book_sort:dafault.f_meter_book_sort}}</span>
|
|
162
|
+
</div>
|
|
163
|
+
<div class="row">
|
|
164
|
+
<label class = "col-sm-5 " >安装位置</label>
|
|
165
|
+
<span class = "col-sm-7">{{data?data.f_position:dafault.f_position}}</span>
|
|
166
|
+
</div>
|
|
167
|
+
<div class="row">
|
|
168
|
+
<label class = "col-sm-5 " >置换人员</label>
|
|
169
|
+
<span class = "col-sm-7">{{data?data.f_gas_person:dafault.f_hand_date}}</span>
|
|
170
|
+
</div>
|
|
171
|
+
<div class="row">
|
|
172
|
+
<label class = "col-sm-5 " >置换时间</label>
|
|
173
|
+
<span class = "col-sm-7">{{data?data.f_gas_date.substring(0,7):dafault.f_hand_date}}</span>
|
|
174
|
+
</div>
|
|
175
|
+
<div class="row" v-if="!data.f_meter_type.includes('物联网')">
|
|
176
|
+
<label class = "col-sm-5 " >抄表员</label>
|
|
177
|
+
<span class = "col-sm-7">{{data?data.f_inputtor:dafault.f_inputtor}}</span>
|
|
178
|
+
</div>
|
|
179
|
+
<div class="row" v-if="!data.f_meter_type.includes('物联网')">
|
|
180
|
+
<label class = "col-sm-5 " >上次抄表日</label>
|
|
181
|
+
<span class = "col-sm-7">{{data?data.f_hand_date.substring(0,7):dafault.f_hand_date}}</span>
|
|
182
|
+
</div>
|
|
183
|
+
<div class="row">
|
|
184
|
+
<label class = "col-sm-5 " >建档日期</label>
|
|
185
|
+
<span class = "col-sm-7">{{data?data.f_input_date.substring(0,7):dafault.f_input_date}}</span>
|
|
186
|
+
</div>
|
|
187
|
+
<div class="row">
|
|
188
|
+
<label class = "col-sm-5 " >备  注</label>
|
|
189
|
+
<span class = "col-sm-7">{{data?data.comments:dafault.comments}}</span>
|
|
190
|
+
</div>
|
|
191
|
+
<modal v-if="showselectncuserfile" :show.sync="showselectncuserfile" width="40%" title="修正表封号"
|
|
192
|
+
v-ref:modal large backdrop="false">
|
|
193
|
+
<article slot="modal-body" class="modal-body">
|
|
194
|
+
<div class="form-horizontal">
|
|
195
|
+
<div class="row">
|
|
196
|
+
<div class="col-sm-12 form-group">
|
|
197
|
+
<label class="font_normal_body">旧表封号</label>
|
|
198
|
+
<input disabled readonly type="text" style="width:80%" class="input_search"
|
|
199
|
+
v-model="data.f_metertitles" placeholder='旧表封号'>
|
|
200
|
+
</div>
|
|
201
|
+
</div>
|
|
202
|
+
<div class="row">
|
|
203
|
+
<div class="col-sm-12 form-group">
|
|
204
|
+
<label class="font_normal_body">新表封号</label>
|
|
205
|
+
<input type="text" style="width:80%" class="input_search" v-model="newmetertitles"
|
|
206
|
+
placeholder='新表封号'>
|
|
207
|
+
</div>
|
|
208
|
+
</div>
|
|
209
|
+
</div>
|
|
210
|
+
</article>
|
|
211
|
+
<footer slot="modal-footer" class="modal-footer">
|
|
212
|
+
<button class="button_search" :disabled='!$m.valid ' @click="modifyUserFile('表封号')">确定</button>
|
|
213
|
+
<button type="button" class="button_clear" @click='close'>取消</button>
|
|
214
|
+
</footer>
|
|
215
|
+
</modal>
|
|
216
|
+
<modal v-if="showSelectUserFee" :show.sync="showSelectUserFee" width="40%" title="修正表累购金额"
|
|
217
|
+
v-ref:modal large backdrop="false">
|
|
218
|
+
<article slot="modal-body" class="modal-body">
|
|
219
|
+
<div class="form-horizontal">
|
|
220
|
+
<div class="row">
|
|
221
|
+
<div class="col-sm-12 form-group">
|
|
222
|
+
<label class="font_normal_body">旧表累购金额</label>
|
|
223
|
+
<input readonly type="text" style="width:80%" class="input_search"
|
|
224
|
+
v-model="data.f_total_fee" placeholder='旧表累购金额'>
|
|
225
|
+
</div>
|
|
226
|
+
</div>
|
|
227
|
+
<div class="row">
|
|
228
|
+
<div class="col-sm-12 form-group">
|
|
229
|
+
<label class="font_normal_body">旧表累购金额</label>
|
|
230
|
+
<input type="text" style="width:80%" class="input_search" v-model="newMeterFee"
|
|
231
|
+
placeholder='旧表累购金额'>
|
|
232
|
+
</div>
|
|
233
|
+
</div>
|
|
234
|
+
</div>
|
|
235
|
+
</article>
|
|
236
|
+
<footer slot="modal-footer" class="modal-footer">
|
|
237
|
+
<button class="button_search" :disabled='!$m.valid ' @click="modifyUserFile('累购金额')">确定</button>
|
|
238
|
+
<button type="button" class="button_clear" @click='close'>取消</button>
|
|
239
|
+
</footer>
|
|
240
|
+
</modal>
|
|
241
|
+
<modal v-if="showSelectUserGas" :show.sync="showSelectUserGas" width="40%" title="修正表累购气量"
|
|
242
|
+
v-ref:modal large backdrop="false">
|
|
243
|
+
<article slot="modal-body" class="modal-body">
|
|
244
|
+
<div class="form-horizontal">
|
|
245
|
+
<div class="row">
|
|
246
|
+
<div class="col-sm-12 form-group">
|
|
247
|
+
<label class="font_normal_body">旧表累购气量</label>
|
|
248
|
+
<input readonly type="text" style="width:80%" class="input_search"
|
|
249
|
+
v-model="data.f_total_gas" placeholder='旧表累购气量'>
|
|
250
|
+
</div>
|
|
251
|
+
</div>
|
|
252
|
+
<div class="row">
|
|
253
|
+
<div class="col-sm-12 form-group">
|
|
254
|
+
<label class="font_normal_body">新表累购气量</label>
|
|
255
|
+
<input type="text" style="width:80%" class="input_search" v-model="newMeterGas"
|
|
256
|
+
placeholder='新表累购气量'>
|
|
257
|
+
</div>
|
|
258
|
+
</div>
|
|
259
|
+
</div>
|
|
260
|
+
</article>
|
|
261
|
+
<footer slot="modal-footer" class="modal-footer">
|
|
262
|
+
<button class="button_search" :disabled='!$m.valid ' @click="modifyUserFile('累购气量')">确定</button>
|
|
263
|
+
<button type="button" class="button_clear" @click='close'>取消</button>
|
|
264
|
+
</footer>
|
|
265
|
+
</modal>
|
|
266
|
+
</div>
|
|
267
|
+
</div>
|
|
268
|
+
</partial-view>
|
|
269
|
+
</template>
|
|
270
|
+
|
|
271
|
+
<script>
|
|
272
|
+
/* 用户档案相关信息组件 */
|
|
273
|
+
export default {
|
|
274
|
+
ready () {
|
|
275
|
+
console.log('看看userinfo里面接收的data数据', this.data)
|
|
276
|
+
},
|
|
277
|
+
title: '客户基本信息',
|
|
278
|
+
data () {
|
|
279
|
+
return {
|
|
280
|
+
dafault: {
|
|
281
|
+
f_total_gas_all: 0,
|
|
282
|
+
f_total_fee_all: 0,
|
|
283
|
+
f_balance_amount: 0,
|
|
284
|
+
f_balance_gas: 0,
|
|
285
|
+
f_initial_base: 0,
|
|
286
|
+
f_meter_base: 0,
|
|
287
|
+
f_deduction_gas: 0,
|
|
288
|
+
f_total_gas: 0,
|
|
289
|
+
f_total_fee: 0,
|
|
290
|
+
f_card_id: '*****',
|
|
291
|
+
f_times: 0,
|
|
292
|
+
f_iot_times: 0,
|
|
293
|
+
f_meternumber: 0,
|
|
294
|
+
f_metertitles: '',
|
|
295
|
+
f_gasproperties: '****',
|
|
296
|
+
f_price_name: '****',
|
|
297
|
+
f_meter_brand: '****',
|
|
298
|
+
f_balance: 0,
|
|
299
|
+
f_user_type: '**',
|
|
300
|
+
f_remanent_gas: 0,
|
|
301
|
+
f_position: '****',
|
|
302
|
+
f_inputtor: '****',
|
|
303
|
+
f_jval: 0,
|
|
304
|
+
f_table_state: 0
|
|
305
|
+
},
|
|
306
|
+
model: null,
|
|
307
|
+
showselectncuserfile: false,
|
|
308
|
+
showSelectUserFee: false,
|
|
309
|
+
showSelectUserGas: false,
|
|
310
|
+
newmetertitles: '',
|
|
311
|
+
newMeterGas: 0,
|
|
312
|
+
newMeterFee: 0
|
|
313
|
+
}
|
|
314
|
+
},
|
|
315
|
+
props: ['data'],
|
|
316
|
+
methods: {
|
|
317
|
+
dealmsg (val) {
|
|
318
|
+
this.$dispatch('deal-msg', val)
|
|
319
|
+
},
|
|
320
|
+
changemetertitles () {
|
|
321
|
+
// 修正表封号
|
|
322
|
+
this.showselectncuserfile = true
|
|
323
|
+
this.newmetertitles = 0
|
|
324
|
+
},
|
|
325
|
+
changeMeterGas () {
|
|
326
|
+
// 修改累购气量
|
|
327
|
+
this.showSelectUserGas = true
|
|
328
|
+
},
|
|
329
|
+
changeMeterFee () {
|
|
330
|
+
// 修改累购金额
|
|
331
|
+
this.showSelectUserFee = true
|
|
332
|
+
},
|
|
333
|
+
async modifyUserFile (type) {
|
|
334
|
+
let param = {
|
|
335
|
+
f_userinfo_id: this.data.f_userinfo_id,
|
|
336
|
+
f_user_id: this.data.f_user_id,
|
|
337
|
+
f_userfiles_id: this.data.f_userfiles_id,
|
|
338
|
+
f_operator: this.$login.f.name,
|
|
339
|
+
f_operatorid: this.$login.f.id,
|
|
340
|
+
f_orgid: this.$login.f.orgid,
|
|
341
|
+
f_orgname: this.$login.f.orgs,
|
|
342
|
+
f_depid: this.$login.f.depids,
|
|
343
|
+
f_depname: this.$login.f.deps
|
|
344
|
+
}
|
|
345
|
+
if (type == '表封号') {
|
|
346
|
+
param.new_metertitles = this.newmetertitles
|
|
347
|
+
} else if (type == '累购气量') {
|
|
348
|
+
param.new_metergas = this.newMeterGas
|
|
349
|
+
} else if (type == '累购金额') {
|
|
350
|
+
param.new_meterfee = this.newMeterFee
|
|
351
|
+
}
|
|
352
|
+
await this.$resetpost('/api/af-revenue/logic/changeuserfilesmetertitles', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
|
|
353
|
+
this.data.f_metertitles = this.newmetertitles
|
|
354
|
+
if (type == '表封号') {
|
|
355
|
+
this.data.f_metertitles = this.newmetertitles
|
|
356
|
+
} else if (type == '累购气量') {
|
|
357
|
+
this.data.f_total_gas = this.newMeterGas
|
|
358
|
+
} else if (type == '累购金额') {
|
|
359
|
+
this.data.f_total_fee = this.newMeterFee
|
|
360
|
+
}
|
|
361
|
+
this.$parent.$parent.close()
|
|
362
|
+
this.$parent.$parent.clean()
|
|
363
|
+
this.$parent.$parent.$refs.list.searchNoData()
|
|
364
|
+
this.close()
|
|
365
|
+
},
|
|
366
|
+
close () {
|
|
367
|
+
this.showselectncuserfile = false
|
|
368
|
+
this.showSelectUserGas = false
|
|
369
|
+
this.showSelectUserFee = false
|
|
370
|
+
this.newmetertitles = 0
|
|
371
|
+
this.newMeterGas = 0
|
|
372
|
+
this.newMeterFee = 0
|
|
373
|
+
}
|
|
374
|
+
},
|
|
375
|
+
watch: {
|
|
376
|
+
'data' (val) {
|
|
377
|
+
console.log('val========', val)
|
|
378
|
+
}
|
|
379
|
+
},
|
|
380
|
+
|
|
381
|
+
}
|
|
382
|
+
</script>
|
|
383
|
+
<style lang="less">
|
|
384
|
+
.row {
|
|
385
|
+
/*border-bottom:1px solid #F2F6FA;*/
|
|
386
|
+
margin-left: 0;
|
|
387
|
+
margin-right: 0;
|
|
388
|
+
}
|
|
389
|
+
.click-change:hover {
|
|
390
|
+
color: #3592ef;
|
|
391
|
+
cursor: pointer;
|
|
392
|
+
}
|
|
393
|
+
// . {
|
|
394
|
+
// height: 23px;
|
|
395
|
+
// border-right: 1px solid #F2F6FA;
|
|
396
|
+
// margin-bottom: 0;
|
|
397
|
+
// text-align: left;
|
|
398
|
+
// }
|
|
399
|
+
// #address {
|
|
400
|
+
// border-left: 1px solid #F2F6FA;
|
|
401
|
+
// }
|
|
402
|
+
// #user-info {
|
|
403
|
+
// padding:6px;
|
|
404
|
+
// span {
|
|
405
|
+
// padding-left: 5px;
|
|
406
|
+
// }
|
|
407
|
+
// }
|
|
408
|
+
// #address1 {
|
|
409
|
+
// border-right: 0;
|
|
410
|
+
// }
|
|
411
|
+
</style>
|
package/src/filiale/xihu/sale.js
CHANGED
|
@@ -29,4 +29,6 @@ export default function () {
|
|
|
29
29
|
Vue.component('iot-change-fill', (resolve) => { require(['./IotChangeFill'], resolve) })
|
|
30
30
|
// 单用户查询界面
|
|
31
31
|
Vue.component('user-info-detail-manage-new', (resolve) => { require(['./UserInfoDetailManageNew'], resolve) })
|
|
32
|
+
// 当前选择用户的表具基本信息
|
|
33
|
+
Vue.component('user-meterinfodetail', (resolve) => { require(['./meterinfodetail'], resolve) })
|
|
32
34
|
}
|
package/src/main.js
CHANGED
|
@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
|
|
|
3
3
|
import App from './App'
|
|
4
4
|
import system from 'system-clients/src/system'
|
|
5
5
|
import sale from './sale'
|
|
6
|
-
import FilialeSale from './filiale/
|
|
6
|
+
import FilialeSale from './filiale/xihu/sale'
|
|
7
7
|
import address from 'address-client/src/address'
|
|
8
8
|
import ldap from 'ldap-clients/src/ldap'
|
|
9
9
|
import VueClipboard from 'vue-clipboard2'
|
|
Binary file
|
|
File without changes
|