manage-client 3.2.3 → 3.2.4
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 → 5.2.1}/executionHistory/executionHistory.bin +0 -0
- package/.gradle/5.2.1/executionHistory/executionHistory.lock +0 -0
- package/.gradle/{7.1 → 5.2.1}/fileChanges/last-build.bin +0 -0
- package/.gradle/{7.1 → 5.2.1}/fileHashes/fileHashes.bin +0 -0
- package/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/{7.1/dependencies-accessors → 5.2.1}/gc.properties +0 -0
- package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
- package/build/dev-server.js +2 -2
- package/package.json +1 -1
- package/src/components/sale/businessquery/ProceedsOper.vue +80 -40
- package/src/components/sale/config/exportConfig.js +4 -3
- package/src/filiale/tongchuan/ReportList.vue +472 -472
- package/src/filiale/tongchuan/sale.js +16 -16
- package/.gradle/6.1.1/fileContent/fileContent.lock +0 -0
- package/.gradle/7.1/dependencies-accessors/dependencies-accessors.lock +0 -0
- package/.gradle/7.1/executionHistory/executionHistory.lock +0 -0
- package/.gradle/7.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/7.1/gc.properties +0 -0
- package/build/libs/ManageClient-3.1.0-17.jar +0 -0
- package/build/tmp/jar/MANIFEST.MF +0 -2
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
package/build/dev-server.js
CHANGED
|
@@ -13,8 +13,8 @@ var compiler = webpack(config)
|
|
|
13
13
|
// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
|
|
14
14
|
var shaoguan='http://119.146.1.106:8300/'
|
|
15
15
|
var qtx='http://36.103.222.144:6300/'
|
|
16
|
-
var bendi = 'http://
|
|
17
|
-
var fuwu = 'http://
|
|
16
|
+
var bendi = 'http://127.0.0.1:8084/', fuwu_login = 'http://192.168.50.4:8400'
|
|
17
|
+
var fuwu = 'http://61.134.55.234:8600'
|
|
18
18
|
var system = 'http://192.168.50.4:8400'
|
|
19
19
|
//192.168.
|
|
20
20
|
// var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
|
package/package.json
CHANGED
|
@@ -6,33 +6,6 @@
|
|
|
6
6
|
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
|
|
7
7
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
8
8
|
<div class="row">
|
|
9
|
-
<res-select-group :initres="$parent.$parent.initres"
|
|
10
|
-
@re-res="$parent.$parent.getRes"
|
|
11
|
-
:show-component="['company','department','operator']"
|
|
12
|
-
v-ref:sel></res-select-group>
|
|
13
|
-
|
|
14
|
-
<div class="span" style="float:right;">
|
|
15
|
-
<button class="button_search button_spacing" @click="search()">查询</button>
|
|
16
|
-
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
17
|
-
|
|
18
|
-
<export-excel :data="$parent.$parent.getCondition"
|
|
19
|
-
:field="$parent.$parent.getfield"
|
|
20
|
-
:footer="$parent.$parent.footer"
|
|
21
|
-
:header="$parent.$parent.other"
|
|
22
|
-
sqlurl="rs/logic/exportfile"
|
|
23
|
-
sql-name="OpertoerCollection"
|
|
24
|
-
template-name='操作员日结列表'
|
|
25
|
-
:choose-col="true"></export-excel>
|
|
26
|
-
<print-data :model="$parent.model"
|
|
27
|
-
:field="$parent.$parent.getfield"
|
|
28
|
-
:sum-field="$parent.$parent.getfield"
|
|
29
|
-
titletable="操作员日结列表"
|
|
30
|
-
:sumsmodel="$parent.$parent.sumsmodel"></print-data>
|
|
31
|
-
<div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
|
|
32
|
-
</div>
|
|
33
|
-
</div>
|
|
34
|
-
|
|
35
|
-
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
36
9
|
<div class="col-sm-2 form-group">
|
|
37
10
|
<label for="startDate" class="font_normal_body">开始日期</label>
|
|
38
11
|
<datepicker id="startDate" placeholder="开始日期" style="width:60%"
|
|
@@ -59,7 +32,34 @@
|
|
|
59
32
|
condition="f_payment in {}"
|
|
60
33
|
close-on-select></v-select>
|
|
61
34
|
</div>
|
|
35
|
+
<res-select-group :initres="$parent.$parent.initres"
|
|
36
|
+
@re-res="$parent.$parent.getRes"
|
|
37
|
+
:show-component="['company','operator']"
|
|
38
|
+
v-ref:sel></res-select-group>
|
|
39
|
+
<div class="span" style="float:right;">
|
|
40
|
+
<button class="button_search button_spacing" @click="search()">查询</button>
|
|
41
|
+
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
42
|
+
|
|
43
|
+
<export-excel :data="$parent.$parent.getCondition"
|
|
44
|
+
:field="$parent.$parent.getfield"
|
|
45
|
+
:footer="$parent.$parent.footer"
|
|
46
|
+
:header="$parent.$parent.other"
|
|
47
|
+
sqlurl="rs/logic/exportfile"
|
|
48
|
+
sql-name="OpertoerCollection"
|
|
49
|
+
template-name='操作员日结列表'
|
|
50
|
+
:choose-col="true"></export-excel>
|
|
51
|
+
<print-data :model="$parent.model"
|
|
52
|
+
:field="$parent.$parent.getfield"
|
|
53
|
+
:sum-field="$parent.$parent.getfield"
|
|
54
|
+
titletable="操作员日结列表"
|
|
55
|
+
:sumsmodel="$parent.$parent.sumsmodel"></print-data>
|
|
56
|
+
<!-- <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>-->
|
|
57
|
+
</div>
|
|
62
58
|
</div>
|
|
59
|
+
|
|
60
|
+
<!-- <div class="row" v-show="$parent.$parent.criteriaShow">-->
|
|
61
|
+
|
|
62
|
+
<!-- </div>-->
|
|
63
63
|
</div>
|
|
64
64
|
</criteria>
|
|
65
65
|
|
|
@@ -78,9 +78,6 @@
|
|
|
78
78
|
<th>
|
|
79
79
|
<nobr>售气金额</nobr>
|
|
80
80
|
</th>
|
|
81
|
-
<th>
|
|
82
|
-
<nobr>维护费</nobr>
|
|
83
|
-
</th>
|
|
84
81
|
<th>
|
|
85
82
|
<nobr>上期结余</nobr>
|
|
86
83
|
</th>
|
|
@@ -90,6 +87,18 @@
|
|
|
90
87
|
<th>
|
|
91
88
|
<nobr>气费滞纳金</nobr>
|
|
92
89
|
</th>
|
|
90
|
+
<th>
|
|
91
|
+
<nobr>退费</nobr>
|
|
92
|
+
</th>
|
|
93
|
+
<th>
|
|
94
|
+
<nobr>冲正气量</nobr>
|
|
95
|
+
</th>
|
|
96
|
+
<th>
|
|
97
|
+
<nobr>冲正金额</nobr>
|
|
98
|
+
</th>
|
|
99
|
+
<th>
|
|
100
|
+
<nobr>冲正滞纳金</nobr>
|
|
101
|
+
</th>
|
|
93
102
|
<th>
|
|
94
103
|
<nobr>发卡数</nobr>
|
|
95
104
|
</th>
|
|
@@ -97,7 +106,10 @@
|
|
|
97
106
|
<nobr>发卡费</nobr>
|
|
98
107
|
</th>
|
|
99
108
|
<th>
|
|
100
|
-
<nobr
|
|
109
|
+
<nobr>其他数</nobr>
|
|
110
|
+
</th>
|
|
111
|
+
<th>
|
|
112
|
+
<nobr>其他费</nobr>
|
|
101
113
|
</th>
|
|
102
114
|
<th>
|
|
103
115
|
<nobr>补卡数</nobr>
|
|
@@ -106,7 +118,7 @@
|
|
|
106
118
|
<nobr>补卡费</nobr>
|
|
107
119
|
</th>
|
|
108
120
|
<th>
|
|
109
|
-
<nobr
|
|
121
|
+
<nobr>实收金额</nobr>
|
|
110
122
|
</th>
|
|
111
123
|
</tr>
|
|
112
124
|
</template>
|
|
@@ -115,16 +127,20 @@
|
|
|
115
127
|
<td style="text-align: center;">{{row.c}}</td>
|
|
116
128
|
<td style="text-align: center;">{{row.f_pregas}}</td>
|
|
117
129
|
<th style="text-align: center;">{{row.f_preamount}}</th>
|
|
118
|
-
<th style="text-align: center;">{{row.f_wmoney}}</th>
|
|
119
130
|
<th style="text-align: center;">{{row.f_balance}}</th>
|
|
120
131
|
<th style="text-align: center;">{{row.f_curbalance}}</th>
|
|
121
132
|
<th style="text-align: center;">{{row.f_delaypay}}</th>
|
|
133
|
+
<th style="text-align: center;">{{row.f_returnfee}}</th>
|
|
134
|
+
<th style="text-align: center;">{{row.f_czpregas}}</th>
|
|
135
|
+
<th style="text-align: center;">{{row.f_czpreamount}}</th>
|
|
136
|
+
<th style="text-align: center;">{{row.f_czdelaypay}}</th>
|
|
122
137
|
<th style="text-align: center;">{{row.fkcardnum}}</th>
|
|
123
138
|
<th style="text-align: center;">{{row.f_fkcardfees}}</th>
|
|
139
|
+
<th style="text-align: center;">{{row.gc}}</th>
|
|
124
140
|
<th style="text-align: center;">{{row.f_gmoney}}</th>
|
|
125
141
|
<th style="text-align: center;">{{row.cardnum}}</th>
|
|
126
142
|
<th style="text-align: center;">{{row.f_cardfees}}</th>
|
|
127
|
-
<th style="text-align: center;">{{row.
|
|
143
|
+
<th style="text-align: center;">{{row.f_collection}}</th>
|
|
128
144
|
</template>
|
|
129
145
|
</data-grid>
|
|
130
146
|
</criteria-paged>
|
|
@@ -144,22 +160,40 @@
|
|
|
144
160
|
售气金额合计: {{sumsmodel.f_preamount}}
|
|
145
161
|
</td>
|
|
146
162
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
147
|
-
|
|
163
|
+
气费滞纳金合计: {{sumsmodel.f_delaypay}}
|
|
148
164
|
</td>
|
|
149
165
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
150
|
-
|
|
166
|
+
退费合计: {{sumsmodel.f_returnfee}}
|
|
167
|
+
</td>
|
|
168
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
169
|
+
冲正气量合计: {{sumsmodel.f_czpregas}}
|
|
170
|
+
</td>
|
|
171
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
172
|
+
冲正金额合计: {{sumsmodel.f_czpreamount}}
|
|
173
|
+
</td>
|
|
174
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
175
|
+
冲正滞纳金合计: {{sumsmodel.f_czdelaypay}}
|
|
176
|
+
</td>
|
|
177
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
178
|
+
发卡数合计: {{sumsmodel.fkcardnum}}
|
|
151
179
|
</td>
|
|
152
180
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
153
181
|
发卡费合计: {{sumsmodel.f_fkcardfees}}
|
|
154
182
|
</td>
|
|
155
183
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
156
|
-
|
|
184
|
+
其他数合计: {{sumsmodel.gc}}
|
|
185
|
+
</td>
|
|
186
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
187
|
+
其他费合计: {{sumsmodel.f_gmoney}}
|
|
188
|
+
</td>
|
|
189
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
190
|
+
补卡数合计: {{sumsmodel.cardnum}}
|
|
157
191
|
</td>
|
|
158
192
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
159
193
|
补卡费合计: {{sumsmodel.f_cardfees}}
|
|
160
194
|
</td>
|
|
161
195
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
162
|
-
|
|
196
|
+
实收金额合计: {{sumsmodel.f_collection}}
|
|
163
197
|
</td>
|
|
164
198
|
</tr>
|
|
165
199
|
</table>
|
|
@@ -204,12 +238,18 @@
|
|
|
204
238
|
c: 0,
|
|
205
239
|
f_pregas: 0,
|
|
206
240
|
f_preamount: 0,
|
|
207
|
-
f_wmoney: 0,
|
|
208
241
|
f_delaypay: 0,
|
|
242
|
+
f_returnfee: 0,
|
|
243
|
+
f_czpregas: 0,
|
|
244
|
+
f_czpreamount: 0,
|
|
245
|
+
f_czdelaypay: 0,
|
|
246
|
+
fkcardnum: 0,
|
|
209
247
|
f_fkcardfees: 0,
|
|
248
|
+
gc: 0,
|
|
210
249
|
f_gmoney: 0,
|
|
250
|
+
cardnum: 0,
|
|
211
251
|
f_cardfees: 0,
|
|
212
|
-
|
|
252
|
+
f_collection: 0
|
|
213
253
|
}),
|
|
214
254
|
orgCondtionStr: '',
|
|
215
255
|
|
|
@@ -115,9 +115,10 @@ export default{
|
|
|
115
115
|
|
|
116
116
|
ProceedsOperConfig: {
|
|
117
117
|
'f_operate_date': '日期', 'c': '售气笔数', 'f_pregas': '售气气量', 'f_preamount': '售气金额',
|
|
118
|
-
'
|
|
119
|
-
'
|
|
120
|
-
'
|
|
118
|
+
'f_balance': '上期结余', 'f_curbalance': '本期结余', 'f_delaypay': '气费滞纳金',
|
|
119
|
+
'f_returnfee': '退费','f_czpregas': '冲正气量','f_czpreamount': '冲正金额','f_czdelaypay': '冲正滞纳金',
|
|
120
|
+
'fkcardnum': '发卡数', 'f_fkcardfees': '发卡费', 'gc': '其他数','f_gmoney': '其他费', 'cardnum': '补卡数',
|
|
121
|
+
'f_cardfees': '补卡费', 'f_collection': '实收金额'
|
|
121
122
|
},
|
|
122
123
|
|
|
123
124
|
arrearsConfig: {
|