From ef18d213a18bc8151b03704f1e6371742323ec60 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Wed, 5 Jul 2023 19:46:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/hzImg/Vector.png | Bin 0 -> 519 bytes .../components/auditDialog.vue | 33 +++++++++++---- .../components/ProjectSupervision/duty.vue | 8 ++-- .../ProjectSupervision/dutyForm.vue | 4 +- .../components/ProjectSupervision/index.vue | 15 +++---- .../ProjectSupervision/overview.vue | 39 +++++++++--------- .../projectMonitor/projectApproval/index.vue | 4 +- 7 files changed, 60 insertions(+), 43 deletions(-) create mode 100644 src/assets/images/hzImg/Vector.png diff --git a/src/assets/images/hzImg/Vector.png b/src/assets/images/hzImg/Vector.png new file mode 100644 index 0000000000000000000000000000000000000000..679d58a7b0a534b0b45e2246cb7cddd335c2bd61 GIT binary patch literal 519 zcmV+i0{H!jP)}h`K$!ruK^ADj$#uZAiETc(_mVjA z`7FtjqA-BALI#Z+C=_Th<)_?D8Fy{a;8o4-_ynp~aEv=Hy60<#7&I2@0?VK z&$?6?8Z!5-*MAhP8J1_@#C^NgY8(qES=!)S6}aZ}wr92z&%TA*H#{Kje(kwx1~@q{ zIU6V!f)AuXF%$N9Azuuc4jDj?CSwi?q@qPh(K5o4P?Tevt8qcY`;N~~=iMr@q7aMo z2&u*hE9UCj?orW09a*7qrW1rS#;o+-uMkHb+xq~PE`F?;r7RI)lfaXrfGdD$0^ew+ z&@Muf{N1{7ffTeNy!YJfgCB+wE|CJ}yM$sRRt=Igo;*tm-nWQ>#%Q`Jm9h?y-mPZE z*fy*>FqgxkODX*>DC;F5J~gz$6+=OW#5CtKKTNoWq?jEI9_``x;0w`0hvRKL1)l%_002ov JPDHLkV1lV|*{}cr literal 0 HcmV?d00001 diff --git a/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/auditDialog.vue b/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/auditDialog.vue index 386e351..419f87f 100644 --- a/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/auditDialog.vue +++ b/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/auditDialog.vue @@ -11,27 +11,27 @@
- + 是否通过审批?
- + - + @@ -53,6 +53,10 @@ const singleData = ref(); // 单个整改情况数据 const auditForm = ref({ content: "" }); +// 驳回审核 +const backAudit = () => { + auditVisible.value = true; +}; // 关闭主窗口 const closeMain = () => { visible1.value = false; @@ -168,4 +172,15 @@ onMounted(() => {}); justify-content: center; align-items: center; } +:deep(.el-input__wrapper), +:deep(.el-textarea__inner) { + background-color: transparent; + box-shadow: 0 0 0 1px #087ba4 inset; +} +:deep(.el-input__inner), +:deep(.el-textarea__inner), +:deep(.el-range-input) { + color: var(--el-menu-text-color); + font-size: 16px; +} diff --git a/src/views/hz-project/projectMonitor/projectApproval/components/ProjectSupervision/duty.vue b/src/views/hz-project/projectMonitor/projectApproval/components/ProjectSupervision/duty.vue index 04f204d..8d30829 100644 --- a/src/views/hz-project/projectMonitor/projectApproval/components/ProjectSupervision/duty.vue +++ b/src/views/hz-project/projectMonitor/projectApproval/components/ProjectSupervision/duty.vue @@ -50,11 +50,11 @@ const isAllowNext = computed(() => active.value >= stepOptions.value.length - 1) const handleToPrevOrNext = () => { if (isAllowNext.value) { - const isInValid = formData.value.find(item => { - return !item.enterpriseSn || !item.creditCode || ("contractType" in item && !item.contractType); - }); + // const isInValid = formData.value.find(item => { + // return !item.enterpriseSn || !item.creditCode || ("contractType" in item && !item.contractType); + // }); - if (isInValid) return ElMessage.warning("请输入必填项"); + // if (isInValid) return ElMessage.warning("请输入必填项"); emit("next", { engineeringMains: formData.value }); } else { emit("prev"); diff --git a/src/views/hz-project/projectMonitor/projectApproval/components/ProjectSupervision/dutyForm.vue b/src/views/hz-project/projectMonitor/projectApproval/components/ProjectSupervision/dutyForm.vue index b7b0490..9e2db86 100644 --- a/src/views/hz-project/projectMonitor/projectApproval/components/ProjectSupervision/dutyForm.vue +++ b/src/views/hz-project/projectMonitor/projectApproval/components/ProjectSupervision/dutyForm.vue @@ -21,7 +21,7 @@ - 删除 - + --> diff --git a/src/views/hz-project/projectMonitor/projectApproval/components/ProjectSupervision/index.vue b/src/views/hz-project/projectMonitor/projectApproval/components/ProjectSupervision/index.vue index b9650ad..6b95cd4 100644 --- a/src/views/hz-project/projectMonitor/projectApproval/components/ProjectSupervision/index.vue +++ b/src/views/hz-project/projectMonitor/projectApproval/components/ProjectSupervision/index.vue @@ -53,11 +53,12 @@ const allSubmit = async () => { ElMessage.success("提交成功"); }; const next = async (data: OverviewForm | { engineeringMains: EngineeringMainList } | { annexFiles: Array }) => { - addRepostData.value = Object.assign({}, addRepostData.value, data); + // addRepostData.value = Object.assign({}, addRepostData.value, data); if (active.value >= datas.length - 1) { - await submit(); - router.push("/project/supervision/SupervisionRecord/index"); + // await submit(); + // router.push("/project/supervision/SupervisionRecord/index"); + visible1.value = false; } active.value++; }; @@ -80,10 +81,10 @@ watch( (n, o) => { visible1.value = n; emits("confirm"); - // if (n) { - // getInfo(); - // } else { - // } + if (n) { + active.value = 0; + } else { + } } ); // 监听el-dialog显示状态，再通过@update:visible 通知父组件，一般是用于关 diff --git a/src/views/hz-project/projectMonitor/projectApproval/components/ProjectSupervision/overview.vue b/src/views/hz-project/projectMonitor/projectApproval/components/ProjectSupervision/overview.vue index cce602a..db18b39 100644 --- a/src/views/hz-project/projectMonitor/projectApproval/components/ProjectSupervision/overview.vue +++ b/src/views/hz-project/projectMonitor/projectApproval/components/ProjectSupervision/overview.vue @@ -1,6 +1,6 @@ @@ -316,18 +315,20 @@ const removeEngineeringSingle = (row: EngineeringSingle) => { const next = async (formEl: FormInstance | undefined, params: any) => { if (!formEl) return; - await formEl.validate(async (valid, fields) => { - if (valid) { - emit("next", form.value); - } else { - console.log("error submit!", fields); - ElMessage({ - showClose: true, - message: "请完善表单信息！", - type: "error" - }); - } - }); + // await formEl.validate(async (valid, fields) => { + // if (valid) { + // emit("next", form.value); + // } else { + // console.log("error submit!", fields); + // ElMessage({ + // showClose: true, + // message: "请完善表单信息！", + // type: "error" + // }); + // } + // }); + + emit("next", form.value); }; onMounted(async () => { diff --git a/src/views/hz-project/projectMonitor/projectApproval/index.vue b/src/views/hz-project/projectMonitor/projectApproval/index.vue index 52c7c32..b9ed714 100644 --- a/src/views/hz-project/projectMonitor/projectApproval/index.vue +++ b/src/views/hz-project/projectMonitor/projectApproval/index.vue @@ -19,7 +19,7 @@