From 16217be9c85f95cb236e639da6e546bb38cdc53d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 05 十二月 2024 14:45:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/finance/components/flowingWater.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/finance/components/flowingWater.vue b/admin/src/views/finance/components/flowingWater.vue
index a646fb0..c042606 100644
--- a/admin/src/views/finance/components/flowingWater.vue
+++ b/admin/src/views/finance/components/flowingWater.vue
@@ -17,10 +17,10 @@
<el-form-item label="璁¤垂鍛ㄦ湡" required>
<el-input v-model="form.date" disabled placeholder="璇疯緭鍏�" v-trim />
</el-form-item>
- <el-form-item label="搴旀敹閲戦" prop="receivableFee">
- <el-input v-model="form.receivableFee" placeholder="璇疯緭鍏�" v-trim />
+ <el-form-item :label="`搴�${form.needReceivableFeeCopy > 0 ? '鏀�' : '浠�'}閲戦`" required>
+ <el-input v-model="form.receivableFee" disabled placeholder="璇疯緭鍏�" v-trim />
</el-form-item>
- <el-form-item label="瀹炴敹閲戦" prop="actReceivableFee">
+ <el-form-item :label="`瀹�${form.needReceivableFeeCopy > 0 ? '鏀�' : '浠�'}閲戦`" prop="actReceivableFee">
<el-input v-model="form.actReceivableFee" placeholder="璇疯緭鍏�" v-trim />
</el-form-item>
<el-form-item label="鍏ヨ处鏃ユ湡" prop="actPayDate">
@@ -100,6 +100,7 @@
contractId: '',
startDate: '',
endDate: '',
+ receivableFee: '',
date: '',
companyId: '',
actReceivableFee: '',
@@ -109,7 +110,8 @@
remark: '',
accountId: '',
multifileList: [],
- costTypeName: ''
+ costTypeName: '',
+ needReceivableFeeCopy: ''
},
rules: {
receivableFee: [
@@ -143,6 +145,7 @@
this.visible = false
this.$tip.apiSuccess('鍒涘缓鎴愬姛')
this.$emit('success')
+ this.$emit('refresh')
})
.finally(() => {
this.isWorking = false
@@ -204,7 +207,6 @@
}
})
const item = file.data[0]
- console.log(item)
this.form.multifileList.push({ ...item, fileurl: item.imgaddr, name: item.originname, userName: this.userInfo.realname, createTime: this.getDay() })
},
close() {
@@ -214,11 +216,11 @@
this.title = title
this.visible = true
this.$nextTick(() => {
+ this.$refs.form.resetFields();
for (const key in this.form) {
this.form[key] = target[key]
}
})
- console.log(this.form)
this.getDates(target.companyId)
}
}
--
Gitblit v1.9.3