新增项目计划立项部分变更

src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue

@@ -25,7 +25,7 @@ import uploadURTfileApproval from '../uploadURTfileApproval.vue'
 import MergeProjectApprova from '../MergeProjectApprova.vue'
 import SplitProjectApprova from '../SplitProjectApprova.vue'
 
-const planfileNames = ["feasibilityReportPreparation","jointTechnicalReview","centralizedCheck","createPlaninfoFile","bidDocumentsPreparation"]
+const planfileNames = ["feasibilityTechReviewConfirm","finalFeasibilityReportDraft","centralizedCheck","createPlaninfoFile","bidDocumentsPreparation","costEvalReportConfirm"]
 const [registerModal, { closeModal }] = useModalInner(init);
 defineProps(["record"])
 

src/views/ProcessApprovalSubPage/planFileApproval.vue

@@ -19,7 +19,7 @@
       <el-divider content-position="left" v-if="resButton.isEdit">重新上传项目计划资料</el-divider>
       <div
         v-if="resButton.isEdit"
-        style="display: flex; justify-content: center; align-items: center; height: 100px"
+        style="display: flex; justify-content: center; align-items: center; height: 400px"
       >
         <el-form ref="importFormRef">
           <el-form-item

src/views/projectLib/projectInfo/index.vue

@@ -39,7 +39,7 @@
         <el-button type="primary" round @click="handleBatchdownload"> 导出项目</el-button>
       </template>
       <template #toolbar>
-        <!-- <el-button
+        <el-button
           style="background-color: #ff7f24; color: aliceblue"
           round
           @click="handlesplitinfo()"
@@ -54,7 +54,7 @@
           v-if="isShowByRoles('projectContact')"
         >
           合并项目</el-button
-        > -->
+        >
         <el-button
           type="primary"
           round

src/views/projectLib/projectPlan/viewPlanDetail.vue

@@ -26,7 +26,6 @@
 
     </el-row> -->
     <el-row>
-
       <el-col :span="24">
         项目进度：<Progress :size="15" :percent="activities[0]?.totalPercent"></Progress>
       </el-col>
@@ -34,25 +33,33 @@
     <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'">
+          <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 }}
+                {{ 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>
+              <Progress
+                type="circle"
+                :percent="item.percent"
+                :size="40"
+                :status="item.progressStatus"
+              ></Progress>
             </template>
           </el-step>
         </el-steps>
       </el-col>
-
     </el-row>
   </div>
 
@@ -63,65 +70,90 @@
       <TableAction :actions="getTableAction(record)" />
     </template>
     <template #tableTitle>
-      <el-button type="primary" @click="handledownload" v-if="isShowByRoles('manageOrg,supervisor')">下载</el-button>
+      <el-button type="primary" @click="handledownload" v-if="isShowByRoles('manageOrg,supervisor')"
+        >下载</el-button
+      >
     </template>
   </BasicTable>
   <div v-if="dataTo.projectStage == 4">
     <ApprovalDetails :projectid="projectId" stage="createPlaninfo" />
   </div>
-  <BasicModal @register="registeruploadFile" title="上传文件" width="1200px" :showOkBtn="false" :showCancelBtn="false">
+  <BasicModal
-    <addPlanFile :type="type" :planinfoid="planinfoid" :files="fileArr" @close="closePlanFileModal()" />
+    @register="registeruploadFile"
+    title="上传文件"
+    width="1200px"
+    :showOkBtn="false"
+    :showCancelBtn="false"
+  >
+    <addPlanFile
+      :type="type"
+      :planinfoid="planinfoid"
+      :files="fileArr"
+      @close="closePlanFileModal()"
+    />
   </BasicModal>
   <planinfoFileDetail @register="registerFileInfo" />
-  <BasicModal @register="registerplanFileApproval" title="文件审批" width="1200px" :showOkBtn="false"
+  <BasicModal
-    :showCancelBtn="false">
+    @register="registerplanFileApproval"
+    title="文件审批"
+    width="1200px"
+    :showOkBtn="false"
+    :showCancelBtn="false"
+  >
     <planFileApproval :record="recordData" @close="closeplanFile" />
   </BasicModal>
   <uploadURTfile @register="registerUnitedTechnicalReview" @close="closePlanFileModal" />
-
 </template>
 <script lang="ts" name="viewPlanDetail" setup>
-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';
-import planinfoFileDetail from './planinfoFileDetail.vue'
+  import planinfoFileDetail from './planinfoFileDetail.vue';
   import { Progress, message } from 'ant-design-vue';
   import { BasicModal } from '@/components/Modal';
   import { PlaninfoColumn } from './projectPlan.data';
-import { queryPlanInfoMainTimeline, getPlanFileApprovalInfoByPlaninfoId, planUploadFile, downloadPlanInfo } from './projectPlan.api'
+  import {
+    queryPlanInfoMainTimeline,
+    getPlanFileApprovalInfoByPlaninfoId,
+    planUploadFile,
+    downloadPlanInfo,
+  } from './projectPlan.api';
   import { ActionItem, BasicTable, TableAction, useTable } from '@/components/Table';
   import { useModal } from '@/components/Modal';
-import ApprovalDetails from "../../ProcessApprovalSubPage/component/ApprovalDetails.vue"
+  import ApprovalDetails from '../../ProcessApprovalSubPage/component/ApprovalDetails.vue';
-import planFileApproval from '@/views/ProcessApprovalSubPage/planFileApproval.vue'
+  import planFileApproval from '@/views/ProcessApprovalSubPage/planFileApproval.vue';
   import { isShowByRoles } from '../../projectLib/projectInfo/projectInfo.api';
-import uploadURTfile from "@/views/projectLib/projectPlan/uploadURTfile.vue"
+  import uploadURTfile from '@/views/projectLib/projectPlan/uploadURTfile.vue';
-
+
-let dataTo = defineProps(["projectId", "projectStage"])
+  let dataTo = defineProps(['projectId', 'projectStage']);
-let projectId = ref(dataTo.projectId)
+  let projectId = ref(dataTo.projectId);
-let isfinish = ref()
+  let isfinish = ref();
-let activities = ref([])
+  let activities = ref([]);
-let type = ref(1)
+  let type = ref(1);
-let fileArr = ref([])
+  let fileArr = ref([]);
-let planinfoid = ref()
+  let planinfoid = ref();
-let taskName = ref()
+  let taskName = ref();
-let recordData = ref({})
+  let recordData = ref({});
   const [registeruploadFile, { openModal: openPlanFile, closeModal: closePlanFile }] = useModal(); //文件上传和查看
-const [registerplanFileApproval, { openModal: openplanFileApproval, closeModal: closeplanFileApproval }] = useModal();//文件上传和查看
+  const [
+    registerplanFileApproval,
+    { openModal: openplanFileApproval, closeModal: closeplanFileApproval },
+  ] = useModal(); //文件上传和查看
   const [registerFileInfo, { openModal: openFileInfo }] = useModal(); //文件上传和查看
-const [registerUnitedTechnicalReview, { openModal:openUnitedTechnicalReviewmode,closeModal:closeUnitedTechnicalReviewmode}] = useModal();//新增修改周月报页面
+  const [
+    registerUnitedTechnicalReview,
+    { openModal: openUnitedTechnicalReviewmode, closeModal: closeUnitedTechnicalReviewmode },
+  ] = useModal(); //新增修改周月报页面
 
   onMounted(() => {
     queryPlanInfoMainTimeline({
-    projectid: dataTo.projectId
+      projectid: dataTo.projectId,
-  }).then(res => {
+    }).then((res) => {
-    activities.value = res
+      activities.value = res;
-    console.log("activities", activities)
+      console.log('activities', activities);
-  })
+    });
-  console.log("projectid1111111111", activities, dataTo.projectId)
+    console.log('projectid1111111111', activities, dataTo.projectId);
-
+  });
-})
-
-
 
   // 项目入库审批table
   const [registerTable, { reload, getDataSource }] = useTable({
@@ -130,7 +162,7 @@ const [registerTable, { reload,getDataSource }] = useTable({
     api: queryPlanInfoMainTimeline,
     columns: PlaninfoColumn,
     // showActionColumn: true,
-  rowKey: "taskName",
+    rowKey: 'taskName',
     showIndexColumn: false,
     useSearchForm: false,
     actionColumn: {
@@ -146,42 +178,48 @@ const [registerTable, { reload,getDataSource }] = useTable({
 
   function getTableAction(record): ActionItem[] {
     if (dataTo.projectStage == 4) {
-    return []
+      return [];
     }
     return [
       {
         label: '详情',
         ifShow: () => {
           if (record.isfinish >= 1) {
-          return true
+            return true;
           }
-        return false
+          return false;
         },
         onClick: handleDetail.bind(null, record),
       },
       {
         label: '上传资料',
         ifShow: () => {
-        if (record.isfinish == 0 && record.taskFile?.length > 0) {
+          if (
+            record.isfinish == 0 &&
+            record.taskFile?.length > 0 &&
+            record.taskName != '可研技术审查报告确认' &&
+            record.taskName != '造价评估报告确认'
+          ) {
             if (isShowByRoles('projectContact')) {
-            return true
+              return true;
             }
-          return false
+            return false;
           }
-        return false
+          return false;
         },
-      onClick: handleuploadfile.bind(null, record)
+        onClick: handleuploadfile.bind(null, record),
       },
       {
         label: '完成',
         ifShow: () => {
-        if (record.isfinish == 0 && record.children == null && record.taskFile?.length == 0) {//归档流程中不允许修改
+          if (record.isfinish == 0 && record.children == null && record.taskFile?.length == 0) {
+            //归档流程中不允许修改
             if (isShowByRoles('projectContact')) {
-            return true
+              return true;
             }
-          return false
+            return false;
           }
-        return false
+          return false;
         },
         // onClick: handleModifyuploadfile.bind(null, record)
         popConfirm: {
@@ -193,67 +231,67 @@ function getTableAction(record): ActionItem[] {
   }
 
   function handleDetail(record) {
-
+    openFileInfo(true, {
-  openFileInfo(true, { planinfoid: record.id, taskName: record.taskName, isfinish: record.isfinish })
+      planinfoid: record.id,
-
+      taskName: record.taskName,
+      isfinish: record.isfinish,
+    });
   }
   async function handleuploadfile(record) {
-  type.value = record.isfinish
+    type.value = record.isfinish;
-  fileArr = record.taskFile.split(",")
+    fileArr = record.taskFile.split(',');
-  planinfoid.value = record.id
+    planinfoid.value = record.id;
-  let tableData = await getDataSource()
+    let tableData = await getDataSource();
-  console.log("tableData",tableData)
+    console.log('tableData', tableData);
-  //项目立项阶段
+    //项目立项阶段先后顺序限制取消
-  for(let i = 0;i<tableData[0].children.length;i++)
+    // for (let i = 0; i < tableData[0].children.length; i++) {
- {
+    //   let child = tableData[0].children[i];
-  let child=tableData[0].children[i]
+    //   //得到当前计划
-  //得到当前计划
+    //   if (child.id == record.id) {
-  if(child.id==record.id){
+    //     //获取上一个计划
-    //获取上一个计划
+    //     let pre = tableData[0].children[i - 1];
-    let pre=tableData[0].children[i-1]
+    //     if (pre.isfinish != 2) {
-    if(pre.isfinish!=2){
+    //       message.error('请先完成【' + pre.taskName + '】');
-      message.error("请先完成【"+pre.taskName+"】")
+    //       return;
-      return
+    //     }
-    }
+    //   }
-  }
+    // }
- }
+    if (record.taskName == '联合技术审查') {
-  if(record.taskName=="联合技术审查"){
+      openUnitedTechnicalReviewmode(true, { planinfoid: record.id });
-    openUnitedTechnicalReviewmode(true,{planinfoid:record.id})
     } else {
-    openPlanFile()
+      openPlanFile();
     }
   }
   async function handlefinish(record) {
     let params = {
       planinfoid: record.id,
-  }
+    };
-  await planUploadFile(params)
+    await planUploadFile(params);
-  reload()
+    reload();
-
   }
   async function handleModifyuploadfile(record) {
     //更加record.id获取当前阶段的流程信息。返回流程信息，然后打开文件上传弹窗
-  let res = await getPlanFileApprovalInfoByPlaninfoId({ planinfoid: record.id })
+    let res = await getPlanFileApprovalInfoByPlaninfoId({ planinfoid: record.id });
     if (res.isEdit == 1) {
-    recordData.value = res
+      recordData.value = res;
-    openplanFileApproval()
+      openplanFileApproval();
     }
-  record.id
+    record.id;
   }
   function closeplanFile() {
-  closeplanFileApproval()
+    closeplanFileApproval();
-  reload()
+    reload();
   }
   function closePlanFileModal() {
-  closePlanFile()
+    closePlanFile();
-  closeUnitedTechnicalReviewmode()
+    closeUnitedTechnicalReviewmode();
-  reload()
+    reload();
     queryPlanInfoMainTimeline({
-    projectid: dataTo.projectId
+      projectid: dataTo.projectId,
-  }).then(res => {
+    }).then((res) => {
-    activities.value = res
+      activities.value = res;
-    console.log("activities", activities)
+      console.log('activities', activities);
-  })
+    });
   }
   async function handledownload() {
     //下载
@@ -290,13 +328,11 @@ async function handledownload() {
 
   :deep(.el-timeline-item__timestamp) {
     font-size: 14px;
-
   }
 
   .el-row {
     margin-bottom: 25px;
     margin-top: 25px;
-
   }
 
   .componentA {
@@ -320,7 +356,6 @@ async function handledownload() {
     transition: left 0.3s;
     z-index: 3;
     margin-top: 20px;
-
   }
 
   .italicize {