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)=>{
+
+
+
+
+
+
+
+
+