sale-client 3.4.150 → 3.4.152
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/package.json +1 -1
- package/src/components/revenue/comprehen/Message/MessageList.vue +42 -15
- package/src/components/revenue/machineHandManage/ArrearsQuery.vue +12 -2
- package/src/components/webMeter/MeterManage/ParamHistory.vue +29 -67
- package/src/components/webMeter/MeterManage/ParamSet.vue +532 -479
- package/src/components/webMeter/MeterManage/ParamSetForm.vue +222 -83
- package/src/sale.js +1075 -1074
package/package.json
CHANGED
|
@@ -52,18 +52,6 @@
|
|
|
52
52
|
</div>
|
|
53
53
|
</div>
|
|
54
54
|
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
55
|
-
<div class="form-group col-sm-3">
|
|
56
|
-
<label class="font_normal_body">评价级别</label>
|
|
57
|
-
<v-select id="f_reply_type"
|
|
58
|
-
v-model="model.f_reply_type"
|
|
59
|
-
placeholder='评价级别'
|
|
60
|
-
style="width: 60%"
|
|
61
|
-
:value.sync="model.f_reply_type"
|
|
62
|
-
:options='$parent.$parent.replyType'
|
|
63
|
-
condition= "f_reply_type = '{}'"
|
|
64
|
-
close-on-select>
|
|
65
|
-
</v-select>
|
|
66
|
-
</div>
|
|
67
55
|
<div class="form-group col-sm-3">
|
|
68
56
|
<label class="font_normal_body">用户编号</label>
|
|
69
57
|
<input type="text" class="form-control" v-model="model.code" placeholder='用户编号' v-filter v-figure_filter
|
|
@@ -93,29 +81,65 @@
|
|
|
93
81
|
</v-select>
|
|
94
82
|
</div>
|
|
95
83
|
<div class="form-group col-sm-3" title="短信生成开始时间">
|
|
96
|
-
<label class="font_normal_body"
|
|
84
|
+
<label class="font_normal_body">生成日期</label>
|
|
97
85
|
<datepicker id="f_create_start_date" placeholder="开始日期"
|
|
98
86
|
v-model="model.f_create_start_date"
|
|
99
87
|
:value.sync="model.f_create_start_date"
|
|
100
88
|
:disabled-days-of-Week="[]"
|
|
101
89
|
style="width: 60%"
|
|
102
|
-
condition="convert(varchar(10),
|
|
90
|
+
condition="convert(varchar(10),f_createdate,120) >= '{}'"
|
|
103
91
|
:format="'yyyy-MM-dd'"
|
|
104
92
|
:show-reset-button="reset">
|
|
105
93
|
</datepicker>
|
|
106
94
|
</div>
|
|
107
95
|
<div class="form-group col-sm-3" title="短信生成结束时间">
|
|
108
|
-
<label class="font_normal_body"
|
|
96
|
+
<label class="font_normal_body">  至 </label>
|
|
109
97
|
<datepicker id="f_create_end_date" placeholder="结束日期"
|
|
110
98
|
v-model="model.f_create_end_date"
|
|
111
99
|
:value.sync="model.f_create_end_date"
|
|
112
100
|
:disabled-days-of-Week="[]"
|
|
113
101
|
style="width: 60%"
|
|
102
|
+
condition="convert(varchar(10),f_createdate,120) <= '{}'"
|
|
103
|
+
:format="'yyyy-MM-dd'"
|
|
104
|
+
:show-reset-button="reset">
|
|
105
|
+
</datepicker>
|
|
106
|
+
</div>
|
|
107
|
+
<div class="form-group col-sm-3" title="短信发送开始时间">
|
|
108
|
+
<label class="font_normal_body">发送日期</label>
|
|
109
|
+
<datepicker id="f_send_start_date" placeholder="开始日期"
|
|
110
|
+
v-model="model.f_send_start_date"
|
|
111
|
+
:value.sync="model.f_send_start_date"
|
|
112
|
+
:disabled-days-of-Week="[]"
|
|
113
|
+
style="width: 60%"
|
|
114
|
+
condition="convert(varchar(10),f_sendtime,120) >= '{}'"
|
|
115
|
+
:format="'yyyy-MM-dd'"
|
|
116
|
+
:show-reset-button="reset">
|
|
117
|
+
</datepicker>
|
|
118
|
+
</div>
|
|
119
|
+
<div class="form-group col-sm-3" title="短信发送结束时间">
|
|
120
|
+
<label class="font_normal_body">  至 </label>
|
|
121
|
+
<datepicker id="f_send_end_date" placeholder="结束日期"
|
|
122
|
+
v-model="model.f_send_end_date"
|
|
123
|
+
:value.sync="model.f_send_end_date"
|
|
124
|
+
:disabled-days-of-Week="[]"
|
|
125
|
+
style="width: 60%"
|
|
114
126
|
condition="convert(varchar(10),f_sendtime,120) <= '{}'"
|
|
115
127
|
:format="'yyyy-MM-dd'"
|
|
116
128
|
:show-reset-button="reset">
|
|
117
129
|
</datepicker>
|
|
118
130
|
</div>
|
|
131
|
+
<div class="form-group col-sm-3">
|
|
132
|
+
<label class="font_normal_body">评价级别</label>
|
|
133
|
+
<v-select id="f_reply_type"
|
|
134
|
+
v-model="model.f_reply_type"
|
|
135
|
+
placeholder='评价级别'
|
|
136
|
+
style="width: 60%"
|
|
137
|
+
:value.sync="model.f_reply_type"
|
|
138
|
+
:options='$parent.$parent.replyType'
|
|
139
|
+
condition= "f_reply_type = '{}'"
|
|
140
|
+
close-on-select>
|
|
141
|
+
</v-select>
|
|
142
|
+
</div>
|
|
119
143
|
</div>
|
|
120
144
|
</div>
|
|
121
145
|
</criteria>
|
|
@@ -299,6 +323,9 @@ export default {
|
|
|
299
323
|
this.$refs.paged.$refs.cri.model.f_create_end_date= dt.getFullYear()+'-12-31 23:59:59'
|
|
300
324
|
var maxsms=this.$appdata.getSingleValue('每年最多短信发送条数')
|
|
301
325
|
if(maxsms){
|
|
326
|
+
//默认查当年
|
|
327
|
+
this.$refs.paged.$refs.cri.model.f_send_start_date= dt.getFullYear()+'-01-01 00:00:00'
|
|
328
|
+
this.$refs.paged.$refs.cri.model.f_send_end_date= dt.getFullYear()+'-12-31 23:59:59'
|
|
302
329
|
//获取本年剩余短信条数
|
|
303
330
|
let http = new HttpResetClass()
|
|
304
331
|
var sendmsg =await http.load('POST', 'rs/sql/singleTable_Count1',
|
|
@@ -321,6 +321,9 @@
|
|
|
321
321
|
<th>
|
|
322
322
|
<nobr>合计欠费</nobr>
|
|
323
323
|
</th>
|
|
324
|
+
<th>
|
|
325
|
+
<nobr>实际欠费</nobr>
|
|
326
|
+
</th>
|
|
324
327
|
<th>
|
|
325
328
|
<nobr>抄表员</nobr>
|
|
326
329
|
</th>
|
|
@@ -412,6 +415,9 @@
|
|
|
412
415
|
<td style="text-align: center;">
|
|
413
416
|
<nobr>{{row.f_oughtfee_all}}</nobr>
|
|
414
417
|
</td>
|
|
418
|
+
<td style="text-align: center;">
|
|
419
|
+
<nobr>{{row.f_oughtfee_col}}</nobr>
|
|
420
|
+
</td>
|
|
415
421
|
<td style="text-align: center;">
|
|
416
422
|
<nobr>{{row.f_inputtor}}</nobr>
|
|
417
423
|
</td>
|
|
@@ -467,6 +473,9 @@
|
|
|
467
473
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
468
474
|
合计欠费: {{sumsmodel.f_oughtfee_all}}
|
|
469
475
|
</td>
|
|
476
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
477
|
+
实际欠费: {{sumsmodel.f_oughtfee_col}}
|
|
478
|
+
</td>
|
|
470
479
|
</tr>
|
|
471
480
|
</table>
|
|
472
481
|
</div>
|
|
@@ -521,7 +530,8 @@
|
|
|
521
530
|
overdue: 0,
|
|
522
531
|
f_garbage_fee: 0,
|
|
523
532
|
f_balance:0,
|
|
524
|
-
f_oughtfee_all: 0
|
|
533
|
+
f_oughtfee_all: 0,
|
|
534
|
+
f_oughtfee_col: 0
|
|
525
535
|
}),
|
|
526
536
|
criteriaShow: false,
|
|
527
537
|
orgCondtionStr: '',
|
|
@@ -878,7 +888,7 @@
|
|
|
878
888
|
'f_gasproperties': '用气性质', 'f_comments': '备注', 'c': '欠费期数', 'f_hand_date': '欠费区间', 'f_oughtamount': '用气量',
|
|
879
889
|
'f_oughtfee': '用气金额','f_operate_date': '缴费时间', 'f_debt_money': '已交金额', 'f_oughtfee_new': '应交气费',
|
|
880
890
|
'overdue': '滞纳金', 'f_garbage_fee': '附加费','f_last_tablebase': '上期抄表底数','f_tablebase': '本期抄表底数','f_balance': '上期余额',
|
|
881
|
-
'f_oughtfee_all': '合计欠费金额','f_cost_type':'缴费方式'
|
|
891
|
+
'f_oughtfee_all': '合计欠费金额','f_oughtfee_col': '实际欠费金额','f_cost_type':'缴费方式'
|
|
882
892
|
}
|
|
883
893
|
},
|
|
884
894
|
usertypes() {
|
|
@@ -1,36 +1,36 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
|
|
3
|
-
|
|
2
|
+
<div class="binary-left" style="width:24% ;text-align:center;align-content: center;">
|
|
3
|
+
<div class="row">
|
|
4
4
|
<div v-for="data in newmeterinfo" style="height: auto">
|
|
5
5
|
<ul class="nav nav-tabs col-sm-12" >
|
|
6
6
|
<li class="active"><a>{{data.name}}</a></li>
|
|
7
7
|
</ul>
|
|
8
8
|
<div class="col-sm-12" style="height: auto" v-for="param in data.params">
|
|
9
|
-
|
|
9
|
+
{{param.name}}：{{row[param.title]}}
|
|
10
10
|
</div>
|
|
11
11
|
</div>
|
|
12
|
-
</div>
|
|
13
12
|
</div>
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
</
|
|
30
|
-
|
|
31
|
-
</
|
|
32
|
-
</
|
|
13
|
+
</div>
|
|
14
|
+
<div class="binary-right" style="width:74%;overflow-y: auto;max-height:1000px;">
|
|
15
|
+
<div class="row list_area table_sy">
|
|
16
|
+
<table class="table table-bordered table-striped table-hover" id="table1" >
|
|
17
|
+
<thead>
|
|
18
|
+
<th style="text-align:center"><nobr>操作</nobr></th>
|
|
19
|
+
<th style="text-align:center"><nobr>指令发送状态</nobr></th>
|
|
20
|
+
<!-- <th style="text-align:center"><nobr>客户类型</nobr></th>-->
|
|
21
|
+
<!-- <th style="text-align:center"><nobr>气表品牌</nobr></th>-->
|
|
22
|
+
</thead>
|
|
23
|
+
<tbody>
|
|
24
|
+
<tr v-for="row in history">
|
|
25
|
+
<td><nobr>{{row.msg}}'</nobr></td>
|
|
26
|
+
<td><nobr>{{row.f_instruct_state}}</nobr></td>
|
|
27
|
+
<!-- <td><nobr>{{row.f_user_type}}</nobr></td>-->
|
|
28
|
+
<!-- <td><nobr>{{row.f_meter_brand}}</nobr></td>-->
|
|
29
|
+
</tr>
|
|
30
|
+
</tbody>
|
|
31
|
+
</table>
|
|
33
32
|
</div>
|
|
33
|
+
</div>
|
|
34
34
|
</template>
|
|
35
35
|
|
|
36
36
|
|
|
@@ -66,6 +66,12 @@ export default {
|
|
|
66
66
|
this.row.isForceSrape = '1'
|
|
67
67
|
if (rat.data.length > 0) {
|
|
68
68
|
rat.data.forEach((item) => {
|
|
69
|
+
if(item.f_param_value === '1'){
|
|
70
|
+
item.f_param_value = '开'
|
|
71
|
+
}
|
|
72
|
+
if(item.f_param_value === '0'){
|
|
73
|
+
item.f_param_value = '关'
|
|
74
|
+
}
|
|
69
75
|
this.row[item.f_param_lname] = item.f_param_value
|
|
70
76
|
})
|
|
71
77
|
// let param = JSON.parse(rat.data[0].f_data)
|
|
@@ -89,50 +95,6 @@ export default {
|
|
|
89
95
|
close () {
|
|
90
96
|
this.$dispatch('close')
|
|
91
97
|
},
|
|
92
|
-
async setParam () {
|
|
93
|
-
let user = []
|
|
94
|
-
let filesid = ''
|
|
95
|
-
this.user.forEach((item) => {
|
|
96
|
-
user.push(item.f_userfiles_id)
|
|
97
|
-
filesid += item.f_userfiles_id + ','
|
|
98
|
-
})
|
|
99
|
-
filesid = filesid.substr(0, filesid.length - 1)
|
|
100
|
-
let params = []
|
|
101
|
-
console.log('------------this.newmeterinfo', this.newmeterinfo)
|
|
102
|
-
for (let i = 0; i < this.newmeterinfo.length; i++) {
|
|
103
|
-
for (let j = 0; j < this.newmeterinfo[i].params.length; j++) {
|
|
104
|
-
for (let key in this.row) {
|
|
105
|
-
if (key === this.newmeterinfo[i].params[j].title) {
|
|
106
|
-
let data = {}
|
|
107
|
-
data.param_group = this.newmeterinfo[i].name
|
|
108
|
-
data.param_name = this.newmeterinfo[i].params[j].name
|
|
109
|
-
data.param_value = this.row[key]
|
|
110
|
-
data.param_lname = this.newmeterinfo[i].params[j].title
|
|
111
|
-
params.push(data)
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
}
|
|
115
|
-
}
|
|
116
|
-
let param = {
|
|
117
|
-
condition: 'f_gasbrand_id = ' + this.gasbrandid[0] + ' and f.f_userfiles_id in (' + filesid + ')',
|
|
118
|
-
switchCheckAll: this.checked1,
|
|
119
|
-
users: user,
|
|
120
|
-
params: params,
|
|
121
|
-
f_alias: this.gasbrand.f_alias,
|
|
122
|
-
columnName: 'g.f_userfiles_id',
|
|
123
|
-
// inputter_name: this.$login.f.name,
|
|
124
|
-
f_operator: this.$login.f.name,
|
|
125
|
-
f_operatorid: this.$login.f.id,
|
|
126
|
-
f_orgid: this.$login.f.orgid,
|
|
127
|
-
f_orgname: this.$login.f.orgs,
|
|
128
|
-
f_depid: this.$login.f.depids,
|
|
129
|
-
f_depname: this.$login.f.deps
|
|
130
|
-
}
|
|
131
|
-
console.log(param)
|
|
132
|
-
await this.$resetpost('/rs/logic/alteration_batch', {data: param}, {rejectMsg: '批量保存失败', resolveMsg: '保存成功'})
|
|
133
|
-
this.row = null
|
|
134
|
-
this.$dispatch('clear')
|
|
135
|
-
},
|
|
136
98
|
async refreshParam (val) {
|
|
137
99
|
this.newmeterinfo = [{}]
|
|
138
100
|
try {
|