|
@@ -25,15 +25,15 @@
|
25
|
25
|
</tr>
|
26
|
26
|
<tr>
|
27
|
27
|
<td class="fontbold">序号</td>
|
28
|
|
- <td class="fontbold">工作内容</td>
|
29
|
|
- <td class="fontbold">比例尺或等级</td>
|
30
|
|
- <td class="fontbold">单位</td>
|
31
|
|
- <td class="fontbold">工作量</td>
|
32
|
|
- <td class="fontbold">地类</td>
|
33
|
|
- <td class="fontbold">单价(元)</td>
|
34
|
|
- <td class="fontbold">系数</td>
|
35
|
|
- <td class="fontbold">结算经费(元)</td>
|
36
|
|
- <td class="fontbold">备注</td>
|
|
28
|
+ <td class="fontbold" style="min-width:100px;">工作内容</td>
|
|
29
|
+ <td class="fontbold" style="min-width:50px;">比例尺或等级</td>
|
|
30
|
+ <td class="fontbold" style="min-width:50px;">单位</td>
|
|
31
|
+ <td class="fontbold" style="min-width:50px;">工作量</td>
|
|
32
|
+ <td class="fontbold" style="min-width:50px;">地类</td>
|
|
33
|
+ <td class="fontbold" style="min-width:50px;">单价(元)</td>
|
|
34
|
+ <td class="fontbold" style="min-width:50px;">系数</td>
|
|
35
|
+ <td class="fontbold" style="min-width:80px;">结算经费(元)</td>
|
|
36
|
+ <td class="fontbold" style="min-width:150px;">备注</td>
|
37
|
37
|
</tr>
|
38
|
38
|
<tr v-for="(work, index) in workList">
|
39
|
39
|
<td>{{ index + 1 }}</td>
|
|
@@ -48,8 +48,8 @@
|
48
|
48
|
<td>{{ work.remark }}</td>
|
49
|
49
|
</tr>
|
50
|
50
|
<tr>
|
51
|
|
- <td :colspan="4" class="header">结算费用合计</td>
|
52
|
|
- <td :colspan="6">{{ settleSum.amount }}</td>
|
|
51
|
+ <td :colspan="8" class="header">结算费用合计</td>
|
|
52
|
+ <td :colspan="1">{{ settleSum.amount }}</td>
|
53
|
53
|
</tr>
|
54
|
54
|
<tr>
|
55
|
55
|
<td :colspan="10" class="header bg">扣除项小计</td>
|
|
@@ -203,20 +203,23 @@ export default {
|
203
|
203
|
},
|
204
|
204
|
methods: {
|
205
|
205
|
initTable() {
|
206
|
|
- this.deductionsList = []
|
207
|
|
- this.deptSettleList = []
|
|
206
|
+ this.deductionsList = [] //扣除列表
|
|
207
|
+ this.deptSettleList = [] //部门分配列表
|
|
208
|
+ debugger
|
208
|
209
|
for (let s of this.settleList) {
|
209
|
210
|
if (s.tableNumber == '0') {
|
210
|
211
|
this.deductionsList.push(s)
|
211
|
212
|
} else if (s.tableNumber == '1' && s.content != '实际结算总金额') {
|
212
|
213
|
this.deptSettleList.push(s)
|
213
|
|
- } else {
|
|
214
|
+ } else if (s.tableNumber == '2') {
|
214
|
215
|
this.settleSum = s
|
|
216
|
+ } else {
|
|
217
|
+ this.actualSumSettle = s.amount
|
215
|
218
|
}
|
216
|
219
|
}
|
217
|
|
- if(this.chooseProject){
|
|
220
|
+ if (this.chooseProject) {
|
218
|
221
|
this.print.popTitle = this.chooseProject.projectName + '结算表单'
|
219
|
|
- }else{
|
|
222
|
+ } else {
|
220
|
223
|
this.print.popTitle = this.form.xmName + '结算表单'
|
221
|
224
|
}
|
222
|
225
|
this.calculateActualSumSettle()
|