diff --git a/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue b/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue index 8f1c2eb..81a2f6e 100644 --- a/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue +++ b/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue @@ -28,11 +28,13 @@ allForm.state == 1 ? "审批中" : allForm.state == 2 - ? "资料验收通过" + ? "资料验收已通过" : allForm.state == 3 ? "已驳回" : allForm.state == 4 ? "已验收通过" + : allForm.state == 5 + ? "已重新发起" : "" }} @@ -374,7 +376,26 @@ const confirm = async () => { if (props.title == "重新发起") { requestData.id = props.relativeId; } + let detailPass = true; requestData.detailList.map(item => { + if (!item.singleId) { + detailPass = false; + } + if (!item.planCheckDate) { + detailPass = false; + } + if (!item.startFlag) { + detailPass = false; + } + if (!item.endFlag) { + detailPass = false; + } + if (!item.headPerson) { + detailPass = false; + } + if (!item.headPersonPhone) { + detailPass = false; + } delete item.id; }); requestData.annexList.map(item => { @@ -398,6 +419,22 @@ const confirm = async () => { delete item.id; }); delete requestData.state; + if (!requestData.stage) { + ElMessage.error("请输入验收阶段"); + return; + } + if (!requestData.type) { + ElMessage.error("请选择类型"); + return; + } + if (!detailPass) { + ElMessage.error("请完整填写验收内容表格"); + return; + } + // if (!annexPass) { + // ElMessage.error("请上传资料附件相关信息"); + // return; + // } const res = await acceptanceApplyAdd(requestData); if (res.message) { ElMessage.success("操作成功"); diff --git a/src/views/enterprise/engineeringAcceptance/acceptanceApply/index.vue b/src/views/enterprise/engineeringAcceptance/acceptanceApply/index.vue index 67dfaba..6de5bb1 100644 --- a/src/views/enterprise/engineeringAcceptance/acceptanceApply/index.vue +++ b/src/views/enterprise/engineeringAcceptance/acceptanceApply/index.vue @@ -82,7 +82,7 @@ const columns: ColumnProps[] = [ label: "状态", enum: [ { label: "审批中", value: 1 }, - { label: "资料验收通过", value: 2 }, + { label: "资料验收已通过", value: 2 }, { label: "已驳回", value: 3 }, { label: "已验收通过", value: 4 }, { label: "已重新发起", value: 5 } diff --git a/src/views/enterprise/engineeringAcceptance/acceptancePlan/index.vue b/src/views/enterprise/engineeringAcceptance/acceptancePlan/index.vue index 5dbfd35..2dab69c 100644 --- a/src/views/enterprise/engineeringAcceptance/acceptancePlan/index.vue +++ b/src/views/enterprise/engineeringAcceptance/acceptancePlan/index.vue @@ -87,7 +87,7 @@ 未验收 - + { newTitle.value = "编辑"; } childrenFormData.value = { ...row }; + if (childrenFormData.value.annexFile) { + childrenFormData.value.annexFile = JSON.parse(row.annexFile); + } + if (childrenFormData.value.overdueIssueFile) { + childrenFormData.value.overdueIssueFile = JSON.parse(row.overdueIssueFile); + } fileList.value = row.annexFile ? [{ ...JSON.parse(row.annexFile) }] : []; fileList1.value = row.overdueIssueFile ? [{ ...JSON.parse(row.overdueIssueFile) }] : []; childrenVisible.value = true; @@ -620,4 +626,12 @@ onMounted(() => { display: none; } } +:deep() { + .el-progress-bar { + display: none; + } + .el-progress__text { + display: none; + } +} diff --git a/src/views/goverment/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue b/src/views/goverment/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue index c699772..b31d28e 100644 --- a/src/views/goverment/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue +++ b/src/views/goverment/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue @@ -45,11 +45,13 @@ allForm.state == 1 ? "审批中" : allForm.state == 2 - ? "资料验收通过" + ? "资料验收已通过" : allForm.state == 3 ? "已驳回" : allForm.state == 4 ? "已验收通过" + : allForm.state == 5 + ? "已重新发起" : "" }} diff --git a/src/views/goverment/engineeringAcceptance/acceptanceApply/index.vue b/src/views/goverment/engineeringAcceptance/acceptanceApply/index.vue index b02bb68..d090f90 100644 --- a/src/views/goverment/engineeringAcceptance/acceptanceApply/index.vue +++ b/src/views/goverment/engineeringAcceptance/acceptanceApply/index.vue @@ -111,7 +111,7 @@ const columns: ColumnProps[] = [ label: "状态", enum: [ { label: "审批中", value: 1 }, - { label: "资料验收通过", value: 2 }, + { label: "资料验收已通过", value: 2 }, { label: "已驳回", value: 3 }, { label: "已验收通过", value: 4 }, { label: "已重新发起", value: 5 } diff --git a/src/views/project/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue b/src/views/project/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue index 7dbfd6c..1660a29 100644 --- a/src/views/project/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue +++ b/src/views/project/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue @@ -28,11 +28,13 @@ allForm.state == 1 ? "审批中" : allForm.state == 2 - ? "资料验收通过" + ? "资料验收已通过" : allForm.state == 3 ? "已驳回" : allForm.state == 4 ? "已验收通过" + : allForm.state == 5 + ? "已重新发起" : "" }} @@ -374,9 +376,29 @@ const confirm = async () => { if (props.title == "重新发起") { requestData.id = props.relativeId; } + let detailPass = true; requestData.detailList.map(item => { + if (!item.singleId) { + detailPass = false; + } + if (!item.planCheckDate) { + detailPass = false; + } + if (!item.startFlag) { + detailPass = false; + } + if (!item.endFlag) { + detailPass = false; + } + if (!item.headPerson) { + detailPass = false; + } + if (!item.headPersonPhone) { + detailPass = false; + } delete item.id; }); + let annexPass = true; requestData.annexList.map(item => { if (item.files && item.files.length > 0) { item.files.map(item2 => { @@ -395,9 +417,28 @@ const confirm = async () => { delete item2.fileId; }); } + if ((item.files && item.files.length == 0) || (item.fileList && item.fileList.length == 0)) { + annexPass = false; + } delete item.id; }); delete requestData.state; + if (!requestData.stage) { + ElMessage.error("请输入验收阶段"); + return; + } + if (!requestData.type) { + ElMessage.error("请选择类型"); + return; + } + if (!detailPass) { + ElMessage.error("请完整填写验收内容表格"); + return; + } + // if (!annexPass) { + // ElMessage.error("请上传资料附件相关信息"); + // return; + // } const res = await acceptanceApplyAdd(requestData); if (res.message) { ElMessage.success("操作成功"); diff --git a/src/views/project/engineeringAcceptance/acceptanceApply/index.vue b/src/views/project/engineeringAcceptance/acceptanceApply/index.vue index a67ea3a..18e5563 100644 --- a/src/views/project/engineeringAcceptance/acceptanceApply/index.vue +++ b/src/views/project/engineeringAcceptance/acceptanceApply/index.vue @@ -85,7 +85,7 @@ const columns: ColumnProps[] = [ label: "状态", enum: [ { label: "审批中", value: 1 }, - { label: "资料验收通过", value: 2 }, + { label: "资料验收已通过", value: 2 }, { label: "已驳回", value: 3 }, { label: "已验收通过", value: 4 }, { label: "已重新发起", value: 5 } diff --git a/src/views/project/engineeringAcceptance/acceptancePlan/index.vue b/src/views/project/engineeringAcceptance/acceptancePlan/index.vue index 0ade3cc..f00deb5 100644 --- a/src/views/project/engineeringAcceptance/acceptancePlan/index.vue +++ b/src/views/project/engineeringAcceptance/acceptancePlan/index.vue @@ -79,7 +79,7 @@ 未验收 - + { newTitle.value = "编辑"; } childrenFormData.value = { ...row }; + if (childrenFormData.value.annexFile) { + childrenFormData.value.annexFile = JSON.parse(row.annexFile); + } + if (childrenFormData.value.overdueIssueFile) { + childrenFormData.value.overdueIssueFile = JSON.parse(row.overdueIssueFile); + } fileList.value = row.annexFile ? [{ ...JSON.parse(row.annexFile) }] : []; fileList1.value = row.overdueIssueFile ? [{ ...JSON.parse(row.overdueIssueFile) }] : []; childrenVisible.value = true; @@ -652,4 +658,12 @@ onMounted(() => { font-size: 14px; } } +:deep() { + .el-progress-bar { + display: none; + } + .el-progress__text { + display: none; + } +}