sale-client 3.6.75 → 3.6.77
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 +4 -1
- package/package.json +1 -1
- package/src/components/revenue/Common/batchDisable.vue +147 -100
- package/src/components/revenue/base/leftview/SafeCheck.vue +8 -0
- package/src/components/revenue/comprehen/Bill/EticketV4/EticketRecordList.vue +12 -4
- package/src/components/revenue/comprehen/ComprehenOperation/OffGasAddGas/OffGasAddGas.vue +15 -0
- package/src/filiale/gehua/MeterinfoTest.vue +8 -2
- package/src/filiale/rizhao/ChargeList.vue +7 -1
- package/src/filiale/shexian/ChargeQueryUser.vue +453 -0
- package/src/filiale/shexian/UserInfoDetailManageNew.vue +208 -0
- package/src/filiale/shexian/revenue/newchangemeter/ChangeMeter.vue +13 -1
- package/src/filiale/shexian/revenue/newchangemeter/ResetMeter.vue +14 -1
- package/src/filiale/shexian/sale.js +1 -0
- package/src/filiale/yuansheng/icTable.vue +4 -5
- package/src/filiale/yuansheng/sale.js +2 -0
- package/src/main.js +1 -2
package/build/dev-server.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
var path = require('path')
|
|
2
|
-
const [
|
|
2
|
+
const [serverRul, localUrl ] = ['http://121.36.106.17:8400/', 'http://localhost:8080/']
|
|
3
3
|
var merge = require('webpack-merge')
|
|
4
4
|
var baseConfig = require('./webpack.dev.conf')
|
|
5
5
|
var devConfig = {
|
|
@@ -20,6 +20,9 @@ var devConfig = {
|
|
|
20
20
|
'/rs/file': {
|
|
21
21
|
target: serverRul
|
|
22
22
|
},
|
|
23
|
+
'/rs/sql/singleTable': {
|
|
24
|
+
target: serverRul
|
|
25
|
+
},
|
|
23
26
|
'/invoice': {
|
|
24
27
|
target: serverRul
|
|
25
28
|
},
|
package/package.json
CHANGED
|
@@ -6,39 +6,9 @@
|
|
|
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
|
-
<
|
|
9
|
+
<res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"
|
|
10
|
+
v-ref:sel></res-select-group>
|
|
10
11
|
|
|
11
|
-
<label for="startDate" class="font_normal_body" title="开始日期">开始日期</label>
|
|
12
|
-
<datepicker id="startDate" placeholder="开始日期" style="width:60%"
|
|
13
|
-
v-model="model.startDate"
|
|
14
|
-
:value.sync="model.startDate"
|
|
15
|
-
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
16
|
-
condition="da.f_operate_date >= '{}' "
|
|
17
|
-
:show-reset-button="true"
|
|
18
|
-
>
|
|
19
|
-
</datepicker>
|
|
20
|
-
</div>
|
|
21
|
-
<div class="col-sm-2 form-group">
|
|
22
|
-
<label for="endDate" class="font_normal_body" title="结束日期"> 至 </label>
|
|
23
|
-
<datepicker id="endDate" placeholder="结束日期" style="width:60%"
|
|
24
|
-
v-model="model.endDate"
|
|
25
|
-
:value.sync="model.endDate"
|
|
26
|
-
condition="da.f_operate_date <= '{}' "
|
|
27
|
-
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
28
|
-
:show-reset-button="true"
|
|
29
|
-
>
|
|
30
|
-
</datepicker>
|
|
31
|
-
</div>
|
|
32
|
-
<div class="col-sm-2 form-group">
|
|
33
|
-
<label class="font_normal_body">客户编号</label>
|
|
34
|
-
<input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
|
|
35
|
-
condition="f_userinfo_code = '{}' " placeholder="客户编号">
|
|
36
|
-
</div>
|
|
37
|
-
<div class="col-sm-2 form-group">
|
|
38
|
-
<label class="font_normal_body">客户名称</label>
|
|
39
|
-
<input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
|
|
40
|
-
condition="f_user_name = '{}'" placeholder="客户名称">
|
|
41
|
-
</div>
|
|
42
12
|
<div class="span" style="float:right;">
|
|
43
13
|
<button v-if="this.$login.r.includes('批量停用')" class="button_search button_spacing" @click="$parent.$parent.batch_audit()">批量修改</button>
|
|
44
14
|
<button class="button_search button_spacing" @click="search()">查询</button>
|
|
@@ -50,8 +20,16 @@
|
|
|
50
20
|
</div>
|
|
51
21
|
|
|
52
22
|
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
53
|
-
<
|
|
54
|
-
|
|
23
|
+
<div class="col-sm-2 form-group">
|
|
24
|
+
<label class="font_normal_body">客户编号</label>
|
|
25
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
|
|
26
|
+
condition="f_userinfo_code = '{}' " placeholder="客户编号">
|
|
27
|
+
</div>
|
|
28
|
+
<div class="col-sm-2 form-group">
|
|
29
|
+
<label class="font_normal_body">客户名称</label>
|
|
30
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
|
|
31
|
+
condition="f_user_name = '{}'" placeholder="客户名称">
|
|
32
|
+
</div>
|
|
55
33
|
|
|
56
34
|
<div class="col-sm-2 form-group">
|
|
57
35
|
<label class="font_normal_body">客户电话</label>
|
|
@@ -87,11 +65,48 @@
|
|
|
87
65
|
condition="da.f_comments = '{}'"
|
|
88
66
|
close-on-select></v-select>
|
|
89
67
|
</div>
|
|
68
|
+
|
|
69
|
+
<div class="col-sm-2 form-group">
|
|
70
|
+
<label class="font_normal_body">是否欠费</label>
|
|
71
|
+
<v-select :value.sync="model.f_pay_state" v-model="model.f_pay_state"
|
|
72
|
+
:options='$parent.$parent.paystate' placeholder='请选择'
|
|
73
|
+
condition="da.f_pay_state = '{}'"
|
|
74
|
+
close-on-select></v-select>
|
|
75
|
+
</div>
|
|
76
|
+
|
|
77
|
+
<div class="col-sm-2 form-group">
|
|
78
|
+
<label class="font_normal_body">用户状态</label>
|
|
79
|
+
<v-select :value.sync="model.f_table_state" v-model="model.f_table_state"
|
|
80
|
+
:options='$parent.$parent.tablestate' placeholder='请选择'
|
|
81
|
+
condition="da.f_table_state = '{}'"
|
|
82
|
+
close-on-select></v-select>
|
|
83
|
+
</div>
|
|
84
|
+
|
|
85
|
+
<div class="col-sm-2 form-group">
|
|
86
|
+
<label for="startDate" class="font_normal_body" title="开始日期">停用日期</label>
|
|
87
|
+
<datepicker id="startDate" placeholder="开始日期" style="width:60%"
|
|
88
|
+
v-model="model.startDate"
|
|
89
|
+
:value.sync="model.startDate"
|
|
90
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
91
|
+
condition="da.f_operate_date >= '{}' "
|
|
92
|
+
:show-reset-button="true">
|
|
93
|
+
</datepicker>
|
|
94
|
+
</div>
|
|
95
|
+
<div class="col-sm-2 form-group">
|
|
96
|
+
<label for="endDate" class="font_normal_body" title="结束日期"> 至 </label>
|
|
97
|
+
<datepicker id="endDate" placeholder="结束日期" style="width:60%"
|
|
98
|
+
v-model="model.endDate"
|
|
99
|
+
:value.sync="model.endDate"
|
|
100
|
+
condition="da.f_operate_date <= '{}' "
|
|
101
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
102
|
+
:show-reset-button="true">
|
|
103
|
+
</datepicker>
|
|
104
|
+
</div>
|
|
90
105
|
</div>
|
|
91
106
|
</div>
|
|
92
107
|
</criteria>
|
|
93
108
|
|
|
94
|
-
<data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
|
|
109
|
+
<data-grid :model="model" partial='list' class="list_area table_sy" :optional="true" v-ref:grid>
|
|
95
110
|
<template partial='head'>
|
|
96
111
|
<tr>
|
|
97
112
|
<th>
|
|
@@ -115,17 +130,20 @@
|
|
|
115
130
|
<th>
|
|
116
131
|
<nobr>用气性质</nobr>
|
|
117
132
|
</th>
|
|
133
|
+
<th>
|
|
134
|
+
<nobr>表具状态</nobr>
|
|
135
|
+
</th>
|
|
118
136
|
<th>
|
|
119
137
|
<nobr>停用原因</nobr>
|
|
120
138
|
</th>
|
|
121
139
|
<th>
|
|
122
|
-
<nobr
|
|
140
|
+
<nobr>停用日期</nobr>
|
|
123
141
|
</th>
|
|
124
142
|
<th>
|
|
125
|
-
<nobr
|
|
143
|
+
<nobr>是否欠费</nobr>
|
|
126
144
|
</th>
|
|
127
145
|
<th>
|
|
128
|
-
<nobr
|
|
146
|
+
<nobr>欠费金额</nobr>
|
|
129
147
|
</th>
|
|
130
148
|
</tr>
|
|
131
149
|
</template>
|
|
@@ -151,17 +169,20 @@
|
|
|
151
169
|
<td style="text-align: center;">
|
|
152
170
|
<nobr>{{row.f_gasproperties}}</nobr>
|
|
153
171
|
</td>
|
|
172
|
+
<td style="text-align: center;">
|
|
173
|
+
<nobr>{{row.f_table_state}}</nobr>
|
|
174
|
+
</td>
|
|
154
175
|
<td style="text-align: center;">
|
|
155
176
|
<nobr>{{row.f_comments}}</nobr>
|
|
156
177
|
</td>
|
|
157
178
|
<td style="text-align: center;">
|
|
158
|
-
<nobr>{{row.
|
|
179
|
+
<nobr>{{row.f_operate_date!=='1900-01-01 00:00:00' ? row.f_operate_date : ''}}</nobr>
|
|
159
180
|
</td>
|
|
160
181
|
<td style="text-align: center;">
|
|
161
|
-
<nobr>{{row.
|
|
182
|
+
<nobr>{{row.f_pay_state}}</nobr>
|
|
162
183
|
</td>
|
|
163
184
|
<td style="text-align: center;">
|
|
164
|
-
<nobr>{{row.
|
|
185
|
+
<nobr>{{row.f_oughtfee}}</nobr>
|
|
165
186
|
</td>
|
|
166
187
|
</template>
|
|
167
188
|
<template partial='foot'></template>
|
|
@@ -187,48 +208,61 @@
|
|
|
187
208
|
</v-select>
|
|
188
209
|
</div>
|
|
189
210
|
</div>
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
</datepicker>
|
|
202
|
-
</div>
|
|
203
|
-
<label class="col-sm-1 control-label"> 至 </label>
|
|
204
|
-
<div class="form-group col-sm-3">
|
|
205
|
-
|
|
206
|
-
<datepicker
|
|
207
|
-
id="endDate1" placeholder="结束日期" style="width:100%"
|
|
208
|
-
v-model="disableModel.endDate"
|
|
209
|
-
:value.sync="disableModel.endDate"
|
|
210
|
-
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
211
|
-
:show-reset-button="true"
|
|
212
|
-
>
|
|
213
|
-
</datepicker>
|
|
211
|
+
<div class="form-group">
|
|
212
|
+
<label class=" col-sm-3 control-label">停用原因:</label>
|
|
213
|
+
<div class="col-sm-4">
|
|
214
|
+
<v-select v-model="f_comments"
|
|
215
|
+
placeholder='请选择'
|
|
216
|
+
:value.sync="disableModel.f_comments"
|
|
217
|
+
:options='comments'
|
|
218
|
+
:value-single="true"
|
|
219
|
+
close-on-select clear-button>
|
|
220
|
+
</v-select>
|
|
221
|
+
</div>
|
|
214
222
|
</div>
|
|
215
|
-
</div>
|
|
216
223
|
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
<
|
|
221
|
-
disabled
|
|
222
|
-
placeholder="总金额" />
|
|
223
|
-
</div>
|
|
224
|
-
</div>
|
|
225
|
-
<div class="form-group">
|
|
226
|
-
<label class=" col-sm-3 control-label">备注:</label>
|
|
227
|
-
<div class="col-sm-8">
|
|
228
|
-
<textarea class="form-control" v-model="disableModel.f_comments" rows="3"
|
|
224
|
+
<div class="form-group">
|
|
225
|
+
<label class=" col-sm-3 control-label">备注:</label>
|
|
226
|
+
<div class="col-sm-8">
|
|
227
|
+
<textarea class="form-control" v-model="disableModel.f_othereason" rows="3"
|
|
229
228
|
placeholder="备注" ></textarea>
|
|
229
|
+
</div>
|
|
230
230
|
</div>
|
|
231
|
-
|
|
231
|
+
<!-- <div class="form-group">-->
|
|
232
|
+
<!-- <label class="col-sm-3 control-label">时间周期:</label>-->
|
|
233
|
+
<!-- <div class="form-group col-sm-3">-->
|
|
234
|
+
<!-- <datepicker-->
|
|
235
|
+
<!-- id="startDate1" placeholder="开始日期" style="width:100%"-->
|
|
236
|
+
<!-- v-model="disableModel.startDate"-->
|
|
237
|
+
<!-- :value.sync="disableModel.startDate"-->
|
|
238
|
+
<!-- :format="'yyyy-MM-dd HH:mm:ss'"-->
|
|
239
|
+
<!-- :show-reset-button="true"-->
|
|
240
|
+
<!-- >-->
|
|
241
|
+
<!-- </datepicker>-->
|
|
242
|
+
<!-- </div>-->
|
|
243
|
+
<!-- <label class="col-sm-1 control-label"> 至 </label>-->
|
|
244
|
+
<!-- <div class="form-group col-sm-3">-->
|
|
245
|
+
|
|
246
|
+
<!-- <datepicker-->
|
|
247
|
+
<!-- id="endDate1" placeholder="结束日期" style="width:100%"-->
|
|
248
|
+
<!-- v-model="disableModel.endDate"-->
|
|
249
|
+
<!-- :value.sync="disableModel.endDate"-->
|
|
250
|
+
<!-- :format="'yyyy-MM-dd HH:mm:ss'"-->
|
|
251
|
+
<!-- :show-reset-button="true"-->
|
|
252
|
+
<!-- >-->
|
|
253
|
+
<!-- </datepicker>-->
|
|
254
|
+
<!-- </div>-->
|
|
255
|
+
<!-- </div>-->
|
|
256
|
+
|
|
257
|
+
<!-- <div v-if="disableModel.f_disable_type === '欠费'" class="form-group">-->
|
|
258
|
+
<!-- <label class=" col-sm-3 control-label">总金额:</label>-->
|
|
259
|
+
<!-- <div class="col-sm-4">-->
|
|
260
|
+
<!-- <input class="form-control" v-model="disableModel.f_totalcost" rows="3"-->
|
|
261
|
+
<!-- disabled-->
|
|
262
|
+
<!-- placeholder="总金额" />-->
|
|
263
|
+
<!-- </div>-->
|
|
264
|
+
<!-- </div>-->
|
|
265
|
+
|
|
232
266
|
</form>
|
|
233
267
|
</validator>
|
|
234
268
|
</article>
|
|
@@ -246,8 +280,6 @@
|
|
|
246
280
|
import {HttpResetClass, PagedList} from 'vue-client'
|
|
247
281
|
|
|
248
282
|
let readySomething = async function (self) {
|
|
249
|
-
self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
|
|
250
|
-
self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
|
|
251
283
|
await self.$LoadParams.loadParam()
|
|
252
284
|
self.initParams()
|
|
253
285
|
}
|
|
@@ -291,7 +323,8 @@
|
|
|
291
323
|
startDate: '',
|
|
292
324
|
endDate: '',
|
|
293
325
|
f_totalcost: '',
|
|
294
|
-
f_comments: ''
|
|
326
|
+
f_comments: '',
|
|
327
|
+
f_othereason:''
|
|
295
328
|
},
|
|
296
329
|
tempfalg: false,
|
|
297
330
|
flag: false
|
|
@@ -309,32 +342,40 @@
|
|
|
309
342
|
this.$refs.paged.$refs.cri.search()
|
|
310
343
|
},
|
|
311
344
|
batch_audit () {
|
|
312
|
-
this.
|
|
313
|
-
|
|
314
|
-
|
|
345
|
+
if (this.$refs.paged.$refs.grid.getRowData().length !== 0) {
|
|
346
|
+
this.tempfalg = true
|
|
347
|
+
this.disableModel.startDate = this.$login.toStandardYearMonth() + '-01 00:00:00'
|
|
348
|
+
this.disableModel.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
349
|
+
}
|
|
315
350
|
},
|
|
316
351
|
close () {
|
|
317
352
|
this.tempfalg = false
|
|
318
353
|
},
|
|
319
|
-
confirm () {
|
|
354
|
+
async confirm () {
|
|
320
355
|
this.tempfalg = false
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
356
|
+
console.log('model----',this.$refs.paged.$refs.grid.getRowData())
|
|
357
|
+
let param = []
|
|
358
|
+
this.$refs.paged.$refs.grid.getRowData().forEach((item) => {
|
|
359
|
+
let temp = {}
|
|
360
|
+
temp.f_userinfo_id = item.f_userinfo_id
|
|
361
|
+
temp.f_user_name = item.f_user_name
|
|
362
|
+
temp.f_disable_type = this.disableModel.f_disable_type
|
|
363
|
+
temp.f_comments = this.disableModel.f_comments
|
|
364
|
+
temp.f_othereason = this.disableModel.f_othereason
|
|
365
|
+
temp.f_operator= this.$login.f.name
|
|
366
|
+
temp. f_operatorid= this.$login.f.id
|
|
367
|
+
temp. f_orgid= this.$login.f.orgid
|
|
368
|
+
temp.f_orgname= this.$login.f.orgs
|
|
369
|
+
temp. f_depid= this.$login.f.depids
|
|
370
|
+
temp. f_depname= this.$login.f.deps
|
|
371
|
+
param.push(temp)
|
|
372
|
+
})
|
|
373
|
+
console.log(param)
|
|
374
|
+
await this.$resetpost('rs/logic/owe_disable', {data: param}, {
|
|
335
375
|
rejectMsg: '同步失败',
|
|
336
376
|
resolveMsg: '同步成功'
|
|
337
377
|
})
|
|
378
|
+
await this.search()
|
|
338
379
|
},
|
|
339
380
|
cancel() {
|
|
340
381
|
this.flag = false
|
|
@@ -448,6 +489,12 @@
|
|
|
448
489
|
comments () {
|
|
449
490
|
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('停用原因')]
|
|
450
491
|
},
|
|
492
|
+
paystate () {
|
|
493
|
+
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('是否欠费')]
|
|
494
|
+
},
|
|
495
|
+
tablestate () {
|
|
496
|
+
return [{label: ' 全部 ', value: ''}, {label: '正常', value: '正常'}, {label: '停用', value: '停用'}]
|
|
497
|
+
},
|
|
451
498
|
metertypes() {
|
|
452
499
|
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
|
|
453
500
|
}
|
|
@@ -24,6 +24,10 @@
|
|
|
24
24
|
<label class="col-sm-6 ">上次安检时间:</label>
|
|
25
25
|
<span class="col-sm-6">{{model.lastCheckDate}}</span>
|
|
26
26
|
</div>
|
|
27
|
+
<div class="row">
|
|
28
|
+
<label class="col-sm-6 ">安检员:</label>
|
|
29
|
+
<span class="col-sm-6">{{model.f_checker_name}}</span>
|
|
30
|
+
</div>
|
|
27
31
|
<div class="row">
|
|
28
32
|
<label class="col-sm-6 ">壁挂炉:</label>
|
|
29
33
|
<span class="col-sm-6">{{model.hasFireplace == 0 ? '无': '有'}}</span>
|
|
@@ -92,6 +96,10 @@
|
|
|
92
96
|
<td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">上次安检时间:</td>
|
|
93
97
|
<td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{ model.f_last_check_date }}</td>
|
|
94
98
|
</tr>
|
|
99
|
+
<tr>
|
|
100
|
+
<td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">安检员:</td>
|
|
101
|
+
<td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{model.f_checker_name}}</td>
|
|
102
|
+
</tr>
|
|
95
103
|
<tr>
|
|
96
104
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">到达时间:</td>
|
|
97
105
|
<td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_onsite_time }}</td>
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
<div class="form-group col-sm-2">
|
|
20
20
|
<label class="font_normal_body">客户地址</label>
|
|
21
21
|
<input type="text" class="form-control" v-model="model.f_buy_address_phone" style="width:60%"
|
|
22
|
-
condition="f_buy_address_phone like '%{}%'" placeholder="
|
|
22
|
+
condition="f_buy_address_phone like '%{}%'" placeholder="客户地址"
|
|
23
23
|
>
|
|
24
24
|
</div>
|
|
25
25
|
<div class="form-group col-sm-2">
|
|
@@ -114,6 +114,10 @@
|
|
|
114
114
|
</th>
|
|
115
115
|
<th>
|
|
116
116
|
<data-order field="f_total_money" name="实收金额"
|
|
117
|
+
:order.sync="$parent.$parent.$parent.orderFields.f_collection"></data-order>
|
|
118
|
+
</th>
|
|
119
|
+
<th>
|
|
120
|
+
<data-order field="f_total_money" name="开票金额"
|
|
117
121
|
:order.sync="$parent.$parent.$parent.orderFields.f_total_money"></data-order>
|
|
118
122
|
</th>
|
|
119
123
|
<th>
|
|
@@ -159,6 +163,7 @@
|
|
|
159
163
|
<th style="text-align:center">{{ row.f_userinfo_code }}</th>
|
|
160
164
|
<th style="text-align:center">{{ row.f_user_name }}</th>
|
|
161
165
|
<th style="text-align:center">{{ row.f_buy_address_phone }}</th>
|
|
166
|
+
<th style="text-align:center">{{ row.f_collection }}</th>
|
|
162
167
|
<th style="text-align:center">{{ row.f_total_money }}</th>
|
|
163
168
|
<th style="text-align:center">{{ row.f_tax_money }}</th>
|
|
164
169
|
<th style="text-align:center">{{ row.f_invoice_type }}</th>
|
|
@@ -246,15 +251,18 @@ export default {
|
|
|
246
251
|
bz: '',
|
|
247
252
|
row: {},
|
|
248
253
|
orderFields: {
|
|
249
|
-
f_operate_date: 'desc'
|
|
254
|
+
f_operate_date: 'desc',
|
|
255
|
+
f_collection: 'no',
|
|
256
|
+
f_total_money: 'no'
|
|
250
257
|
},
|
|
251
258
|
// 排序
|
|
252
|
-
orderitem: '',
|
|
259
|
+
orderitem: ' f_operate_date desc ',
|
|
253
260
|
fields: {
|
|
254
261
|
'f_userinfo_code': '客户编号',
|
|
255
262
|
'f_user_name': '客户姓名',
|
|
256
263
|
'f_buy_address_phone': '用户地址',
|
|
257
|
-
'
|
|
264
|
+
'f_collection': '实收金额',
|
|
265
|
+
'f_total_money': '开票金额',
|
|
258
266
|
'f_tax_money': '不含税金额',
|
|
259
267
|
'f_invoice_type': '发票类型',
|
|
260
268
|
'f_bill_code': '发票代码',
|
|
@@ -67,6 +67,8 @@
|
|
|
67
67
|
</template>
|
|
68
68
|
<script>
|
|
69
69
|
|
|
70
|
+
import {HttpResetClass} from "vue-client";
|
|
71
|
+
|
|
70
72
|
let asyncOffGasManage = async function (self, val) {
|
|
71
73
|
await self.$getConfig(self, 'OffGasAddGas')
|
|
72
74
|
console.log('掉气补气config', self.config)
|
|
@@ -239,6 +241,19 @@ export default {
|
|
|
239
241
|
)
|
|
240
242
|
},
|
|
241
243
|
async apply () {
|
|
244
|
+
let http = new HttpResetClass()
|
|
245
|
+
let param = {
|
|
246
|
+
items: 'id',
|
|
247
|
+
condition: `f_userinfo_id = '${this.row.f_userinfo_id}' and f_state = '0' and f_delete = '0'`,
|
|
248
|
+
tablename: '"t_flow"',
|
|
249
|
+
orderitem: '"id"'
|
|
250
|
+
}
|
|
251
|
+
let result = await http.load('POST', 'rs/sql/saleSingleTable', {data: param},
|
|
252
|
+
{resolveMsg: null, rejectMsg: '获取流程信息失败！！'})
|
|
253
|
+
if (result.data.length > 0) {
|
|
254
|
+
this.$showAlert('当前申请用户已有流程在进行中，请完成当前进行流程在进行申请！！！', 'warning', 3000)
|
|
255
|
+
return
|
|
256
|
+
}
|
|
242
257
|
this.addTaskModel.f_task_name = `用户：${this.row.f_user_name}，编号：${this.row.f_userinfo_code} 申请掉气补气`
|
|
243
258
|
this.addTaskModel.f_userinfo_code = this.row.f_userinfo_code
|
|
244
259
|
this.addTaskModel.f_memorandum = this.model.f_othereason
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
<!-- <v-select :value.sync="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
|
|
46
46
|
search @change='brandChange' v-model='row.gasbrand' :disabled="!((row.f_meter_classify.indexOf('卡表') !== -1&&row.f_user_state === '预备') || (row.f_meter_classify.indexOf('卡表') !== -1&&row.f_whether_hairpin === '未发'))" v-ref:brand></v-select>-->
|
|
47
47
|
<v-select :value.sync="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
|
|
48
|
-
search @change='brandChange' v-model='row.gasbrand' :disabled="
|
|
48
|
+
search @change='brandChange' v-model='row.gasbrand' :disabled="user_State === '正常'" v-ref:brand></v-select>
|
|
49
49
|
</div>
|
|
50
50
|
<div class="col-sm-4 form-group" :class="[$m.model.required ? 'has-error' : '']">
|
|
51
51
|
<label for="gasmodel" class="font_normal_body">气表型号</label>
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
<!-- v-model='row.gasmodel' :disabled="!(row.gasbrand.length !== 0 && ((row.f_meter_classify.indexOf('卡表') !== -1&&row.f_user_state === '预备') || (row.f_meter_classify.indexOf('卡表') !== -1&&row.f_whether_hairpin === '未发')))" v-ref:model></v-select>-->
|
|
57
57
|
<v-select :value.sync="row.gasmodel" :options='row.gasbrand[0].gasmodel' placeholder='气表型号'
|
|
58
58
|
close-on-select
|
|
59
|
-
v-model='row.gasmodel' :disabled="!(row.gasbrand.length !== 0 && (
|
|
59
|
+
v-model='row.gasmodel' :disabled="!(row.gasbrand.length !== 0 && (user_State !== '正常'))" v-ref:model></v-select>
|
|
60
60
|
</div>
|
|
61
61
|
<div class="col-sm-4 form-group">
|
|
62
62
|
<label for="f_meter_base" class="font_normal_body"> 累购气量</label>
|
|
@@ -576,6 +576,7 @@
|
|
|
576
576
|
props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id', 'overdueset', 'curuser'],
|
|
577
577
|
async ready () {
|
|
578
578
|
this.user_State = this.curuser.f_user_state
|
|
579
|
+
console.log(this.user_State)
|
|
579
580
|
this.row = Object.assign(this.row, this.meter, {f_use_limit : this.$appdata.getSingleValue('报废年限')})
|
|
580
581
|
if (this.row.f_meter_classify) {
|
|
581
582
|
if (this.row.f_meter_classify === '物联网表') {
|
|
@@ -671,6 +672,11 @@
|
|
|
671
672
|
co(brandChangeGen(this))
|
|
672
673
|
}
|
|
673
674
|
this.meternumberValidate()
|
|
675
|
+
console.log('---------------------------------')
|
|
676
|
+
console.log(this.curuser)
|
|
677
|
+
console.log(this.meter)
|
|
678
|
+
console.log(this.user_State)
|
|
679
|
+
console.log('---------------------------------')
|
|
674
680
|
},
|
|
675
681
|
userTypeChange () {
|
|
676
682
|
this.gasproperties = []
|
|
@@ -307,7 +307,7 @@
|
|
|
307
307
|
<p class="form-control-static">{{userAddress}}</p>
|
|
308
308
|
</div>
|
|
309
309
|
<label class="col-sm-2 control-label" v-if="showOrgname">所属公司</label>
|
|
310
|
-
<div class="col-sm-
|
|
310
|
+
<div class="col-sm-10" v-if="showOrgname">
|
|
311
311
|
<p class="form-control-static" style="color: red">{{orgName}}</p>
|
|
312
312
|
</div>
|
|
313
313
|
</div>
|
|
@@ -575,6 +575,12 @@
|
|
|
575
575
|
if (getUser.data[0].f_filialeid != self.$login.f.orgid) {
|
|
576
576
|
self.showCardError = true
|
|
577
577
|
self.showCardError2 = true
|
|
578
|
+
self.orgName = ''
|
|
579
|
+
let arr = []
|
|
580
|
+
for(let i=0;i < getUser.data.length;i++){
|
|
581
|
+
arr.push(getUser.data[i].f_orgname)
|
|
582
|
+
}
|
|
583
|
+
self.orgName = arr.join(", ")
|
|
578
584
|
self.showOrgname = true
|
|
579
585
|
return
|
|
580
586
|
}
|