manage-client 3.1.50 → 3.1.54
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/7.1/dependencies-accessors/dependencies-accessors.lock +0 -0
- package/.gradle/7.1/executionHistory/executionHistory.bin +0 -0
- package/.gradle/7.1/executionHistory/executionHistory.lock +0 -0
- package/.gradle/7.1/fileHashes/fileHashes.bin +0 -0
- package/.gradle/7.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
- package/.gradle/{6.1 → configuration-cache}/gc.properties +0 -0
- package/build/dev-server.js +6 -6
- package/package.json +1 -1
- package/src/components/SellReport/OperatorCheckoutReport.vue +237 -250
- package/src/components/SellReport/OperatorCheckoutTwo.vue +237 -250
- package/src/components/SellReport/ReportItems.vue +241 -241
- package/src/components/sale/businessquery/AccountQuery/SellingGasList.vue +67 -37
- package/src/components/sale/businessquery/FillGasQuery.vue +491 -491
- package/src/components/sale/filesquery/DeviceQuery.vue +524 -524
- package/src/filiale/WEINAN/ReportDataQuery.vue +249 -0
- package/src/filiale/WEINAN/config/tableConfig.js +0 -12
- package/src/filiale/WEINAN/sale.js +3 -1
- package/src/filiale/jingwei/ChargeQuery.vue +1241 -1241
- package/src/filiale/liaoyuan/ChargeQuery.vue +1284 -1284
- package/src/filiale/liaoyuan/exportConfig.js +718 -718
- package/src/filiale/meihekou/CardHandplanQuery.vue +541 -541
- package/src/filiale/meihekou/config/exportConfig.js +804 -804
- package/src/filiale/shaoguan/ChargeQuery.vue +1034 -1034
- package/src/filiale/shaoguan/OtherChargeQuery.vue +596 -596
- package/src/filiale/shaoguan/sale/businessquery/oldList.vue +41 -41
- package/src/filiale/shaoguan/sale/businessquery/oldMeterList.vue +290 -290
- package/src/filiale/shaoguan/sale.js +35 -35
- package/src/main.js +66 -66
- package/src/reportManage.js +478 -482
- package/.gradle/4.4/fileChanges/last-build.bin +0 -0
- package/.gradle/4.4/fileHashes/fileHashes.bin +0 -0
- package/.gradle/4.4/fileHashes/fileHashes.lock +0 -0
- package/.gradle/6.1/executionHistory/executionHistory.bin +0 -0
- package/.gradle/6.1/executionHistory/executionHistory.lock +0 -0
- package/.gradle/6.1/fileChanges/last-build.bin +0 -0
- package/.gradle/6.1/fileHashes/fileHashes.bin +0 -0
- package/.gradle/6.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/6.1.1/fileContent/fileContent.lock +0 -0
- package/build/libs/ManageClient-3.1.0-17.jar +0 -0
- package/build/tmp/jar/MANIFEST.MF +0 -2
- package/src/components/SellReport/AmountDay.vue +0 -257
|
@@ -0,0 +1,249 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div id="unit" class="flex-row">
|
|
3
|
+
<div class="basic-main" @keyup.enter="search">
|
|
4
|
+
<div class="flex">
|
|
5
|
+
<criteria-paged :model="model" v-ref:paged>
|
|
6
|
+
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
|
|
7
|
+
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
8
|
+
<div class="row">
|
|
9
|
+
<div class="col-sm-2 form-group">
|
|
10
|
+
<label class="font_normal_body">客户编号</label>
|
|
11
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
|
|
12
|
+
condition="f_userinfo_code = '{}' " placeholder="客户编号">
|
|
13
|
+
</div>
|
|
14
|
+
<div class="col-sm-2 form-group">
|
|
15
|
+
<label class="font_normal_body">客户名称</label>
|
|
16
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
|
|
17
|
+
condition=" f_user_name like '%{}%'" placeholder='客户名称'>
|
|
18
|
+
</div>
|
|
19
|
+
<!-- <div class="col-sm-2">-->
|
|
20
|
+
<!-- <label class="font_normal_body">组织机构</label>-->
|
|
21
|
+
<!-- <res-select :initresid="$parent.$parent.org"-->
|
|
22
|
+
<!-- style="width:60%"-->
|
|
23
|
+
<!-- @res-select="$parent.$parent.getorg"-->
|
|
24
|
+
<!-- restype='organization'>-->
|
|
25
|
+
<!-- </res-select>-->
|
|
26
|
+
|
|
27
|
+
<!-- </div>-->
|
|
28
|
+
<div class="col-sm-2">
|
|
29
|
+
<label class="font_normal_body"> 公司 </label>
|
|
30
|
+
<right-tree @re-res="$parent.$parent.getorg"
|
|
31
|
+
:initresid='$parent.$parent.org'></right-tree>
|
|
32
|
+
</div>
|
|
33
|
+
<div class="span" style="float:right;">
|
|
34
|
+
<button class="button_search button_spacing" @click="search()">查询</button>
|
|
35
|
+
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
36
|
+
<div style="float: right" class="button_spacing"
|
|
37
|
+
:class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
|
|
38
|
+
@click="$parent.$parent.hidden()"></div>
|
|
39
|
+
</div>
|
|
40
|
+
|
|
41
|
+
</div>
|
|
42
|
+
|
|
43
|
+
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
44
|
+
<div class="col-sm-2 form-group">
|
|
45
|
+
<label class="font_normal_body">表 号</label>
|
|
46
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
|
|
47
|
+
condition="f_meternumber like '%{}%'" placeholder='表号'>
|
|
48
|
+
</div>
|
|
49
|
+
<div class="col-sm-2 form-group">
|
|
50
|
+
<label class="font_normal_body">气表品牌</label>
|
|
51
|
+
<v-select
|
|
52
|
+
placeholder='气表品牌'
|
|
53
|
+
:value.sync="model.f_meter_brand"
|
|
54
|
+
v-model="model.f_meter_brand"
|
|
55
|
+
:options='$parent.$parent.meterbrands'
|
|
56
|
+
close-on-select
|
|
57
|
+
condition="f_meter_brand='{}'">
|
|
58
|
+
</v-select>
|
|
59
|
+
</div>
|
|
60
|
+
<div class="col-sm-2 form-group" >
|
|
61
|
+
<label class="font_normal_body">气表类型</label>
|
|
62
|
+
<v-select
|
|
63
|
+
placeholder='气表类型'
|
|
64
|
+
:value.sync="model.f_meter_classify"
|
|
65
|
+
v-model="model.f_meter_classify"
|
|
66
|
+
:options='$parent.$parent.metertypes'
|
|
67
|
+
close-on-select
|
|
68
|
+
condition="f_meter_classify='{}'">
|
|
69
|
+
</v-select>
|
|
70
|
+
</div>
|
|
71
|
+
<div class="col-sm-2 form-group">
|
|
72
|
+
<label for="startDate" class="font_normal_body">插入时间</label>
|
|
73
|
+
<datepicker id="startDate" placeholder="插入时间" style="width:60%"
|
|
74
|
+
v-model="model.startDate"
|
|
75
|
+
:value.sync="model.startDate"
|
|
76
|
+
:format="'yyyy-MM-dd 00:00:00'"
|
|
77
|
+
:show-reset-button="true"
|
|
78
|
+
condition="f_insert_date >= '{}'">
|
|
79
|
+
</datepicker>
|
|
80
|
+
</div>
|
|
81
|
+
<div class="col-sm-2 form-group">
|
|
82
|
+
<label for="endDate" class="font_normal_body"> 至 </label>
|
|
83
|
+
<datepicker id="endDate" placeholder="插入时间" style="width:60%"
|
|
84
|
+
v-model="model.endDate"
|
|
85
|
+
:value.sync="model.endDate"
|
|
86
|
+
:format="'yyyy-MM-dd 23:59:59'"
|
|
87
|
+
:show-reset-button="true"
|
|
88
|
+
condition="f_insert_date <= '{}'">
|
|
89
|
+
</datepicker>
|
|
90
|
+
</div>
|
|
91
|
+
</div>
|
|
92
|
+
|
|
93
|
+
</div>
|
|
94
|
+
</criteria>
|
|
95
|
+
|
|
96
|
+
<data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
|
|
97
|
+
<template partial='head'>
|
|
98
|
+
<tr>
|
|
99
|
+
<th v-for="row in $parent.$parent.$parent.headData">
|
|
100
|
+
<nobr>{{row}}</nobr>
|
|
101
|
+
</th>
|
|
102
|
+
</tr>
|
|
103
|
+
</template>
|
|
104
|
+
<template partial='body'>
|
|
105
|
+
<tr v-for="row in $parent.$parent.$parent.model.rows">
|
|
106
|
+
<td style="text-align: center;" v-for="item in $parent.$parent.$parent.config.fieldMapping">
|
|
107
|
+
<nobr>{{row[item]}}</nobr>
|
|
108
|
+
</td>
|
|
109
|
+
</tr>
|
|
110
|
+
</template>
|
|
111
|
+
<template partial='foot'></template>
|
|
112
|
+
</data-grid>
|
|
113
|
+
</criteria-paged>
|
|
114
|
+
</div>
|
|
115
|
+
</div>
|
|
116
|
+
</div>
|
|
117
|
+
</template>
|
|
118
|
+
|
|
119
|
+
<script>
|
|
120
|
+
import {HttpResetClass, PagedList} from 'vue-client'
|
|
121
|
+
import tableConfig from './config/tableConfig'
|
|
122
|
+
import plugins from '../../plugins/GetLoginInfoService'
|
|
123
|
+
import plugin from 'system-clients/src/plugins/GetLoginInfoService'
|
|
124
|
+
|
|
125
|
+
let readySomething = async function (self) {
|
|
126
|
+
await self.$MagLoadParams.loadParam()
|
|
127
|
+
self.initParams()
|
|
128
|
+
// self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
|
|
129
|
+
}
|
|
130
|
+
export default {
|
|
131
|
+
title: '上报数据查询',
|
|
132
|
+
data() {
|
|
133
|
+
return {
|
|
134
|
+
model: new PagedList('rs/sql/manage_getReportDataQuery', 20, {}),
|
|
135
|
+
criteriaShow: false,
|
|
136
|
+
config: {
|
|
137
|
+
fieldMapping: {
|
|
138
|
+
f_userinfo_code: '客户编号',
|
|
139
|
+
f_user_name: '客户名称'
|
|
140
|
+
}
|
|
141
|
+
},
|
|
142
|
+
WarningType: [
|
|
143
|
+
{label: '全部', value: ''}
|
|
144
|
+
],
|
|
145
|
+
Warningstyles: [
|
|
146
|
+
{label: '全部', value: ''}
|
|
147
|
+
],
|
|
148
|
+
styles:false,
|
|
149
|
+
headData: [],
|
|
150
|
+
bodyData: [],
|
|
151
|
+
orgCondtionStr: " and f_filialeid in (" + this.$login.f.orgid+")",
|
|
152
|
+
resshow:['company'],
|
|
153
|
+
org:[this.$login.f.orgid],
|
|
154
|
+
meterbrands:[]
|
|
155
|
+
}
|
|
156
|
+
},
|
|
157
|
+
created () {
|
|
158
|
+
this.config.fieldMapping=tableConfig.ReportDataQuery
|
|
159
|
+
console.log("========================")
|
|
160
|
+
console.log(this.config.fieldMapping)
|
|
161
|
+
var item="用户编号"
|
|
162
|
+
console.log("~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
|
|
163
|
+
console.log(this.config.fieldMapping[item])
|
|
164
|
+
this.headData=Object.keys(this.config.fieldMapping)
|
|
165
|
+
// for(var i=0;i<this.config.fieldMapping;i++){
|
|
166
|
+
// this.headData.push(this.config.fieldMapping[i])
|
|
167
|
+
// }
|
|
168
|
+
|
|
169
|
+
},
|
|
170
|
+
ready() {
|
|
171
|
+
this.$refs.paged.$refs.cri.search()
|
|
172
|
+
readySomething(this).then(() => {
|
|
173
|
+
this.$emit('ready')
|
|
174
|
+
}).catch((error) => {
|
|
175
|
+
this.$emit('error', error)
|
|
176
|
+
})
|
|
177
|
+
},
|
|
178
|
+
methods: {
|
|
179
|
+
initParams() {
|
|
180
|
+
// 初始化气表品牌
|
|
181
|
+
let brandArr = []
|
|
182
|
+
this.$MagGetSaleParam.getGasbrand().forEach((item) => {
|
|
183
|
+
let temp = {}
|
|
184
|
+
temp.label = item.label
|
|
185
|
+
temp.value = item.value.f_meter_brand
|
|
186
|
+
brandArr.push(temp)
|
|
187
|
+
})
|
|
188
|
+
this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
|
|
189
|
+
//初始化气表价格
|
|
190
|
+
this.prices = this.$MagGetSaleParam.getPrices();
|
|
191
|
+
},
|
|
192
|
+
showMeterStyle() {
|
|
193
|
+
this.styles = true
|
|
194
|
+
},
|
|
195
|
+
search() {
|
|
196
|
+
this.$refs.paged.$refs.cri.search()
|
|
197
|
+
},
|
|
198
|
+
async selfSearch(args) {
|
|
199
|
+
args.condition = `${args.condition}` + this.orgCondtionStr
|
|
200
|
+
await this.model.search(args.condition, args.model)
|
|
201
|
+
// 查询到数据进行处理
|
|
202
|
+
// if (this.model.rows.length > 0) {
|
|
203
|
+
// this.bodyData = Object.keys(this.model.rows[0])
|
|
204
|
+
// }
|
|
205
|
+
},
|
|
206
|
+
getorg(obj) {
|
|
207
|
+
if (obj.resids.length>0) {
|
|
208
|
+
this.orgCondtionStr = " and f_filialeid in " + plugin.convertToIn(obj.resids)
|
|
209
|
+
}else
|
|
210
|
+
{
|
|
211
|
+
this.orgCondtionStr = " and f_filialeid = " + this.$login.f.orgid
|
|
212
|
+
}
|
|
213
|
+
},
|
|
214
|
+
// getorg(obj) {
|
|
215
|
+
// // if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
|
|
216
|
+
// // this.orgCondtionStr = " and f_filialeid in " + plugins.convertToIn(obj)
|
|
217
|
+
// // }else{
|
|
218
|
+
// // this.orgCondtionStr = " and f_filialeid = " + this.$login.f.orgid
|
|
219
|
+
// // }
|
|
220
|
+
// // this.orgname = obj.res
|
|
221
|
+
// },
|
|
222
|
+
clear() {
|
|
223
|
+
//清空部门和人员
|
|
224
|
+
this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
|
|
225
|
+
this.$refs.paged.$refs.cri.$refs.sel.$children[2].selectres = []
|
|
226
|
+
//部门和人员变为全选
|
|
227
|
+
this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
|
|
228
|
+
this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
|
|
229
|
+
Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
|
|
230
|
+
this.$refs.paged.$refs.cri.model[key] = []
|
|
231
|
+
})
|
|
232
|
+
},
|
|
233
|
+
hidden() {
|
|
234
|
+
this.criteriaShow = !this.criteriaShow
|
|
235
|
+
},
|
|
236
|
+
|
|
237
|
+
// getRes(obj) {
|
|
238
|
+
// this.orgCondtionStr = obj
|
|
239
|
+
// }
|
|
240
|
+
},
|
|
241
|
+
watch: {
|
|
242
|
+
},
|
|
243
|
+
computed: {
|
|
244
|
+
metertypes() {
|
|
245
|
+
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
|
|
246
|
+
},
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
</script>
|
|
@@ -12,9 +12,6 @@ export default{
|
|
|
12
12
|
|
|
13
13
|
"上次抄表日期":"f_last_hand_date",
|
|
14
14
|
"开户日期":"f_gas_date",
|
|
15
|
-
"软件版本号":"f_software_version",
|
|
16
|
-
"表状态信息":"f_table_msg",
|
|
17
|
-
"上次表状态信息":"f_last_meter_state_msg",
|
|
18
15
|
|
|
19
16
|
"插入日期":"f_insert_date",
|
|
20
17
|
"上次插入日期":"f_last_insertdate",
|
|
@@ -30,15 +27,6 @@ export default{
|
|
|
30
27
|
|
|
31
28
|
"阀门强制状态":"f_networkshutvalve",
|
|
32
29
|
"阀门状态":"f_valvestate",
|
|
33
|
-
"计量类型":"f_wmprepaytype",
|
|
34
|
-
"上报类型":"f_upload_type",
|
|
35
|
-
"金额状态":"f_moneystate",
|
|
36
|
-
|
|
37
|
-
"电压状态":"f_lowlithiumbattery",
|
|
38
|
-
"磁干扰异常":"f_magneticinterference",
|
|
39
|
-
"表内剩余金额":"f_meterbalanceamt",
|
|
40
|
-
"表内累计充值金额":"f_meterdebitamt",
|
|
41
|
-
"补偿状态":"f_compensatestate",
|
|
42
30
|
"气表品牌":"f_meter_brand",
|
|
43
31
|
"气表型号":"f_meter_style",
|
|
44
32
|
"分公司":"f_orgname"
|
|
@@ -17,7 +17,9 @@ let specialComp = {
|
|
|
17
17
|
// 业务查询
|
|
18
18
|
'business-manage':(resolve) => {require(['./BusinessManage'], resolve)},
|
|
19
19
|
// 换表查询
|
|
20
|
-
'change-meter-query':(resolve) => {require(['./manage/ChangeMeterQuery'], resolve)}
|
|
20
|
+
'change-meter-query':(resolve) => {require(['./manage/ChangeMeterQuery'], resolve)},
|
|
21
|
+
// 上报数据查询
|
|
22
|
+
'report-data-query':(resolve) => {require(['./ReportDataQuery'], resolve)}
|
|
21
23
|
|
|
22
24
|
}
|
|
23
25
|
exports.specialComp = specialComp
|