Browse Source

联合验收审批

master
wbc 3 weeks ago
parent
commit
95f6f66ab8
  1. 18
      src/views/ProcessApprovalSubPage/planFileApproval.vue
  2. 20
      src/views/projectLib/projectPlan/addPlanFile.vue

18
src/views/ProcessApprovalSubPage/planFileApproval.vue

@ -147,7 +147,11 @@
import planinfoFileDetail from '@/views/projectLib/projectPlan/planinfoFileDetail.vue';
import { useModal, BasicModal } from '@/components/Modal';
import { BasicTable, ActionItem, TableAction, useTable } from '@/components/Table';
import { approvePlanFile, getActionParam } from '../myWork/inComplete/inComplete.api';
import {
approvePlanFile,
approveURTFile,
getActionParam,
} from '../myWork/inComplete/inComplete.api';
import {
PlaninfoFiletableColumns,
PlaninfoColumn,
@ -252,7 +256,7 @@
let taskName = ref('');
let pjid = ref('');
let isContractFinished = ref();
let projectList = ref([])
let projectList = ref([]);
const showMoneyForm = ref(false);
onMounted(async () => {
resButton = await getActionParam({
@ -263,7 +267,7 @@
showApprovalForm.value = resButton.showApprovalForm;
planFileDetailKey.value += 1;
let resList = await getplaninfoByid({ planinfoid: planinfoid });
projectList.value = resList
projectList.value = resList;
let taskLevel = resList[0].taskLevel.split('.')[0];
console.log('taskLevel', taskLevel, resList);
let res2 = await queryPlanInfoMainTimeline({ projectid: resList[0].projectId });
@ -350,7 +354,7 @@
function goContract() {
openFileInfo(true, {
planinfoid: projectList.value[0].id,
taskName: "合同签订",
taskName: '合同签订',
isfinish: 2,
projectid: projectList.value[0].projectId,
});
@ -562,11 +566,17 @@
}
console.log('param', params, 'approvalform', approvalform);
if (await ApprovalFromPageRef.value.validateApprovalForm()) {
if (taskName.value== '联合验收审批') {
let res = await approveURTFile(params);
console.log('提交成功!', res);
emit('close');
} else {
let res = await approvePlanFile(params);
console.log('提交成功!', res);
emit('close');
}
}
}
async function exit() {
emit('close');
}

20
src/views/projectLib/projectPlan/addPlanFile.vue

@ -113,7 +113,12 @@
<script lang="ts" name="uploadFile" setup>
import { reactive, defineProps, onMounted, ref } from 'vue';
import { planUploadFile, planUploadModifyFile, planREUploadFile } from './projectPlan.api';
import {
planUploadFile,
planUploadModifyFile,
planREUploadFile,
uploadURTFile,
} from './projectPlan.api';
import { message } from 'ant-design-vue';
import ContractPay from '@/views/projectLib/projectContract/ContractPay.vue';
import { queryProjectInfoById } from '@/views/projectLib/projectInfo/projectInfo.api';
@ -358,8 +363,7 @@
let fromdate = await contractRef.value.getFieldsValuetoRef();
params.append('contractinfoList', JSON.stringify(fromdate));
}
}
else if(showMoneyForm.value){
} else if (showMoneyForm.value) {
let fromdate = await contractRef.value.getFieldsValuetoRef();
params.append('contractinfoList', JSON.stringify(fromdate));
}
@ -371,6 +375,15 @@
params.append('planinfoid', dataTo.planinfoid);
isSubmitting.value = true;
if (dataTo.type == 0) {
if (dataTo.taskName == '联合验收审批') {
uploadURTFile(params)
.then(() => {
emit('close');
})
.catch(() => {
isSubmitting.value = false;
});
} else {
planUploadFile(params)
.then(() => {
emit('close');
@ -378,6 +391,7 @@
.catch(() => {
isSubmitting.value = false;
});
}
} else if (dataTo.type == 1) {
planUploadModifyFile(params)
.then(() => {

Loading…
Cancel
Save