sale-client 4.0.74-preview → 4.0.75-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/fileChanges/last-build.bin +0 -0
- package/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/5.2.1/gc.properties +0 -0
- package/.gradle/8.5/fileChanges/last-build.bin +0 -0
- package/.gradle/8.5/gc.properties +0 -0
- package/build/dev-server.js +7 -7
- package/package.json +1 -1
- package/src/components/common/userinfo_detail/UserInfoDetailManageNew.vue +6 -1
- package/src/components/common/userinfo_detail/ic_detail/meteringRecords.vue +112 -0
- package/src/filiale/dexin/cardsHand.vue +898 -0
- package/src/filiale/dexin/sale.js +2 -0
- package/src/main.js +1 -1
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
File without changes
|
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://222.83.114.229:31785/', 'http://222.83.114.229:31785/']
|
|
5
5
|
var merge = require('webpack-merge')
|
|
6
6
|
var baseConfig = require('./webpack.dev.conf')
|
|
7
7
|
var devConfig = {
|
|
@@ -20,9 +20,9 @@ var devConfig = {
|
|
|
20
20
|
},
|
|
21
21
|
proxy: {
|
|
22
22
|
'/api/af-revenue/logic': {
|
|
23
|
-
pathRewrite: {
|
|
24
|
-
|
|
25
|
-
},
|
|
23
|
+
// pathRewrite: {
|
|
24
|
+
// '/api/af-revenue/logic': '/logic'
|
|
25
|
+
// },
|
|
26
26
|
target: localUrl
|
|
27
27
|
},
|
|
28
28
|
'/api/af-revenue/file': {
|
|
@@ -38,9 +38,9 @@ var devConfig = {
|
|
|
38
38
|
target: 'http://410663id1ia4.vicp.fun'
|
|
39
39
|
},
|
|
40
40
|
'/api/af-revenue/sql': {
|
|
41
|
-
pathRewrite: {
|
|
42
|
-
|
|
43
|
-
},
|
|
41
|
+
// pathRewrite: {
|
|
42
|
+
// '/api/af-revenue/sql': '/sql'
|
|
43
|
+
// },
|
|
44
44
|
target: localUrl
|
|
45
45
|
},
|
|
46
46
|
'/api': {
|
package/package.json
CHANGED
|
@@ -101,6 +101,9 @@
|
|
|
101
101
|
<saletab header="安检记录" v-if="permission('安检记录')">
|
|
102
102
|
<security-check-info :row="row" @deal-msg="dealMsg"></security-check-info>
|
|
103
103
|
</saletab>
|
|
104
|
+
<saletab header="装表记录" v-if="permission('装表记录')">
|
|
105
|
+
<metering-records :row="row" @deal-msg="dealMsg"></metering-records>
|
|
106
|
+
</saletab>
|
|
104
107
|
<!-- <saletab header="报装流转记录" v-if="permission('报装流转记录查看')">-->
|
|
105
108
|
<!-- <supervisory-control :row="row" ></supervisory-control>-->
|
|
106
109
|
<!-- </saletab>-->
|
|
@@ -135,6 +138,7 @@
|
|
|
135
138
|
import UserKeyRecord from './ic_detail/UserKeyRecord'
|
|
136
139
|
import RepairList from "./ic_detail/RepairList";
|
|
137
140
|
import SecurityCheckInfo from './ic_detail/SecuritycheckInfo';
|
|
141
|
+
import MeteringRecords from './ic_detail/MeteringRecords'
|
|
138
142
|
// import SupervisoryControl from './apply_detail/Supervisory/SupervisoryControl'
|
|
139
143
|
// import ApplyChargeSearch from './apply_detail/applyCharge/ApplyChargeSearch'
|
|
140
144
|
// 导入物联网相关查询
|
|
@@ -180,7 +184,8 @@ export default {
|
|
|
180
184
|
MachineRecordQuery,
|
|
181
185
|
UserDeviceQuery,
|
|
182
186
|
contractSigningList,
|
|
183
|
-
UserKeyRecord
|
|
187
|
+
UserKeyRecord,
|
|
188
|
+
MeteringRecords
|
|
184
189
|
// SupervisoryControl,
|
|
185
190
|
// ApplyChargeSearch
|
|
186
191
|
},
|
|
@@ -0,0 +1,112 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="flex" style="justify-content: space-between;" >
|
|
3
|
+
<div @keyup.enter="search">
|
|
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-2 form-group">
|
|
9
|
+
<label class="font_normal_body">开始时间</label>
|
|
10
|
+
<datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
|
|
11
|
+
class="datepicker"
|
|
12
|
+
condition="f_parameter_value >= '{} 00:00:00' "
|
|
13
|
+
placeholder="起始时间"
|
|
14
|
+
style="width:60%"
|
|
15
|
+
v-model="model.f_start_date"
|
|
16
|
+
></datepicker>
|
|
17
|
+
</div>
|
|
18
|
+
<div class="col-sm-2 form-group" >
|
|
19
|
+
<label class="font_normal_body" >结束时间</label>
|
|
20
|
+
<datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
|
|
21
|
+
class="datepicker"
|
|
22
|
+
condition="f_parameter_value <= '{} 23:59:59' "
|
|
23
|
+
placeholder="结束时间"
|
|
24
|
+
style="width:60%"
|
|
25
|
+
v-model="model.f_end_date"
|
|
26
|
+
></datepicker>
|
|
27
|
+
</div>
|
|
28
|
+
<div style="float: right">
|
|
29
|
+
<button @click="search()" class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
|
|
30
|
+
<button class="btn btn-success" @click="$parent.$parent.clear()" v-el:cx>清空</button>
|
|
31
|
+
</div>
|
|
32
|
+
</div>
|
|
33
|
+
</div>
|
|
34
|
+
</criteria>
|
|
35
|
+
<data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
|
|
36
|
+
<template partial='head'>
|
|
37
|
+
<tr>
|
|
38
|
+
<th><nobr>序号</nobr></th>
|
|
39
|
+
<th><nobr>用户编号</nobr></th>
|
|
40
|
+
<th><nobr>用户姓名</nobr></th>
|
|
41
|
+
<th><nobr>用户地址</nobr></th>
|
|
42
|
+
<th><nobr>用户电话</nobr></th>
|
|
43
|
+
<th><nobr>来电电话</nobr></th>
|
|
44
|
+
<th><nobr>用户类型</nobr></th>
|
|
45
|
+
<th><nobr>装表员</nobr></th>
|
|
46
|
+
<th><nobr>备注</nobr></th>
|
|
47
|
+
</tr>
|
|
48
|
+
</template>
|
|
49
|
+
<template partial='body' partial='list' v-ref:grid>
|
|
50
|
+
<tr v-for="(row, index) in model.items" :key="index">
|
|
51
|
+
<td style="text-align:center">{{$index+1}}</td>
|
|
52
|
+
<td style="text-align:center">{{row.f_userinfo_code}}</td>
|
|
53
|
+
<td style="text-align:center">{{row.f_user_name}}</td>
|
|
54
|
+
<td style="text-align:center">{{row.f_address}}</td>
|
|
55
|
+
<td style="text-align:center">{{row.f_user_phone}}</td>
|
|
56
|
+
<td style="text-align:center">{{row.f_meternumber}}</td>
|
|
57
|
+
<td style="text-align:center">{{row.f_card_id}}</td>
|
|
58
|
+
<td style="text-align:center">{{row.f_comments}}</td>
|
|
59
|
+
</tr>
|
|
60
|
+
</template>
|
|
61
|
+
</data-grid>
|
|
62
|
+
</criteria-paged>
|
|
63
|
+
</div>
|
|
64
|
+
</div>
|
|
65
|
+
|
|
66
|
+
</template>
|
|
67
|
+
<script>
|
|
68
|
+
import {PagedList} from "vue-client"
|
|
69
|
+
export default {
|
|
70
|
+
title: '装表记录',
|
|
71
|
+
data () {
|
|
72
|
+
return {
|
|
73
|
+
condition: '1=1',
|
|
74
|
+
model: new PagedList('/api/af-revenue/sql/sale_blackRecordQuery', 20),
|
|
75
|
+
searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
|
|
76
|
+
}
|
|
77
|
+
},
|
|
78
|
+
props: ['row'],
|
|
79
|
+
methods: {
|
|
80
|
+
formatFunction (functionString) {
|
|
81
|
+
if (!functionString) return ''
|
|
82
|
+
try {
|
|
83
|
+
// 解析 JSON 字符串为数组
|
|
84
|
+
let functionArray = JSON.parse(functionString)
|
|
85
|
+
// 将数组转换为用逗号分隔的字符串
|
|
86
|
+
return functionArray.join(', ')
|
|
87
|
+
} catch (e) {
|
|
88
|
+
// 如果解析失败，返回原始字符串
|
|
89
|
+
return functionString
|
|
90
|
+
}
|
|
91
|
+
},
|
|
92
|
+
clear () {
|
|
93
|
+
Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
|
|
94
|
+
this.$refs.paged.$refs.criteria.model[key] = []
|
|
95
|
+
})
|
|
96
|
+
},
|
|
97
|
+
async search () {
|
|
98
|
+
this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}'`
|
|
99
|
+
this.model.search(this.condition, this.model)
|
|
100
|
+
}
|
|
101
|
+
},
|
|
102
|
+
ready () {
|
|
103
|
+
this.$refs.paged.$refs.criteria.search()
|
|
104
|
+
},
|
|
105
|
+
computed: {
|
|
106
|
+
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
}
|
|
110
|
+
</script>
|
|
111
|
+
<style scoped>
|
|
112
|
+
</style>
|
|
@@ -0,0 +1,898 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="flex-row">
|
|
3
|
+
<div @keyup.enter="search" class="basic-main">
|
|
4
|
+
<criteria-paged :model="model" v-ref:paged @sort="sort">
|
|
5
|
+
<criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch">
|
|
6
|
+
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
7
|
+
<modal :show.sync="$parent.$parent.upshow" width="500px" title="文件导入" v-ref:modal large backdrop="false">
|
|
8
|
+
<article slot="modal-body" class="modal-body">
|
|
9
|
+
<file-upload class="my-file-uploader " name="UploadFile" class="btn btn-success"
|
|
10
|
+
style="border-radius: 2px;"
|
|
11
|
+
action="api/af-revenue/file/uploadFile" tagname="导入抄表数据" v-ref:file :headers="headers"
|
|
12
|
+
multiple></file-upload>
|
|
13
|
+
</article>
|
|
14
|
+
<footer slot="modal-footer" class="modal-footer">
|
|
15
|
+
</footer>
|
|
16
|
+
</modal>
|
|
17
|
+
<div class="row">
|
|
18
|
+
<div class="col-sm-2 form-group">
|
|
19
|
+
<label class="font_normal_body">开始日期</label>
|
|
20
|
+
<datepicker style="width:60%" id="startDate" placeholder="开始日期"
|
|
21
|
+
v-model="model.startDate"
|
|
22
|
+
:value.sync="model.startDate"
|
|
23
|
+
:format="'yyyy-MM-dd'"
|
|
24
|
+
:show-reset-button="true">
|
|
25
|
+
</datepicker>
|
|
26
|
+
</div>
|
|
27
|
+
<div class="col-sm-2 form-group">
|
|
28
|
+
<label class="font_normal_body">结束日期</label>
|
|
29
|
+
<!--<label for="endDate" class="control-label">结束日期</label>-->
|
|
30
|
+
<datepicker style="width:60%" id="endDate" placeholder="结束日期"
|
|
31
|
+
v-model="model.endDate"
|
|
32
|
+
:value.sync="model.endDate"
|
|
33
|
+
:format="'yyyy-MM-dd'"
|
|
34
|
+
:show-reset-button="true">
|
|
35
|
+
</datepicker>
|
|
36
|
+
</div>
|
|
37
|
+
<div class="col-sm-2 form-group">
|
|
38
|
+
<label class="font_normal_body">用户编号</label>
|
|
39
|
+
<input style="width:60%" type="text" class="form-control col-sm-6" v-model="model.f_userinfo_code"
|
|
40
|
+
condition="f_userinfo_code='{}'" placeholder='用户编号'
|
|
41
|
+
>
|
|
42
|
+
</div>
|
|
43
|
+
|
|
44
|
+
<div class="col-sm-2 form-group">
|
|
45
|
+
<label class="font_normal_body" style="color:red">抄表日期</label>
|
|
46
|
+
<!--<label for="endDate" class="control-label">结束日期</label>-->
|
|
47
|
+
<datepicker style="width:60%" id="handDate" placeholder="抄表录入日期"
|
|
48
|
+
v-model="$parent.$parent.handDate"
|
|
49
|
+
:value.sync="$parent.$parent.handDate"
|
|
50
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
51
|
+
:show-reset-button="true">
|
|
52
|
+
</datepicker>
|
|
53
|
+
</div>
|
|
54
|
+
<!--<div class="form-group">-->
|
|
55
|
+
<!--<input style="width:60%" type="text" class="form-control" v-model="model.f_user_id"-->
|
|
56
|
+
<!--condition="f_user_id='{}'" placeholder='表编号'-->
|
|
57
|
+
<!--:size="model.f_user_id ? model.f_user_id.length : 3">-->
|
|
58
|
+
<!--</div>-->
|
|
59
|
+
|
|
60
|
+
<div class="span" style="float:right;">
|
|
61
|
+
<button class="button_search button_spacing" @click="search()">查询</button>
|
|
62
|
+
<button class="button_search" style="width: 90px" @click="$parent.$parent.downloadFiles()">模板下载</button>
|
|
63
|
+
<button class="button_search button_spacing" @click="$parent.$parent.clickupshow()">抄表导入</button>
|
|
64
|
+
<!--<button class="button_clear button_spacing" @click="$parent.$parent.searchPrint()">抄表模板导出</button>-->
|
|
65
|
+
<!--<button class="btn btn-success width-100" @click="$parent.$parent.batchAudit()">批量审核</button>
|
|
66
|
+
-->
|
|
67
|
+
<export-excel
|
|
68
|
+
:data="{startDate: $parent.$parent.startDate, endDate: $parent.$parent.endDate, condition: $parent.$parent.model.condition,orderitem: $parent.$parent.orderitem?$parent.$parent.orderitem :'f_userinfo_code'}"
|
|
69
|
+
:field="$parent.$parent.getfield"
|
|
70
|
+
sqlurl="api/af-revenue/logic/saleExport" progress="saleGetExportProgress" sql-name="getCardPlan"
|
|
71
|
+
template-name='卡表抄表导出'
|
|
72
|
+
:choose-col="true">
|
|
73
|
+
</export-excel>
|
|
74
|
+
<div
|
|
75
|
+
:class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
|
|
76
|
+
@click="$parent.$parent.hidden()" class="button_spacing" style="float: right"></div>
|
|
77
|
+
</div>
|
|
78
|
+
</div>
|
|
79
|
+
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
80
|
+
<div class="col-sm-2 form-group">
|
|
81
|
+
<label class="font_normal_body"> 小区域</label>
|
|
82
|
+
<v-select :value.sync="model.f_small_area" v-model="model.f_small_area"
|
|
83
|
+
:options='$parent.$parent.smallareas' placeholder='小区域'
|
|
84
|
+
close-on-select :search='true'
|
|
85
|
+
condition="f_small_area = '{}'"></v-select>
|
|
86
|
+
</div>
|
|
87
|
+
<div class="col-sm-2 form-group">
|
|
88
|
+
<label class="font_normal_body">用户姓名</label>
|
|
89
|
+
<input style="width:60%" type="text" class="form-control" v-model="model.f_user_name" placeholder='用户姓名'
|
|
90
|
+
condition="f_user_name = '{}'">
|
|
91
|
+
</div>
|
|
92
|
+
<div class="col-sm-2 form-group">
|
|
93
|
+
<label class="font_normal_body">用户地址</label>
|
|
94
|
+
<input style="width:60%" type="text" class="form-control" v-model="model.f_address"
|
|
95
|
+
condition="f_address like '%{}%'" placeholder='用户地址'
|
|
96
|
+
>
|
|
97
|
+
</div>
|
|
98
|
+
<div class="col-sm-2 form-group">
|
|
99
|
+
<label class="font_normal_body">小  区</label>
|
|
100
|
+
<input style="width:60%" type="text" class="form-control" v-model="model.f_residential_area"
|
|
101
|
+
condition="f_residential_area like '%{}%'" placeholder='小区'
|
|
102
|
+
>
|
|
103
|
+
</div>
|
|
104
|
+
<div class="col-sm-2 form-group">
|
|
105
|
+
<label class="font_normal_body">楼  栋</label>
|
|
106
|
+
<input style="width:60%" type="text" class="form-control" v-model="model.f_building"
|
|
107
|
+
condition="f_building like '%{}%'" placeholder='楼栋'
|
|
108
|
+
>
|
|
109
|
+
</div>
|
|
110
|
+
<div class="col-sm-2 form-group">
|
|
111
|
+
<label class="font_normal_body">单  元</label>
|
|
112
|
+
<input style="width:60%" type="text" class="form-control" v-model="model.f_unit"
|
|
113
|
+
condition="f_unit like '%{}%'" placeholder='单元'
|
|
114
|
+
>
|
|
115
|
+
</div>
|
|
116
|
+
<div class="col-sm-2 form-group">
|
|
117
|
+
<label class="font_normal_body">楼  层</label>
|
|
118
|
+
<input style="width:60%" type="text" class="form-control" v-model="model.f_floor"
|
|
119
|
+
condition="f_floor like '%{}%'" placeholder='楼层'
|
|
120
|
+
>
|
|
121
|
+
</div>
|
|
122
|
+
<div class="col-sm-2 form-group">
|
|
123
|
+
<label class="font_normal_body"> 门牌号</label>
|
|
124
|
+
<input style="width:60%" type="text" class="form-control" v-model="model.f_room"
|
|
125
|
+
condition="f_room like '%{}%'" placeholder='门牌号'
|
|
126
|
+
>
|
|
127
|
+
</div>
|
|
128
|
+
<div class="col-sm-2 form-group">
|
|
129
|
+
<label class="font_normal_body">表  号</label>
|
|
130
|
+
<input style="width:60%" type="text" class="form-control" v-model="model.f_meternumber"
|
|
131
|
+
condition="f_meternumber like '%{}%'" placeholder='表号'
|
|
132
|
+
>
|
|
133
|
+
</div>
|
|
134
|
+
<!--</div>-->
|
|
135
|
+
<!--<div class="row">-->
|
|
136
|
+
<div class="col-sm-2 form-group">
|
|
137
|
+
<label class="font_normal_body"> 抄表员</label>
|
|
138
|
+
<v-select :value.sync="model.f_inputtor" v-model='model.f_inputtor'
|
|
139
|
+
:options='$parent.$parent.inputtore' placeholder='抄表员'
|
|
140
|
+
close-on-select multiple="true"
|
|
141
|
+
></v-select>
|
|
142
|
+
</div>
|
|
143
|
+
<div class="col-sm-2 form-group">
|
|
144
|
+
<label class="font_normal_body">用户类型</label>
|
|
145
|
+
<v-select :value.sync="model.f_user_type" v-model="model.f_user_type"
|
|
146
|
+
:options='$parent.$parent.usertypes' placeholder='用户类型'
|
|
147
|
+
close-on-select :search='true'
|
|
148
|
+
condition="f_user_type = '{}'"></v-select>
|
|
149
|
+
</div>
|
|
150
|
+
<div class="col-sm-2 form-group">
|
|
151
|
+
<label class="font_normal_body">用气性质</label>
|
|
152
|
+
<v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
|
|
153
|
+
:options='$parent.$parent.gasproperties' placeholder='用气性质'
|
|
154
|
+
close-on-select :search='true'
|
|
155
|
+
condition="f_gasproperties = '{}'"></v-select>
|
|
156
|
+
</div>
|
|
157
|
+
<div class="col-sm-2 form-group">
|
|
158
|
+
<label class="font_normal_body">用户等级</label>
|
|
159
|
+
<v-select :value.sync="model.f_user_level" v-model="model.f_user_level"
|
|
160
|
+
:options='$parent.$parent.userlevels' placeholder='用户等级'
|
|
161
|
+
style="width:60%"
|
|
162
|
+
close-on-select
|
|
163
|
+
condition="f_user_level = '{}'"></v-select>
|
|
164
|
+
</div>
|
|
165
|
+
<!-- <div class="col-sm-2 form-group">
|
|
166
|
+
<label class="col-sm-4 font_normal_body">气价名称</label>
|
|
167
|
+
<v-select :value.sync="model.f_price_name"
|
|
168
|
+
v-model="model.f_price_name"
|
|
169
|
+
:options='$parent.$parent.pricenames' placeholder='气价名称'
|
|
170
|
+
condition="f_price_name= '{}'" class="col-sm-8"
|
|
171
|
+
close-on-select></v-select>
|
|
172
|
+
</div>-->
|
|
173
|
+
<div class="col-sm-2 form-group">
|
|
174
|
+
<label class="font_normal_body">抄表状态</label>
|
|
175
|
+
<v-select :value.sync="model.f_meter_state" v-model="model.f_meter_state"
|
|
176
|
+
:options='$parent.$parent.meterstates' placeholder='抄表状态'
|
|
177
|
+
close-on-select f_gasbrand_id
|
|
178
|
+
condition="f_meter_state {}"></v-select>
|
|
179
|
+
</div>
|
|
180
|
+
<div class="col-sm-2 form-group">
|
|
181
|
+
<label class="font_normal_body">气表品牌</label>
|
|
182
|
+
<v-select :value.sync="model.gasbrand" v-model="model.gasbrand"
|
|
183
|
+
:options='$parent.$parent.meterbrands' placeholder='气表品牌' close-on-select
|
|
184
|
+
v-model='$parent.$parent.gasbrand'
|
|
185
|
+
condition="f_meter_brand = '{}'"
|
|
186
|
+
></v-select>
|
|
187
|
+
</div>
|
|
188
|
+
<res-select-group :show-component="['company','department','operator']" :initres="$parent.$parent.initres"
|
|
189
|
+
@re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
|
|
190
|
+
<hl-downdata class="col-sm-1 form-group" :info="model"></hl-downdata>
|
|
191
|
+
</div>
|
|
192
|
+
|
|
193
|
+
</div>
|
|
194
|
+
</criteria>
|
|
195
|
+
<data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid id="CardHand">
|
|
196
|
+
<template partial='head'>
|
|
197
|
+
<tr>
|
|
198
|
+
<th>
|
|
199
|
+
<nobr>序号</nobr>
|
|
200
|
+
</th>
|
|
201
|
+
<!-- <th>户编号</th>-->
|
|
202
|
+
<!-- <th>基本信息</th>-->
|
|
203
|
+
<th>
|
|
204
|
+
<nobr>
|
|
205
|
+
<data-order field="f_userinfo_code" name="户编号"
|
|
206
|
+
:order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
|
|
207
|
+
</nobr>
|
|
208
|
+
</th>
|
|
209
|
+
<th>
|
|
210
|
+
<nobr>
|
|
211
|
+
<data-order field="f_address" name="基本信息"
|
|
212
|
+
:order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
|
|
213
|
+
</nobr>
|
|
214
|
+
</th>
|
|
215
|
+
<th>
|
|
216
|
+
<nobr>用户等级</nobr>
|
|
217
|
+
</th>
|
|
218
|
+
<th>
|
|
219
|
+
<nobr>小区</nobr>
|
|
220
|
+
</th>
|
|
221
|
+
<th>
|
|
222
|
+
<nobr>表号</nobr>
|
|
223
|
+
</th>
|
|
224
|
+
<th>
|
|
225
|
+
<nobr>用户电话</nobr>
|
|
226
|
+
</th>
|
|
227
|
+
<th>
|
|
228
|
+
<nobr>抄表员</nobr>
|
|
229
|
+
</th>
|
|
230
|
+
<th>
|
|
231
|
+
<nobr>总购金额</nobr>
|
|
232
|
+
</th>
|
|
233
|
+
<th>
|
|
234
|
+
<nobr>累购气量</nobr>
|
|
235
|
+
</th>
|
|
236
|
+
<th>
|
|
237
|
+
<nobr>
|
|
238
|
+
<data-order field="f_hand_date" name="下发日期"
|
|
239
|
+
:order.sync="$parent.$parent.$parent.orderFields.f_hand_date"></data-order>
|
|
240
|
+
</nobr>
|
|
241
|
+
</th>
|
|
242
|
+
<th>
|
|
243
|
+
<nobr>
|
|
244
|
+
<data-order field="f_last_input_date" name="上次抄表录入日期"
|
|
245
|
+
:order.sync="$parent.$parent.$parent.orderFields.f_last_input_date"></data-order>
|
|
246
|
+
</nobr>
|
|
247
|
+
</th>
|
|
248
|
+
<th>
|
|
249
|
+
<nobr>
|
|
250
|
+
<data-order field="f_input_date" name="抄表录入日期"
|
|
251
|
+
:order.sync="$parent.$parent.$parent.orderFields.f_input_date"></data-order>
|
|
252
|
+
</nobr>
|
|
253
|
+
</th>
|
|
254
|
+
<th>
|
|
255
|
+
<nobr>上期底数</nobr>
|
|
256
|
+
</th>
|
|
257
|
+
<th>
|
|
258
|
+
<nobr>本期底数</nobr>
|
|
259
|
+
</th>
|
|
260
|
+
<th>
|
|
261
|
+
<nobr>抄表结果</nobr>
|
|
262
|
+
</th>
|
|
263
|
+
<th>
|
|
264
|
+
<nobr>附件查看</nobr>
|
|
265
|
+
</th>
|
|
266
|
+
<th>
|
|
267
|
+
<nobr>附件查看2</nobr>
|
|
268
|
+
</th>
|
|
269
|
+
<th>
|
|
270
|
+
<nobr>签章图片</nobr>
|
|
271
|
+
</th>
|
|
272
|
+
<th>
|
|
273
|
+
<nobr>实际用量</nobr>
|
|
274
|
+
</th>
|
|
275
|
+
<th>
|
|
276
|
+
<nobr>剩余气量</nobr>
|
|
277
|
+
</th>
|
|
278
|
+
<th>
|
|
279
|
+
<nobr>状态</nobr>
|
|
280
|
+
</th>
|
|
281
|
+
<th>
|
|
282
|
+
<nobr>操作</nobr>
|
|
283
|
+
</th>
|
|
284
|
+
<th>
|
|
285
|
+
<nobr>备注</nobr>
|
|
286
|
+
</th>
|
|
287
|
+
</tr>
|
|
288
|
+
</template>
|
|
289
|
+
<template partial='body'>
|
|
290
|
+
<td style="text-align: center;">{{ $index + 1 }}</td>
|
|
291
|
+
<td style="text-align: center;">{{ row.f_userinfo_code }}</td>
|
|
292
|
+
<td style="text-align: center;">
|
|
293
|
+
{{ row.f_user_name }} {{ row.f_gasproperties }} {{
|
|
294
|
+
row.f_user_phone
|
|
295
|
+
}} {{ row.f_address }}
|
|
296
|
+
</td>
|
|
297
|
+
<td>{{ row.f_user_level }}</td>
|
|
298
|
+
<td style="text-align: center;">{{ row.f_residential_area }}</td>
|
|
299
|
+
<td style="text-align: center;">{{ row.f_meternumber }}</td>
|
|
300
|
+
<td style="text-align: center;">{{ row.f_user_phone }}</td>
|
|
301
|
+
<td style="text-align: center;">{{ row.f_inputtor }}</td>
|
|
302
|
+
<td style="text-align: center;">{{ row.total_fee }}</td>
|
|
303
|
+
<td style="text-align: center;">{{ row.total_gas }}</td>
|
|
304
|
+
<td>{{row.f_hand_date}}</td>
|
|
305
|
+
<td>{{row.f_last_input_date}}</td>
|
|
306
|
+
<td style="text-align: center;">
|
|
307
|
+
<div class="form-group" style="margin-bottom:0px;display: contents;" :class="{
|
|
308
|
+
'has-success has-feedback': !row.error,
|
|
309
|
+
'has-error has-feedback': row.error}"
|
|
310
|
+
v-if="row.f_meter_state === '未抄表'">
|
|
311
|
+
<datepicker id="f_hand_date" placeholder="抄表录入日期"
|
|
312
|
+
v-model="row.f_input_date"
|
|
313
|
+
:value.sync="row.f_input_date"
|
|
314
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
315
|
+
:show-reset-button="true">
|
|
316
|
+
</datepicker>
|
|
317
|
+
</div>
|
|
318
|
+
<div v-else>
|
|
319
|
+
{{ row.f_input_date }}
|
|
320
|
+
</div>
|
|
321
|
+
</td>
|
|
322
|
+
<td style="text-align: center;">{{ row.f_last_tablebase }}</td>
|
|
323
|
+
<td style="text-align: center;">
|
|
324
|
+
<div class="form-group" style="margin-bottom:0px;" :class="{
|
|
325
|
+
'has-success has-feedback': row.f_tablebase ? ((row.f_last_tablebase-0) <= (row.f_tablebase -0)) : false,
|
|
326
|
+
'has-error has-feedback': row.f_tablebase ? ((row.f_last_tablebase-0) > (row.f_tablebase -0) ) : false}"
|
|
327
|
+
v-if="row.f_meter_state === '未抄表' ">
|
|
328
|
+
<input type="text" class="form-control" v-model="row.f_tablebase"
|
|
329
|
+
@blur="$parent.$parent.$parent.enter(row)"
|
|
330
|
+
v-next-el="{id: $index+1}" :id="$index" style="width: 100px;padding: 6px;"
|
|
331
|
+
:disabled="row.state === '开始'"
|
|
332
|
+
@focus="$parent.$parent.$parent.clearError(row)">
|
|
333
|
+
</div>
|
|
334
|
+
<div v-else>
|
|
335
|
+
<span v-if="row.f_tablebase">{{ row.f_tablebase }}</span>
|
|
336
|
+
</div>
|
|
337
|
+
<span v-if="row.error" style="color: red;">{{ row.error }}</span>
|
|
338
|
+
</td>
|
|
339
|
+
<td>
|
|
340
|
+
<div class="form-group" style="margin-bottom:0px;display: contents;" :class="{
|
|
341
|
+
'has-success has-feedback': !row.error,
|
|
342
|
+
'has-error has-feedback': row.error}"
|
|
343
|
+
v-if="row.f_meter_state === '未抄表' && row.states !== 0">
|
|
344
|
+
<v-select :value.sync="row.f_result_state" v-model="row.f_result_state"
|
|
345
|
+
:options='$parent.$parent.$parent.resultstate' placeholder='抄表结果'
|
|
346
|
+
width="100%"
|
|
347
|
+
:value-single="true"
|
|
348
|
+
close-on-select
|
|
349
|
+
condition="f_adjustable_name = '{}'"></v-select>
|
|
350
|
+
<!-- <span id="inputError2Status" class="sr-only">(error)</span> -->
|
|
351
|
+
</div>
|
|
352
|
+
<div v-else>
|
|
353
|
+
{{ row.f_result_state }}
|
|
354
|
+
</div>
|
|
355
|
+
</td>
|
|
356
|
+
<td style="text-align:center">
|
|
357
|
+
<img-self :src="row.f_handplan_image" v-if="row.f_handplan_image" :width="100" :height="100"></img-self>
|
|
358
|
+
<img-self :src="`rs/image/file/${row.f_notified_path}`" v-if="row.f_notified_path" :width="100" :height="100"></img-self>
|
|
359
|
+
</td>
|
|
360
|
+
<td style="text-align:center">
|
|
361
|
+
<img-self :src="row.f_handplan_image" v-if="row.f_handplan_image" :width="100" :height="100"></img-self>
|
|
362
|
+
<img-self :src="`rs/image/file/${row.f_second_notified_path}`" v-if="row.f_second_notified_path" :width="100" :height="100"></img-self>
|
|
363
|
+
</td>
|
|
364
|
+
<td style="text-align:center">
|
|
365
|
+
<img-self :src="row.f_sign_path" v-if="row.f_sign_path.indexOf('http:') > -1" :width="100" :height="100"></img-self>
|
|
366
|
+
<img-self :src="`rs/image/file/${row.f_sign_path}`" v-else :width="100" :height="100"></img-self>
|
|
367
|
+
</td>
|
|
368
|
+
|
|
369
|
+
<td style="text-align: center;">{{ row.f_actualtablebase }}</td>
|
|
370
|
+
<td style="text-align: center;">
|
|
371
|
+
<div class="form-group" style="margin-bottom:0px;"
|
|
372
|
+
v-if="row.f_meter_state === '未抄表' ">
|
|
373
|
+
<input type="text" class="form-control" v-model="row.f_shengyu_gas"
|
|
374
|
+
v-next-el="{id: $index+1}" :id="$index" style="width: 100px;padding: 6px;"
|
|
375
|
+
:disabled="row.state === '开始'"
|
|
376
|
+
>
|
|
377
|
+
</div>
|
|
378
|
+
<div v-else>
|
|
379
|
+
<span >{{ row.f_shengyu_gas }}</span>
|
|
380
|
+
</div>
|
|
381
|
+
</td>
|
|
382
|
+
<td style="text-align: center;">{{ row.f_meter_state }}</td>
|
|
383
|
+
<td style="text-align: center;">
|
|
384
|
+
|
|
385
|
+
<!-- <button type="button" name="button" class="btn btn-link"-->
|
|
386
|
+
<!-- @click.stop="$parent.$parent.$parent.modify(row)"-->
|
|
387
|
+
<!-- v-if="row.f_meter_state === '已抄表' && !$parent.$parent.$parent.jurisdiction.includes('审核权限')">修正</button>-->
|
|
388
|
+
|
|
389
|
+
<!-- <button type="button" name="button" class="btn btn-link"
|
|
390
|
+
@click.stop="$parent.$parent.$parent.pass(row)"
|
|
391
|
+
v-if="$parent.$parent.$parent.jurisdiction.includes('审核权限') && row.f_meter_state === '待审核'">通过</button>
|
|
392
|
+
|
|
393
|
+
<button type="button" name="button" class="btn btn-link"
|
|
394
|
+
@click.stop="$parent.$parent.$parent.nopass(row)"
|
|
395
|
+
v-if="row.f_meter_state === '待审核' && $parent.$parent.$parent.jurisdiction.includes('审核权限')">不通过</button>-->
|
|
396
|
+
<button type="button" name="button" class="button_search button_spacing width-60" title="权限名称:(卡表抄表冲正)"
|
|
397
|
+
@click.stop="$parent.$parent.$parent.cardhandCenter(row)"
|
|
398
|
+
v-if="row.f_meter_state === '已抄表'">冲正
|
|
399
|
+
</button>
|
|
400
|
+
</td>
|
|
401
|
+
<td><span title="{{row.f_card_reason}}"
|
|
402
|
+
v-if="row.f_card_reason">{{ row.f_card_reason.substring(0, 5) }} ...</span>
|
|
403
|
+
</td>
|
|
404
|
+
</template>
|
|
405
|
+
</data-grid>
|
|
406
|
+
</criteria-paged>
|
|
407
|
+
<table class="table-hover">
|
|
408
|
+
<tr style="position: relative" class="table-bordered">
|
|
409
|
+
<td
|
|
410
|
+
style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
|
|
411
|
+
汇总信息
|
|
412
|
+
</td>
|
|
413
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
|
|
414
|
+
抄表用量: {{ sumsmodel.f_actualtablebase }}
|
|
415
|
+
</td>
|
|
416
|
+
</tr>
|
|
417
|
+
</table>
|
|
418
|
+
<modal :show.sync="cardCental" v-ref:modal backdrop="false">
|
|
419
|
+
<header slot="modal-header" class="modal-header">
|
|
420
|
+
<h4 class="modal-title">卡表抄表冲正</h4>
|
|
421
|
+
</header>
|
|
422
|
+
<article slot="modal-body" class="modal-body">
|
|
423
|
+
<div class="form-group">
|
|
424
|
+
<label class="label-control">撤销原因</label>
|
|
425
|
+
<textarea class="form-control" v-model="cardreason" rows="3" placeholder="请填写撤销原因"></textarea>
|
|
426
|
+
</div>
|
|
427
|
+
</article>
|
|
428
|
+
<footer slot="modal-footer" class="modal-footer">
|
|
429
|
+
<button v-show="cardCental" type="button" class="btn btn-default" @click='close'>取消</button>
|
|
430
|
+
<button v-show="cardCental" type="button" class="btn btn-success" @click='cancel(this.cardCentalData)'>确认
|
|
431
|
+
</button>
|
|
432
|
+
</footer>
|
|
433
|
+
</modal>
|
|
434
|
+
</div>
|
|
435
|
+
</div>
|
|
436
|
+
</template>
|
|
437
|
+
<script>
|
|
438
|
+
import {HttpResetClass, PagedList} from 'vue-client'
|
|
439
|
+
import Vue from 'vue'
|
|
440
|
+
import AppData from '../../stores/AppData'
|
|
441
|
+
import * as Util from '../../Util'
|
|
442
|
+
import co from 'co'
|
|
443
|
+
|
|
444
|
+
let loadParamGem = async function (self) {
|
|
445
|
+
await self.$LoadParams.loadParam(self.f_filialeid)
|
|
446
|
+
self.loadMeterBooks()
|
|
447
|
+
}
|
|
448
|
+
let modifyGen = function* (self, row, url) {
|
|
449
|
+
console.log('抄表修正，。。。', row, url)
|
|
450
|
+
self.cardCental = false
|
|
451
|
+
self.cardCentalData = ''
|
|
452
|
+
row.f_user_id = row.f_user_id + ''
|
|
453
|
+
// 删除待审核的抄表记录
|
|
454
|
+
let state = yield self.$resetpost(url, {data: row}, {warnMsg: null, rejectMsg: null, resolveMsg: null})
|
|
455
|
+
if (state.data === '异常') {
|
|
456
|
+
Vue.showAlert('该笔抄表有差额记录，请先冲正！！！', 'warning', 4000)
|
|
457
|
+
return
|
|
458
|
+
} else if (state.data === '正常') {
|
|
459
|
+
Vue.showAlert('冲正成功，稍等片刻，正在重新查询！', 'success', 4000)
|
|
460
|
+
}
|
|
461
|
+
self.cardreason = ''
|
|
462
|
+
// 重新查询界面
|
|
463
|
+
self.search()
|
|
464
|
+
}
|
|
465
|
+
|
|
466
|
+
export default {
|
|
467
|
+
title: '卡表抄表',
|
|
468
|
+
data () {
|
|
469
|
+
return {
|
|
470
|
+
initres: {
|
|
471
|
+
org: [this.$login.f.orgid],
|
|
472
|
+
dep: [],
|
|
473
|
+
user: []
|
|
474
|
+
},
|
|
475
|
+
timer: null,
|
|
476
|
+
// 请求对象(批量导入,查询进度使用)
|
|
477
|
+
HttpReset: new HttpResetClass(),
|
|
478
|
+
resultstate: this.$appdata.getParam('卡表抄表表状态'),
|
|
479
|
+
criteriaShow: false,
|
|
480
|
+
orderitem: 'f_userinfo_code',
|
|
481
|
+
model: new PagedList('api/af-revenue/sql/getCardPlan', 50, {orderitem: this.orderitem ? '"' + this.orderitem + ' "' : `'f_userinfo_code'`}, {f_actualtablebase: 0}),
|
|
482
|
+
// model: new PagedList('api/af-revenue/sql/cardHands', 50),
|
|
483
|
+
startDate: Util.toStartAndEndDateString()[0],
|
|
484
|
+
endDate: Util.toStartAndEndDateString()[1],
|
|
485
|
+
handDate: null,
|
|
486
|
+
batch_audit: false,
|
|
487
|
+
cardCental: false,
|
|
488
|
+
// 合计数据
|
|
489
|
+
sumsmodel: {},
|
|
490
|
+
orderFields: {
|
|
491
|
+
f_userinfo_id: 'no'
|
|
492
|
+
},
|
|
493
|
+
f_filialeid: this.$login.f.orgid,
|
|
494
|
+
cardreason: '',
|
|
495
|
+
cardCentalData: '',
|
|
496
|
+
getfield: {
|
|
497
|
+
'id': '抄表单编号',
|
|
498
|
+
'f_userinfo_code': '客户编号',
|
|
499
|
+
'f_user_name': '客户姓名',
|
|
500
|
+
'f_meternumber': '表号',
|
|
501
|
+
'f_gasproperties': '用气性质',
|
|
502
|
+
'f_user_phone': '客户电话',
|
|
503
|
+
'f_address': '客户地址',
|
|
504
|
+
'f_inputtor': '抄表员',
|
|
505
|
+
'total_fee': '总购金额',
|
|
506
|
+
'total_gas': '累购气量',
|
|
507
|
+
'f_hand_date': '下发日期',
|
|
508
|
+
'f_last_input_date': '上次抄表录入日期',
|
|
509
|
+
'f_input_date': '抄表录入日期',
|
|
510
|
+
'f_last_tablebase': '上期底数',
|
|
511
|
+
'f_tablebase': '本期底数',
|
|
512
|
+
'f_shengyu_gas': '剩余气量',
|
|
513
|
+
'f_actualtablebase': '实际用量',
|
|
514
|
+
'f_img_path': '附件查看',
|
|
515
|
+
'f_sign_img': '签章图片',
|
|
516
|
+
'f_meter_state': '状态'
|
|
517
|
+
},
|
|
518
|
+
meterbrands: [{label: '全部', value: ''}],
|
|
519
|
+
upshow: false,
|
|
520
|
+
orgCondtionStr: ''
|
|
521
|
+
}
|
|
522
|
+
},
|
|
523
|
+
beforeDestroy () {
|
|
524
|
+
// 销毁定时器
|
|
525
|
+
if (this.timer) clearInterval(this.timer)
|
|
526
|
+
},
|
|
527
|
+
ready () {
|
|
528
|
+
this.$refs.paged.$refs.criteria.model.startDate = Util.toStartAndEndDateString()[0]
|
|
529
|
+
this.$refs.paged.$refs.criteria.model.endDate = Util.toStartAndEndDateString()[1]
|
|
530
|
+
loadParamGem(this)
|
|
531
|
+
},
|
|
532
|
+
methods: {
|
|
533
|
+
downloadFiles () {
|
|
534
|
+
let downurl = 'api/af-revenue/downloadfile/file?filename=卡表批量抄表导入模板'
|
|
535
|
+
this.$downFile(downurl,'卡表批量抄表导入模板.xlsx')
|
|
536
|
+
},
|
|
537
|
+
hidden () {
|
|
538
|
+
this.criteriaShow = !this.criteriaShow
|
|
539
|
+
},
|
|
540
|
+
loadMeterBooks () {
|
|
541
|
+
let meterbrand = this.$GetSaleParam.getGasbrand()
|
|
542
|
+
for (let row of meterbrand) {
|
|
543
|
+
console.log(row)
|
|
544
|
+
this.meterbrands.push({label: row.label, value: row.label})
|
|
545
|
+
}
|
|
546
|
+
},
|
|
547
|
+
search () {
|
|
548
|
+
this.$refs.paged.$refs.criteria.search()
|
|
549
|
+
},
|
|
550
|
+
clickupshow () {
|
|
551
|
+
console.log('in upload', this.upshow, !this.upshow)
|
|
552
|
+
this.upshow = !this.upshow
|
|
553
|
+
},
|
|
554
|
+
searchPrint () {
|
|
555
|
+
console.log('mode', this.model)
|
|
556
|
+
let cons = this.model.params
|
|
557
|
+
console.log('查询条件', cons)
|
|
558
|
+
let data = {
|
|
559
|
+
'body': {
|
|
560
|
+
'data': {
|
|
561
|
+
'condition': ''
|
|
562
|
+
},
|
|
563
|
+
'field': [],
|
|
564
|
+
'templateName': '',
|
|
565
|
+
'sqlName': ''
|
|
566
|
+
},
|
|
567
|
+
'condition': cons,
|
|
568
|
+
'sqlname': 'cardHands'
|
|
569
|
+
}
|
|
570
|
+
this.$resetpost('api/af-revenue/logic/allExportExcel', {data: data}, {resolveMsg: null, rejectMsg: '上传失败'}).then((res) => {
|
|
571
|
+
if (res.data === 'no user') {
|
|
572
|
+
this.$showAlert(`无匹配用户，无法导出对应excel`, 'warning', 2000)
|
|
573
|
+
} else {
|
|
574
|
+
var link = document.createElement('a')
|
|
575
|
+
res.data.forEach((item) => {
|
|
576
|
+
console.log('导出路径', item.filename)
|
|
577
|
+
let path = item.filename
|
|
578
|
+
// 本地
|
|
579
|
+
// let pathName = "http://" + location.host + "/excel" + path.split('excel')[1]
|
|
580
|
+
// 服务器
|
|
581
|
+
let pathName = 'http://' + location.host + '/webapps' + path.split('webapps')[1]
|
|
582
|
+
link.href = pathName
|
|
583
|
+
console.log('=============================', path.split('excel/')[1])
|
|
584
|
+
link.download = path.split('excel/')[1]
|
|
585
|
+
link.dispatchEvent(new MouseEvent('click'))
|
|
586
|
+
})
|
|
587
|
+
}
|
|
588
|
+
})
|
|
589
|
+
},
|
|
590
|
+
changeType () {
|
|
591
|
+
if (this.$refs.paged.$refs.criteria.model.f_meter_classify && this.$refs.paged.$refs.criteria.model.f_meter_classify.length > 0) {
|
|
592
|
+
this.$dispatch('type', this.$refs.paged.$refs.criteria.model.f_meter_classify[0])
|
|
593
|
+
}
|
|
594
|
+
},
|
|
595
|
+
getRes (obj) {
|
|
596
|
+
this.orgCondtionStr = obj
|
|
597
|
+
},
|
|
598
|
+
selfSearch (args) {
|
|
599
|
+
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
600
|
+
|
|
601
|
+
this.startDate = this.$refs.paged.$refs.criteria.model.startDate
|
|
602
|
+
this.endDate = this.$refs.paged.$refs.criteria.model.endDate
|
|
603
|
+
console.log('卡表抄表查询参数，。，。', args, this.model)
|
|
604
|
+
this.model.params.startDate = this.$refs.paged.$refs.criteria.model.startDate
|
|
605
|
+
this.model.params.endDate = this.$refs.paged.$refs.criteria.model.endDate
|
|
606
|
+
|
|
607
|
+
// 抄表员查询条件
|
|
608
|
+
this.inputtouPerson = this.$refs.paged.$refs.criteria.model.f_inputtor
|
|
609
|
+
if (this.inputtouPerson.length !== 0) {
|
|
610
|
+
let str = JSON.stringify(this.inputtouPerson)
|
|
611
|
+
str = str.replace(/"/g, `'`)
|
|
612
|
+
str = str.replace(/\[/g, ``)
|
|
613
|
+
str = str.replace(/\]/g, ``)
|
|
614
|
+
console.log('=====抄表员model22222222222绑定====', str)
|
|
615
|
+
// 查询多个抄表员时条件
|
|
616
|
+
args.condition += ` and f_inputtor in ( ${str} )`
|
|
617
|
+
}
|
|
618
|
+
|
|
619
|
+
if (!this.orgCondtionStr) {
|
|
620
|
+
args.condition = `${args.condition} and f_orgid = '${this.$login.f.orgid}'`
|
|
621
|
+
} else {
|
|
622
|
+
args.condition = `${args.condition}` + this.orgCondtionStr
|
|
623
|
+
}
|
|
624
|
+
if (args.model.f_meter_state.length > 0) {
|
|
625
|
+
console.log('选择待审核状态了', args.model)
|
|
626
|
+
this.batch_audit = args.model.f_meter_state[0] !== '已抄表' && args.model.f_meter_state[0] !== '未抄表'
|
|
627
|
+
}
|
|
628
|
+
this.model.search(args.condition, this.model)
|
|
629
|
+
},
|
|
630
|
+
reflash () {
|
|
631
|
+
this.$refs.paged.$refs.criteria.search()
|
|
632
|
+
},
|
|
633
|
+
enter (row) {
|
|
634
|
+
if (!row.f_tablebase || ((row.f_tablebase - 0) - (row.f_last_tablebase - 0)).toFixed(3) < 0) {
|
|
635
|
+
return
|
|
636
|
+
}
|
|
637
|
+
if (row.f_tablebase.toString().split(".").length>1 && row.f_tablebase.toString().split(".")[1].length>3) {
|
|
638
|
+
Vue.set(row, 'error', '底数最多只能输入小数点后3位')
|
|
639
|
+
return
|
|
640
|
+
}
|
|
641
|
+
// || ((row.f_tablebase - 0) - (row.f_last_tablebase - 0)).toFixed(3) < 0
|
|
642
|
+
if (row.f_tablebase) {
|
|
643
|
+
// 如果本期底数大于上期底数生成超用收费
|
|
644
|
+
// if ((row.f_tablebase - 0) > (row.f_meter_base - 0)) {
|
|
645
|
+
// row.charge_type = '超用收费'
|
|
646
|
+
// row.f_real_amount = (row.f_tablebase - 0) - (row.f_last_tablebase - 0)
|
|
647
|
+
// } else if ((row.f_tablebase - 0) < (row.f_meter_base - 0)) {
|
|
648
|
+
// // 如果本地底数小于上期底数生成补差收费
|
|
649
|
+
// row.charge_type = '补差收费'
|
|
650
|
+
// row.f_real_amount = (row.f_tablebase - 0) - (row.f_last_tablebase - 0)
|
|
651
|
+
// } else if ((row.f_tablebase - 0) == (row.f_last_tablebase - 0)) {
|
|
652
|
+
// row.charge_type = '正常收费'
|
|
653
|
+
// row.f_real_amount = 0
|
|
654
|
+
// }
|
|
655
|
+
row.f_operator = this.$login.f.name
|
|
656
|
+
row.f_filiale = this.$login.f.f_fengongsi
|
|
657
|
+
row.f_outlets = this.$login.f.f_parentname
|
|
658
|
+
row.f_meter_state = '已抄表'
|
|
659
|
+
if (this.handDate) {
|
|
660
|
+
row.f_input_date = this.handDate
|
|
661
|
+
}
|
|
662
|
+
row.f_input_date = row.f_input_date ? row.f_input_date : Util.toStandardTimeString()
|
|
663
|
+
row.f_last_input_date = row.f_last_input_date ? row.f_last_input_date : row.f_input_date
|
|
664
|
+
row.f_operate_date = Util.toStandardTimeString()
|
|
665
|
+
row.f_filialeids = this.$login.f.orgid
|
|
666
|
+
row.f_orgid = this.$login.f.orgid
|
|
667
|
+
row.f_orgname = this.$login.f.orgs
|
|
668
|
+
row.f_depid = this.$login.f.depids
|
|
669
|
+
row.f_depname = this.$login.f.deps
|
|
670
|
+
row.f_operatorid = this.$login.f.id
|
|
671
|
+
row.f_user_id = row.f_user_id + ''
|
|
672
|
+
row.f_total_gas = row.total_gas
|
|
673
|
+
row.f_total_fee = row.total_fee
|
|
674
|
+
// 余气量=累购-(本期指数-表初始指数)
|
|
675
|
+
console.log('录入完毕。。', row)
|
|
676
|
+
this.$resetpost('api/af-revenue/logic/cardCommonEnter', row, {resolveMsg: null, rejectMsg: '录入数据出错!!!'}).then((res) => {
|
|
677
|
+
console.log('返回数据', res)
|
|
678
|
+
row.id = res.data.id
|
|
679
|
+
console.log('录入完数据的row值,,', row)
|
|
680
|
+
}).catch((error) => {
|
|
681
|
+
row.state = '失败'
|
|
682
|
+
Vue.set(row, 'error', JSON.stringify(error))
|
|
683
|
+
})
|
|
684
|
+
} else {
|
|
685
|
+
|
|
686
|
+
}
|
|
687
|
+
},
|
|
688
|
+
batchAudit () {
|
|
689
|
+
// 批量审核
|
|
690
|
+
console.log('录入完毕。。', this.model.condition)
|
|
691
|
+
this.$resetpost('api/af-revenue/logic/batchCardHandAudit', {
|
|
692
|
+
data: {
|
|
693
|
+
condition: this.model.condition,
|
|
694
|
+
startDate: this.$refs.paged.$refs.criteria.model.startDate,
|
|
695
|
+
endDate: this.$refs.paged.$refs.criteria.model.endDate
|
|
696
|
+
}
|
|
697
|
+
}, {resolveMsg: null, rejectMsg: '批量审核出错！！！'}, 0).then((res) => {
|
|
698
|
+
if (res.data.f_state === '异常') {
|
|
699
|
+
this.$showAlert(`本次审核有${res.data.handRepeatLength}户重复抄表，请处理后再进行审核操作!重复用户编号：${res.data.userRepeat}`, 'warning', 10000)
|
|
700
|
+
} else {
|
|
701
|
+
console.log('审核通过', res.data)
|
|
702
|
+
this.$showAlert(`批量审核成功!!! 审核抄表数: ${res.data.total}, 成功条数: ${res.data.success}`, 'success', 4000)
|
|
703
|
+
this.search()
|
|
704
|
+
}
|
|
705
|
+
})
|
|
706
|
+
},
|
|
707
|
+
modify (row) {
|
|
708
|
+
// 录入错误进行修正
|
|
709
|
+
co(modifyGen(this, row, 'api/af-revenue/logic/cardhandnopass'))
|
|
710
|
+
},
|
|
711
|
+
pass (row) {
|
|
712
|
+
co(modifyGen(this, row, 'api/af-revenue/logic/cardhandpass'))
|
|
713
|
+
},
|
|
714
|
+
nopass (row) {
|
|
715
|
+
co(modifyGen(this, row, 'api/af-revenue/logic/cardhandnopass'))
|
|
716
|
+
},
|
|
717
|
+
cardhandCenter (row) {
|
|
718
|
+
// let load = new HttpResetClass()
|
|
719
|
+
// load.load('POST', 'api/af-revenue/logic/Correct', {data: row}, {warnMsg: null, resolveMsg: null})
|
|
720
|
+
// 抄表加入权限
|
|
721
|
+
if (!this.$login.r.find(value => value == '卡表抄表冲正')) {
|
|
722
|
+
this.$showMessage('当前登录用户没有冲正权限, 请联系管理员!')
|
|
723
|
+
return
|
|
724
|
+
}
|
|
725
|
+
this.cardCental = true
|
|
726
|
+
this.cardCentalData = row
|
|
727
|
+
},
|
|
728
|
+
cancel (row) {
|
|
729
|
+
row.operatorInfo = {
|
|
730
|
+
f_filiale: this.$login.f.f_fengongsi,
|
|
731
|
+
f_outlets: this.$login.f.f_parentname,
|
|
732
|
+
f_operator: this.$login.f.name,
|
|
733
|
+
cardreason: this.cardreason
|
|
734
|
+
}
|
|
735
|
+
row.f_last_hand_date = row.f_last_input_date
|
|
736
|
+
co(modifyGen(this, row, 'api/af-revenue/logic/cardhandCancel'))
|
|
737
|
+
},
|
|
738
|
+
close () {
|
|
739
|
+
this.cardCental = false
|
|
740
|
+
this.cardCentalData = ''
|
|
741
|
+
this.cardreason = ''
|
|
742
|
+
},
|
|
743
|
+
clearError (row) {
|
|
744
|
+
if (row.f_tablebase === 0) {
|
|
745
|
+
row.f_tablebase = ''
|
|
746
|
+
}
|
|
747
|
+
Vue.set(row, 'error', null)
|
|
748
|
+
},
|
|
749
|
+
// 删除这条计划
|
|
750
|
+
delectHand (row) {
|
|
751
|
+
this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
|
|
752
|
+
if (res === 'confirm') {
|
|
753
|
+
this.$resetpost('api/af-revenue/logic/deleteCardPlan', {data: row}).then(() => {
|
|
754
|
+
let condition = this.model.condition
|
|
755
|
+
this.selfSearch({condition: condition})
|
|
756
|
+
})
|
|
757
|
+
}
|
|
758
|
+
})
|
|
759
|
+
},
|
|
760
|
+
sort (field, rule) {
|
|
761
|
+
// 将所有排序方式设为不排序，实现相互排斥
|
|
762
|
+
for (let key in this.orderFields) {
|
|
763
|
+
if (key === field) {
|
|
764
|
+
this.orderFields[key] = rule
|
|
765
|
+
} else {
|
|
766
|
+
this.orderFields[key] = 'no'
|
|
767
|
+
}
|
|
768
|
+
}
|
|
769
|
+
// 如果新规则不排序，还原为默认排序
|
|
770
|
+
if (rule === 'no') {
|
|
771
|
+
this.model.paramSource.orderitem = `'${this.orderitem}'`
|
|
772
|
+
} else {
|
|
773
|
+
this.model.paramSource.orderitem = `'${field} ${rule}'`
|
|
774
|
+
}
|
|
775
|
+
|
|
776
|
+
this.search()
|
|
777
|
+
}
|
|
778
|
+
},
|
|
779
|
+
computed: {
|
|
780
|
+
inputtore () {
|
|
781
|
+
// 获取抄表员
|
|
782
|
+
console.log('获取抄表员', this.$login.f)
|
|
783
|
+
let rs = []
|
|
784
|
+
if (this.$login.f.f_gasman.length > 0) {
|
|
785
|
+
for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
|
|
786
|
+
let temp = {
|
|
787
|
+
label: this.$login.f.f_gasman[i].name,
|
|
788
|
+
value: this.$login.f.f_gasman[i].name
|
|
789
|
+
}
|
|
790
|
+
rs.push(temp)
|
|
791
|
+
}
|
|
792
|
+
}
|
|
793
|
+
this.inputtores2 = rs
|
|
794
|
+
return [...rs]
|
|
795
|
+
},
|
|
796
|
+
meterstates () {
|
|
797
|
+
return [{label: '全部', value: ''}, {label: '未抄表', value: "= '未抄表'"}, {
|
|
798
|
+
label: '已抄表',
|
|
799
|
+
value: "= '已抄表'"
|
|
800
|
+
}, {label: '冲正', value: "='冲正'"}]
|
|
801
|
+
},
|
|
802
|
+
specialuser () {
|
|
803
|
+
return [{label: '全部', value: ''}, {label: '正常用户', value: "= '正常用户'"}, {label: '采暖户', value: "= '采暖户'"}]
|
|
804
|
+
},
|
|
805
|
+
usertypes () {
|
|
806
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
|
|
807
|
+
},
|
|
808
|
+
userlevels () {
|
|
809
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户等级')]
|
|
810
|
+
},
|
|
811
|
+
smallareas () {
|
|
812
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('小区域')]
|
|
813
|
+
},
|
|
814
|
+
ventilationstate () {
|
|
815
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('通气手续')]
|
|
816
|
+
},
|
|
817
|
+
gasproperties () {
|
|
818
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
|
|
819
|
+
},
|
|
820
|
+
pricenames () {
|
|
821
|
+
let arr = []
|
|
822
|
+
AppData.getOnlyPrice().forEach((item) => {
|
|
823
|
+
let temp = {}
|
|
824
|
+
temp.label = item.label
|
|
825
|
+
temp.value = item.value.f_price_name
|
|
826
|
+
arr.push(temp)
|
|
827
|
+
})
|
|
828
|
+
return [{label: '全部', value: ''}, ...arr]
|
|
829
|
+
},
|
|
830
|
+
whetherpaies () {
|
|
831
|
+
return [
|
|
832
|
+
{label: '全部', value: ''},
|
|
833
|
+
{label: '已缴费', value: '是'},
|
|
834
|
+
{label: '未缴费', value: '否'}
|
|
835
|
+
]
|
|
836
|
+
},
|
|
837
|
+
// 界面细节权限
|
|
838
|
+
jurisdiction () {
|
|
839
|
+
return this.$login.r ? this.$login.r : []
|
|
840
|
+
},
|
|
841
|
+
brand () {
|
|
842
|
+
return [{
|
|
843
|
+
label: '全部',
|
|
844
|
+
value: {f_meter_brand: '', gasmodel: [{label: '全部', value: {f_meter_style: ''}}]}
|
|
845
|
+
}, ...AppData.getGasbrand()]
|
|
846
|
+
}
|
|
847
|
+
},
|
|
848
|
+
events: {
|
|
849
|
+
onFileUpload: function (file, res) {
|
|
850
|
+
console.log('进入了抄表上传')
|
|
851
|
+
let uuid = this.$login.guid()
|
|
852
|
+
let data1 = {
|
|
853
|
+
filepath: res.f_downloadpath,
|
|
854
|
+
f_operator: this.$login.f.name,
|
|
855
|
+
f_operatorid: this.$login.f.id,
|
|
856
|
+
f_orgid: this.$login.f.orgid,
|
|
857
|
+
f_orgname: this.$login.f.orgs,
|
|
858
|
+
f_depid: this.$login.f.depids,
|
|
859
|
+
f_depname: this.$login.f.deps,
|
|
860
|
+
uuid: uuid
|
|
861
|
+
}
|
|
862
|
+
console.log('传入数据', data1)
|
|
863
|
+
try {
|
|
864
|
+
this.$resetpost('api/af-revenue/handPlanAudit/cardBatchCommonEnter', data1, {resolveMsg: null, rejectMsg: null}, 1000)
|
|
865
|
+
} catch (e) {
|
|
866
|
+
}
|
|
867
|
+
this.$showMessage(`正在批量处理中, 请耐心等待...`, [])
|
|
868
|
+
// 启动定时器定时查询处理结果
|
|
869
|
+
this.timer = setInterval(async () => {
|
|
870
|
+
let res = await this.HttpReset.load('POST', 'api/af-revenue/logic/getBatchOperaPro', {data: {uuid: uuid}}, {
|
|
871
|
+
resolveMsg: null,
|
|
872
|
+
rejectMsg: null
|
|
873
|
+
})
|
|
874
|
+
console.log('查询进度返回: ', res)
|
|
875
|
+
if (res.data.msg || res.data.error) {
|
|
876
|
+
clearInterval(this.timer)
|
|
877
|
+
this.$closeMessage()
|
|
878
|
+
if (res.data.error) {
|
|
879
|
+
this.$showAlert(`${res.data.error}`, 'danger')
|
|
880
|
+
return
|
|
881
|
+
}
|
|
882
|
+
await this.$showMessage(`处理总条数: ${res.data.n}, 成功${res.data.success}条, 失败${res.data.fail}条`)
|
|
883
|
+
this.upshow = false
|
|
884
|
+
this.search()
|
|
885
|
+
}
|
|
886
|
+
}, 5000)
|
|
887
|
+
}
|
|
888
|
+
}
|
|
889
|
+
}
|
|
890
|
+
</script>
|
|
891
|
+
<style lang="less">
|
|
892
|
+
#CardHand {
|
|
893
|
+
thead {
|
|
894
|
+
position: relative;
|
|
895
|
+
z-index: 2;
|
|
896
|
+
}
|
|
897
|
+
}
|
|
898
|
+
</style>
|
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/dexin/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'
|