sale-client 3.5.114 → 3.5.116
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 +1 -1
- package/package.json +1 -1
- package/src/components/FilesManage/UserGeneralInfoTest.vue +3 -3
- package/src/components/revenue/machineHandManage/machineHandAudit.vue +9 -21
- package/src/filiale/dongguan/components/BasicLiving.vue +12 -3
- package/src/filiale/qianneng/eticket/EticketPrint.vue +6 -8
- package/src/filiale/qianneng/revenue/machineHandManage/machineHand.vue +2 -2
- package/src/filiale/shangluo/LimitGas.vue +210 -0
- package/src/filiale/shangluo/sale.js +15 -13
- package/src/filiale/tongchuan/common/userinfo_detail/UserInfoDetailManageNew.vue +6 -1
- package/src/filiale/tongchuan/common/userinfo_detail/iot_detail/MeterParamIot.vue +86 -0
- package/src/main.js +22 -22
- package/yarn-error.log +0 -9224
package/build/dev-server.js
CHANGED
|
@@ -10,7 +10,7 @@ var compiler = webpack(config)
|
|
|
10
10
|
|
|
11
11
|
// Define HTTP proxies to your custom API backend
|
|
12
12
|
// https://github.com/chimurai/http-proxy-middleware
|
|
13
|
-
var bendi = 'http://
|
|
13
|
+
var bendi = 'http://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400/'
|
|
14
14
|
// 公司测试服务
|
|
15
15
|
// var fuwu = 'http://192.168.50.4:8400'
|
|
16
16
|
var fuwu = 'http://192.168.50.4:8400/'
|
package/package.json
CHANGED
|
@@ -93,7 +93,7 @@
|
|
|
93
93
|
</div>
|
|
94
94
|
<div class="row">
|
|
95
95
|
<div class="col-sm-2"></div>
|
|
96
|
-
<input v-if="fileSaveData.reason
|
|
96
|
+
<input v-if="fileSaveData.reason==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
|
|
97
97
|
</div>
|
|
98
98
|
</article>
|
|
99
99
|
<footer slot="modal-footer" class="modal-footer">
|
|
@@ -620,8 +620,8 @@ export default {
|
|
|
620
620
|
fireinfo: {}, // 用气信息
|
|
621
621
|
f_meter_book_num: '',
|
|
622
622
|
f_use_limit: '',
|
|
623
|
-
f_gas_date:
|
|
624
|
-
f_install_date:
|
|
623
|
+
f_gas_date: '',
|
|
624
|
+
f_install_date: ''
|
|
625
625
|
}],
|
|
626
626
|
devicesinfo: []
|
|
627
627
|
}
|
|
@@ -394,7 +394,7 @@
|
|
|
394
394
|
import * as Util from '../../../Util'
|
|
395
395
|
|
|
396
396
|
let readyGen = async function (self) {
|
|
397
|
-
self.$refs.paged.$refs.cri.model.startDate =
|
|
397
|
+
self.$refs.paged.$refs.cri.model.startDate = self.$login.toStartAndEndDateString()[0]
|
|
398
398
|
self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
|
|
399
399
|
await self.$LoadParams.loadMeterBook(self.f_filialeid)
|
|
400
400
|
self.loadMeterBooks()
|
|
@@ -414,13 +414,12 @@
|
|
|
414
414
|
dep: [],
|
|
415
415
|
user: []
|
|
416
416
|
},
|
|
417
|
-
config:
|
|
418
|
-
examine: false
|
|
417
|
+
config:{
|
|
418
|
+
examine: false,
|
|
419
419
|
},
|
|
420
420
|
imgfilename: '',
|
|
421
421
|
// 小区
|
|
422
422
|
residentialArea: [],
|
|
423
|
-
inputtouPerson: [],
|
|
424
423
|
imgshow: false,
|
|
425
424
|
criteriaShow: false,
|
|
426
425
|
orgCondtionStr: '',
|
|
@@ -445,8 +444,8 @@
|
|
|
445
444
|
'f_adjustable_name': '调压箱名称',
|
|
446
445
|
'f_inputtor': '抄表员'
|
|
447
446
|
},
|
|
448
|
-
auditState:
|
|
449
|
-
auditState1:
|
|
447
|
+
auditState:[{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
|
|
448
|
+
auditState1:[{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
|
|
450
449
|
meters: [{label: '全部', value: ''}, {label: '机表', value: '机表'}, {label: '物联网表', value: '物联网表'}],
|
|
451
450
|
resultstate: this.$appdata.getParam('抄表结果状态'),
|
|
452
451
|
meterstates: this.$appdata.getParam('抄表状态') ? [{
|
|
@@ -476,7 +475,7 @@
|
|
|
476
475
|
methods: {
|
|
477
476
|
// 修正本期底数
|
|
478
477
|
amend (row) {
|
|
479
|
-
let tablebase = window.prompt('请输入你要修正的底数值,上期底数:'
|
|
478
|
+
let tablebase = window.prompt('请输入你要修正的底数值,上期底数:'+ row.f_meter_base)
|
|
480
479
|
if (!tablebase) return
|
|
481
480
|
if (tablebase < 0) {
|
|
482
481
|
this.$showAlert(`底数不能小于0,请注意!`, 'warning', 2000)
|
|
@@ -597,9 +596,9 @@
|
|
|
597
596
|
this.imgshow = false
|
|
598
597
|
},
|
|
599
598
|
imgShow (val) {
|
|
600
|
-
console.log(
|
|
599
|
+
console.log("-----------val2:",val)
|
|
601
600
|
this.imgfilename = `rs/image/file/` + val
|
|
602
|
-
console.log(
|
|
601
|
+
console.log("-----------imgfilename2:",this.imgfilename)
|
|
603
602
|
this.imgshow = true
|
|
604
603
|
},
|
|
605
604
|
async getaddress () {
|
|
@@ -633,17 +632,6 @@
|
|
|
633
632
|
} else {
|
|
634
633
|
args.condition = `${args.condition}` + this.orgCondtionStr
|
|
635
634
|
}
|
|
636
|
-
// 抄表员查询条件
|
|
637
|
-
this.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
|
|
638
|
-
if (this.inputtouPerson.length !== 0) {
|
|
639
|
-
let str = JSON.stringify(this.inputtouPerson)
|
|
640
|
-
str = str.replace(/"/g, `'`)
|
|
641
|
-
str = str.replace(/\[/g, ``)
|
|
642
|
-
str = str.replace(/\]/g, ``)
|
|
643
|
-
console.log('=====抄表员model22222222222绑定====', str)
|
|
644
|
-
// 查询多个抄表员时条件
|
|
645
|
-
args.condition += ` and f_inputtor in ( ${str} )`
|
|
646
|
-
}
|
|
647
635
|
this.excelCondition = args.condition
|
|
648
636
|
this.$refs.paged.$refs.grid.selectInit()
|
|
649
637
|
this.model.search(args.condition, args.model)
|
|
@@ -708,7 +696,7 @@
|
|
|
708
696
|
},
|
|
709
697
|
loadMeterBooks () {
|
|
710
698
|
this.meterbooks = this.$GetSaleParam.getMeterBooks()
|
|
711
|
-
}
|
|
699
|
+
},
|
|
712
700
|
|
|
713
701
|
},
|
|
714
702
|
computed: {
|
|
@@ -233,7 +233,10 @@
|
|
|
233
233
|
} else {
|
|
234
234
|
this.model = res.data[0]
|
|
235
235
|
this.$parent.blodid = this.model.f_userinfo_id
|
|
236
|
+
console.log("时间是什么时候",this.$login.toStandardDateString())
|
|
237
|
+
// self.$refs.paged.$refs.cri.model.f_start_date
|
|
236
238
|
this.model.f_start_date = this.$login.toStandardDateString()
|
|
239
|
+
console.log("开始时间有吗?",this.model.f_start_date)
|
|
237
240
|
}
|
|
238
241
|
},
|
|
239
242
|
async confirm (type) {
|
|
@@ -250,9 +253,16 @@
|
|
|
250
253
|
f_price_id: this.model.f_price_id,
|
|
251
254
|
f_price_name: this.model.f_price_name
|
|
252
255
|
}
|
|
253
|
-
let res =await this.$resetpost('rs/logic/stopBasicLiving', {data: data},{resolveMsg: null, rejectMsg: null})
|
|
256
|
+
let res = await this.$resetpost('rs/logic/stopBasicLiving', {data: data},{resolveMsg: null, rejectMsg: null})
|
|
257
|
+
if (res){
|
|
258
|
+
if (res.data.code == 200) {
|
|
259
|
+
this.$showAlert(res.data.msg, 'success', 2000)
|
|
260
|
+
this.$dispatch('success','isBasicLiving')
|
|
261
|
+
} else if (res.data.code == 500) {
|
|
262
|
+
this.$showAlert(res.data.msg, 'warning', 2000)
|
|
263
|
+
}
|
|
264
|
+
}
|
|
254
265
|
this.initModel()
|
|
255
|
-
this.$dispatch('success','isBasicLiving')
|
|
256
266
|
}else {
|
|
257
267
|
await this.$LogicService.basicLiving(this.model, this.data)
|
|
258
268
|
this.initModel()
|
|
@@ -286,7 +296,6 @@
|
|
|
286
296
|
let s = new Date(date1)
|
|
287
297
|
let e = new Date(date2)
|
|
288
298
|
if (e < s) {
|
|
289
|
-
this.model.f_start_date = ''
|
|
290
299
|
this.model.f_end_date = ''
|
|
291
300
|
this.$showAlert('结束日期不能小于开始日期', 'warning', 2000)
|
|
292
301
|
}
|
|
@@ -132,12 +132,11 @@ export default {
|
|
|
132
132
|
id: ticket_id,
|
|
133
133
|
f_bill_code: req.fpDm,
|
|
134
134
|
f_bill_number: req.fpHm,
|
|
135
|
-
f_bill_url: req.
|
|
136
|
-
|
|
137
|
-
f_sign_result: req.sharecode,
|
|
135
|
+
f_bill_url: req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', ''),
|
|
136
|
+
f_sign_result: req.msg,
|
|
138
137
|
f_bill_state: req.status
|
|
139
138
|
}
|
|
140
|
-
this.eticket_src = '
|
|
139
|
+
this.eticket_src = req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', '')
|
|
141
140
|
} else if (req.status === '开票中') {
|
|
142
141
|
model = {
|
|
143
142
|
id: ticket_id,
|
|
@@ -304,12 +303,11 @@ export default {
|
|
|
304
303
|
f_eticket_id: ticket_id,
|
|
305
304
|
f_bill_code: req.fpDm,
|
|
306
305
|
f_bill_number: req.fpHm,
|
|
307
|
-
f_bill_url: req.
|
|
308
|
-
|
|
309
|
-
f_sign_result: req.sharecode,
|
|
306
|
+
f_bill_url: req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', ''),
|
|
307
|
+
f_sign_result: req.msg,
|
|
310
308
|
f_bill_state: req.status
|
|
311
309
|
})
|
|
312
|
-
this.eticket_src =
|
|
310
|
+
this.eticket_src = req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', '')
|
|
313
311
|
} else if (req && req.status !== '开票中') {
|
|
314
312
|
clearInterval(interval)
|
|
315
313
|
// TODO 失败后保存发票详情
|
|
@@ -482,11 +482,11 @@
|
|
|
482
482
|
</td>
|
|
483
483
|
<td
|
|
484
484
|
style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
485
|
-
应缴气量: {{sumsmodel.
|
|
485
|
+
应缴气量: {{sumsmodel.f_oughtamount}}
|
|
486
486
|
</td>
|
|
487
487
|
<td
|
|
488
488
|
style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
489
|
-
应缴金额: {{sumsmodel.
|
|
489
|
+
应缴金额: {{sumsmodel.f_oughtfee}}
|
|
490
490
|
</td>
|
|
491
491
|
</tr>
|
|
492
492
|
</table>
|
|
@@ -0,0 +1,210 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="auto">
|
|
3
|
+
<modal :show.sync="show" v-ref:modal large backdrop="false">
|
|
4
|
+
<header slot="modal-header" class="modal-header">
|
|
5
|
+
<h3 style="color:black" class="modal-title">限购配置</h3>
|
|
6
|
+
</header>
|
|
7
|
+
<article slot="modal-body" class="modal-body">
|
|
8
|
+
<validator name='v'>
|
|
9
|
+
<form class="form-horizontal select-overspread">
|
|
10
|
+
<div class="row">
|
|
11
|
+
<div class="col-sm-6 form-input-group">
|
|
12
|
+
<label class="font_normal_body col-sm-3">第三方缴费</label>
|
|
13
|
+
<v-select
|
|
14
|
+
:value.sync="model.f_third_pay"
|
|
15
|
+
v-model="model.f_third_pay"
|
|
16
|
+
:options='thirdPays'
|
|
17
|
+
:value-single="true"
|
|
18
|
+
close-on-select></v-select>
|
|
19
|
+
</div>
|
|
20
|
+
<div class="col-sm-6 form-input-group">
|
|
21
|
+
<label class="font_normal_body col-sm-3">限制类型</label>
|
|
22
|
+
<v-select
|
|
23
|
+
:value.sync="model.f_limit_style"
|
|
24
|
+
v-model="model.f_limit_style"
|
|
25
|
+
:options='limitstyle'
|
|
26
|
+
:value-single="true"
|
|
27
|
+
close-on-select></v-select>
|
|
28
|
+
</div>
|
|
29
|
+
</div>
|
|
30
|
+
<div class="row" style="margin-top:10px;" >
|
|
31
|
+
<div class="col-sm-6 form-input-group">
|
|
32
|
+
<label class="font_normal_body col-sm-3">周期类型</label>
|
|
33
|
+
<v-select
|
|
34
|
+
:value.sync="model.f_time_type"
|
|
35
|
+
v-model="model.f_time_type"
|
|
36
|
+
:options='timeTypes'
|
|
37
|
+
:value-single="true"
|
|
38
|
+
close-on-select></v-select>
|
|
39
|
+
</div>
|
|
40
|
+
<div class="col-sm-6 form-input-group">
|
|
41
|
+
<label class="font_normal_body col-sm-3">周期时长</label>
|
|
42
|
+
<input type="text" v-model="model.f_time_value" placeholder="周期时长" style="vertical-align:middle">
|
|
43
|
+
</div>
|
|
44
|
+
</div>
|
|
45
|
+
|
|
46
|
+
<div class="row" style="margin-top:10px;" v-if="model.f_limit_style !=='按总量'">
|
|
47
|
+
<div class="col-sm-6 form-input-group">
|
|
48
|
+
<label class="font_normal_body col-sm-3">限制次数</label>
|
|
49
|
+
<input type="text" v-model="model.f_limit_times" placeholder="限制次数">
|
|
50
|
+
</div>
|
|
51
|
+
<div class="col-sm-6 form-input-group" v-if="model.f_limit_type ==='气量'">
|
|
52
|
+
<label class="font_normal_body col-sm-3">单次限购</label>
|
|
53
|
+
<input type="text" v-model="model.f_limit_value" placeholder="单次限购">
|
|
54
|
+
</div>
|
|
55
|
+
<div class="col-sm-6 form-input-group" v-if="model.f_limit_type ==='金额'">
|
|
56
|
+
<label class="font_normal_body col-sm-3">单次限购</label>
|
|
57
|
+
<input type="text" v-model="model.f_limit_amount" placeholder="单次限购">
|
|
58
|
+
</div>
|
|
59
|
+
</div>
|
|
60
|
+
<div class="row" style="margin-top:10px;" v-if="model.f_limit_style ==='按总量'">
|
|
61
|
+
<div class="col-sm-6 form-input-group" v-if="model.f_limit_type ==='气量'">
|
|
62
|
+
<label class="font_normal_body col-sm-3">总限购量</label>
|
|
63
|
+
<input type="text" v-model="model.f_limit_value" placeholder="单次限购">
|
|
64
|
+
</div>
|
|
65
|
+
<div class="col-sm-6 form-input-group" v-if="model.f_limit_type ==='金额'">
|
|
66
|
+
<label class="font_normal_body col-sm-3">总限购量</label>
|
|
67
|
+
<input type="text" v-model="model.f_limit_amount" placeholder="单次限购">
|
|
68
|
+
</div>
|
|
69
|
+
</div>
|
|
70
|
+
<div class="row" style="margin-top:10px;">
|
|
71
|
+
<div class="col-sm-6 form-input-group">
|
|
72
|
+
<label class="font_normal_body col-sm-3">支付限制</label>
|
|
73
|
+
<v-select
|
|
74
|
+
:value.sync="model.f_limit_type"
|
|
75
|
+
v-model="model.f_limit_type"
|
|
76
|
+
:options='limitTypes'
|
|
77
|
+
:value-single="true"
|
|
78
|
+
close-on-select></v-select>
|
|
79
|
+
</div>
|
|
80
|
+
<div class="col-sm-6 form-input-group">
|
|
81
|
+
<label class="font_normal_body col-sm-3">执行时间</label>
|
|
82
|
+
<datepicker placeholder="执行时间"
|
|
83
|
+
v-model="model.f_start_date"
|
|
84
|
+
:value.sync="model.f_start_date"
|
|
85
|
+
:format="'yyyy-MM-dd'">
|
|
86
|
+
</datepicker>
|
|
87
|
+
</div>
|
|
88
|
+
</div>
|
|
89
|
+
</form>
|
|
90
|
+
</validator>
|
|
91
|
+
</article>
|
|
92
|
+
<footer slot="modal-footer" class="modal-footer">
|
|
93
|
+
<button class="btn btn-success" v-if="limitshow" @click="cancellimit">取消限购</button>
|
|
94
|
+
<button class="button_search btn-gn" @click="confirm">确认</button>
|
|
95
|
+
<button class="button_clear btn-gn" @click="cancel">取消</button>
|
|
96
|
+
</footer>
|
|
97
|
+
</modal>
|
|
98
|
+
</div>
|
|
99
|
+
</template>
|
|
100
|
+
<script>
|
|
101
|
+
|
|
102
|
+
import {HttpResetClass} from 'vue-client'
|
|
103
|
+
|
|
104
|
+
let getLimitDataGen = async function (self) {
|
|
105
|
+
let param = {
|
|
106
|
+
tablename: 't_limit_gas'
|
|
107
|
+
}
|
|
108
|
+
if (self.f_price_id) {
|
|
109
|
+
param.condition = ` f_price_id = '${self.f_price_id}' and isnull(f_state,'') != '无效'`
|
|
110
|
+
} else if (self.f_userinfo_id) {
|
|
111
|
+
param.condition = ` f_userinfo_id = '${self.f_userinfo_id}' and isnull(f_state,'') != '无效'`
|
|
112
|
+
}
|
|
113
|
+
let http = new HttpResetClass()
|
|
114
|
+
let res = await http.load('POST', 'rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: '获取限购配置失败!!'})
|
|
115
|
+
console.log('获取的限购数据', res)
|
|
116
|
+
if (res.data.length > 0 ) {
|
|
117
|
+
self.model = Object.assign({}, self.model, res.data[0])
|
|
118
|
+
self.model.f_third_pay = self.model.f_third_pay + ''
|
|
119
|
+
self.limitshow = true
|
|
120
|
+
} else {
|
|
121
|
+
self.limitshow = false
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
|
|
127
|
+
export default {
|
|
128
|
+
title: '限购配置',
|
|
129
|
+
data () {
|
|
130
|
+
return {
|
|
131
|
+
model: {
|
|
132
|
+
f_third_pay: '0',
|
|
133
|
+
f_time_type: '按月',
|
|
134
|
+
f_limit_times: '',
|
|
135
|
+
f_time_value: '12',
|
|
136
|
+
f_limit_type: '气量',
|
|
137
|
+
f_limit_style:'按总量',
|
|
138
|
+
f_limit_value: -1,
|
|
139
|
+
f_limit_amount: -1,
|
|
140
|
+
f_start_date: this.$login.toStandardDateString()
|
|
141
|
+
},
|
|
142
|
+
limitshow: false,
|
|
143
|
+
thirdPays: [{label: '支持', value: '1'},{label: '不支持', value: '0'}],
|
|
144
|
+
timeTypes: [{label: '按月', value: '按月'},{label: '按日', value: '按日'}],
|
|
145
|
+
limitTypes: [{label: '气量', value: '气量'},{label: '金额', value: '金额'}],
|
|
146
|
+
limitstyle: [{label: '按次数', value: '按次数'},{label: '按总量', value: '按总量'}]
|
|
147
|
+
}
|
|
148
|
+
},
|
|
149
|
+
props: ['show', 'f_price_id', 'f_userinfo_id'],
|
|
150
|
+
ready () {
|
|
151
|
+
this.getLimitData()
|
|
152
|
+
},
|
|
153
|
+
watch: {
|
|
154
|
+
'f_price_id' () {
|
|
155
|
+
this.getLimitData()
|
|
156
|
+
},
|
|
157
|
+
'f_userinfo_id' () {
|
|
158
|
+
this.getLimitData()
|
|
159
|
+
}
|
|
160
|
+
},
|
|
161
|
+
methods: {
|
|
162
|
+
getLimitData () {
|
|
163
|
+
console.log('获取限购配置。。', this.f_price_id, this.f_userinfo_id)
|
|
164
|
+
if (this.f_price_id || this.f_userinfo_id) {
|
|
165
|
+
getLimitDataGen(this)
|
|
166
|
+
}
|
|
167
|
+
},
|
|
168
|
+
|
|
169
|
+
confirm () {
|
|
170
|
+
this.$dispatch('limit', this.model)
|
|
171
|
+
this.model = {
|
|
172
|
+
f_third_pay: '0',
|
|
173
|
+
f_time_type: '按月',
|
|
174
|
+
f_limit_times: '',
|
|
175
|
+
f_time_value: '',
|
|
176
|
+
f_limit_type: '气量',
|
|
177
|
+
f_limit_style:'',
|
|
178
|
+
f_limit_value: 0,
|
|
179
|
+
f_limit_amount: 0,
|
|
180
|
+
f_start_date: this.$login.toStandardDateString()
|
|
181
|
+
}
|
|
182
|
+
this.show = false
|
|
183
|
+
},
|
|
184
|
+
async cancellimit() {
|
|
185
|
+
let sql = `update t_limit_gas set f_state = '无效' where id = '${this.model.id}'`
|
|
186
|
+
let data = {
|
|
187
|
+
sql: sql
|
|
188
|
+
}
|
|
189
|
+
await this.$resetpost('rs/logic/runSQL',data)
|
|
190
|
+
this.model = {
|
|
191
|
+
f_third_pay: '0',
|
|
192
|
+
f_time_type: '按月',
|
|
193
|
+
f_limit_times: '',
|
|
194
|
+
f_time_value: '',
|
|
195
|
+
f_limit_type: '气量',
|
|
196
|
+
f_limit_style:'',
|
|
197
|
+
f_limit_value: 0,
|
|
198
|
+
f_limit_amount: 0,
|
|
199
|
+
f_start_date: this.$login.toStandardDateString()
|
|
200
|
+
}
|
|
201
|
+
getLimitDataGen(this)
|
|
202
|
+
},
|
|
203
|
+
cancel () {
|
|
204
|
+
this.show = false
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
</script>
|
|
@@ -1,13 +1,15 @@
|
|
|
1
|
-
// 分公司特殊组件页面注册
|
|
2
|
-
const Vue = require("vue");
|
|
3
|
-
let specialComp = {
|
|
4
|
-
'file-meter-info': (resolve) => { require(['./MeterinfoTest'], resolve) },
|
|
5
|
-
'file-user-essential-info': (resolve) => { require(['./UserEssentialInfoTest'], resolve) },
|
|
6
|
-
// 物联网表收费
|
|
7
|
-
'iot-meter-center': (resolve) => { require(['./IOTMeterCenter'], resolve) },
|
|
8
|
-
//机表收费
|
|
9
|
-
'machine-meter-center': (resolve) => { require(['./MachineMeterCenter'], resolve) },
|
|
10
|
-
//卡表
|
|
11
|
-
'card-meter-center': (resolve) => { require(['./CardMeterCenter'], resolve) }
|
|
12
|
-
|
|
13
|
-
|
|
1
|
+
// 分公司特殊组件页面注册
|
|
2
|
+
const Vue = require("vue");
|
|
3
|
+
let specialComp = {
|
|
4
|
+
'file-meter-info': (resolve) => { require(['./MeterinfoTest'], resolve) },
|
|
5
|
+
'file-user-essential-info': (resolve) => { require(['./UserEssentialInfoTest'], resolve) },
|
|
6
|
+
// 物联网表收费
|
|
7
|
+
'iot-meter-center': (resolve) => { require(['./IOTMeterCenter'], resolve) },
|
|
8
|
+
//机表收费
|
|
9
|
+
'machine-meter-center': (resolve) => { require(['./MachineMeterCenter'], resolve) },
|
|
10
|
+
//卡表
|
|
11
|
+
'card-meter-center': (resolve) => { require(['./CardMeterCenter'], resolve) },
|
|
12
|
+
// 限购配置
|
|
13
|
+
'limit-gas': (resolve) => { require(['./LimitGas'], resolve) },
|
|
14
|
+
}
|
|
15
|
+
exports.specialComp = specialComp
|
|
@@ -63,9 +63,12 @@
|
|
|
63
63
|
<saletab header="设备查询" v-if="permission('设备查询')">
|
|
64
64
|
<deveice-record :row="row" v-if="show == '设备查询'" @deal-msg="dealMsg"></deveice-record>
|
|
65
65
|
</saletab>
|
|
66
|
-
<saletab header="流量计参数查看" v-if="permission('流量计参数查看')">
|
|
66
|
+
<saletab header="流量计参数查看" v-if="permission('流量计参数查看')&&!row.f_meter_brand.includes('苍南')">
|
|
67
67
|
<meter-param :row="row" v-if="show == '流量计参数查看'" @deal-msg="dealMsg"></meter-param>
|
|
68
68
|
</saletab>
|
|
69
|
+
<saletab header="流量计参数查看" v-if="permission('流量计参数查看')&&row.f_meter_brand.includes('苍南')">
|
|
70
|
+
<meter-param-iot :row="row" v-if="show == '流量计参数查看'" @deal-msg="dealMsg"></meter-param-iot>
|
|
71
|
+
</saletab>
|
|
69
72
|
<saletab header="表使用量图表">
|
|
70
73
|
<table-usage-chart :row="row" v-if="show == '表使用量图表'" @deal-msg="dealMsg"></table-usage-chart>
|
|
71
74
|
</saletab>
|
|
@@ -97,6 +100,7 @@
|
|
|
97
100
|
import ChangeRecord from './ic_detail/ChangeRecord'
|
|
98
101
|
import PriceAdjustmentQueryUser from './ic_detail/PriceAdjustmentQueryUser'
|
|
99
102
|
import MeterParam from './ic_detail/MeterParam'
|
|
103
|
+
import MeterParamIot from './iot_detail/MeterParamIot'
|
|
100
104
|
import DeveiceRecord from './ic_detail/DeveiceRecord'
|
|
101
105
|
export default {
|
|
102
106
|
title: '用户详细信息',
|
|
@@ -121,6 +125,7 @@ export default {
|
|
|
121
125
|
CardHandRecord,
|
|
122
126
|
MeterParam,
|
|
123
127
|
DeveiceRecord,
|
|
128
|
+
MeterParamIot,
|
|
124
129
|
MachineRecordQuery
|
|
125
130
|
},
|
|
126
131
|
data () {
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
<template >
|
|
2
|
+
<div class="flex" style="justify-content: space-between;">
|
|
3
|
+
<div @keyup.enter="search" style="">
|
|
4
|
+
<criteria-paged :model="model" v-ref:paged>
|
|
5
|
+
<criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
|
|
6
|
+
<div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
|
|
7
|
+
<div class="row" width="100%">
|
|
8
|
+
<div class="col-sm-4" >
|
|
9
|
+
<label class="font_normal_body" > 开始时间</label>
|
|
10
|
+
<datepicker placeholder="起始时间" style="width:60%"
|
|
11
|
+
:value.sync="model.f_start_date"
|
|
12
|
+
v-model="model.f_start_date"
|
|
13
|
+
:format="'yyyy-MM-dd'"
|
|
14
|
+
condition="f_insert_date >= '{} 00:00:00' "
|
|
15
|
+
>></datepicker>
|
|
16
|
+
</div>
|
|
17
|
+
<div class="col-sm-4" >
|
|
18
|
+
<label class="font_normal_body" >结束时间</label>
|
|
19
|
+
<datepicker placeholder="结束时间" style="width:60%"
|
|
20
|
+
:value.sync="model.f_end_date"
|
|
21
|
+
v-model="model.f_end_date"
|
|
22
|
+
:format="'yyyy-MM-dd'"
|
|
23
|
+
condition="f_insert_date <= '{} 23:59:59' "
|
|
24
|
+
>></datepicker>
|
|
25
|
+
</div>
|
|
26
|
+
<div class="span" style="float:right;">
|
|
27
|
+
<button class="button_search" @click="search()" v-el:cba>查询</button>
|
|
28
|
+
</div>
|
|
29
|
+
</div>
|
|
30
|
+
</div>
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
</criteria>
|
|
34
|
+
<data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
|
|
35
|
+
<template partial='head'>
|
|
36
|
+
<tr>
|
|
37
|
+
<th v-for="(key,value) in $parent.$parent.$parent.jsonFields"><nobr>{{value}}</nobr></th>
|
|
38
|
+
</tr>
|
|
39
|
+
</template>
|
|
40
|
+
<template partial='body' partial='list' v-ref:grid>
|
|
41
|
+
<tr >
|
|
42
|
+
<td style="text-align:center" v-for="(key,value) in $parent.$parent.$parent.jsonFields"><nobr>{{row[key]}}</nobr></td>
|
|
43
|
+
</tr>
|
|
44
|
+
</template>
|
|
45
|
+
<template partial='foot'></template>
|
|
46
|
+
</data-grid>
|
|
47
|
+
</criteria-paged>
|
|
48
|
+
</div>
|
|
49
|
+
</div>
|
|
50
|
+
</template>
|
|
51
|
+
|
|
52
|
+
<script>
|
|
53
|
+
import {PagedList} from 'vue-client'
|
|
54
|
+
export default {
|
|
55
|
+
title: '流量计参数查看',
|
|
56
|
+
data () {
|
|
57
|
+
return {
|
|
58
|
+
condition: '1=1',
|
|
59
|
+
model: new PagedList('rs/sql/sale_meterparamQuery', 20, {}),
|
|
60
|
+
jsonFields: {
|
|
61
|
+
f_insert_date: '插入日期',
|
|
62
|
+
operatingModeTotal: '工况累计',
|
|
63
|
+
standardConditionFlow: '标况流量',
|
|
64
|
+
operatingModeFlow: '工况流量',
|
|
65
|
+
flowmeterTemperature: '温度',
|
|
66
|
+
flowmeterPressure: '压力',
|
|
67
|
+
flowmeterTemperatureState: '流量计温度状态',
|
|
68
|
+
flowmeterPressureState: '流量计压力状态'
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
},
|
|
72
|
+
props: ['row'],
|
|
73
|
+
ready () {
|
|
74
|
+
this.$refs.paged.$refs.criteria.search()
|
|
75
|
+
},
|
|
76
|
+
methods: {
|
|
77
|
+
search () {
|
|
78
|
+
this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_userfiles_id = '${this.row.f_userfiles_id}'`
|
|
79
|
+
this.model.search(this.condition, this.model)
|
|
80
|
+
},
|
|
81
|
+
},
|
|
82
|
+
computed: {
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
</script>
|
|
86
|
+
|
package/src/main.js
CHANGED
|
@@ -1,22 +1,22 @@
|
|
|
1
|
-
import Vue from 'vue'
|
|
2
|
-
import { all } from 'vue-client'
|
|
3
|
-
import App from './App'
|
|
4
|
-
import { system } from 'system-clients'
|
|
5
|
-
import sale from './sale'
|
|
6
|
-
import { address } from 'address-client'
|
|
7
|
-
import { ldap } from 'ldap-clients'
|
|
8
|
-
import VueClipboard from 'vue-clipboard2'
|
|
9
|
-
Vue.use(VueClipboard)
|
|
10
|
-
Vue.config.silent = true
|
|
11
|
-
|
|
12
|
-
all()
|
|
13
|
-
system(false)
|
|
14
|
-
sale()
|
|
15
|
-
address()
|
|
16
|
-
ldap()
|
|
17
|
-
require('system-clients/src/styles/less/bootstrap.less')
|
|
18
|
-
|
|
19
|
-
new Vue({
|
|
20
|
-
el: 'body',
|
|
21
|
-
components: { App }
|
|
22
|
-
})
|
|
1
|
+
import Vue from 'vue'
|
|
2
|
+
import { all } from 'vue-client'
|
|
3
|
+
import App from './App'
|
|
4
|
+
import { system } from 'system-clients'
|
|
5
|
+
import sale from './sale'
|
|
6
|
+
import { address } from 'address-client'
|
|
7
|
+
import { ldap } from 'ldap-clients'
|
|
8
|
+
import VueClipboard from 'vue-clipboard2'
|
|
9
|
+
Vue.use(VueClipboard)
|
|
10
|
+
Vue.config.silent = true
|
|
11
|
+
|
|
12
|
+
all()
|
|
13
|
+
system(false)
|
|
14
|
+
sale('shangluo')
|
|
15
|
+
address()
|
|
16
|
+
ldap()
|
|
17
|
+
require('system-clients/src/styles/less/bootstrap.less')
|
|
18
|
+
|
|
19
|
+
new Vue({
|
|
20
|
+
el: 'body',
|
|
21
|
+
components: { App }
|
|
22
|
+
})
|