apply-clients 3.4.93 → 3.4.95
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 +8 -0
- package/package.json +1 -1
- package/src/components/product/Install/ContractCharge.vue +210 -185
- package/src/filiale/yangchunboneng/pc/ApplyChargeList.vue +30 -0
- package/src/filiale/yangchunboneng/pc/ApplyUpload.vue +375 -336
- package/src/filiale/yangchunboneng/pc/InstallInfoSelect.vue +356 -334
- package/src/filiale/yangchunboneng/pc/ServiceControl.vue +1831 -1814
- package/src/filiale/yangchunboneng/pc/chargeManagement.vue +793 -783
package/build/dev-server.js
CHANGED
|
@@ -12,6 +12,14 @@ var ldap = 'http://125.71.238.50:30789'
|
|
|
12
12
|
var applyinstall = 'http://125.71.238.50:30789'
|
|
13
13
|
|
|
14
14
|
var proxyTable = {
|
|
15
|
+
'/apply/rs/entity': {
|
|
16
|
+
target: ldap,
|
|
17
|
+
changeOrigin: true
|
|
18
|
+
},
|
|
19
|
+
'/rs/file/uploadFile': {
|
|
20
|
+
target: ldap,
|
|
21
|
+
changeOrigin: true
|
|
22
|
+
},
|
|
15
23
|
'/rs/logic/getSaleInitData': {
|
|
16
24
|
target: ldap,
|
|
17
25
|
changeOrigin: true
|
package/package.json
CHANGED
|
@@ -1,185 +1,210 @@
|
|
|
1
|
-
<template>
|
|
2
|
-
<div class="col-sm-12" style="margin: 20px 0px;">
|
|
3
|
-
<data-grid :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
|
|
4
|
-
<template partial='head'>
|
|
5
|
-
<tr>
|
|
6
|
-
<th>合同金额</th>
|
|
7
|
-
<th>付款节点</th>
|
|
8
|
-
<th>付款比例</th>
|
|
9
|
-
<th>应收金额</th>
|
|
10
|
-
<th
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
:
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
<
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
<
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
this.
|
|
178
|
-
this.
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
1
|
+
<template>
|
|
2
|
+
<div class="col-sm-12" style="margin: 20px 0px;">
|
|
3
|
+
<data-grid :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
|
|
4
|
+
<template partial='head'>
|
|
5
|
+
<tr>
|
|
6
|
+
<th>合同金额</th>
|
|
7
|
+
<th>付款节点</th>
|
|
8
|
+
<th>付款比例</th>
|
|
9
|
+
<th>应收金额</th>
|
|
10
|
+
<th>
|
|
11
|
+
<button type="button" class="btn btn-primary" @click="$parent.$parent.showAdd()">新增</button>
|
|
12
|
+
</th>
|
|
13
|
+
</tr>
|
|
14
|
+
</template>
|
|
15
|
+
<template partial='body'>
|
|
16
|
+
<tr>
|
|
17
|
+
<td style="text-align: center;">
|
|
18
|
+
<nobr><font>{{ row.f_amount }}</font></nobr>
|
|
19
|
+
</td>
|
|
20
|
+
<td style="text-align: center;">
|
|
21
|
+
<nobr><font>{{ row.defname }}</font></nobr>
|
|
22
|
+
</td>
|
|
23
|
+
<td style="text-align: center;">
|
|
24
|
+
<nobr><font>{{ row.f_payment_ratio }}%</font></nobr>
|
|
25
|
+
</td>
|
|
26
|
+
<td style="text-align: center;">
|
|
27
|
+
<nobr><font>{{ $parent.$parent.toFixed(row.f_due_money) }}</font></nobr>
|
|
28
|
+
</td>
|
|
29
|
+
<td style="text-align: center;">
|
|
30
|
+
<nobr><font>
|
|
31
|
+
<button type="button" class="btn btn-primary" @click="$parent.$parent.updateData(row)">修改</button>
|
|
32
|
+
<button type="button" class="btn btn-primary" @click="$parent.$parent.delData(row)">删除</button>
|
|
33
|
+
</font></nobr>
|
|
34
|
+
</td>
|
|
35
|
+
</tr>
|
|
36
|
+
</template>
|
|
37
|
+
</data-grid>
|
|
38
|
+
<modal
|
|
39
|
+
:show.sync="addModal"
|
|
40
|
+
backdrop="false"
|
|
41
|
+
:title="titleText"
|
|
42
|
+
>
|
|
43
|
+
<header slot="modal-header" class="modal-header">
|
|
44
|
+
<button type="button" class="close" @click="closeModal"><span>×</span></button>
|
|
45
|
+
<h4 class="modal-title">{{ titleText }}</h4>
|
|
46
|
+
</header>
|
|
47
|
+
<article slot="modal-body" class="modal-body clearfix">
|
|
48
|
+
<div class="form-group col-sm-12">
|
|
49
|
+
<label class="col-sm-3 control-label">合同金额(元)：：</label>
|
|
50
|
+
<div class="col-sm-9">
|
|
51
|
+
<input type="text"
|
|
52
|
+
class="form-control input_view"
|
|
53
|
+
style="width: 60%"
|
|
54
|
+
readonly
|
|
55
|
+
v-model="addData.f_amount"/>
|
|
56
|
+
</div>
|
|
57
|
+
</div>
|
|
58
|
+
<div class="form-group col-sm-12">
|
|
59
|
+
<label class="col-sm-3 control-label">付款节点：</label>
|
|
60
|
+
<div class="col-sm-9">
|
|
61
|
+
<v-select
|
|
62
|
+
v-model="addData.applyType"
|
|
63
|
+
placeholder='请选择需要发起的工程类型'
|
|
64
|
+
:value.sync="addData.applyType"
|
|
65
|
+
:options='payProjects'
|
|
66
|
+
:value-single="true"
|
|
67
|
+
class="select select_list"
|
|
68
|
+
:search="false"
|
|
69
|
+
close-on-select></v-select>
|
|
70
|
+
</div>
|
|
71
|
+
</div>
|
|
72
|
+
<div class="form-group col-sm-12">
|
|
73
|
+
<label class="col-sm-3 control-label">付款比例(%)：</label>
|
|
74
|
+
<div class="col-sm-9">
|
|
75
|
+
<input type="text"
|
|
76
|
+
class="form-control input_view" style="width: 60%"
|
|
77
|
+
v-model="addData.f_payment_ratio" @change="inputChange(1)"/>
|
|
78
|
+
</div>
|
|
79
|
+
</div>
|
|
80
|
+
<div class="form-group col-sm-12">
|
|
81
|
+
<label class="col-sm-3 control-label">预付款金额(元)：</label>
|
|
82
|
+
<div class="col-sm-9">
|
|
83
|
+
<input type="text"
|
|
84
|
+
style="width: 60%"
|
|
85
|
+
class="form-control input_view"
|
|
86
|
+
v-model="addData.f_due_money"
|
|
87
|
+
@change="inputChange(2)"/>
|
|
88
|
+
</div>
|
|
89
|
+
</div>
|
|
90
|
+
</article>
|
|
91
|
+
<footer slot="modal-footer" class="modal-footer">
|
|
92
|
+
<button type="button" class="btn btn-primary" @click="saveOrUpdate()">确认</button>
|
|
93
|
+
</footer>
|
|
94
|
+
</modal>
|
|
95
|
+
</div>
|
|
96
|
+
</template>
|
|
97
|
+
<script>
|
|
98
|
+
import {HttpResetClass} from 'vue-client'
|
|
99
|
+
|
|
100
|
+
export default {
|
|
101
|
+
title: '付款预设',
|
|
102
|
+
props: {
|
|
103
|
+
selectdata: {
|
|
104
|
+
type: Object
|
|
105
|
+
},
|
|
106
|
+
mark: {
|
|
107
|
+
type: Number,
|
|
108
|
+
default: 1
|
|
109
|
+
}
|
|
110
|
+
},
|
|
111
|
+
data () {
|
|
112
|
+
return {
|
|
113
|
+
model: {rows: [{f_process_id: 100, f_payment_ratio: '', defname: '', f_due_money: ''}]},
|
|
114
|
+
payProjects: [{label: '合同签订', value: '合同签订'}, {label: '验收通气', value: '验收通气'}, {label: '完工', value: '完工'}],
|
|
115
|
+
addModal: false,
|
|
116
|
+
addData: {f_amount: 0, f_process_id: '', f_payment_ratio: '', defname: '', f_due_money: ''},
|
|
117
|
+
titleText: ''
|
|
118
|
+
}
|
|
119
|
+
},
|
|
120
|
+
methods: {
|
|
121
|
+
toFixed (num) {
|
|
122
|
+
return parseFloat(num).toFixed(2)
|
|
123
|
+
},
|
|
124
|
+
showAdd () {
|
|
125
|
+
this.addData = {
|
|
126
|
+
f_amount: this.selectdata.f_contract_money,
|
|
127
|
+
f_process_id: this.selectdata.f_process_id,
|
|
128
|
+
f_payment_ratio: '',
|
|
129
|
+
defname: '',
|
|
130
|
+
f_due_money: ''
|
|
131
|
+
}
|
|
132
|
+
this.titleText = '新增付款预设'
|
|
133
|
+
this.addModal = true
|
|
134
|
+
},
|
|
135
|
+
inputChange (type) {
|
|
136
|
+
if (this.addData.f_amount) {
|
|
137
|
+
if (type === 1) {
|
|
138
|
+
this.addData.f_due_money = (this.addData.f_amount * (this.addData.f_payment_ratio / 100)).toFixed(2)
|
|
139
|
+
// this.addData.f_due_money转为数字类型
|
|
140
|
+
this.addData.f_due_money = parseFloat(this.addData.f_due_money)
|
|
141
|
+
this.selectdata.f_contract_money = parseFloat(this.selectdata.f_contract_money)
|
|
142
|
+
if (this.addData.f_due_money > this.selectdata.f_contract_money) {
|
|
143
|
+
this.addData.f_payment_ratio = 0
|
|
144
|
+
this.addData.f_due_money = 0
|
|
145
|
+
this.$showMessage('预付款金额不能大于合同金额')
|
|
146
|
+
}
|
|
147
|
+
} else {
|
|
148
|
+
this.addData.f_payment_ratio = Math.floor(this.addData.f_due_money / this.addData.f_amount * 100)
|
|
149
|
+
this.addData.f_payment_ratio = parseFloat(this.addData.f_payment_ratio)
|
|
150
|
+
if (this.addData.f_payment_ratio > 100) {
|
|
151
|
+
this.addData.f_payment_ratio = 0
|
|
152
|
+
this.addData.f_due_money = 0
|
|
153
|
+
this.$showMessage('付款比率不能大于100%')
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
},
|
|
158
|
+
updateData (row) {
|
|
159
|
+
this.addData = row
|
|
160
|
+
this.addData.f_amount = this.selectdata.f_contract_money
|
|
161
|
+
this.titleText = '修改付款预设'
|
|
162
|
+
this.addModal = true
|
|
163
|
+
},
|
|
164
|
+
delData (row) {
|
|
165
|
+
console.log('delData=========')
|
|
166
|
+
this.$resetdelete('apply/rs/entity/t_contract_charge', {id: row.id}, {
|
|
167
|
+
resolveMsg: null,
|
|
168
|
+
rejectMsg: null
|
|
169
|
+
}).then(() => {
|
|
170
|
+
this.search()
|
|
171
|
+
})
|
|
172
|
+
this.addModal = false
|
|
173
|
+
},
|
|
174
|
+
saveOrUpdate () {
|
|
175
|
+
// this.addData
|
|
176
|
+
console.log('saveOrUpdate=========')
|
|
177
|
+
this.addData.defname = this.addData.applyType
|
|
178
|
+
new HttpResetClass().load('POST', 'apply/rs/entity/t_contract_charge', this.addData, {
|
|
179
|
+
resolveMsg: null,
|
|
180
|
+
rejectMsg: null
|
|
181
|
+
}).then(() => {
|
|
182
|
+
this.search()
|
|
183
|
+
})
|
|
184
|
+
// 关闭弹窗
|
|
185
|
+
this.addModal = false
|
|
186
|
+
},
|
|
187
|
+
closeModal () {
|
|
188
|
+
this.addModal = false
|
|
189
|
+
},
|
|
190
|
+
search () {
|
|
191
|
+
let data = {
|
|
192
|
+
condition: `f_process_id = '${this.selectdata.f_process_id}'`
|
|
193
|
+
}
|
|
194
|
+
new HttpResetClass().load('POST', 'rs/sql/getContractCharge', {data: data}
|
|
195
|
+
, {resolveMsg: null, rejectMsg: null})
|
|
196
|
+
.then((res) => {
|
|
197
|
+
this.model.rows = res.data
|
|
198
|
+
})
|
|
199
|
+
}
|
|
200
|
+
},
|
|
201
|
+
ready () {
|
|
202
|
+
this.payProjects = this.$appdata.getParam(this.selectdata.f_apply_type + '付款预设')
|
|
203
|
+
this.search()
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
</script>
|
|
207
|
+
|
|
208
|
+
<style scoped>
|
|
209
|
+
|
|
210
|
+
</style>
|
|
@@ -209,6 +209,17 @@
|
|
|
209
209
|
:value-single="true"
|
|
210
210
|
close-on-select ></v-select>
|
|
211
211
|
</div>
|
|
212
|
+
<div class="form-group col-sm-3">
|
|
213
|
+
<label class="font_normal_body">是否确认：</label>
|
|
214
|
+
<v-select
|
|
215
|
+
v-model="model.f_confirm"
|
|
216
|
+
placeholder='请选择'
|
|
217
|
+
:value.sync="model.f_confirm"
|
|
218
|
+
class="select select_list"
|
|
219
|
+
:options='$parent.$parent.confirms'
|
|
220
|
+
:value-single="true"
|
|
221
|
+
close-on-select ></v-select>
|
|
222
|
+
</div>
|
|
212
223
|
<div class="form-group col-sm-3">
|
|
213
224
|
<label class="font_normal_body">确 认 人：</label>
|
|
214
225
|
<input type="text" style="width: 60%"
|
|
@@ -265,6 +276,7 @@
|
|
|
265
276
|
<th style="white-space: nowrap;">收费日期(退款日期)</th>
|
|
266
277
|
<th style="white-space: nowrap;">确认人</th>
|
|
267
278
|
<th style="white-space: nowrap;">确认日期</th>
|
|
279
|
+
<th style="white-space: nowrap;">备注</th>
|
|
268
280
|
<th style="white-space: nowrap;">实际收费时间</th>
|
|
269
281
|
<th style="white-space: nowrap;">状态</th>
|
|
270
282
|
</tr>
|
|
@@ -331,6 +343,9 @@
|
|
|
331
343
|
<td style="text-align: center;">
|
|
332
344
|
<nobr><font>{{row.f_confirm_date}}</font></nobr>
|
|
333
345
|
</td>
|
|
346
|
+
<td style="text-align: center;">
|
|
347
|
+
<nobr><font>{{row.f_charge_remarks}}</font></nobr>
|
|
348
|
+
</td>
|
|
334
349
|
<td style="text-align: center;">
|
|
335
350
|
<nobr><font>{{row.f_actual_date}}</font></nobr>
|
|
336
351
|
</td>
|
|
@@ -369,6 +384,11 @@ export default {
|
|
|
369
384
|
{label: '作废', value: '作废'},
|
|
370
385
|
{label: '退款', value: '退款'}
|
|
371
386
|
],
|
|
387
|
+
confirms: [
|
|
388
|
+
{label: '全部', value: ''},
|
|
389
|
+
{label: '是', value: '是'},
|
|
390
|
+
{label: '否', value: '否'}
|
|
391
|
+
],
|
|
372
392
|
criteriaShow: false,
|
|
373
393
|
chargeAll: {
|
|
374
394
|
count: 0,
|
|
@@ -392,6 +412,7 @@ export default {
|
|
|
392
412
|
'f_actual_date': '实际收费时间',
|
|
393
413
|
'f_confirm_person': '确认人',
|
|
394
414
|
'f_confirm_date': '确认时间',
|
|
415
|
+
'f_charge_remarks': '备注',
|
|
395
416
|
'f_charge_status': '状态'
|
|
396
417
|
}
|
|
397
418
|
}
|
|
@@ -459,6 +480,15 @@ export default {
|
|
|
459
480
|
if (this.curuserid.length > 0) {
|
|
460
481
|
args.condition = args.condition + ` and cr.f_charge_collectors_id in (${this.curuserid})`
|
|
461
482
|
}
|
|
483
|
+
if (args.model.f_confirm){
|
|
484
|
+
if (args.model.f_confirm == '是'){
|
|
485
|
+
args.condition = args.condition + ` and cr.f_confirm_person is not null`
|
|
486
|
+
}
|
|
487
|
+
if (args.model.f_confirm == '否'){
|
|
488
|
+
args.condition = args.condition + ` and cr.f_confirm_person is null`
|
|
489
|
+
}
|
|
490
|
+
|
|
491
|
+
}
|
|
462
492
|
this.model.search(args.condition, args.model)
|
|
463
493
|
},
|
|
464
494
|
// 查询
|