|
@@ -199,12 +199,13 @@ export default {
|
199
|
199
|
budgetId() {
|
200
|
200
|
this.initTable();
|
201
|
201
|
},
|
202
|
|
- settle(newval){
|
203
|
|
- this.$emit('settleExpense',newval)
|
|
202
|
+ settle(newval) {
|
|
203
|
+ this.$emit('settleExpense', newval)
|
204
|
204
|
},
|
205
|
|
- contentList:{
|
|
205
|
+ contentList: {
|
206
|
206
|
handler(newVal) {
|
207
|
|
- this.$emit('contentList', newVal)
|
|
207
|
+ let list = newVal.filter(item => item.priceId);
|
|
208
|
+ this.$emit('contentList', list)
|
208
|
209
|
},
|
209
|
210
|
immediate: true, // 立即生效
|
210
|
211
|
deep: true //监听对象或数组的时候,要用到深度监听
|
|
@@ -327,7 +328,7 @@ export default {
|
327
|
328
|
let total = this.calculateTotal(work.price, work.coefficient, work.workload, 1);
|
328
|
329
|
if (total < 600) {
|
329
|
330
|
total = 600
|
330
|
|
- this.$message.warning('不足600,按600算')
|
|
331
|
+ work.remark = '不足600,按600算'
|
331
|
332
|
}
|
332
|
333
|
this.$set(work, 'settle', total)
|
333
|
334
|
this.getSettleSum();
|