From a40e6a45b2207a9b172b7687ce6e4fe7da8b9ac6 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期二, 03 十二月 2024 16:46:49 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei --- admin/src/views/finance/components/flowingWater.vue | 45 +++++++++++++++++++++++++++++++++------------ 1 files changed, 33 insertions(+), 12 deletions(-) diff --git a/admin/src/views/finance/components/flowingWater.vue b/admin/src/views/finance/components/flowingWater.vue index a2490c2..d011587 100644 --- a/admin/src/views/finance/components/flowingWater.vue +++ b/admin/src/views/finance/components/flowingWater.vue @@ -3,7 +3,7 @@ @confirm="confirm"> <div class="main"> <div class="main_content"> - <el-form :model="form" label-position="top" ref="paramRef" :rules="rules"> + <el-form :model="form" label-position="top" ref="form" :rules="rules"> <div class="head"> <div class="m_title">娴佹按淇℃伅</div> </div> @@ -17,8 +17,8 @@ <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="搴旀敹閲戦" required> + <el-input v-model="form.receivableFee" disabled placeholder="璇疯緭鍏�" v-trim /> </el-form-item> <el-form-item label="瀹炴敹閲戦" prop="actReceivableFee"> <el-input v-model="form.actReceivableFee" placeholder="璇疯緭鍏�" v-trim /> @@ -77,7 +77,6 @@ <script> import GlobalWindow from '@/components/common/GlobalWindow' import BaseOpera from '@/components/base/BaseOpera' - import { rules } from './config' import { ywAccountList } from '@/api/bill' import { create } from '@/api/ywContractRevenue' import { Message, Loading } from 'element-ui' @@ -101,6 +100,7 @@ contractId: '', startDate: '', endDate: '', + receivableFee: '', date: '', companyId: '', actReceivableFee: '', @@ -112,8 +112,20 @@ multifileList: [], costTypeName: '' }, - rules, - + rules: { + receivableFee: [ + { required: true, message: '璇疯緭鍏�', trigger: 'blur' } + ], + actPayDate: [ + { required: true, message: '璇烽�夋嫨', trigger: 'blur' } + ], + payType: [ + { required: true, message: '璇烽�夋嫨', trigger: 'blur' } + ], + accountId: [ + { required: true, message: '璇烽�夋嫨', trigger: 'blur' } + ] + }, loadingInstance: null, uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/uploadBatch', uploadData: { @@ -124,10 +136,20 @@ }, methods: { confirm () { - create(this.form) - .then(res => { - console.log(res) - }) + this.$refs.form.validate((valid) => { + if (!valid) return + this.isWorking = true + create(this.form) + .then(() => { + this.visible = false + this.$tip.apiSuccess('鍒涘缓鎴愬姛') + this.$emit('success') + this.$emit('refresh') + }) + .finally(() => { + this.isWorking = false + }) + }) }, handleRent() { this.$refs.MemberSearchRef.openModal() @@ -184,7 +206,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() { @@ -194,11 +215,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