Browse Source

加合同信息跳转

master
wbc 2 weeks ago
parent
commit
77bb84e001
  1. 5
      src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue
  2. 26
      src/views/ProcessApprovalSubPage/planFileApproval.vue
  3. 2
      src/views/projectLib/projectPlan/projectPlan.api.ts

5
src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue

@ -52,7 +52,10 @@
"chuYanJieDuan", "chuYanJieDuan",
"shouFuZhiFu", "shouFuZhiFu",
"heTongQianDing", "heTongQianDing",
'projectStartMeeting' 'projectStartMeeting',
'niceProjectAcceptanceStage',
'performanceEvaluation',
'projectDeploymentStage'
]; ];
const [registerModal, { closeModal }] = useModalInner(init); const [registerModal, { closeModal }] = useModalInner(init);
defineProps(['record']); defineProps(['record']);

26
src/views/ProcessApprovalSubPage/planFileApproval.vue

@ -5,6 +5,10 @@
}}<a-button type="link" @click="hdDetail">详情</a-button></el-divider }}<a-button type="link" @click="hdDetail">详情</a-button></el-divider
> >
<el-divider content-position="left">项目名称 {{ dataTo.record.projectName }} </el-divider> <el-divider content-position="left">项目名称 {{ dataTo.record.projectName }} </el-divider>
<el-divider content-position="left" v-if="isContractFinished"
>合同金额<a-button type="link" @click="goContract">详情</a-button></el-divider
>
<planinfoFileDetail @register="registerFileInfo" />
<BasicForm @register="registerApprovalMoneyForm" v-if="taskName == '立项审批'" /> <BasicForm @register="registerApprovalMoneyForm" v-if="taskName == '立项审批'" />
<div v-if="showMoneyForm && taskName != '合同签订'"> <div v-if="showMoneyForm && taskName != '合同签订'">
<el-divider content-position="left">计划金额</el-divider> <el-divider content-position="left">计划金额</el-divider>
@ -27,7 +31,7 @@
:taskName="taskName" :taskName="taskName"
:isModify="resButton.isEdit" :isModify="resButton.isEdit"
:isEdit="resButton.isEdit" :isEdit="resButton.isEdit"
:isJiHua="taskName == '合同签订'?true:false" :isJiHua="taskName == '合同签订' ? true : false"
v-if="pjid" v-if="pjid"
ref="contractRef" ref="contractRef"
/> />
@ -140,6 +144,7 @@
</template> </template>
<script lang="ts" name="planFileApproval" setup> <script lang="ts" name="planFileApproval" setup>
import { onMounted, ref, reactive, h } from 'vue'; import { onMounted, ref, reactive, h } from 'vue';
import planinfoFileDetail from '@/views/projectLib/projectPlan/planinfoFileDetail.vue';
import { useModal, BasicModal } from '@/components/Modal'; import { useModal, BasicModal } from '@/components/Modal';
import { BasicTable, ActionItem, TableAction, useTable } from '@/components/Table'; import { BasicTable, ActionItem, TableAction, useTable } from '@/components/Table';
import { approvePlanFile, getActionParam } from '../myWork/inComplete/inComplete.api'; import { approvePlanFile, getActionParam } from '../myWork/inComplete/inComplete.api';
@ -150,6 +155,7 @@
import { import {
planFilePageList, planFilePageList,
getplaninfoByid, getplaninfoByid,
taskNameIsFinished,
} from '@/views/projectLib/projectPlan/projectPlan.api'; } from '@/views/projectLib/projectPlan/projectPlan.api';
import { downloadFile } from '../../api/common/api'; import { downloadFile } from '../../api/common/api';
import { message } from 'ant-design-vue'; import { message } from 'ant-design-vue';
@ -170,7 +176,7 @@
ContractMoneyFormSchemas, ContractMoneyFormSchemas,
} from '@/views/projectLib/projectPlan/projectPlan.data'; } from '@/views/projectLib/projectPlan/projectPlan.data';
const [registerProjectPlan, { openModal: openProjectPlan }] = useModal(); // const [registerProjectPlan, { openModal: openProjectPlan }] = useModal(); //
const [registerFileInfo, { openModal: openFileInfo }] = useModal();
const [ const [
registerApprovalMoneyForm, registerApprovalMoneyForm,
{ {
@ -245,6 +251,8 @@
let fileAdviceList = reactive<Array<any>>([]); let fileAdviceList = reactive<Array<any>>([]);
let taskName = ref(''); let taskName = ref('');
let pjid = ref(''); let pjid = ref('');
let isContractFinished = ref();
let projectList = ref([])
const showMoneyForm = ref(false); const showMoneyForm = ref(false);
onMounted(async () => { onMounted(async () => {
resButton = await getActionParam({ resButton = await getActionParam({
@ -255,6 +263,7 @@
showApprovalForm.value = resButton.showApprovalForm; showApprovalForm.value = resButton.showApprovalForm;
planFileDetailKey.value += 1; planFileDetailKey.value += 1;
let resList = await getplaninfoByid({ planinfoid: planinfoid }); let resList = await getplaninfoByid({ planinfoid: planinfoid });
projectList.value = resList
let taskLevel = resList[0].taskLevel.split('.')[0]; let taskLevel = resList[0].taskLevel.split('.')[0];
console.log('taskLevel', taskLevel, resList); console.log('taskLevel', taskLevel, resList);
let res2 = await queryPlanInfoMainTimeline({ projectid: resList[0].projectId }); let res2 = await queryPlanInfoMainTimeline({ projectid: resList[0].projectId });
@ -264,6 +273,9 @@
} }
} }
showtuList.value = res2; showtuList.value = res2;
const res3 = await taskNameIsFinished(resList[0].projectId);
isContractFinished.value = res3;
console.log(res3);
}); });
const [registerplaninfoTable, { getDataSource }] = useTable({ const [registerplaninfoTable, { getDataSource }] = useTable({
@ -335,6 +347,14 @@
function hdDetail() { function hdDetail() {
openProjectPlan(); openProjectPlan();
} }
function goContract() {
openFileInfo(true, {
planinfoid: projectList.value[0].id,
taskName: "合同签订",
isfinish: 2,
projectid: projectList.value[0].projectId,
});
}
function getTableAction(record): ActionItem[] { function getTableAction(record): ActionItem[] {
return [ return [
{ {
@ -499,7 +519,7 @@
} }
let fromdate = await contractRef.value.getFieldsValuetoRef(); let fromdate = await contractRef.value.getFieldsValuetoRef();
params.append('contractinfoList', JSON.stringify(fromdate)); params.append('contractinfoList', JSON.stringify(fromdate));
}else if(showMoneyForm.value){ } else if (showMoneyForm.value) {
let fromdate = await contractRef.value.getFieldsValuetoRef(); let fromdate = await contractRef.value.getFieldsValuetoRef();
params.append('contractinfoList', JSON.stringify(fromdate)); params.append('contractinfoList', JSON.stringify(fromdate));
} }

2
src/views/projectLib/projectPlan/projectPlan.api.ts

@ -36,6 +36,7 @@ export enum Api {
getContractinfoByTaskName = "/huzhouContractinfo/getContractinfoByTaskName", getContractinfoByTaskName = "/huzhouContractinfo/getContractinfoByTaskName",
queryUpdatePlanFlagById = "/huzhouProject/queryUpdatePlanFlagById", queryUpdatePlanFlagById = "/huzhouProject/queryUpdatePlanFlagById",
deleteContractMoney = "/huzhouPlan/deleteContractMoney", deleteContractMoney = "/huzhouPlan/deleteContractMoney",
taskNameIsFinished = "/huzhouPlan/taskNameIsFinished",
} }
/** /**
* *
@ -75,3 +76,4 @@ export const setPlaninfoIsoffline = (params) => defHttp.post({ url: Api.setPlani
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}`}) export const deleteContractMoney = (id: any) =>defHttp.delete<boolean>({url: `${Api.deleteContractMoney}?projectid=${id}`})
export const taskNameIsFinished = (id: any) =>defHttp.get({url: `${Api.taskNameIsFinished}?projectid=${id}`})

Loading…
Cancel
Save