sale-client 4.2.47 → 4.2.49
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 +6 -0
- package/package.json +1 -1
- package/src/filiale/fugou/components/FileUserAddress.vue +2 -7
- package/src/filiale/fugou/components/revenue/HandManager/MbpeopleList.vue +2 -2
- package/src/filiale/qingjian/ChargeModal.vue +110 -0
- package/src/filiale/qingjian/FileUserFiles.vue +34 -3
- package/src/filiale/qingjian/sale.js +2 -0
package/build/dev-server.js
CHANGED
|
@@ -56,6 +56,12 @@ var devConfig = {
|
|
|
56
56
|
// },
|
|
57
57
|
// target: "http://localhost:8080"
|
|
58
58
|
// },
|
|
59
|
+
'/api/af-revenue/logic/getOperBtns': {
|
|
60
|
+
pathRewrite: {
|
|
61
|
+
'/api/af-revenue': '/rs'
|
|
62
|
+
},
|
|
63
|
+
target: 'http://127.0.0.1:8080'
|
|
64
|
+
},
|
|
59
65
|
'/api': {
|
|
60
66
|
target: serverRul,
|
|
61
67
|
pathRewrite: {
|
package/package.json
CHANGED
|
@@ -707,9 +707,9 @@ export default {
|
|
|
707
707
|
})
|
|
708
708
|
this.communitylist=redata
|
|
709
709
|
},
|
|
710
|
-
async communityChange(val){
|
|
710
|
+
async communityChange (val) {
|
|
711
711
|
console.log(val)
|
|
712
|
-
if(val){
|
|
712
|
+
if (val && val !== '[object Event]') {
|
|
713
713
|
await this.initareas(` f_filialeid = '${this.f_filialeids}' and f_community_id ='${val}' `)
|
|
714
714
|
if(this.model.f_residential_area_id){
|
|
715
715
|
// if (this.findbyid(this.areaslist,this.model.f_residential_area_id)) {
|
|
@@ -722,11 +722,6 @@ export default {
|
|
|
722
722
|
// }
|
|
723
723
|
|
|
724
724
|
}
|
|
725
|
-
// if(this.model.f_pcd_id.length==0){
|
|
726
|
-
// if (this.findbyid(this.streetslist,this.model.f_street_id)) {
|
|
727
|
-
// this.model.f_pcd_id=this.findbyid(this.streetslist,this.model.f_street_id).f_pcd_id
|
|
728
|
-
// }
|
|
729
|
-
// }
|
|
730
725
|
}
|
|
731
726
|
this.$resetValidation()
|
|
732
727
|
},
|
|
@@ -700,9 +700,9 @@ let loadParamGem = async function (self) {
|
|
|
700
700
|
await this.initcommunity(` f_filialeid = '${this.f_filialeids}' and f_street_id ='${val}' `)
|
|
701
701
|
}
|
|
702
702
|
},
|
|
703
|
-
async communityChange(val){
|
|
703
|
+
async communityChange (val) {
|
|
704
704
|
console.log(val)
|
|
705
|
-
if(val){
|
|
705
|
+
if (val && val !== '[object Event]') {
|
|
706
706
|
await this.initareas(` f_filialeid = '${this.f_filialeids}' and f_community_id ='${val}' `)
|
|
707
707
|
}
|
|
708
708
|
}
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<modal :show.sync="modalShow" backdrop="false" width="50%" title="提示信息">
|
|
3
|
+
<article slot="modal-body">
|
|
4
|
+
<div style="width:98%;margin: auto" v-show="showInformation">
|
|
5
|
+
<p>{{warninginfo.data.msgData}}</p>
|
|
6
|
+
<div style="font-size: 15px;padding: 10px">
|
|
7
|
+
<span style="float: right">
|
|
8
|
+
<button class="button_search" v-show="!warninginfo.data.state.info" @click="operational('files_complete')" style="width: max-content;">完善信息</button>
|
|
9
|
+
<button class="button_search" v-show="warninginfo.data.state.blacklist&&!warninginfo.data.state.dibao" @click="operational('basic-living')" style="width: max-content;">低保续保</button>
|
|
10
|
+
<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>
|
|
11
|
+
<button class="button_search" v-show="!(!warninginfo.data.state.dibao&&warninginfo.data.state.dibaoend) && warninginfo.canCharge" @click="success()">确认</button>
|
|
12
|
+
<button class="button_search" v-show="warninginfo.data.state.hasOwnProperty('chargeAccount') && warninginfo.data.state.chargeAccount === false" @click="goToAccount()">去挂账管理</button>
|
|
13
|
+
</span>
|
|
14
|
+
</div>
|
|
15
|
+
<p>{{authorityInformation}}</p>
|
|
16
|
+
</div>
|
|
17
|
+
<div style="width:98%;margin: auto" v-show="!showInformation" >
|
|
18
|
+
<route v-ref:route @close="close" @success="success" v-show="!showInformation" :data="row"></route>
|
|
19
|
+
</div>
|
|
20
|
+
</article>
|
|
21
|
+
<footer slot="modal-footer" class="modal-footer" style="text-align: center;border: 0">
|
|
22
|
+
<!--如果想忽略到期信息，modal的值设为null-->
|
|
23
|
+
<!-- <button class="button_clear" @click="ignore" v-if="basicLiving">忽略</button>-->
|
|
24
|
+
</footer>
|
|
25
|
+
</modal>
|
|
26
|
+
</template>
|
|
27
|
+
<script>
|
|
28
|
+
let initGen = async function (self) {
|
|
29
|
+
if(self.warninginfo){
|
|
30
|
+
if (!self.warninginfo.data.state.info && !self.warninginfo.data.state.blacklist && !self.warninginfo.data.state.dibao) {
|
|
31
|
+
self.authorityInformation = '您没有相关的业务操作权限, 请联系管理员！！'
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
export default {
|
|
38
|
+
title: '收费弹出框',
|
|
39
|
+
props: {
|
|
40
|
+
// 动态属性表数据
|
|
41
|
+
warninginfo:{
|
|
42
|
+
type:Object
|
|
43
|
+
},
|
|
44
|
+
// 双击用户的数据
|
|
45
|
+
row: {
|
|
46
|
+
type: Object
|
|
47
|
+
},
|
|
48
|
+
modalShow: {
|
|
49
|
+
type: Boolean
|
|
50
|
+
}
|
|
51
|
+
},
|
|
52
|
+
data () {
|
|
53
|
+
return {
|
|
54
|
+
showInformation: true,
|
|
55
|
+
informationtype: '',
|
|
56
|
+
|
|
57
|
+
// 终止低保户 必选低保户到期
|
|
58
|
+
stopBasicLiving: false,
|
|
59
|
+
|
|
60
|
+
// 低保户到期提醒时间
|
|
61
|
+
dibao_remind: this.$appdata.getSingleValue('低保快到期提醒') ? this.$appdata.getSingleValue('低保快到期提醒') : 0,
|
|
62
|
+
// 低保户权限
|
|
63
|
+
basicLivingAuthority: false,
|
|
64
|
+
// 档案完善权限
|
|
65
|
+
filesCompleteAuthority: true
|
|
66
|
+
}
|
|
67
|
+
},
|
|
68
|
+
methods: {
|
|
69
|
+
goToAccount () {
|
|
70
|
+
console.log('点击了去挂帐管理')
|
|
71
|
+
if (window.parent !== window) {
|
|
72
|
+
window.parent.postMessage({type: 'route', path:'/duizhang/credit'}, '*')
|
|
73
|
+
this.close()
|
|
74
|
+
}
|
|
75
|
+
},
|
|
76
|
+
close () {
|
|
77
|
+
this.$emit('close')
|
|
78
|
+
},
|
|
79
|
+
async success (val) {
|
|
80
|
+
|
|
81
|
+
// 如果所有提示信息均处理，获取改户数据，进入收费操作
|
|
82
|
+
if (!this.warninginfo.data.info && !this.warninginfo.data.blacklist && !this.warninginfo.data.dibao) {
|
|
83
|
+
this.showInformation = false
|
|
84
|
+
let data = await this.$resetpost('api/af-revenue/sql/sale_getUser', {data: {condition: `1=1 and f_userinfo_code = '${this.row.f_userinfo_code}' and u.f_filialeid = '${this.$login.f.orgid}'`}}, {resolveMsg: '', rejectMsg: ''})
|
|
85
|
+
this.$emit('modalsuccess', data.data[0])
|
|
86
|
+
} else { // 没有处理完，显示提示信息
|
|
87
|
+
this.showInformation = true
|
|
88
|
+
}
|
|
89
|
+
},
|
|
90
|
+
operational (val) {
|
|
91
|
+
this.showInformation = false
|
|
92
|
+
this.$refs.route.init(val, {data: this.row})
|
|
93
|
+
}
|
|
94
|
+
},
|
|
95
|
+
ready () {
|
|
96
|
+
initGen(this)
|
|
97
|
+
console.log('charge-modal', this.warninginfo.data.state)
|
|
98
|
+
}
|
|
99
|
+
// watch: {
|
|
100
|
+
// 'modalShow' (val) {
|
|
101
|
+
// this.modal = val
|
|
102
|
+
// }
|
|
103
|
+
// }
|
|
104
|
+
}
|
|
105
|
+
</script>
|
|
106
|
+
<style>
|
|
107
|
+
.basic-main {
|
|
108
|
+
width: 79%;
|
|
109
|
+
}
|
|
110
|
+
</style>
|
|
@@ -160,6 +160,14 @@
|
|
|
160
160
|
condition="f_meter_brand in {}"
|
|
161
161
|
close-on-select></v-select>
|
|
162
162
|
</div>
|
|
163
|
+
<div class="form-group" :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}">
|
|
164
|
+
<label class="font_normal_body">现场表具型号</label>
|
|
165
|
+
<v-select :value.sync="model.f_xc_meter_style" multiple
|
|
166
|
+
v-model="model.f_xc_meter_style"
|
|
167
|
+
:options='$parent.$parent.metermodels' placeholder='请选择'
|
|
168
|
+
condition="f_xc_meter_style in {}"
|
|
169
|
+
close-on-select></v-select>
|
|
170
|
+
</div>
|
|
163
171
|
<!-- <div-->
|
|
164
172
|
<!-- :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"-->
|
|
165
173
|
<!-- class="form-group">-->
|
|
@@ -347,6 +355,9 @@
|
|
|
347
355
|
<th>
|
|
348
356
|
<nobr>气表品牌</nobr>
|
|
349
357
|
</th>
|
|
358
|
+
<th>
|
|
359
|
+
<nobr>现场表具型号</nobr>
|
|
360
|
+
</th>
|
|
350
361
|
<th>
|
|
351
362
|
<nobr>发卡状态</nobr>
|
|
352
363
|
</th>
|
|
@@ -391,6 +402,7 @@
|
|
|
391
402
|
<td style="text-align: center;">{{row.f_gasproperties}}</td>
|
|
392
403
|
<td style="text-align: center;">{{row.f_meter_classify}}</td>
|
|
393
404
|
<td style="text-align: center;">{{row.f_meter_brand}}</td>
|
|
405
|
+
<td style="text-align: center;">{{row.f_xc_meter_style}}</td>
|
|
394
406
|
<td style="text-align: center;">{{row.f_whether_hairpin}}</td>
|
|
395
407
|
<td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_userfiles_address}}</td>
|
|
396
408
|
<td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_user_state}}</td>
|
|
@@ -433,7 +445,7 @@
|
|
|
433
445
|
|
|
434
446
|
<modal :show.sync="show" width="500px" title="文件导入" v-ref:modal large backdrop="false">
|
|
435
447
|
<article slot="modal-body" class="modal-body">
|
|
436
|
-
<file-upload class="my-file-uploader " name="UploadFile"
|
|
448
|
+
<file-upload class="my-file-uploader btn btn-success" name="UploadFile" style="border-radius: 2px;"
|
|
437
449
|
action="rs/file/uploadFile" tagname="导入档案" v-ref:file :headers="headers"></file-upload>
|
|
438
450
|
</article>
|
|
439
451
|
<footer slot="modal-footer" class="modal-footer">
|
|
@@ -613,6 +625,7 @@ let loadParamGem = async function (self) {
|
|
|
613
625
|
value: ''
|
|
614
626
|
}, ...this.$appdata.getParam('气表类型')] : [],
|
|
615
627
|
meterbrands: [],
|
|
628
|
+
metermodels: [],
|
|
616
629
|
f_whether_hairpin: this.$appdata.getParam('发卡状态') ? [{
|
|
617
630
|
label: '全部',
|
|
618
631
|
value: ''
|
|
@@ -949,6 +962,24 @@ let loadParamGem = async function (self) {
|
|
|
949
962
|
brandArr.push(temp1)
|
|
950
963
|
})
|
|
951
964
|
this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
|
|
965
|
+
|
|
966
|
+
// 初始化气表型号
|
|
967
|
+
let modelArr = []
|
|
968
|
+
this.$GetSaleParam.getGasbrand().forEach((item) => {
|
|
969
|
+
if (item.value.gasmodel && item.value.gasmodel.length > 0) {
|
|
970
|
+
item.value.gasmodel.forEach((model) => {
|
|
971
|
+
let temp2 = {}
|
|
972
|
+
temp2.label = model.label
|
|
973
|
+
temp2.value = model.label
|
|
974
|
+
modelArr.push(temp2)
|
|
975
|
+
})
|
|
976
|
+
}
|
|
977
|
+
})
|
|
978
|
+
// 去重
|
|
979
|
+
let uniqueModels = modelArr.filter((item, index, self) =>
|
|
980
|
+
index === self.findIndex(t => t.label === item.label)
|
|
981
|
+
)
|
|
982
|
+
this.metermodels = [{label: '全部', value: ''}, ...uniqueModels]
|
|
952
983
|
},
|
|
953
984
|
importFile () {
|
|
954
985
|
this.show = true
|
|
@@ -1095,12 +1126,12 @@ let loadParamGem = async function (self) {
|
|
|
1095
1126
|
.nav-tabss ul > li > a {
|
|
1096
1127
|
padding: 5px 10px;
|
|
1097
1128
|
}
|
|
1098
|
-
|
|
1129
|
+
/* 两个字符占用4个字符距离 */
|
|
1099
1130
|
.w2 {
|
|
1100
1131
|
letter-spacing:2em; /*如果需要y个字两端对齐，则为(x-y)/(y-1),这里是（4-2）/(2-1)=2em */
|
|
1101
1132
|
margin-right:-2em; /*同上*/
|
|
1102
1133
|
}
|
|
1103
|
-
|
|
1134
|
+
/* 三个字符占用4个字符距离 */
|
|
1104
1135
|
.w3 {
|
|
1105
1136
|
letter-spacing: 0.5em;
|
|
1106
1137
|
margin-right: -0.5em
|
|
@@ -17,4 +17,6 @@ export default function () {
|
|
|
17
17
|
Vue.component('iot-refund', (resolve) => { require(['./IOTRefund'], resolve) })
|
|
18
18
|
// 用户基本信息test
|
|
19
19
|
Vue.component('file-user-essential-info', (resolve) => { require(['./UserEssentialInfoTest'], resolve) })
|
|
20
|
+
// 售气收费 --弹出框
|
|
21
|
+
Vue.component('charge-modal', (resolve) => { require(['./ChargeModal'], resolve) })
|
|
20
22
|
}
|