From fcab20a543ae2437f96a33821e9f4a4a5283a4ca Mon Sep 17 00:00:00 2001
From: zhouhaibin <zhouhaibin@qq.com>
Date: Fri, 30 Aug 2024 15:16:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=98=E5=8C=96=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/ApprovalDetails.vue             | 152 +++++---
 .../component/ApprovalPageModel.vue           |   2 +-
 .../planFileApproval.vue                      | 201 ++++++++--
 .../projectPlanApproval.vue                   |   1 +
 .../uploadURTfileApproval.vue                 |  47 ++-
 .../myWork/inComplete/inComplete.data.ts      |   5 +
 .../projectBoard/childBoard/gaiGeRenWu.vue    |   2 +-
 .../childBoard/xingZhengQuHua.vue             |   2 +-
 .../totalProjectBoard/ProjectCard.vue         |   2 +-
 .../projectLib/projectInfo/Detailpage.vue     |  11 +-
 .../projectLib/projectPlan/addPlanFile.vue    | 356 +++++++++++++-----
 src/views/projectLib/projectPlan/index.vue    |   4 +-
 .../projectPlan/planinfoFileDetail.vue        | 134 +++++--
 .../projectLib/projectPlan/projectPlan.api.ts |   9 +-
 .../projectPlan/projectPlan.data.ts           | 258 ++++++++++++-
 src/views/projectLib/projectPlan/showtu.vue   | 126 +++++++
 .../projectLib/projectPlan/uploadURTfile.vue  |  85 +++--
 .../projectLib/projectPlan/viewPlanDetail.vue |  91 ++++-
 18 files changed, 1249 insertions(+), 239 deletions(-)
 create mode 100644 src/views/projectLib/projectPlan/showtu.vue

diff --git a/src/views/ProcessApprovalSubPage/component/ApprovalDetails.vue b/src/views/ProcessApprovalSubPage/component/ApprovalDetails.vue
index 5f9d6c8..5624589 100644
--- a/src/views/ProcessApprovalSubPage/component/ApprovalDetails.vue
+++ b/src/views/ProcessApprovalSubPage/component/ApprovalDetails.vue
@@ -26,70 +26,110 @@
       </a-timeline>
     </el-tab-pane> -->
   </el-tabs>
-
 </template>
 
 <script lang="ts" name="ApprovalDetails" setup>
-//ts语法
-import { defineProps, ref, onMounted } from 'vue';
-import { BasicTable, useTable } from '@/components/Table';
-import { approveStartProcessColumns } from "../../myWork/inComplete/inComplete.data";
-import { queryProcessInfo, getProcessInstanceIdByProid } from '../../myWork/inComplete/inComplete.api';
-import { useGlobSetting } from '@/hooks/setting';
-import { Icon } from '@/components/Icon';
-import { ActivitiTask } from '@/api/activiti/model/activitiTaskModel';
-import { selectHistoric } from '@/api/activiti/activitiHistoric';
-import { formatToNow } from '@/utils/dateUtil';
-import { useUserStore } from '@/store/modules/user';
-
-const userStore = useUserStore();
-const globSetting = useGlobSetting();
-let processInstanceId = ref()
-
-// url: `${globSetting.apiUrl}/api/activiti/process/trace/process/progress/image/${processInstanceId}`,
-const imgSrc = ref<string>();
-const activitiTaskList = ref<ActivitiTask[]>([]);
-const activeName = ref('1')
-
-let dataTo = defineProps(["processInstanceId", "stage", "projectid"])
-onMounted(async () => {
-  let url = ""
-  if (!dataTo.stage) {
+  //ts语法
+  import { defineProps, ref, onMounted } from 'vue';
+  import { BasicTable, useTable } from '@/components/Table';
+  import { approveStartProcessColumns } from '../../myWork/inComplete/inComplete.data';
+  import {
+    queryProcessInfo,
+    getProcessInstanceIdByProid,
+  } from '../../myWork/inComplete/inComplete.api';
+  import { useGlobSetting } from '@/hooks/setting';
+  import { Icon } from '@/components/Icon';
+  import { ActivitiTask } from '@/api/activiti/model/activitiTaskModel';
+  import { selectHistoric } from '@/api/activiti/activitiHistoric';
+  import { formatToNow } from '@/utils/dateUtil';
+  import { useUserStore } from '@/store/modules/user';
 
-    processInstanceId.value = dataTo.processInstanceId
-    url = globSetting.apiUrl + "/api/activiti/process/trace/process/progress/image/" + processInstanceId.value
-  } else {
-    processInstanceId.value = await getProcessInstanceIdByProid({ projectid: dataTo.projectid, stage: dataTo.stage })
-    url = globSetting.apiUrl + "/api/activiti/process/trace/process/progress/image/" + processInstanceId.value
+  const userStore = useUserStore();
+  const globSetting = useGlobSetting();
+  let processInstanceId = ref();
 
-  }
-  imgSrc.value = `${url}?t=${new Date().getTime()}`;
-  selectHistoric(processInstanceId.value).then((res) => {
-    activitiTaskList.value = res;
-  });
-})
-userStore
-console.log("1111userStore1111",userStore.getUserInfo)
+  // url: `${globSetting.apiUrl}/api/activiti/process/trace/process/progress/image/${processInstanceId}`,
+  const imgSrc = ref<string>();
+  const activitiTaskList = ref<ActivitiTask[]>([]);
+  const activeName = ref('1');
 
-//我的待办表格组件
-const [registerTable] = useTable({
-  size: 'small',//紧凑型表格
-  title: '流程审批情况',
-  api: queryProcessInfo,
-  columns: approveStartProcessColumns,
-  // showActionColumn: false,
-  useSearchForm: false,
-  beforeFetch(params) {
-    if (dataTo.stage) {
-      params.stage = dataTo.stage
-      params.projectid = dataTo.projectid
+  let dataTo = defineProps(['processInstanceId', 'stage', 'projectid']);
+  onMounted(async () => {
+    let url = '';
+    if (!dataTo.stage) {
+      processInstanceId.value = dataTo.processInstanceId;
+      url =
+        globSetting.apiUrl +
+        '/api/activiti/process/trace/process/progress/image/' +
+        processInstanceId.value;
     } else {
-      params.processInstanceId = dataTo.processInstanceId
-
+      processInstanceId.value = await getProcessInstanceIdByProid({
+        projectid: dataTo.projectid,
+        stage: dataTo.stage,
+      });
+      url =
+        globSetting.apiUrl +
+        '/api/activiti/process/trace/process/progress/image/' +
+        processInstanceId.value;
     }
-  },
-});
+    imgSrc.value = `${url}?t=${new Date().getTime()}`;
+    selectHistoric(processInstanceId.value).then((res) => {
+      activitiTaskList.value = res;
+    });
+  });
+  userStore;
+  console.log('1111userStore1111', userStore.getUserInfo);
 
+  //我的待办表格组件
+  const [registerTable, { setColumns }] = useTable({
+    size: 'small', //紧凑型表格
+    title: '流程审批情况',
+    api: queryProcessInfo,
+    columns: approveStartProcessColumns,
+    // showActionColumn: false,
+    useSearchForm: false,
+    beforeFetch(params) {
+      if (dataTo.stage) {
+        params.stage = dataTo.stage;
+        params.projectid = dataTo.projectid;
+      } else {
+        params.processInstanceId = dataTo.processInstanceId;
+      }
+    },
+    afterFetch(res) {
+      if (res[0].operatorPhone == '') {
+        setColumns([
+          {
+            title: '节点名称',
+            dataIndex: 'taskName',
+            width: 120,
+          },
+          {
+            title: '处理人',
+            dataIndex: 'operator',
+            width: 100,
+          },
+          {
+            title: '处理时间',
+            dataIndex: 'operateDate',
+            width: 100,
+          },
+          {
+            title: '审批状态',
+            dataIndex: 'approvalStatue',
+            width: 100,
+            format: 'dict|approvalResult',
+            filters: 'dict|approvalResult',
+          },
+          {
+            title: '审批意见',
+            dataIndex: 'comment',
+            width: 400,
+          },
+        ]);
+      }
+    },
+  });
 </script>
 
-<style scoped></style>
\ No newline at end of file
+<style scoped></style>
diff --git a/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue b/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue
index bd2cd74..ea56f33 100644
--- a/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue
+++ b/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue
@@ -6,7 +6,7 @@
         <planFileApproval :record="record" @close="exit"  v-if="planfileNames.includes(record.stage)"/>
         <fieldChangeApproval :record="record" @close="exit"  v-if="record.stage=='fieldChange'"/>
         <contractApproval :record="record" @close="exit"  v-if="record.stage=='createContract'"/>
-        <uploadURTfileApproval :record="record" @close="exit"  v-if="record.stage=='createURT'"/>
+        <uploadURTfileApproval :record="record" @close="exit"  v-if="record.stage=='createURT'||record.stage=='createURT2'"/>
         <MergeProjectApprova :record="record" @close="exit"  v-if="record.stage=='MergeProject'"/>         
         <SplitProjectApprova :record="record" @close="exit"  v-if="record.stage=='SplitProject'"/> 
     </BasicModal>
diff --git a/src/views/ProcessApprovalSubPage/planFileApproval.vue b/src/views/ProcessApprovalSubPage/planFileApproval.vue
index 41edabc..47d8a16 100644
--- a/src/views/ProcessApprovalSubPage/planFileApproval.vue
+++ b/src/views/ProcessApprovalSubPage/planFileApproval.vue
@@ -1,5 +1,8 @@
 <template>
   <!-- 自定义表单 -->
+  <el-divider content-position="left">项目名称： {{ dataTo.record.projectName }} </el-divider>
+  <BasicForm @register="registerApprovalMoneyForm" v-if="taskName == '立项审批'" />
+  <BasicForm @register="registerContractMoneyForm" v-if="taskName == '合同签订'" />
   <el-divider content-position="left">项目计划详情</el-divider>
   <BasicTable @register="registerplaninfoTable"> </BasicTable>
   <el-divider content-position="left">项目计划资料详情</el-divider>
@@ -82,11 +85,69 @@
     getplaninfoByid,
   } from '@/views/projectLib/projectPlan/projectPlan.api';
   import { downloadFile } from '../../api/common/api';
-  import { ElMessage } from 'element-plus';
+  import { message } from 'ant-design-vue';
   import ApprovalDetails from '../ProcessApprovalSubPage/component/ApprovalDetails.vue';
   import ApprovalFromPage from '../ProcessApprovalSubPage/component/ApprovalFromPage.vue';
   import PlanFileDetail from '@/views/ProcessApprovalSubPage/component/PlanFileDetail.vue';
+  import { queryProjectInfoById } from '@/views/projectLib/projectInfo/projectInfo.api';
 
+  import { useForm, BasicForm } from '@/components/Form';
+  import { getProjectinfoMoneyInfo } from '@/views/projectLib/projectPlan/projectPlan.api';
+  import {
+    ApprovalMoneyFormSchemas,
+    ContractMoneyFormSchemas,
+  } from '@/views/projectLib/projectPlan/projectPlan.data';
+  const [
+    registerApprovalMoneyForm,
+    {
+      setFieldsValue: setApprovalMoneyFieldsValue,
+      setProps: setApprovalMoneyProps,
+      validate: validateApprovalMoneyForm,
+      getFieldsValue: getApprovalMoneyFieldsValue,
+    },
+  ] = useForm({
+    //注册表单列
+    schemas: ApprovalMoneyFormSchemas,
+    showActionButtonGroup: false,
+    //回车提交
+    // autoSubmitOnEnter: true,
+    // //不显示重置按钮
+    // showResetButton: false,
+    //自定义提交按钮文本和图标
+    // submitButtonOptions: { text: '提交', preIcon: '' },
+    //查询列占比 24代表一行 取值范围 0-24
+    // actionColOptions: { span: 17 },
+    // size: "small",
+    // labelCol: { style: { width: '120px' } },
+    disabled: true,
+    wrapperCol: { style: { width: 'auto' } },
+  });
+  const [
+    registerContractMoneyForm,
+    {
+      setProps: setContractMoneyProps,
+      validate: validateContractMoneyForm,
+      getFieldsValue: getContractMoneyFieldsValue,
+      setFieldsValue: setContractMoneyFieldsValue,
+      updateSchema: updateContractMoneySchema,
+    },
+  ] = useForm({
+    //注册表单列
+    schemas: ContractMoneyFormSchemas,
+    showActionButtonGroup: false,
+    //回车提交
+    // autoSubmitOnEnter: true,
+    // //不显示重置按钮
+    // showResetButton: false,
+    //自定义提交按钮文本和图标
+    // submitButtonOptions: { text: '提交', preIcon: '' },
+    //查询列占比 24代表一行 取值范围 0-24
+    // actionColOptions: { span: 17 },
+    // size: "small",
+    // labelCol: { style: { width: '120px' } },
+    disabled: true,
+    wrapperCol: { style: { width: 'auto' } },
+  });
   let dataTo = defineProps(['record']);
   const emit = defineEmits(['close']);
   console.log('routerouterouteroute', dataTo.record);
@@ -104,6 +165,8 @@
   });
   let fileList = reactive<Array<any>>([]);
   let fileAdviceList = reactive<Array<any>>([]);
+  let taskName = ref('');
+  let pjid = ref('');
   onMounted(async () => {
     resButton = await getActionParam({
       processInstanceId: processInstanceId,
@@ -123,12 +186,31 @@
     beforeFetch(params) {
       params.planinfoid = planinfoid;
     },
-    afterFetch(data) {
-      if(data[0].taskFile.indexOf('，') == -1){
+    afterFetch: async function (data) {
+      if (data[0].taskFile.indexOf('，') == -1) {
         tableDataFiles.value = data[0].taskFile.split(',');
-      }else{
+      } else {
         tableDataFiles.value = data[0].taskFile.split('，');
-
+      }
+      if (data[0].taskName.indexOf('可研报告初稿编制') >= 0) {
+        tableDataFiles.value.push('《项目建议书》');
+      } else if (data[0].taskName.indexOf('可研报告终稿编制') >= 0) {
+        tableDataFiles.value.push('《项目建议书》');
+      }
+      taskName.value = data[0].taskName;
+      pjid.value = data[0].projectId;
+      if (taskName.value == '立项审批') {
+        let res = await getProjectinfoMoneyInfo({
+          projectid: pjid.value,
+        });
+        setApprovalMoneyFieldsValue(res);
+        setApprovalMoneyProps({ disabled: resButton.isEdit == true ? false : true });
+      } else if (taskName.value == '合同签订') {
+        let res = await getProjectinfoMoneyInfo({
+          projectid: pjid.value,
+        });
+        setContractMoneyFieldsValue(res);
+        setContractMoneyProps({ disabled: resButton.isEdit == true ? false : true });
       }
     },
   });
@@ -197,26 +279,33 @@
     const FIVE_M = 500 * 1024 * 1024;
     //大于5M，不允许上传
     if (fileSize > FIVE_M) {
-      ElMessage.error('最大上传500M');
+      message.error('最大上传500M');
       return false;
     }
     let geShi = ['xlx', 'xlsx', 'docx', 'doc', 'pdf'] as Array<string>;
     if (geShi.indexOf(file.name.substring(file.name.lastIndexOf('.') + 1)) == -1) {
-      ElMessage.error('文件格式错误！仅支持' + 'xlx,xlsx, docx, doc, pdf');
+      message.error('文件格式错误！仅支持' + 'xlx,xlsx, docx, doc, pdf');
       console.log('文件格式错误！仅支持' + 'xlsx', 'docx', 'doc', 'pdf');
       return false;
     }
-    if (item.indexOf(file.name.substring(0, file.name.indexOf('.'))) == -1) {
-      ElMessage.error('请上传文件:' + item);
-      return false;
+    let dataSource = await getDataSource();
+    if (
+      dataSource[0].taskName.indexOf('可研技术审查报告确认') == -1 &&
+      dataSource[0].taskName.indexOf('造价评估报告确认') == -1
+    ) {
+      if (item.indexOf(file.name.substring(0, file.name.indexOf('.'))) == -1) {
+        message.error('请上传文件:' + item);
+        return false;
+      }
     }
+
     console.log('文件上传成功');
 
     return true;
   }
   // 文件数量过多时提醒
   function handleExceed() {
-    ElMessage.warning('最多只能上传一个文件');
+    message.warning('最多只能上传一个文件');
   }
   function beforeAdviceUpload(file) {
     console.log('file,item', file);
@@ -224,12 +313,12 @@
     const FIVE_M = 500 * 1024 * 1024;
     //大于5M，不允许上传
     if (fileSize > FIVE_M) {
-      ElMessage.error('最大上传500M');
+      message.error('最大上传500M');
       return false;
     }
     let geShi = ['xlx', 'xlsx', 'docx', 'doc', 'pdf'] as Array<string>;
     if (geShi.indexOf(file.name.substring(file.name.indexOf('.') + 1)) == -1) {
-      ElMessage.error('文件格式错误！仅支持' + 'xlx,xlsx, docx, doc, pdf');
+      message.error('文件格式错误！仅支持' + 'xlx,xlsx, docx, doc, pdf');
       console.log('文件格式错误！仅支持' + 'xlsx', 'docx', 'doc', 'pdf');
       return false;
     }
@@ -239,26 +328,90 @@
   }
 
   async function handleSubmit() {
+    const params = new FormData();
+
+    if (taskName.value == '立项审批') {
+      if (await validateApprovalMoneyForm()) {
+        const approvalMoneyFieldsValue = getApprovalMoneyFieldsValue();
+        const {
+          approvalTotalMoney,
+          approvalCentralMoney,
+          approvalProvincialMoney,
+          approvalCityMoney,
+          approvalCountyMoney,
+          approvalSelfMoney,
+        } = approvalMoneyFieldsValue;
+
+        // 计算其他金额之和
+        const sumOfOtherAmounts =
+          approvalCentralMoney +
+          approvalProvincialMoney +
+          approvalCityMoney +
+          approvalCountyMoney +
+          approvalSelfMoney;
+        // 校验总金额是否等于其他金额之和
+        if (Math.abs(approvalTotalMoney - sumOfOtherAmounts) < Number.EPSILON) {
+          approvalMoneyFieldsValue['id'] = pjid.value;
+          params.append('approvalMoneyFieldsValue', JSON.stringify(approvalMoneyFieldsValue));
+        } else {
+          message.error('总金额与其他金额之和不相等，请重新输入！');
+          return;
+        }
+      } else {
+        return;
+      }
+    } else if (taskName.value == '合同签订') {
+      if (await validateContractMoneyForm()) {
+        const contractMoneyFieldsValue = getContractMoneyFieldsValue();
+        const {
+          contractTotalMoney,
+          contractCentralMoney,
+          contractProvincialMoney,
+          contractCityMoney,
+          contractCountyMoney,
+          contractSelfMoney,
+        } = contractMoneyFieldsValue;
+
+        // 计算其他金额之和
+        const sumOfOtherAmounts =
+          contractCentralMoney +
+          contractProvincialMoney +
+          contractCityMoney +
+          contractCountyMoney +
+          contractSelfMoney;
+
+        // 校验总金额是否等于其他金额之和，使用Number.EPSILON进行比较
+        if (Math.abs(contractTotalMoney - sumOfOtherAmounts) < Number.EPSILON) {
+          contractMoneyFieldsValue['id'] = pjid.value;
+          params.append('contractMoneyFieldsValue', JSON.stringify(contractMoneyFieldsValue));
+        } else {
+          message.error('总金额与其他金额之和不相等，请重新输入！');
+          return;
+        }
+      } else {
+        return;
+      }
+    }
     if (resButton.isEdit) {
       if (fileList.length == 0) {
-        ElMessage({
-          message: '未选择任何文件，无法上传！',
-          type: 'error',
-        });
+        message.error('未选择任何文件，无法上传！');
         return;
       }
       // type ==0新增，type ==1 是修改
-      if (fileList.length != tableDataFiles.value.length) {
-        ElMessage({
-          message: '上传的文件不符合要求请检查',
-          type: 'error',
-        });
-        return;
+      let dataSource = await getDataSource();
+      if (
+        dataSource[0].taskName.indexOf('可研技术审查报告确认') == -1 ||
+        dataSource[0].taskName.indexOf('可研报告初稿编制') == -1 ||
+        dataSource[0].taskName.indexOf('可研报告终稿编制') == -1
+      ) {
+        if (fileList.length != tableDataFiles.value.length) {
+          message.error('上传的文件不符合要求请检查');
+          return;
+        }
       }
     }
 
     let approvalform = await ApprovalFromPageRef.value.getFieldsValueApprovalForm();
-    const params = new FormData();
     params.append('flag', approvalform.flag);
     params.append('planinfoid', planinfoid);
     params.append('comment', approvalform.comment);
diff --git a/src/views/ProcessApprovalSubPage/projectPlanApproval.vue b/src/views/ProcessApprovalSubPage/projectPlanApproval.vue
index a20db3f..a40d3aa 100644
--- a/src/views/ProcessApprovalSubPage/projectPlanApproval.vue
+++ b/src/views/ProcessApprovalSubPage/projectPlanApproval.vue
@@ -1,5 +1,6 @@
 <template>
   <!-- 自定义表单 -->
+  <el-divider content-position="left">项目名称：   {{ dataTo.record.projectName }}  </el-divider>
   <el-divider content-position="left"  v-if="resButton.isEdit">模板表格文件下载</el-divider>
     <div style="padding-left: 40px;" v-if="resButton.isEdit">
         <el-button slot="trigger" type="primary" @click="downexcel">下载模板</el-button>
diff --git a/src/views/ProcessApprovalSubPage/uploadURTfileApproval.vue b/src/views/ProcessApprovalSubPage/uploadURTfileApproval.vue
index 9ee9500..e15b46e 100644
--- a/src/views/ProcessApprovalSubPage/uploadURTfileApproval.vue
+++ b/src/views/ProcessApprovalSubPage/uploadURTfileApproval.vue
@@ -1,12 +1,14 @@
 <template>
   <div>
+    <el-divider content-position="left">项目名称： {{ dataTo.record.projectName }} </el-divider>
+    <BasicForm @register="registerMoneyForm" />
     <el-divider content-position="left">联合技术审查文件详情</el-divider>
     <PlanFileDetail :planinfoid="projectId" :stage="1" />
   </div>
-  <div>
+  <!-- <div>
     <el-divider content-position="left">联合技术审查审批文件详情</el-divider>
     <PlanFileDetail :planinfoid="projectId" :stage="2" />
-  </div>
+  </div> -->
   <ApprovalDetails :processInstanceId="processInstanceId" />
   <!-- -->
   <ApprovalFromPage
@@ -17,7 +19,7 @@
     @exit="exit"
   >
     <div>
-      <div v-if="procesType == '0' && !resButton.isEdit">
+      <!-- <div v-if="procesType == '0' && !resButton.isEdit">
         <el-divider content-position="left">上传意见文件</el-divider>
         <div style="display: flex; justify-content: center; align-items: center; height: 100px">
           <el-upload
@@ -34,7 +36,7 @@
             <div slot="tip" class="el-upload__tip">文件大小且不超过500M</div>
           </el-upload>
         </div>
-      </div>
+      </div> -->
       <el-divider content-position="left" v-if="resButton.isEdit">重新上传项目资料</el-divider>
       <div
         v-if="resButton.isEdit"
@@ -63,7 +65,11 @@
   import { ElMessage } from 'element-plus';
   import ApprovalDetails from '@/views/ProcessApprovalSubPage/component/ApprovalDetails.vue';
   import ApprovalFromPage from '@/views/ProcessApprovalSubPage/component/ApprovalFromPage.vue';
-  import PlanFileDetail from "@/views/ProcessApprovalSubPage/component/PlanFileDetail.vue";
+  import PlanFileDetail from '@/views/ProcessApprovalSubPage/component/PlanFileDetail.vue';
+  import { EstimateAmountFormSchemas } from '@/views/projectLib/projectPlan/projectPlan.data';
+  import { queryProjectInfoById } from '@/views/projectLib/projectInfo/projectInfo.api';
+  import {getplaninfoByid} from '@/views/projectLib/projectPlan/projectPlan.api';
+  import { useForm, BasicForm } from '@/components/Form';
 
   let dataTo = defineProps(['record']);
   console.log('routerouterouteroute', dataTo.record);
@@ -81,6 +87,27 @@
   });
   let fileList = reactive<Array<any>>([]);
   let fileAdviceList = reactive<Array<any>>([]);
+  const [
+    registerMoneyForm,
+    { getFieldsValue: getMoneyFieldsValue, setFieldsValue: setMoneyFieldsValue, setProps},
+  ] = useForm({
+    //注册表单列
+    schemas: EstimateAmountFormSchemas,
+    showActionButtonGroup: false,
+    //回车提交
+    // autoSubmitOnEnter: true,
+    // //不显示重置按钮
+    // showResetButton: false,
+    //自定义提交按钮文本和图标
+    // submitButtonOptions: { text: '提交', preIcon: '' },
+    //查询列占比 24代表一行 取值范围 0-24
+    // actionColOptions: { span: 17 },
+    // size: "small",
+
+    disabled: resButton.isEdit == true ? false : true,
+    // labelCol: { style: { width: '120px' } },
+    wrapperCol: { style: { width: 'auto' } },
+  });
   onMounted(async () => {
     resButton = await getActionParam({
       processInstanceId: processInstanceId,
@@ -88,6 +115,13 @@
       procesType: dataTo.record.procesType,
     });
     showApprovalForm.value = resButton.showApprovalForm;
+    let resList=await getplaninfoByid({planinfoid:projectId})
+    let param: any = {
+      projectid: resList[0].projectId
+    };
+    let res = await queryProjectInfoById(param);
+    setMoneyFieldsValue(res);
+    setProps({disabled: resButton.isEdit == true ? false : true})
   });
 
   function removeFile(option) {
@@ -128,10 +162,13 @@
   async function handleSubmit() {
     let approvalform = await ApprovalFromPageRef.value.getFieldsValueApprovalForm();
     const params = new FormData();
+    let moneydata = await getMoneyFieldsValue();
+    params.append('urtEstimatedAmount', moneydata.urtEstimatedAmount);
     params.append('flag', approvalform.flag);
     params.append('projectid', projectId);
     params.append('comment', approvalform.comment);
     params.append('taskId', taskid);
+    params.append('processInstanceId', processInstanceId);
     if (fileList.length > 0) {
       fileList.forEach((x) => {
         params.append('file', x.file);
diff --git a/src/views/myWork/inComplete/inComplete.data.ts b/src/views/myWork/inComplete/inComplete.data.ts
index 506705f..270c0c0 100644
--- a/src/views/myWork/inComplete/inComplete.data.ts
+++ b/src/views/myWork/inComplete/inComplete.data.ts
@@ -20,6 +20,11 @@ export const approveStartProcessColumns: BasicColumn[] = [
     dataIndex: 'operator',
     width: 100,
   },
+  {
+      title: '处理人手机号',
+      dataIndex: 'operatorPhone',
+      width: 100,
+  },
   {
     title: '处理时间',
     dataIndex: 'operateDate',
diff --git a/src/views/projectBoard/childBoard/gaiGeRenWu.vue b/src/views/projectBoard/childBoard/gaiGeRenWu.vue
index 60bdfc3..9f369fe 100644
--- a/src/views/projectBoard/childBoard/gaiGeRenWu.vue
+++ b/src/views/projectBoard/childBoard/gaiGeRenWu.vue
@@ -10,7 +10,7 @@
                 :stroke-width="18"
                 :percentage="
                   Number(data.totalProgress.progress) * 100 > 0
-                    ? Number(data.totalProgress.progress) * 100
+                    ? Math.floor(Number(data.totalProgress.progress) * 100)
                     : 0
                 "
                 :width="200"
diff --git a/src/views/projectBoard/childBoard/xingZhengQuHua.vue b/src/views/projectBoard/childBoard/xingZhengQuHua.vue
index bcb9175..cc05dd3 100644
--- a/src/views/projectBoard/childBoard/xingZhengQuHua.vue
+++ b/src/views/projectBoard/childBoard/xingZhengQuHua.vue
@@ -10,7 +10,7 @@
                 :stroke-width="18"
                 :percentage="
                   Number(data.totalProgress.progress) * 100 > 0
-                    ? Number(data.totalProgress.progress) * 100
+                    ? Math.floor(Number(data.totalProgress.progress) * 100)
                     : 0
                 "
                 :width="200"
diff --git a/src/views/projectBoard/totalProjectBoard/ProjectCard.vue b/src/views/projectBoard/totalProjectBoard/ProjectCard.vue
index 8c3b8c0..9435a19 100644
--- a/src/views/projectBoard/totalProjectBoard/ProjectCard.vue
+++ b/src/views/projectBoard/totalProjectBoard/ProjectCard.vue
@@ -88,7 +88,7 @@
                 :stroke-width="18"
                 :percentage="
                   Number(data.totalProgress.progress) * 100 > 0
-                    ? Number(data.totalProgress.progress) * 100
+                    ? Math.floor(Number(data.totalProgress.progress) * 100)
                     : 0
                 "
                 :width="200"
diff --git a/src/views/projectLib/projectInfo/Detailpage.vue b/src/views/projectLib/projectInfo/Detailpage.vue
index 7db4a14..93ddbe8 100644
--- a/src/views/projectLib/projectInfo/Detailpage.vue
+++ b/src/views/projectLib/projectInfo/Detailpage.vue
@@ -4,6 +4,8 @@
       <ProjectDetails :isEdit="false" :projectid="projectid" />
       <el-divider content-position="left">资金承诺函</el-divider>
       <UploadfileDetail :projectid="projectid" :stage="5" />
+      <ApprovalDetails :projectid="projectid" :stage="'creatProjectinfo'" v-if="showApprovalDetails==true"/>
+
     </el-tab-pane>
     <el-tab-pane label="项目资料详情" name="2" v-if="showUploadfileDetail">
       <el-divider content-position="left">项目资料详情</el-divider>
@@ -20,14 +22,18 @@
     <el-tab-pane label="由以下项目拆分" name="5" v-if="splitDetailList?.length > 0">
       <ProjectTable :row="splitDetailList"/>
     </el-tab-pane>
+    <el-tab-pane label="项目计划详情" name="6" v-if="showtuList?.length > 0">
+      <showtu  :res="showtuList"  />
+    </el-tab-pane>
   </el-tabs>
-  <ApprovalDetails :projectid="projectid" :stage="'creatProjectinfo'" v-if="showApprovalDetails==true"/>
 
 </template>
 <script lang="ts" name="Detailpage" setup>
 import { defineProps, ref, onMounted } from 'vue'
 import { resourcetableColumns } from './projectInfo.data';
 import { uploacFilePageList, getFieldchangeListByprojectid,getMergeDetailList,getSplitDetailList } from './projectInfo.api'
+
+import { queryPlanInfoMainTimeline } from '@/views/projectLib/projectPlan/projectPlan.api'
 import { ActionItem, BasicTable, TableAction, useTable } from '@/components/Table';
 import { downloadFile } from "@/api/common/api"
 import ProjectDetails from "../../ProcessApprovalSubPage/component/ProjectDetails.vue"
@@ -35,16 +41,19 @@ import ApprovalDetails from "../../ProcessApprovalSubPage/component/ApprovalDeta
 import UploadfileDetail from '../../ProcessApprovalSubPage/component/UploadfileDetail.vue'
 import fieldChangeDetail from '../../ProcessApprovalSubPage/component/fieldChangeDetail.vue'
 import ProjectTable from "@/views/ProcessApprovalSubPage/component/ProjectTable.vue"
+import showtu from "@/views/projectLib/projectPlan/showtu.vue"
 let dataTo = defineProps(["projectid", "stage", "IsModify","showUploadfileDetail","showApprovalDetails"])
 let fieldChangeDetailList = ref<Array<Object>>()
 let mergeDetailList = ref<Array<Object>>()
 let splitDetailList = ref<Array<Object>>()
+let showtuList = ref<Array<Object>>()
 console.log("dataTodataTodataTo", dataTo)
 
 onMounted(async () => {
   fieldChangeDetailList.value = await getFieldchangeListByprojectid({ projectid: dataTo.projectid })
   mergeDetailList.value=await getMergeDetailList({ projectid: dataTo.projectid })
   splitDetailList.value=await getSplitDetailList({ projectid: dataTo.projectid })
+  showtuList.value =await queryPlanInfoMainTimeline({ projectid: dataTo.projectid })
 })
 let activeName = ref("1")
 function getTableAction(record): ActionItem[] {
diff --git a/src/views/projectLib/projectPlan/addPlanFile.vue b/src/views/projectLib/projectPlan/addPlanFile.vue
index c7bee28..3c0fdc9 100644
--- a/src/views/projectLib/projectPlan/addPlanFile.vue
+++ b/src/views/projectLib/projectPlan/addPlanFile.vue
@@ -1,122 +1,300 @@
 <template>
-    <!-- 自定义表单 -->
-    <!-- <el-divider content-position="left">模板表格文件下载</el-divider>
+  <!-- 自定义表单 -->
+  <!-- <el-divider content-position="left">模板表格文件下载</el-divider>
     <div style="padding-left: 40px;">
         <el-button slot="trigger" type="primary">下载模板</el-button>
     </div> -->
-    <el-divider content-position="left">上传文件</el-divider>
-    <el-form ref="importFormRef" >
-        <el-form-item v-for=" (item, index) in dataTo.files" :key="index" :label="item" label-width="auto">
-            <el-upload class="upload-demo" ref="upload" action :http-request="httpRequest"
-                :before-upload="(file) => { return beforeUpload(file, item) }" :on-exceed="handleExceed" :limit="1"
-                :on-remove="removeFile">
-                <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-                <div slot="tip" class="el-upload__tip">只能上传{{ item }}且不超过500M</div>
-            </el-upload>
-        </el-form-item>
-        <el-form-item>
-            <el-button type="primary" @click="submitImportForm">开始导入</el-button>
-            <el-button type="info" @click="dialogVisible">关闭窗口</el-button>
-        </el-form-item>
-    </el-form>
-</template>
+  <BasicForm @register="registerApprovalMoneyForm" v-if="dataTo.taskName == '立项审批'" />
+  <BasicForm @register="registerContractMoneyForm" v-if="dataTo.taskName == '合同签订'" />
 
-<script lang="ts" name="uploadFile" setup>
-import { reactive, defineProps, onMounted } from 'vue'
-import { planUploadFile, planUploadModifyFile } from './projectPlan.api';
-import { ElMessage } from 'element-plus'
+  <el-divider content-position="left">上传文件</el-divider>
+  <el-divider content-position="left" v-if="dataTo.taskName.indexOf('可研报告初稿编制') >= 0 ||
+      dataTo.taskName.indexOf('可研报告终稿编制') >= 0" >支持上传文件数量为1-2份</el-divider>
 
+  <el-form ref="importFormRef">
+    <el-form-item
+      v-for="(item, index) in dataTo.files"
+      :key="index"
+      :label="item"
+      label-width="auto"
+    >
+      <el-upload
+        class="upload-demo"
+        ref="upload"
+        action
+        :http-request="httpRequest"
+        :before-upload="
+          (file) => {
+            return beforeUpload(file, item);
+          }
+        "
+        :on-exceed="handleExceed"
+        :limit="1"
+        :on-remove="removeFile"
+      >
+        <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+        <div slot="tip" class="el-upload__tip">只能上传{{ item }}且不超过500M</div>
+      </el-upload>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" @click="submitImportForm" :disabled="isSubmitting"
+        >开始导入</el-button
+      >
+      <el-button type="info" @click="dialogVisible">关闭窗口</el-button>
+    </el-form-item>
+  </el-form>
+</template>
 
-let fileList = reactive<Array<any>>([]);
-let dataTo = defineProps(["type", "files", "planinfoid"])
-const emit = defineEmits(['close']);
-//加载项目数据
-onMounted(async () => {
-    console.log("dataTo", dataTo)
-})
+<script lang="ts" name="uploadFile" setup>
+  import { reactive, defineProps, onMounted, ref } from 'vue';
+  import { planUploadFile, planUploadModifyFile,planREUploadFile } from './projectPlan.api';
+  import { message } from 'ant-design-vue';
+  import { queryProjectInfoById } from '@/views/projectLib/projectInfo/projectInfo.api';
+  import { getplaninfoByid } from '@/views/projectLib/projectPlan/projectPlan.api';
+  import {
+    ApprovalMoneyFormSchemas,
+    ContractMoneyFormSchemas,
+  } from '@/views/projectLib/projectPlan/projectPlan.data';
+  import { useForm, BasicForm } from '@/components/Form';
+  const [
+    registerApprovalMoneyForm,
+    {
+      validate: validateApprovalMoneyForm,
+      getFieldsValue: getApprovalMoneyFieldsValue,
+      setFieldsValue: setApprovalMoneyFieldsValue,
+    },
+  ] = useForm({
+    //注册表单列
+    schemas: ApprovalMoneyFormSchemas,
+    showActionButtonGroup: false,
+    //回车提交
+    // autoSubmitOnEnter: true,
+    // //不显示重置按钮
+    // showResetButton: false,
+    //自定义提交按钮文本和图标
+    // submitButtonOptions: { text: '提交', preIcon: '' },
+    //查询列占比 24代表一行 取值范围 0-24
+    // actionColOptions: { span: 17 },
+    // size: "small",
+    // labelCol: { style: { width: '120px' } },
+    wrapperCol: { style: { width: 'auto' } },
+  });
+  const [
+    registerContractMoneyForm,
+    {
+      validate: validateContractMoneyForm,
+      getFieldsValue: getContractMoneyFieldsValue,
+      setFieldsValue: setContractMoneyFieldsValue,
+      updateSchema: updateContractMoneySchema,
+    },
+  ] = useForm({
+    //注册表单列
+    schemas: ContractMoneyFormSchemas,
+    showActionButtonGroup: false,
+    //回车提交
+    // autoSubmitOnEnter: true,
+    // //不显示重置按钮
+    // showResetButton: false,
+    //自定义提交按钮文本和图标
+    // submitButtonOptions: { text: '提交', preIcon: '' },
+    //查询列占比 24代表一行 取值范围 0-24
+    // actionColOptions: { span: 17 },
+    // size: "small",
+    // labelCol: { style: { width: '120px' } },
+    wrapperCol: { style: { width: 'auto' } },
+  });
 
+  let fileList = reactive<Array<any>>([]);
+  let projectId = ref('');
+  let isSubmitting = ref(false);
+  let dataTo = defineProps(['type', 'files', 'planinfoid', 'taskName']);
+  const emit = defineEmits(['close']);
+  //加载项目数据
+  onMounted(async () => {
+    console.log('dataTo', dataTo);
+    let resList = await getplaninfoByid({ planinfoid: dataTo.planinfoid });
+    let param: any = {
+      projectid: resList[0].projectId,
+    };
+    projectId.value = resList[0].projectId;
+    let res = await queryProjectInfoById(param);
+    if (dataTo.taskName == '立项审批') {
+      setApprovalMoneyFieldsValue({ approvalTotalMoney: res.urtEstimatedAmount });
+    }
+    if (dataTo.taskName == '合同签订') {
+      updateContractMoneySchema({
+        field: 'contractTotalMoney',
+        componentProps: {
+          precision: 2,
+          min: 0,
+          style: { width: '100%' },
+          max: res.urtEstimatedAmount,
+        },
+      });
+    }
+  });
 
-function httpRequest(option) {
-    fileList.push(option)
-    console.log(fileList, option)
-}
-function removeFile(option) {
+  function httpRequest(option) {
+    fileList.push(option);
+    console.log(fileList, option);
+  }
+  function removeFile(option) {
     for (let i = 0; i < fileList.length; i++) {
-        if (fileList[i].file.name == option.name) {
-            fileList.splice(i, 1)
-        }
+      if (fileList[i].file.name == option.name) {
+        fileList.splice(i, 1);
+      }
     }
-    console.log(fileList, option)
-
-}
-// 上传前处理
-function beforeUpload(file, item) {
-    console.log("file,item", file, item)
-    let fileSize = file.size
+    console.log(fileList, option);
+  }
+  // 上传前处理
+  function beforeUpload(file, item) {
+    console.log('file,item', file, item);
+    let fileSize = file.size;
     const FIVE_M = 500 * 1024 * 1024;
     //大于5M，不允许上传
     if (fileSize > FIVE_M) {
-        ElMessage.error("最大上传500M")
-        return false
+      message.error('最大上传500M');
+      return false;
     }
-    let geShi = ["xlx","xlsx", "docx", "doc", "pdf"] as Array<string>
-    if (geShi.indexOf(file.name.substring(file.name.lastIndexOf(".") + 1)) == -1) {
-        ElMessage.error('文件格式错误！仅支持' + "xlx,xlsx, docx, doc, pdf");
-        console.log('文件格式错误！仅支持' + "xlsx", "docx", "doc", "pdf")
-        return false;
+    let geShi = ['xlx', 'xlsx', 'docx', 'doc', 'pdf'] as Array<string>;
+    if (geShi.indexOf(file.name.substring(file.name.lastIndexOf('.') + 1)) == -1) {
+      message.error('文件格式错误！仅支持' + 'xlx,xlsx, docx, doc, pdf');
+      console.log('文件格式错误！仅支持' + 'xlsx', 'docx', 'doc', 'pdf');
+      return false;
     }
-    if (item.indexOf(file.name.substring(0,file.name.indexOf(".")))==-1) {
-        ElMessage.error('请上传文件:' + item);
-        return false;
+    if (item.indexOf(file.name.substring(0, file.name.indexOf('.'))) == -1) {
+      message.error('请上传文件:' + item);
+      return false;
     }
-    console.log('文件上传成功')
+    console.log('文件上传成功');
 
-    return true
-}
-// 文件数量过多时提醒
-function handleExceed() {
-    ElMessage.warning("最多只能上传一个文件")
-}
-//导入Excel病种信息数据
-async function submitImportForm() {
+    return true;
+  }
+  // 文件数量过多时提醒
+  function handleExceed() {
+    message.warning('最多只能上传一个文件');
+  }
+  //导入Excel病种信息数据
+  async function submitImportForm() {
     if (fileList.length == 0) {
-        ElMessage({
-            message: "未选择任何文件，无法上传！",
-            type: "error"
-        })
-        return
+      message.error('未选择任何文件，无法上传！');
+      return;
     }
     // type ==0新增，type ==1 是修改
-    if (fileList.length != dataTo.files.length && dataTo.type == 0) {
-        ElMessage({
-            message: "上传的文件不符合要求请检查",
-            type: "error"
-        })
-        return
+    //“可研报告初稿编制”阶段：需支持上传《可行性研究报告（初稿）》或《项目建议书》（支持上传文件数量为1-2份）
+    if (
+      dataTo.taskName.indexOf('可研报告初稿编制') >= 0 ||
+      dataTo.taskName.indexOf('可研报告终稿编制') >= 0
+    ) {
+      //有一个文件就行
+    } else {
+      if (fileList.length != dataTo.files.length && dataTo.type == 0) {
+        message.error('上传的文件不符合要求请检查');
+        return;
+      }
     }
+
     // // 使用form表单的数据格式
-    const params = new FormData()
+    const params = new FormData();
+    if (dataTo.taskName == '立项审批') {
+      if (await validateApprovalMoneyForm()) {
+        const approvalMoneyFieldsValue = getApprovalMoneyFieldsValue();
+        const {
+          approvalTotalMoney,
+          approvalCentralMoney,
+          approvalProvincialMoney,
+          approvalCityMoney,
+          approvalCountyMoney,
+          approvalSelfMoney,
+        } = approvalMoneyFieldsValue;
+
+        // 计算其他金额之和
+        const sumOfOtherAmounts =
+          approvalCentralMoney +
+          approvalProvincialMoney +
+          approvalCityMoney +
+          approvalCountyMoney +
+          approvalSelfMoney;
+        // 校验总金额是否等于其他金额之和
+        if (Math.abs(approvalTotalMoney - sumOfOtherAmounts) < Number.EPSILON) {
+          approvalMoneyFieldsValue['id'] = projectId.value;
+          params.append('approvalMoneyFieldsValue', JSON.stringify(approvalMoneyFieldsValue));
+        } else {
+          message.error('总金额与其他金额之和不相等，请重新输入！');
+          return;
+        }
+      } else {
+        return;
+      }
+    } else if (dataTo.taskName == '合同签订') {
+      if (await validateContractMoneyForm()) {
+        const contractMoneyFieldsValue = getContractMoneyFieldsValue();
+        const {
+          contractTotalMoney,
+          contractCentralMoney,
+          contractProvincialMoney,
+          contractCityMoney,
+          contractCountyMoney,
+          contractSelfMoney,
+        } = contractMoneyFieldsValue;
+
+        // 计算其他金额之和
+        const sumOfOtherAmounts =
+          contractCentralMoney +
+          contractProvincialMoney +
+          contractCityMoney +
+          contractCountyMoney +
+          contractSelfMoney;
+
+        // 校验总金额是否等于其他金额之和，使用Number.EPSILON进行比较
+        if (Math.abs(contractTotalMoney - sumOfOtherAmounts) < Number.EPSILON) {
+          contractMoneyFieldsValue['id'] = projectId.value;
+          params.append('contractMoneyFieldsValue', JSON.stringify(contractMoneyFieldsValue));
+        } else {
+          message.error('总金额与其他金额之和不相等，请重新输入！');
+
+          return;
+        }
+      } else {
+        return;
+      }
+    }
     // 将上传文件数组依次添加到参数paramsData中
     fileList.forEach((x) => {
-        console.log("xxxxxxxxxx", x, x.file)
-        params.append('file', x.file)
+      console.log('xxxxxxxxxx', x, x.file);
+      params.append('file', x.file);
     });
-    params.append("planinfoid", dataTo.planinfoid)
+    params.append('planinfoid', dataTo.planinfoid);
+    isSubmitting.value = true;
     if (dataTo.type == 0) {
-        planUploadFile(params).then(() => {
-            emit("close")
+      planUploadFile(params)
+        .then(() => {
+          emit('close');
         })
-    } else {
-        planUploadModifyFile(params).then(() => {
-            emit("close")
+        .catch(() => {
+          isSubmitting.value = false;
+        });
+    } else if(dataTo.type == 1){
+      planUploadModifyFile(params)
+        .then(() => {
+          emit('close');
         })
-
+        .catch(() => {
+          isSubmitting.value = false;
+        });
+    }else{
+      planREUploadFile(params)
+        .then(() => {
+          emit('close');
+        })
+        .catch(() => {
+          isSubmitting.value = false;
+        });
     }
-
-}
-function dialogVisible() {
-    emit("close")
-}
+  }
+  function dialogVisible() {
+    emit('close');
+  }
 </script>
 
 <style></style>
diff --git a/src/views/projectLib/projectPlan/index.vue b/src/views/projectLib/projectPlan/index.vue
index ff54c24..d2ec9ba 100644
--- a/src/views/projectLib/projectPlan/index.vue
+++ b/src/views/projectLib/projectPlan/index.vue
@@ -35,8 +35,8 @@ import viewPlanDetail from "@/views/projectLib/projectPlan/viewPlanDetail.vue";
 import { isShowByRoles } from '@/views/projectLib/projectInfo/projectInfo.api';
 
 import { columns } from '@/views/projectLib/projectInfo/projectInfo.data';
-import { searchFormSchema ,unitedTechnicalRevieColumns} from '@/views/projectLib/projectPlan/projectPlan.data';
-import { projectPlanPageList,getUnitedTechnicalReviewList } from '@/views/projectLib/projectPlan/projectPlan.api';
+import { searchFormSchema } from '@/views/projectLib/projectInfo/projectInfo.data';
+import { projectPlanPageList } from '@/views/projectLib/projectPlan/projectPlan.api';
 import { useRouter } from 'vue-router';  // 导入 useRouter
 
 const router = useRouter();
diff --git a/src/views/projectLib/projectPlan/planinfoFileDetail.vue b/src/views/projectLib/projectPlan/planinfoFileDetail.vue
index fbff0e1..4806bc2 100644
--- a/src/views/projectLib/projectPlan/planinfoFileDetail.vue
+++ b/src/views/projectLib/projectPlan/planinfoFileDetail.vue
@@ -1,11 +1,22 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" title="文件详情" width="1200px" :showOkBtn="false">
+  <BasicModal
+    v-bind="$attrs"
+    @register="registerModal"
+    title="文件详情"
+    width="1200px"
+    :showOkBtn="false"
+  >
     <el-divider content-position="left">{{ taskName }}</el-divider>
     <div>
+      <BasicForm @register="registerMoneyForm" v-if="taskName == '联合技术审查'" />
+      <BasicForm @register="registerApprovalMoneyForm" v-if="taskName == '立项审批'" />
+      <BasicForm @register="registerContractMoneyForm" v-if="taskName == '合同签订'" />
       <el-divider content-position="left">项目计划资料详情</el-divider>
       <PlanFileDetail :planinfoid="planinfoid" :stage="1" />
-      <el-divider content-position="left">项目计划审批文件列表</el-divider>
-      <PlanFileDetail :planinfoid="planinfoid" :stage="2" />
+      <el-divider content-position="left" v-if="taskName != '联合技术审查'"
+        >项目计划审批文件列表</el-divider
+      >
+      <PlanFileDetail :planinfoid="planinfoid" :stage="2" v-if="taskName != '联合技术审查'" />
       <div v-if="isfinish == 1">
         <ApprovalDetails :projectid="planinfoid" :stage="processName" />
       </div>
@@ -13,28 +24,101 @@
   </BasicModal>
 </template>
 <script lang="ts" name="Detailpage" setup>
-import { ref, onMounted } from 'vue'
-import { BasicModal, useModalInner } from '@/components/Modal';
-import {getProcessName} from "./projectPlan.api"
-import ApprovalDetails from "../../ProcessApprovalSubPage/component/ApprovalDetails.vue"
-import PlanFileDetail from "@/views/ProcessApprovalSubPage/component/PlanFileDetail.vue";
-
-const [registerModal, { closeModal }] = useModalInner(init);
-let processName = ref("")
-let planinfoid = ref()
-let taskName=ref()
-let isfinish=ref(0)
-onMounted(async () => {
-  // processName.value =await getProcessName(dataTo.planinfoid)
-})
-async function init(data) {
-  processName.value =await getProcessName({pid:data.planinfoid})
-  planinfoid.value = data.planinfoid
-  taskName.value = data.taskName
-  isfinish.value = data.isfinish
-
-}
-
+  import { ref, onMounted } from 'vue';
+  import { BasicModal, useModalInner } from '@/components/Modal';
+  import { getProcessName } from './projectPlan.api';
+  import ApprovalDetails from '../../ProcessApprovalSubPage/component/ApprovalDetails.vue';
+  import PlanFileDetail from '@/views/ProcessApprovalSubPage/component/PlanFileDetail.vue';
+  import { EstimateAmountFormSchemas } from '@/views/projectLib/projectPlan/projectPlan.data';
+  import { queryProjectInfoById } from '@/views/projectLib/projectInfo/projectInfo.api';
 
+  import { useForm, BasicForm } from '@/components/Form';
+  const [registerMoneyForm, { setFieldsValue: setMoneyFieldsValue }] = useForm({
+    //注册表单列
+    schemas: EstimateAmountFormSchemas,
+    showActionButtonGroup: false,
+    //回车提交
+    // autoSubmitOnEnter: true,
+    // //不显示重置按钮
+    // showResetButton: false,
+    //自定义提交按钮文本和图标
+    // submitButtonOptions: { text: '提交', preIcon: '' },
+    //查询列占比 24代表一行 取值范围 0-24
+    // actionColOptions: { span: 17 },
+    disabled: true,
+    // size: "small",
+    // labelCol: { style: { width: '120px' } },
+    wrapperCol: { style: { width: 'auto' } },
+  });
+  import { getProjectinfoMoneyInfo } from '@/views/projectLib/projectPlan/projectPlan.api';
+  import {
+    ApprovalMoneyFormSchemas,
+    ContractMoneyFormSchemas,
+  } from '@/views/projectLib/projectPlan/projectPlan.data';
+  const [registerApprovalMoneyForm, { setFieldsValue: setApprovalMoneyFieldsValue }] = useForm({
+    //注册表单列
+    schemas: ApprovalMoneyFormSchemas,
+    showActionButtonGroup: false,
+    //回车提交
+    // autoSubmitOnEnter: true,
+    // //不显示重置按钮
+    // showResetButton: false,
+    //自定义提交按钮文本和图标
+    // submitButtonOptions: { text: '提交', preIcon: '' },
+    //查询列占比 24代表一行 取值范围 0-24
+    // actionColOptions: { span: 17 },
+    // size: "small",
+    // labelCol: { style: { width: '120px' } },
+    disabled: true,
+    wrapperCol: { style: { width: 'auto' } },
+  });
+  const [registerContractMoneyForm, { setFieldsValue: setContractMoneyFieldsValue }] = useForm({
+    //注册表单列
+    schemas: ContractMoneyFormSchemas,
+    showActionButtonGroup: false,
+    //回车提交
+    // autoSubmitOnEnter: true,
+    // //不显示重置按钮
+    // showResetButton: false,
+    //自定义提交按钮文本和图标
+    // submitButtonOptions: { text: '提交', preIcon: '' },
+    //查询列占比 24代表一行 取值范围 0-24
+    // actionColOptions: { span: 17 },
+    // size: "small",
+    // labelCol: { style: { width: '120px' } },
+    disabled: true,
+    wrapperCol: { style: { width: 'auto' } },
+  });
+  const [registerModal, { closeModal }] = useModalInner(init);
+  let processName = ref('');
+  let planinfoid = ref();
+  let taskName = ref();
+  let isfinish = ref(0);
+  onMounted(async () => {
+    // processName.value =await getProcessName(dataTo.planinfoid)
+  });
+  async function init(data) {
+    processName.value = await getProcessName({ pid: data.planinfoid });
+    planinfoid.value = data.planinfoid;
+    taskName.value = data.taskName;
+    isfinish.value = data.isfinish;
+    if (taskName.value == '立项审批') {
+      let res = await getProjectinfoMoneyInfo({
+        projectid: data.projectid,
+      });
+      setApprovalMoneyFieldsValue(res);
+    } else if (taskName.value == '合同签订') {
+      let res = await getProjectinfoMoneyInfo({
+        projectid: data.projectid,
+      });
+      setContractMoneyFieldsValue(res);
+    } else if (taskName.value == '联合技术审查') {
+      let param: any = {
+        projectid: data.projectid,
+      };
+      let res = await queryProjectInfoById(param);
+      setMoneyFieldsValue(res);
+    }
+  }
 </script>
 <style></style>
diff --git a/src/views/projectLib/projectPlan/projectPlan.api.ts b/src/views/projectLib/projectPlan/projectPlan.api.ts
index 451ce40..f88fdff 100644
--- a/src/views/projectLib/projectPlan/projectPlan.api.ts
+++ b/src/views/projectLib/projectPlan/projectPlan.api.ts
@@ -22,11 +22,16 @@ export enum Api {
   getPlanFileApprovalInfoByPlaninfoId="/huzhouPlaninfofile/getPlanFileApprovalInfoByPlaninfoId",
   downloadPlanInfo="/huzhouPlan/downloadPlanInfo",
   getUnitedTechnicalReviewList='/huzhouProject/getUnitedTechnicalReviewList',
-  uploadURTFile='/huzhouUploadfileinfo/uploadURTFile'
+  uploadURTFile='/huzhouUploadfileinfo/uploadURTFile',
+  getProjectinfoMoneyInfo="/huzhouProjectinfoMoney/getProjectinfoMoneyInfo",
+  planREUploadFile="/huzhouPlaninfofile/planREUploadFile",
+  
 }
 /**
  * 提交入库申请流程
  */
+export const getProjectinfoMoneyInfo = (params) => defHttp.get({ url: Api.getProjectinfoMoneyInfo, params })
+
 export const projectPlanPageList = (params) => defHttp.get({ url: Api.projectPlanPageList, params })
 export const getProcessName = (params) => defHttp.get({ url: Api.getProcessName, params })
 
@@ -41,6 +46,8 @@ export const queryProjectPlan = (params) => defHttp.get({ url: Api.queryProjectP
 export const submitplaninfoUploadFile =  (params?) =>defHttp.post({ url: Api.submitplaninfoUploadFile,headers:{ "Content-Type": "multipart/form-data" }, params })
 export const queryPlanInfoMainTimeline = (params) => defHttp.get({ url: Api.queryPlanInfoMainTimeline, params })
 export const planUploadFile =  (params?) =>defHttp.post({ url: Api.planUploadFile,headers:{ "Content-Type": "multipart/form-data" }, params })
+export const planREUploadFile =  (params?) =>defHttp.post({ url: Api.planREUploadFile,headers:{ "Content-Type": "multipart/form-data" }, 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 })
 export const modifyPlaninfo =  (params?) =>defHttp.post({ url: Api.modifyPlaninfo,headers:{ "Content-Type": "multipart/form-data" }, params })
diff --git a/src/views/projectLib/projectPlan/projectPlan.data.ts b/src/views/projectLib/projectPlan/projectPlan.data.ts
index 46cdfec..c89a106 100644
--- a/src/views/projectLib/projectPlan/projectPlan.data.ts
+++ b/src/views/projectLib/projectPlan/projectPlan.data.ts
@@ -1,8 +1,5 @@
 import { BasicColumn } from '@/components/Table';
-
-
-
-
+import { FormSchema } from '@/components/Form';
 
 export const PlaninfoColumn: BasicColumn[] = [
 
@@ -216,3 +213,256 @@ export const unitedTechnicalRevieColumns: BasicColumn[] = [
     },
   },
 ];
+export const EstimateAmountFormSchemas: FormSchema[] = [
+  {
+    //标题名称
+    label: '项目申报金额(元)',
+    //字段
+    field: 'totalMoney',
+    labelWidth: 'auto',
+    component: 'Input',
+    componentProps:{
+      precision:2,
+    },
+    colProps: { span: 6 },
+    dynamicDisabled:true,
+    defaultValue:2000
+  },
+  {
+    //标题名称
+    label: '联合审查估算金额(元)',
+    //字段
+    field: 'urtEstimatedAmount',
+    labelWidth: 'auto',
+    component: "InputNumber",
+    required: true,
+    componentProps: ({ formModel, formActionType }) => {
+      return {
+        //
+        style: { width: '100%' },
+        min:0,
+        precision:2,
+        max:formModel.totalMoney,
+        onChange: async (value, option) => {
+          let hejian = formModel.totalMoney-value
+          // formModel.manageContactor = undefined; //  reset city value
+          const { updateSchema, setFieldsValue } = formActionType;
+          if (value >= 0) {
+            updateSchema({
+              field: 'hejian',
+              suffix: String(((hejian/formModel.totalMoney)*100).toFixed(2))+'%',
+            });
+            setFieldsValue({ hejian: hejian })
+          }
+        },
+      };
+    },
+    colProps: { span: 8 },
+  },
+  {
+    //标题名称
+    label: '核减金额(元)',
+    //字段
+    field: 'hejian',
+    component: 'Input',
+    dynamicDisabled:true,
+    componentProps:{
+      precision:2,
+    },
+    colProps: { span: 6 },
+  },
+  
+]
+export const ApprovalMoneyFormSchemas: FormSchema[] = [
+  {
+    //标题名称
+    label: '项目总金额(元)',
+    //字段
+    field: 'approvalTotalMoney',
+    labelWidth: 'auto',
+    component: 'InputNumber',
+    componentProps:{
+      precision:2,
+      style: { width: '100%' },
+    },
+    colProps: { span: 6 },
+    dynamicDisabled:true,
+    defaultValue:2000
+  },
+  {
+    //标题名称
+    label: '中央资金(元)',
+    //字段
+    field: 'approvalCentralMoney',
+    labelWidth: 'auto',
+    componentProps:{
+      precision:2,
+      min:0,
+      style: { width: '100%' },
+    },
+    required: true,
+    component: 'InputNumber',
+    colProps: { span: 6 }, 
+  },
+  {
+    //标题名称
+    label: '省级资金(元)',
+    //字段
+    field: 'approvalProvincialMoney',
+    labelWidth: 'auto',
+    required: true,
+    componentProps:{
+      precision:2,
+      min:0,
+      style: { width: '100%' },
+    },
+    component: 'InputNumber',
+    colProps: { span: 6 },
+  },
+  {
+    //标题名称
+    label: '市级资金(元)',
+    //字段
+    field: 'approvalCityMoney',
+    labelWidth: 'auto',
+    required: true,
+    componentProps:{
+      precision:2,
+      min:0,
+      style: { width: '100%' },
+    },
+    component: 'InputNumber',
+    colProps: { span: 6 },
+  },
+  {
+    //标题名称
+    label: '区县级资金(元)',
+    //字段
+    field: 'approvalCountyMoney',
+    labelWidth: 'auto',
+    required: true,
+    componentProps:{
+      precision:2,
+      min:0,
+      style: { width: '100%' },
+    },
+    //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType
+    component: 'InputNumber',
+    colProps: { span: 6 },
+  },
+
+  {
+    //标题名称
+    label: '自筹资金(元)',
+    //字段
+    field: 'approvalSelfMoney',
+    labelWidth: 'auto',
+    required: true,
+    componentProps:{
+      precision:2,
+      min:0,
+      style: { width: '100%' },
+    },
+    //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType
+    component: 'InputNumber',
+    colProps: { span: 6 },
+  },
+  
+]
+export const ContractMoneyFormSchemas: FormSchema[] = [
+  {
+    //标题名称
+    label: '合同总金额(元)',
+    //字段
+    field: 'contractTotalMoney',
+    labelWidth: 'auto',
+    component: 'InputNumber',
+    componentProps:{
+      precision:2,
+      min:0,
+      style: { width: '100%' },
+    },
+    colProps: { span: 6 },
+    required:true,
+    defaultValue:0
+  },
+  {
+    //标题名称
+    label: '中央资金(元)',
+    //字段
+    field: 'contractCentralMoney',
+    labelWidth: 'auto',
+    componentProps:{
+      precision:2,
+      min:0,
+      style: { width: '100%' },
+    },
+    required: true,
+    component: 'InputNumber',
+    colProps: { span: 6 }, 
+  },
+  {
+    //标题名称
+    label: '省级资金(元)',
+    //字段
+    field: 'contractProvincialMoney',
+    labelWidth: 'auto',
+    required: true,
+    componentProps:{
+      precision:2,
+      min:0,
+      style: { width: '100%' },
+    },
+    component: 'InputNumber',
+    colProps: { span: 6 },
+  },
+  {
+    //标题名称
+    label: '市级资金(元)',
+    //字段
+    field: 'contractCityMoney',
+    labelWidth: 'auto',
+    required: true,
+    componentProps:{
+      precision:2,
+      min:0,
+      style: { width: '100%' },
+    },
+    component: 'InputNumber',
+    colProps: { span: 6 },
+  },
+  {
+    //标题名称
+    label: '区县级资金(元)',
+    //字段
+    field: 'contractCountyMoney',
+    labelWidth: 'auto',
+    required: true,
+    componentProps:{
+      precision:2,
+      min:0,
+      style: { width: '100%' },
+    },
+    //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType
+    component: 'InputNumber',
+    colProps: { span: 6 },
+  },
+
+  {
+    //标题名称
+    label: '自筹资金(元)',
+    //字段
+    field: 'contractSelfMoney',
+    labelWidth: 'auto',
+    required: true,
+    componentProps:{
+      precision:2,
+      min:0,
+      style: { width: '100%' },
+    },
+    //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType
+    component: 'InputNumber',
+    colProps: { span: 6 },
+  },
+  
+]
\ No newline at end of file
diff --git a/src/views/projectLib/projectPlan/showtu.vue b/src/views/projectLib/projectPlan/showtu.vue
new file mode 100644
index 0000000..32ea2e3
--- /dev/null
+++ b/src/views/projectLib/projectPlan/showtu.vue
@@ -0,0 +1,126 @@
+<template>
+  <div>
+    <el-row>
+      <el-col :span="24">
+        项目进度：<Progress :size="15" :percent="activities[0]?.totalPercent"></Progress>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24">
+        <el-steps finish-status="success" :active="activities.status">
+          <el-step
+            v-for="(item, index) in activities"
+            :key="index"
+            :status="item.isfinish == 2 ? 'success' : 'wait'"
+          >
+            <template #title>
+              <div>
+                {{ item.taskName }}
+              </div>
+              <div>
+                {{ item.scheduledStartTime + '--' + item.scheduledEndTime }}
+              </div>
+            </template>
+            <template #description>
+              <elstepchild v-if="item.children != null" :child="item.children"></elstepchild>
+            </template>
+            <template #icon>
+              <Progress
+                type="circle"
+                :percent="item.percent"
+                :size="40"
+                :status="item.progressStatus"
+              ></Progress>
+            </template>
+          </el-step>
+        </el-steps>
+      </el-col>
+    </el-row>
+  </div>
+
+</template>
+<script lang="ts" name="viewPlanDetail" setup>
+  import { ref, onMounted } from 'vue';
+  import elstepchild from './elstepchild.vue';
+  import { Progress, message } from 'ant-design-vue';
+
+
+  let dataTo = defineProps(["res"]);
+  let activities = ref([]);
+  onMounted(() => {
+    activities.value=dataTo.res
+  });
+
+  
+</script>
+<style scoped>
+  .timeline {
+    display: flex;
+    width: 100%;
+    margin-bottom: 100px;
+
+    .lineitem {
+      transform: translateX(50%);
+      width: 25%;
+    }
+  }
+
+  :deep(.el-timeline-item__tail) {
+    border-left: none;
+    border-top: 2px solid #e4e7ed;
+    width: 100%;
+    position: absolute;
+    top: 9px;
+  }
+
+  :deep(.el-timeline-item__wrapper) {
+    padding-left: 0;
+    position: absolute;
+    top: 20px;
+    transform: translateX(-50%);
+    text-align: center;
+  }
+
+  :deep(.el-timeline-item__timestamp) {
+    font-size: 14px;
+  }
+
+  .el-row {
+    margin-bottom: 25px;
+    margin-top: 25px;
+  }
+
+  .componentA {
+    position: absolute;
+    z-index: 1;
+    /* 设置较低的z-index值 */
+    /* 其他样式 */
+  }
+
+  .componentB {
+    position: absolute;
+    z-index: 2;
+    /* 设置较高的z-index值 */
+    /* 其他样式 */
+  }
+
+  .custom-content {
+    position: absolute;
+    top: 0;
+    transform: translateX(-50%);
+    transition: left 0.3s;
+    z-index: 3;
+    margin-top: 20px;
+  }
+
+  .italicize {
+    /* transform: skew(15deg); 使用 transform 属性进行倾斜 */
+    transform: rotate(-45deg);
+    display: inline-block;
+    /* 需要将元素设为块级元素才能应用transform属性 */
+    z-index: 4;
+    margin-top: -20px;
+    color: #ea1212;
+    font-size: large;
+  }
+</style>
diff --git a/src/views/projectLib/projectPlan/uploadURTfile.vue b/src/views/projectLib/projectPlan/uploadURTfile.vue
index ec4eb99..e0eae97 100644
--- a/src/views/projectLib/projectPlan/uploadURTfile.vue
+++ b/src/views/projectLib/projectPlan/uploadURTfile.vue
@@ -8,6 +8,8 @@
     :showOkBtn="false"
     :showCancelBtn="false"
   >
+    <BasicForm @register="registerMoneyForm" />
+
     <el-divider content-position="left">上传《部门联审意见》</el-divider>
 
     <el-form ref="importFormRef">
@@ -48,7 +50,7 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button type="primary" @click="submitImportForm">开始导入</el-button>
+        <el-button type="primary" @click="submitImportForm" :disabled="isSubmitting">开始导入</el-button>
         <el-button type="info" @click="dialogVisible">关闭窗口</el-button>
       </el-form-item>
     </el-form>
@@ -56,17 +58,50 @@
 </template>
 <script lang="ts" name="setProjectWorkReport" setup>
   import { reactive, defineEmits, onMounted, ref } from 'vue';
-  import { ElMessage } from 'element-plus';
+  import { message } from 'ant-design-vue';
 
   import { useModalInner, BasicModal } from '@/components/Modal';
   import { uploadURTFile } from '@/views/projectLib/projectPlan/projectPlan.api';
   import { queryProjectInfoById } from '@/views/projectLib/projectInfo/projectInfo.api';
+  import { EstimateAmountFormSchemas } from '@/views/projectLib/projectPlan/projectPlan.data';
   const [registerModal, { closeModal }] = useModalInner(init);
+  import { useForm, BasicForm } from '@/components/Form';
+  let projectid = ref('');
+  const [
+    registerMoneyForm,
+    {
+      validate: validateMoneyForm,
+      getFieldsValue: getMoneyFieldsValue,
+      setFieldsValue: setMoneyFieldsValue,
+    },
+  ] = useForm({
+    //注册表单列
+    schemas: EstimateAmountFormSchemas,
+    showActionButtonGroup: false,
+    //回车提交
+    // autoSubmitOnEnter: true,
+    // //不显示重置按钮
+    // showResetButton: false,
+    //自定义提交按钮文本和图标
+    // submitButtonOptions: { text: '提交', preIcon: '' },
+    //查询列占比 24代表一行 取值范围 0-24
+    // actionColOptions: { span: 17 },
+    // size: "small",
+    // labelCol: { style: { width: '120px' } },
+    wrapperCol: { style: { width: 'auto' } },
+  });
   let fileList = reactive<Array<any>>([]);
   let planinfoid = ref('');
+  let isSubmitting = ref(false);
   async function init(data) {
     console.log('datadatadata', data);
     planinfoid.value = data.planinfoid;
+    projectid.value = data.projectid;
+    let param: any = {
+      projectid: projectid.value,
+    };
+    let res = await queryProjectInfoById(param);
+    setMoneyFieldsValue(res);
   }
 
   const emit = defineEmits(['close']);
@@ -92,17 +127,17 @@
     const FIVE_M = 500 * 1024 * 1024;
     //大于5M，不允许上传
     if (fileSize > FIVE_M) {
-      ElMessage.error('最大上传500M');
+      message.error('最大上传500M');
       return false;
     }
     // let geShi = ['xlx', 'xlsx', 'docx', 'doc', 'pdf'] as Array<string>;
     // if (geShi.indexOf(file.name.substring(file.name.indexOf('.') + 1)) == -1) {
-    //     ElMessage.error('文件格式错误！仅支持' + 'xlx,xlsx, docx, doc, pdf');
+    //     message.error('文件格式错误！仅支持' + 'xlx,xlsx, docx, doc, pdf');
     //     console.log('文件格式错误！仅支持' + 'xlsx', 'docx', 'doc', 'pdf');
     //     return false;
     // }
     // if (item.indexOf(file.name.substring(0, file.name.indexOf('.'))) == -1) {
-    //     ElMessage.error('请上传文件:' + item);
+    //     message.error('请上传文件:' + item);
     //     return false;
     // }
     console.log('文件上传成功');
@@ -111,15 +146,12 @@
   }
   // 文件数量过多时提醒
   function handleExceed() {
-    ElMessage.warning('最多只能上传十个文件');
+    message.warning('最多只能上传十个文件');
   }
   //导入Excel病种信息数据
   async function submitImportForm() {
     if (fileList.length == 0) {
-      ElMessage({
-        message: '未选择任何文件，无法上传！',
-        type: 'error',
-      });
+      message.error('未选择任何文件，无法上传！');
       return;
     }
     let cunzai = false;
@@ -130,20 +162,29 @@
       }
     });
     if (!cunzai) {
-      ElMessage.error('请上传《部门联审意见》');
+      message.error('请上传《部门联审意见》');
       return;
     }
-    // // 使用form表单的数据格式
-    const params = new FormData();
-    // 将上传文件数组依次添加到参数paramsData中
-    fileList.forEach((x) => {
-      console.log('xxxxxxxxxx', x, x.file);
-      params.append('file', x.file);
-    });
-    params.append('planinfoid', planinfoid.value);
-    uploadURTFile(params).then(() => {
-      emit('close');
-    });
+    if (await validateMoneyForm()) {
+      let moneydata = await getMoneyFieldsValue();
+      // // 使用form表单的数据格式
+      const params = new FormData();
+      // 将上传文件数组依次添加到参数paramsData中
+      fileList.forEach((x) => {
+        console.log('xxxxxxxxxx', x, x.file);
+        params.append('file', x.file);
+      });
+      params.append('urtEstimatedAmount', moneydata.urtEstimatedAmount);
+      params.append('planinfoid', planinfoid.value);
+      isSubmitting.value = true;
+      uploadURTFile(params).then(() => {
+        emit('close');
+      }).catch(() => {
+        isSubmitting.value = false;
+      });
+    } else {
+      message.error('请正确填写联合审查估算金额');
+    }
   }
   function dialogVisible() {
     emit('close');
diff --git a/src/views/projectLib/projectPlan/viewPlanDetail.vue b/src/views/projectLib/projectPlan/viewPlanDetail.vue
index d41f897..8ce3a50 100644
--- a/src/views/projectLib/projectPlan/viewPlanDetail.vue
+++ b/src/views/projectLib/projectPlan/viewPlanDetail.vue
@@ -89,6 +89,7 @@
       :type="type"
       :planinfoid="planinfoid"
       :files="fileArr"
+      :taskName="taskName"
       @close="closePlanFileModal()"
     />
   </BasicModal>
@@ -103,6 +104,15 @@
     <planFileApproval :record="recordData" @close="closeplanFile" />
   </BasicModal>
   <uploadURTfile @register="registerUnitedTechnicalReview" @close="closePlanFileModal" />
+  <BasicModal
+    @register="registerMessageInfo"
+    title="提示信息"
+    :showOkBtn="true"
+    :showCancelBtn="true"
+    @ok="okMessageInfo"
+  >
+    <h1>{{ messageInfo }}</h1>
+  </BasicModal>
 </template>
 <script lang="ts" name="viewPlanDetail" setup>
   import { ref, onMounted } from 'vue';
@@ -133,6 +143,8 @@
   let fileArr = ref([]);
   let planinfoid = ref();
   let taskName = ref();
+  let UnitedTechnicalReviewmode = ref('');
+  let messageInfo = ref('');
   let recordData = ref({});
   const [registeruploadFile, { openModal: openPlanFile, closeModal: closePlanFile }] = useModal(); //文件上传和查看
   const [
@@ -144,6 +156,8 @@
     registerUnitedTechnicalReview,
     { openModal: openUnitedTechnicalReviewmode, closeModal: closeUnitedTechnicalReviewmode },
   ] = useModal(); //新增修改周月报页面
+  const [registerMessageInfo, { openModal: openMessageInfo, closeModal: closeMessageInfo }] =
+    useModal(); //显示消息
 
   onMounted(() => {
     queryPlanInfoMainTimeline({
@@ -227,6 +241,24 @@
           confirm: handlefinish.bind(null, record),
         },
       },
+      {
+        label: '重新上传',
+        ifShow: () => {
+          if (
+            record.isfinish ==2 &&
+            record.taskFile?.length > 0 &&(
+            record.taskName == '可研报告初稿编制' ||
+            record.taskName == '可研报告终稿编制')
+          ) {
+            if (isShowByRoles('projectContact')) {
+              return true;
+            }
+            return false;
+          }
+          return false;
+        },
+        onClick: handleREuploadfile.bind(null, record),
+      },
     ];
   }
 
@@ -235,18 +267,45 @@
       planinfoid: record.id,
       taskName: record.taskName,
       isfinish: record.isfinish,
+      projectid: dataTo.projectId,
     });
   }
+  async function handleREuploadfile(record) {
+        //重新上传
+        taskName.value = record.taskName;
+    type.value = record.isfinish;
+    if (record.taskFile.includes(',')) {
+      fileArr.value = record.taskFile.split(',');
+    } else {
+      fileArr.value = record.taskFile.split('，');
+    }
+    if (record.taskName.indexOf('可研报告初稿编制') >= 0) {
+      fileArr.value.push("《项目建议书》");
+    }else if (record.taskName.indexOf('可研报告终稿编制') >= 0) {
+      fileArr.value.push("《项目建议书》");
+
+    }
+    planinfoid.value = record.id;
+    openPlanFile();
+  }
   async function handleuploadfile(record) {
+    taskName.value = record.taskName;
     type.value = record.isfinish;
-    if(record.taskFile.includes(',')){
+    if (record.taskFile.includes(',')) {
       fileArr.value = record.taskFile.split(',');
-    }else{
+    } else {
       fileArr.value = record.taskFile.split('，');
     }
+    if (record.taskName.indexOf('可研报告初稿编制') >= 0) {
+      fileArr.value.push("《项目建议书》");
+    }else if (record.taskName.indexOf('可研报告终稿编制') >= 0) {
+      fileArr.value.push("《项目建议书》");
+
+    }
+    fileArr.value.push()
     planinfoid.value = record.id;
-    let tableData = await getDataSource();
-    console.log('tableData', tableData);
+    // let tableData = await getDataSource();
+    // console.log('tableData', tableData);
     //项目立项阶段先后顺序限制取消
     // for (let i = 0; i < tableData[0].children.length; i++) {
     //   let child = tableData[0].children[i];
@@ -260,8 +319,28 @@
     //     }
     //   }
     // }
-    if (record.taskName == '联合技术审查') {
-      openUnitedTechnicalReviewmode(true, { planinfoid: record.id });
+    if (record.taskName.indexOf('联合技术审查') >= 0) {
+      UnitedTechnicalReviewmode.value = record.id;
+      messageInfo.value = '如项目涉及申报资金变更的，请先进行资金变更流程';
+      openMessageInfo();
+      //先给提示信息，在打开
+    } else {
+      if (record.taskName.indexOf('招标文件编制') >= 0) {
+        messageInfo.value = '要求在招标文件公示前请线下与任务牵头处室进行交流，在公示后再进行上传';
+        openMessageInfo();
+      } else {
+        openPlanFile();
+      }
+    }
+  }
+
+  async function okMessageInfo() {
+    closeMessageInfo();
+    if (taskName.value.indexOf('联合技术审查') >= 0) {
+      openUnitedTechnicalReviewmode(true, {
+        planinfoid: UnitedTechnicalReviewmode.value,
+        projectid: dataTo.projectId,
+      });
     } else {
       openPlanFile();
     }