From 6145c82be29e53d4473371819230303a086eef22 Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Tue, 9 Dec 2025 15:59:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E7=AA=97=E5=88=97=E8=A1=A8=EF=BC=9A?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=A0=E9=99=A4=E5=8E=9F=E5=9B=A0=EF=BC=88?= =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9=EF=BC=89=E6=94=AF=E6=8C=81=E5=9C=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=BF=9B=E8=A1=8C=E6=9F=A5=E7=9C=8B=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=8F=8A=E5=88=A0=E9=99=A4=E5=8E=9F=E5=9B=A0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/report/index.ts | 13 +++- src/components/depart-tree-select.vue | 2 +- src/views/entryWindow/index.vue | 14 +++- src/views/report/edit/controlPrice.vue | 82 ++++++++++++++++++-- src/views/warning/compile/warningCompile.vue | 5 +- src/views/warning/components/detail.vue | 2 +- src/views/warning/reportDetail.vue | 10 +-- 7 files changed, 102 insertions(+), 26 deletions(-) diff --git a/src/api/report/index.ts b/src/api/report/index.ts index 215395f..2d2c05c 100644 --- a/src/api/report/index.ts +++ b/src/api/report/index.ts @@ -7,12 +7,19 @@ export const saveReportProject=(body)=>{ }) } //删除 -export const removeReportProject = (id)=>{ - return request.del({ - url:`/reportProject/${id}` +// export const removeReportProject = (id)=>{ +// return request.del({ +// url:`/reportProject/${id}` +// }) +// } +export const deleteReportProject = (body)=>{ + return request.post({ + url:`/reportProject/deleteReportProject`, + body }) } + //根据项目名称获取项目列表 export const getListByName=(query)=>{ return request.get({ diff --git a/src/components/depart-tree-select.vue b/src/components/depart-tree-select.vue index bf4fa6a..b3e405e 100644 --- a/src/components/depart-tree-select.vue +++ b/src/components/depart-tree-select.vue @@ -37,7 +37,7 @@ const treeProps = computed(() => ({ label: 'shortName', value: 'id', disabled: (data, node) => { - debugger + // debugger if (!props.disableRoot) return false if (!node) return false return node.level === 1 diff --git a/src/views/entryWindow/index.vue b/src/views/entryWindow/index.vue index 519df81..94a7633 100644 --- a/src/views/entryWindow/index.vue +++ b/src/views/entryWindow/index.vue @@ -124,6 +124,7 @@ getList() //查看详情 const router = useRouter(); const getDetail =(row,code)=>{ + debugger //判断是否为报审人 let query ={ isEnd:row.reportType == "结算项目", @@ -143,7 +144,6 @@ const getDetail =(row,code)=>{ query.node = row.node query.disabledVal=true; } - router.push({ path:`/report/edit/controlPrice`, query: query @@ -151,6 +151,7 @@ const getDetail =(row,code)=>{ } const isAdminShow = ()=>{ + debugger if(userStore.user && userStore.user.roleCodes){ return userStore.user.roleCodes.indexOf('admin_1') >= 0 }else{ @@ -412,7 +413,7 @@ const isAdminShow = ()=>{ { diff --git a/src/views/report/edit/controlPrice.vue b/src/views/report/edit/controlPrice.vue index 8c6d9eb..26039e4 100644 --- a/src/views/report/edit/controlPrice.vue +++ b/src/views/report/edit/controlPrice.vue @@ -9,7 +9,13 @@ import useCatchStore from '@/stores/modules/catch' import reportAudit from '@/components/reportAudit/start.vue'; import reportAuditFinish from '@/components/reportAudit/finish.vue'; import reportAuditReject from '@/components/reportAudit/reject.vue'; -import {getDetail, removeReportProject, saveReportProject,getExcelContrilPrice,upFinalizationPathFun} from "@/api/report/index"; +import { + getDetail, + saveReportProject, + getExcelContrilPrice, + upFinalizationPathFun, + deleteReportProject +} from "@/api/report/index"; import {useRoute, useRouter} from "vue-router"; import {getReportFlow} from "@/api/report/flow"; import useTabsStore from "@/stores/modules/multipleTabs"; @@ -73,6 +79,25 @@ const isAuditButton = ref(false) const datePicker = ref() const serviceTime = ref([]) const editAll = ref(false) + +// 删除 +const delDialog = ref(false); +const delFormData = ref({}); +const deleteFlag = ref(false) + + +const handleDel= async ()=> { + const body ={ + id: route.query.id, + deleteReason: delFormData.value.deleteReason + } + await deleteReportProject(body); + closeFun(); +} + + + + const auditEdit = () => { // 进入“全部可编辑模式” editAll.value = !editAll.value @@ -100,11 +125,12 @@ const getDetailFun = async (val) => { loading.value = true; - formData.value = await getDetail({"id": val}); + formData.value = await getDetail({"id": val}); + if (route.query.disabledVal) { isDisabled.value = true } - + debugger //报审 if ((!['initial'].includes(formData.value.project.node))) { isDisabled.value = true; @@ -190,6 +216,7 @@ const getDetailFun = async (val) => { ]; } } + deleteFlag.value= formData.value.project.deleteFlag query.value.applicantId =formData.value.project?.applicantId; // query.value.departId = formData.value.project?.auditUnitId getPoliceList(); @@ -455,9 +482,12 @@ let date = ref() //删除数据 const removeFun = async () => { - await feedback.confirm("是否确认删除数据？"); - const res = await removeReportProject(route.query.id); - closeFun(); + debugger + delDialog.value = true; + + // await feedback.confirm("是否确认删除数据？"); + // const res = await removeReportProject(route.query.id); + // closeFun(); } //提交审批 @@ -1062,6 +1092,14 @@ watch(()=>formData.value.review.thirdlyMoney,(val)=>{ + + + + + + +
@@ -1305,17 +1343,20 @@ watch(()=>formData.value.review.thirdlyMoney,(val)=>{ 提交 驳回 -
+
审批记录 删除 关闭
+
+ 关闭 +
提交 保存 取消 - 审批记录 + 审批记录
@@ -1391,6 +1432,31 @@ watch(()=>formData.value.review.thirdlyMoney,(val)=>{ + + + + + + + +
+ 取消 + 确定 +
+