Guoyan
/
new_huozhou_frontend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

合同签订加消息提示删除

master
wbc 2 weeks ago
parent
7ba738e18a
commit
21752bb388
2 changed files with 64 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 72
      src/views/projectLib/projectPlan/projectPlan.api.ts
  2. 40
      src/views/projectLib/projectPlan/viewPlanDetail.vue

72
src/views/projectLib/projectPlan/projectPlan.api.ts
View File

@ -10,31 +10,32 @@ export enum Api {
queryPlanModuleDetailPage = "/huzhouPlan/queryPlanModuleDetailPage", queryPlanModuleDetailPage = "/huzhouPlan/queryPlanModuleDetailPage",
queryPlanModuleone = '/huzhouPlan/queryPlanModuleone', queryPlanModuleone = '/huzhouPlan/queryPlanModuleone',
saveProjectPlan = '/huzhouPlan/saveProjectPlan', saveProjectPlan = '/huzhouPlan/saveProjectPlan',
queryProjectPlan="/huzhouPlan/queryProjectPlan", queryProjectPlan = "/huzhouPlan/queryProjectPlan",
submitplaninfoUploadFile="/huzhouPlan/submitplaninfoUploadFile", submitplaninfoUploadFile = "/huzhouPlan/submitplaninfoUploadFile",
queryPlanInfoMainTimeline="/huzhouPlan/queryPlanInfoMainTimeline", queryPlanInfoMainTimeline = "/huzhouPlan/queryPlanInfoMainTimeline",
queryPlanInfoMainTimelineByPlaninfoid="/huzhouPlan/queryPlanInfoMainTimelineByPlaninfoid", queryPlanInfoMainTimelineByPlaninfoid = "/huzhouPlan/queryPlanInfoMainTimelineByPlaninfoid",
queryPlanInfoMainTimelineOffline="/huzhouPlan/queryPlanInfoMainTimelineOffline", queryPlanInfoMainTimelineOffline = "/huzhouPlan/queryPlanInfoMainTimelineOffline",
planUploadFile="/huzhouPlaninfofile/planUploadFile", planUploadFile = "/huzhouPlaninfofile/planUploadFile",
queryPlaninfoFilePageByid="/huzhouPlaninfofile/queryPlaninfoFilePageByid", queryPlaninfoFilePageByid = "/huzhouPlaninfofile/queryPlaninfoFilePageByid",
planUploadModifyFile="/huzhouPlaninfofile/planUploadModifyFile", planUploadModifyFile = "/huzhouPlaninfofile/planUploadModifyFile",
modifyPlaninfo="/huzhouPlan/modifyPlaninfo", modifyPlaninfo = "/huzhouPlan/modifyPlaninfo",
approvePlaninfo='/huzhouPlan/approvePlaninfo', approvePlaninfo = '/huzhouPlan/approvePlaninfo',
planFilePageList="/huzhouPlaninfofile/planFilePageList", planFilePageList = "/huzhouPlaninfofile/planFilePageList",
getProcessName="/huzhouPlaninfofile/getProcessName", getProcessName = "/huzhouPlaninfofile/getProcessName",
getplaninfoByid="/huzhouPlan/qetplaninfoByid", getplaninfoByid = "/huzhouPlan/qetplaninfoByid",
getPlanFileApprovalInfoByPlaninfoId="/huzhouPlaninfofile/getPlanFileApprovalInfoByPlaninfoId", getPlanFileApprovalInfoByPlaninfoId = "/huzhouPlaninfofile/getPlanFileApprovalInfoByPlaninfoId",
downloadPlanInfo="/huzhouPlan/downloadPlanInfo", downloadPlanInfo = "/huzhouPlan/downloadPlanInfo",
getUnitedTechnicalReviewList='/huzhouProject/getUnitedTechnicalReviewList', getUnitedTechnicalReviewList = '/huzhouProject/getUnitedTechnicalReviewList',
uploadURTFile='/huzhouUploadfileinfo/uploadURTFile', uploadURTFile = '/huzhouUploadfileinfo/uploadURTFile',
getProjectinfoMoneyInfo="/huzhouProjectinfoMoney/getProjectinfoMoneyInfo", getProjectinfoMoneyInfo = "/huzhouProjectinfoMoney/getProjectinfoMoneyInfo",
planREUploadFile="/huzhouPlaninfofile/planREUploadFile", planREUploadFile = "/huzhouPlaninfofile/planREUploadFile",
getProcessDetailByPlaninfoid="/huzhouPlaninfofile/getProcessDetailByPlaninfoid", getProcessDetailByPlaninfoid = "/huzhouPlaninfofile/getProcessDetailByPlaninfoid",
setPlaninfoIsoffline="/huzhouPlaninfofile/setPlaninfoIsoffline", setPlaninfoIsoffline = "/huzhouPlaninfofile/setPlaninfoIsoffline",
queryTaskLevelDetail="/huzhouPlan/queryTaskLevelDetail", queryTaskLevelDetail = "/huzhouPlan/queryTaskLevelDetail",
getContractinfoByTaskName="/huzhouContractinfo/getContractinfoByTaskName", getContractinfoByTaskName = "/huzhouContractinfo/getContractinfoByTaskName",
queryUpdatePlanFlagById="/huzhouProject/queryUpdatePlanFlagById" queryUpdatePlanFlagById = "/huzhouProject/queryUpdatePlanFlagById",
deleteContractMoney = "/guoyan/huzhouPlan/deleteContractMoney",
} }
/** /**
* 提交入库申请流程 * 提交入库申请流程
@ -48,28 +49,29 @@ export const getProcessName = (params) => defHttp.get({ url: Api.getProcessName,
export const queryPlanModuleDetailPage = (params) => defHttp.get({ url: Api.queryPlanModuleDetailPage, params }) export const queryPlanModuleDetailPage = (params) => defHttp.get({ url: Api.queryPlanModuleDetailPage, params })
export const queryPlanModuleone = (params) => defHttp.get({ url: Api.queryPlanModuleone, params }) export const queryPlanModuleone = (params) => defHttp.get({ url: Api.queryPlanModuleone, params })
export const getPlanFileApprovalInfoByPlaninfoId = (params) => defHttp.get({ url: Api.getPlanFileApprovalInfoByPlaninfoId, params }) export const getPlanFileApprovalInfoByPlaninfoId = (params) => defHttp.get({ url: Api.getPlanFileApprovalInfoByPlaninfoId, params })
export const downloadPlanInfo = (params) => downloadResource(Api.downloadPlanInfo,"项目计划数据.xlsx",params) export const downloadPlanInfo = (params) => downloadResource(Api.downloadPlanInfo, "项目计划数据.xlsx", params)
export const saveProjectPlan = (params) => defHttp.post({ url: Api.saveProjectPlan, params }) export const saveProjectPlan = (params) => defHttp.post({ url: Api.saveProjectPlan, params })
export const queryProjectPlan = (params) => defHttp.get({ url: Api.queryProjectPlan, params }) export const queryProjectPlan = (params) => defHttp.get({ url: Api.queryProjectPlan, params })
export const submitplaninfoUploadFile = (params?) =>defHttp.post({ url: Api.submitplaninfoUploadFile,headers:{ "Content-Type": "multipart/form-data" }, params,timeout:10*60*1000 }) export const submitplaninfoUploadFile = (params?) => defHttp.post({ url: Api.submitplaninfoUploadFile, headers: { "Content-Type": "multipart/form-data" }, params, timeout: 10 * 60 * 1000 })
export const queryPlanInfoMainTimeline = (params) => defHttp.get({ url: Api.queryPlanInfoMainTimeline, params }) export const queryPlanInfoMainTimeline = (params) => defHttp.get({ url: Api.queryPlanInfoMainTimeline, params })
export const queryPlanInfoMainTimelineByPlaninfoid = (params) => defHttp.get({ url: Api.queryPlanInfoMainTimelineByPlaninfoid, params }) export const queryPlanInfoMainTimelineByPlaninfoid = (params) => defHttp.get({ url: Api.queryPlanInfoMainTimelineByPlaninfoid, params })
export const planUploadFile = (params?) =>defHttp.post({ url: Api.planUploadFile,headers:{ "Content-Type": "multipart/form-data" }, params,timeout:10*60*1000 }) export const planUploadFile = (params?) => defHttp.post({ url: Api.planUploadFile, headers: { "Content-Type": "multipart/form-data" }, params, timeout: 10 * 60 * 1000 })
export const planREUploadFile = (params?) =>defHttp.post({ url: Api.planREUploadFile,headers:{ "Content-Type": "multipart/form-data" }, params,timeout:10*60*1000 }) export const planREUploadFile = (params?) => defHttp.post({ url: Api.planREUploadFile, headers: { "Content-Type": "multipart/form-data" }, params, timeout: 10 * 60 * 1000 })
export const queryPlaninfoFilePageByid = (params) => defHttp.get({ url: Api.queryPlaninfoFilePageByid, params }) export const queryPlaninfoFilePageByid = (params) => defHttp.get({ url: Api.queryPlaninfoFilePageByid, params })
export const planUploadModifyFile = (params?) =>defHttp.post({ url: Api.planUploadModifyFile,headers:{ "Content-Type": "multipart/form-data" }, params,timeout:10*60*1000 }) export const planUploadModifyFile = (params?) => defHttp.post({ url: Api.planUploadModifyFile, headers: { "Content-Type": "multipart/form-data" }, params, timeout: 10 * 60 * 1000 })
export const modifyPlaninfo = (params?) =>defHttp.post({ url: Api.modifyPlaninfo,headers:{ "Content-Type": "multipart/form-data" }, params }) export const modifyPlaninfo = (params?) => defHttp.post({ url: Api.modifyPlaninfo, headers: { "Content-Type": "multipart/form-data" }, params })
export const approvePlaninfo = (params?) =>defHttp.post({ url: Api.approvePlaninfo,headers:{ "Content-Type": "multipart/form-data" }, params }) export const approvePlaninfo = (params?) => defHttp.post({ url: Api.approvePlaninfo, headers: { "Content-Type": "multipart/form-data" }, params })
export const planFilePageList = (params) => defHttp.get({ url: Api.planFilePageList, params }) export const planFilePageList = (params) => defHttp.get({ url: Api.planFilePageList, params })
export const getplaninfoByid = (params) => defHttp.get({ url: Api.getplaninfoByid, params }) export const getplaninfoByid = (params) => defHttp.get({ url: Api.getplaninfoByid, params })
export const getUnitedTechnicalReviewList=(params) => defHttp.get({ url:Api.getUnitedTechnicalReviewList , params }) export const getUnitedTechnicalReviewList = (params) => defHttp.get({ url: Api.getUnitedTechnicalReviewList, params })
export const uploadURTFile=(params) => defHttp.post({ url:Api.uploadURTFile,headers:{ "Content-Type": "multipart/form-data" }, params }) export const uploadURTFile = (params) => defHttp.post({ url: Api.uploadURTFile, headers: { "Content-Type": "multipart/form-data" }, params })
export const getProcessDetailByPlaninfoid=(params) => defHttp.get({ url:Api.getProcessDetailByPlaninfoid , params }) export const getProcessDetailByPlaninfoid = (params) => defHttp.get({ url: Api.getProcessDetailByPlaninfoid, params })
export const queryPlanInfoMainTimelineOffline = (params) => defHttp.get({ url: Api.queryPlanInfoMainTimelineOffline, params }) export const queryPlanInfoMainTimelineOffline = (params) => defHttp.get({ url: Api.queryPlanInfoMainTimelineOffline, params })
export const setPlaninfoIsoffline = (params) => defHttp.post({ url: Api.setPlaninfoIsoffline, params }) export const setPlaninfoIsoffline = (params) => defHttp.post({ url: Api.setPlaninfoIsoffline, params })
export const getContractinfoByTaskName = (params) => defHttp.get({ url: Api.getContractinfoByTaskName, params }) export const getContractinfoByTaskName = (params) => defHttp.get({ url: Api.getContractinfoByTaskName, params })
export const queryUpdatePlanFlagById = (params) =>defHttp.get({ url: Api.queryUpdatePlanFlagById, params }) export const queryUpdatePlanFlagById = (params) => defHttp.get({ url: Api.queryUpdatePlanFlagById, params })
export const deleteContractMoney = (id: any) =>defHttp.delete<boolean>({url: `${Api.deleteContractMoney}?projectid=${id}`})

40
src/views/projectLib/projectPlan/viewPlanDetail.vue
View File

@ -33,15 +33,18 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-steps finish-status="success" :active="activities.status" > <el-steps finish-status="success" :active="activities.status">
<el-step <el-step
v-for="(item, index) in activities" v-for="(item, index) in activities"
:key="index" :key="index"
:status="item.isfinish == 2 ? 'success' : 'wait'" :status="item.isfinish == 2 ? 'success' : 'wait'"
> >
<template #title> <template #title>
<div @click="item.showChildren=!item.showChildren" style="cursor:pointer"> <div @click="item.showChildren = !item.showChildren" style="cursor: pointer">
{{ item.taskName }} <DownOutlined v-if="item.children!= null&&!item.showChildren"/><UpOutlined v-if="item.children!= null&&item.showChildren"/> {{ item.taskName }}
<DownOutlined v-if="item.children != null && !item.showChildren" /><UpOutlined
v-if="item.children != null && item.showChildren"
/>
</div> </div>
<div> <div>
{{ item.scheduledStartTime + '--' + item.scheduledEndTime }} {{ item.scheduledStartTime + '--' + item.scheduledEndTime }}
@ -116,7 +119,7 @@
</BasicModal> </BasicModal>
</template> </template>
<script lang="ts" name="viewPlanDetail" setup> <script lang="ts" name="viewPlanDetail" setup>
import { DownOutlined,UpOutlined } from '@ant-design/icons-vue'; import { DownOutlined, UpOutlined } from '@ant-design/icons-vue';
import { ref, onMounted } from 'vue'; import { ref, onMounted } from 'vue';
import elstepchild from './elstepchild.vue'; import elstepchild from './elstepchild.vue';
import addPlanFile from './addPlanFile.vue'; import addPlanFile from './addPlanFile.vue';
@ -129,6 +132,7 @@
getPlanFileApprovalInfoByPlaninfoId, getPlanFileApprovalInfoByPlaninfoId,
planUploadFile, planUploadFile,
downloadPlanInfo, downloadPlanInfo,
deleteContractMoney
} from './projectPlan.api'; } from './projectPlan.api';
import { ActionItem, BasicTable, TableAction, useTable } from '@/components/Table'; import { ActionItem, BasicTable, TableAction, useTable } from '@/components/Table';
import { useModal } from '@/components/Modal'; import { useModal } from '@/components/Modal';
@ -168,9 +172,9 @@
projectid: dataTo.projectId, projectid: dataTo.projectId,
}).then((res) => { }).then((res) => {
activities.value = res; activities.value = res;
activities.value.forEach((i:any)=>{ activities.value.forEach((i: any) => {
i.showChildren = false i.showChildren = false;
}) });
console.log('activities', activities); console.log('activities', activities);
}); });
let res = await queryHasSubProject({ projectid: dataTo.projectId }); let res = await queryHasSubProject({ projectid: dataTo.projectId });
@ -229,7 +233,7 @@
record.taskFile?.length > 0 && record.taskFile?.length > 0 &&
record.taskName != '可研技术审查报告确认' && record.taskName != '可研技术审查报告确认' &&
record.taskName != '造价评估报告确认') || record.taskName != '造价评估报告确认') ||
(record.ismodify&&record.isfinish==2) (record.ismodify && record.isfinish == 2)
) { ) {
if (isShowByRoles('projectContact')) { if (isShowByRoles('projectContact')) {
//有子项目，就展示一级的任务 //有子项目，就展示一级的任务
@ -268,9 +272,13 @@
if ( if (
record.isfinish == 2 && record.isfinish == 2 &&
record.taskFile?.length > 0 && record.taskFile?.length > 0 &&
(record.taskName == '可研报告初稿编制' || record.taskName == '可研报告送审稿编制'|| record.taskName == '造价评估报告确认' (record.taskName == '可研报告初稿编制' ||
|| record.taskName == '联合技术审查' || record.taskName == '集中核验'|| record.taskName == '招标文件编制' || record.taskName == '招标结果确认' record.taskName == '可研报告送审稿编制' ||
) record.taskName == '造价评估报告确认' ||
record.taskName == '联合技术审查' ||
record.taskName == '集中核验' ||
record.taskName == '招标文件编制' ||
record.taskName == '招标结果确认')
) { ) {
if (isShowByRoles('projectContact')) { if (isShowByRoles('projectContact')) {
return true; return true;
@ -313,7 +321,7 @@
messageInfo.value = '如项目涉及申报资金变更的，请先进行资金变更流程'; messageInfo.value = '如项目涉及申报资金变更的，请先进行资金变更流程';
openMessageInfo(); openMessageInfo();
//先给提示信息，在打开 //先给提示信息，在打开
} else { } else {
if (record.taskName.indexOf('招标文件编制') >= 0) { if (record.taskName.indexOf('招标文件编制') >= 0) {
messageInfo.value = '要求在招标文件公示前请线下与任务牵头处室进行交流，在公示后再进行上传'; messageInfo.value = '要求在招标文件公示前请线下与任务牵头处室进行交流，在公示后再进行上传';
openMessageInfo(); openMessageInfo();
@ -321,7 +329,6 @@
openPlanFile(); openPlanFile();
} }
} }
} }
async function handleuploadfile(record) { async function handleuploadfile(record) {
taskName.value = record.taskName; taskName.value = record.taskName;
@ -375,6 +382,10 @@
messageInfo.value = '如项目涉及申报资金变更的，请先进行资金变更流程'; messageInfo.value = '如项目涉及申报资金变更的，请先进行资金变更流程';
openMessageInfo(); openMessageInfo();
//先给提示信息，在打开 //先给提示信息，在打开
} else if (record.taskName.indexOf('合同签订') >= 0) {
messageInfo.value = '合同签订重新上传会删除原有的合同金额是否需要继续上传?';
openMessageInfo();
//先给提示信息，在打开
} else { } else {
if (record.taskName.indexOf('招标文件编制') >= 0) { if (record.taskName.indexOf('招标文件编制') >= 0) {
messageInfo.value = '要求在招标文件公示前请线下与任务牵头处室进行交流，在公示后再进行上传'; messageInfo.value = '要求在招标文件公示前请线下与任务牵头处室进行交流，在公示后再进行上传';
@ -392,6 +403,9 @@
planinfoid: UnitedTechnicalReviewmode.value, planinfoid: UnitedTechnicalReviewmode.value,
projectid: dataTo.projectId, projectid: dataTo.projectId,
}); });
} else if(taskName.value.indexOf('合同签订') >= 0) {
await deleteContractMoney(dataTo.projectId)
openPlanFile();
} else { } else {
openPlanFile(); openPlanFile();
} }

Write Preview
Loading…
Cancel
Save