|
@@ -324,7 +324,7 @@
|
|
|
</template>
|
|
|
<template #footer>
|
|
|
<el-button type="default" @click="closeSchedulePage">取消</el-button>
|
|
|
- <el-button type="success" @click="submitSchedule()">提交</el-button>
|
|
|
+ <el-button type="success" @click="submitSchedule(formRef)">提交</el-button>
|
|
|
</template>
|
|
|
</vuecmf-dialog>
|
|
|
<!-- 弹出项目进度更新页面-->
|
|
@@ -393,22 +393,22 @@
|
|
|
<el-table-column prop="title" label="合同名称" width="" />
|
|
|
<el-table-column prop="client" label="甲方/客户" width="" />
|
|
|
<el-table-column prop="developer" label="乙方/开发公司" width="" />
|
|
|
- <el-table-column prop="date" label="合同签署日期" width="" >
|
|
|
+ <el-table-column prop="date" label="合同签署日期" width="">
|
|
|
<template #default="{ row }">
|
|
|
<el-text v-if="row.date">{{ row.date }}</el-text>
|
|
|
- <el-text v-else >暂无数据</el-text>
|
|
|
+ <el-text v-else>暂无数据</el-text>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="start_date" label="合同开始日期" width="">
|
|
|
<template #default="{ row }">
|
|
|
<el-text v-if="row.start_date">{{ row.start_date }}</el-text>
|
|
|
- <el-text v-else >暂无数据</el-text>
|
|
|
+ <el-text v-else>暂无数据</el-text>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="end_date" label="合同结束日期" width="" >
|
|
|
+ <el-table-column prop="end_date" label="合同结束日期" width="">
|
|
|
<template #default="{ row }">
|
|
|
<el-text v-if="row.end_date">{{ row.end_date }}</el-text>
|
|
|
- <el-text v-else >暂无数据</el-text>
|
|
|
+ <el-text v-else>暂无数据</el-text>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="amount" label="合同金额/元" width="">
|
|
@@ -479,7 +479,7 @@
|
|
|
</template>
|
|
|
<template #footer>
|
|
|
<el-button type="default" @click="closeSchedulePage">取消</el-button>
|
|
|
- <el-button type="success" @click="submitContract()">提交</el-button>
|
|
|
+ <el-button type="success" @click="submitContract(formRef)">提交</el-button>
|
|
|
</template>
|
|
|
</vuecmf-dialog>
|
|
|
<!-- 弹出合同更新页面-->
|
|
@@ -1018,17 +1018,24 @@ const submitForm = (formEl: FormInstance | undefined) => {
|
|
|
/**
|
|
|
* 提交进度表单,新增
|
|
|
*/
|
|
|
-const submitSchedule = async () => {
|
|
|
- data.schedule.isLoading = true;
|
|
|
- let res = await Repertory.addschedules(data.formList);
|
|
|
- data.schedule.isLoading = false;
|
|
|
- if (res.code != 0) {
|
|
|
- return;
|
|
|
- }
|
|
|
- ElMessage.success(res.msg);
|
|
|
- search();
|
|
|
- closeSchedulePage();
|
|
|
- closePage();
|
|
|
+const submitSchedule = async (formEl: FormInstance | undefined) => {
|
|
|
+ if (!formEl) return;
|
|
|
+ formEl.validate(async (valid) => {
|
|
|
+ if (!valid) {
|
|
|
+ console.log('error submit!');
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ data.schedule.isLoading = true;
|
|
|
+ let res = await Repertory.addschedules(data.formList);
|
|
|
+ data.schedule.isLoading = false;
|
|
|
+ if (res.code != 0) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ ElMessage.success(res.msg);
|
|
|
+ search();
|
|
|
+ closeSchedulePage();
|
|
|
+ closePage();
|
|
|
+ });
|
|
|
};
|
|
|
/**
|
|
|
* 提交进度表单,编辑
|
|
@@ -1048,17 +1055,24 @@ const submitScheduleUpdate = async () => {
|
|
|
/**
|
|
|
* 提交合同表单,新增
|
|
|
*/
|
|
|
-const submitContract = async () => {
|
|
|
- data.contract.isLoading = true;
|
|
|
- let res = await Repertory.addcontract(data.formContract);
|
|
|
- data.contract.isLoading = false;
|
|
|
- if (res.code != 0) {
|
|
|
- return;
|
|
|
- }
|
|
|
- ElMessage.success(res.msg);
|
|
|
- search();
|
|
|
- closeSchedulePage();
|
|
|
- closePage();
|
|
|
+const submitContract = async (formEl: FormInstance | undefined) => {
|
|
|
+ if (!formEl) return;
|
|
|
+ formEl.validate(async (valid) => {
|
|
|
+ if (!valid) {
|
|
|
+ console.log('error submit!');
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ data.contract.isLoading = true;
|
|
|
+ let res = await Repertory.addcontract(data.formContract);
|
|
|
+ data.contract.isLoading = false;
|
|
|
+ if (res.code != 0) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ ElMessage.success(res.msg);
|
|
|
+ search();
|
|
|
+ closeSchedulePage();
|
|
|
+ closePage();
|
|
|
+ });
|
|
|
};
|
|
|
/**
|
|
|
* 提交合同表单,编辑
|