联合验收审批

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,9 +354,9 @@
   function goContract() {
     openFileInfo(true, {
       planinfoid: projectList.value[0].id,
-      taskName:  "合同签订",
+      taskName: '合同签订',
-      isfinish:  2,
+      isfinish: 2,
-      projectid:  projectList.value[0].projectId,
+      projectid: projectList.value[0].projectId,
     });
   }
   function getTableAction(record): ActionItem[] {
@@ -408,7 +412,7 @@
     if (item == 'all') {
       return true;
     }
-    let geShi = ['xlx', 'xlsx', 'docx', 'doc', 'pdf','zip'] as Array<string>;
+    let geShi = ['xlx', 'xlsx', 'docx', 'doc', 'pdf', 'zip'] as Array<string>;
     if (geShi.indexOf(file.name.substring(file.name.lastIndexOf('.') + 1)) == -1) {
       message.error('文件格式错误！仅支持' + 'xlx,xlsx, docx, doc, pdf,zip');
       console.log('文件格式错误！仅支持' + 'xlsx', 'docx', 'doc', 'pdf,zip');
@@ -562,9 +566,15 @@
     }
     console.log('param', params, 'approvalform', approvalform);
     if (await ApprovalFromPageRef.value.validateApprovalForm()) {
-      let res = await approvePlanFile(params);
+      if (taskName.value== '联合验收审批') {
-      console.log('提交成功！', res);
+        let res = await approveURTFile(params);
-      emit('close');
+        console.log('提交成功！', res);
+        emit('close');
+      } else {
+        let res = await approvePlanFile(params);
+        console.log('提交成功！', res);
+        emit('close');
+      }
     }
   }
   async function exit() {

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';
@@ -250,7 +255,7 @@
     if (item == 'all') {
       return true;
     }
-    let geShi = ['xlx', 'xlsx', 'docx', 'doc', 'pdf','zip'] as Array<string>;
+    let geShi = ['xlx', 'xlsx', 'docx', 'doc', 'pdf', 'zip'] as Array<string>;
     if (geShi.indexOf(file.name.substring(file.name.lastIndexOf('.') + 1)) == -1) {
       message.error('文件格式错误！仅支持' + 'xlx,xlsx, docx, doc, pdf,zip');
       console.log('文件格式错误！仅支持' + 'xlsx', 'docx', 'doc', 'pdf,zip');
@@ -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,13 +375,23 @@
     params.append('planinfoid', dataTo.planinfoid);
     isSubmitting.value = true;
     if (dataTo.type == 0) {
-      planUploadFile(params)
+      if (dataTo.taskName == '联合验收审批') {
-        .then(() => {
+        uploadURTFile(params)
-          emit('close');
+          .then(() => {
-        })
+            emit('close');
-        .catch(() => {
+          })
-          isSubmitting.value = false;
+          .catch(() => {
-        });
+            isSubmitting.value = false;
+          });
+      } else {
+        planUploadFile(params)
+          .then(() => {
+            emit('close');
+          })
+          .catch(() => {
+            isSubmitting.value = false;
+          });
+      }
     } else if (dataTo.type == 1) {
       planUploadModifyFile(params)
         .then(() => {