归档提交

src/views/projectLib/projectArchive/index.vue

@@ -7,133 +7,148 @@
         <TableAction :actions="getTableAction(record)" />
       </template>
     </BasicTable>
-    <BasicModal @register="registerSubmitProjectArchive" title="归档信息详情" width="1200px" :showOkBtn="false"
-      :showCancelBtn="false">
-      <SubmitProjectArchive :projectid="projectid" :showApprovalForm="showApprovalForm" @close="close" />
+    <BasicModal
+      @register="registerSubmitProjectArchive"
+      title="归档信息详情"
+      width="1200px"
+      :showOkBtn="false"
+      :showCancelBtn="false"
+    >
+      <SubmitProjectArchive
+        :projectid="projectid"
+        :showApprovalForm="showApprovalForm"
+        @close="close"
+      />
     </BasicModal>
-
   </PageWrapper>
 </template>
 
 <script lang="ts" name="system-user" setup>
-//ts语法
-import { ref } from 'vue';
-import { ActionItem, BasicTable, TableAction, useTable } from '@/components/Table';
-import { useModal, BasicModal } from '@/components/Modal';
-import SubmitProjectArchive from './SubmitProjectArchive.vue'
-import { PageWrapper } from '@/components/Page';
-
-import { columns, searchFormSchema } from '../projectInfo/projectInfo.data';
-
-import { projectArchivePageList } from './projectArchive.api';
-import { useUserStore } from '@/store/modules/user';
-
-const userStore = useUserStore();
-const [registerSubmitProjectArchive, { openModal: openModalSubmitProjectArchive, closeModal }] = useModal();
-let projectid = ref()
-let showApprovalForm = ref<boolean>(false)
-const [registerTable] = useTable({
-  title: '项目归档信息',
-  api: projectArchivePageList,
-  columns: columns,
-  useSearchForm: true,
-  rowKey: "id",
-  showIndexColumn: false,
-  actionColumn: {
-    width: 140,
-    title: '操作',
-    dataIndex: 'action',
-    slots: { customRender: 'action' },
-  },
-  //表单查询项设置
-  formConfig: {
-    schemas: searchFormSchema,
-  },
-  beforeFetch: (param) => {
-
-if(param.stage == undefined||param.stage == null){
-  param.stage = "2"
-}else{
-  param.newStage=param.stage
-  param.stage = "2"
-}
-
-},
-});
-
-
-function getTableAction(record): ActionItem[] {
-  return [
-    {
-      label: '详情',
-      ifShow: () => {
-        return record.stage >= 2
-      },
-      onClick: handleDetailpage.bind(null, record),
+  //ts语法
+  import { ref } from 'vue';
+  import { ActionItem, BasicTable, TableAction, useTable } from '@/components/Table';
+  import { useModal, BasicModal } from '@/components/Modal';
+  import SubmitProjectArchive from './SubmitProjectArchive.vue';
+  import { PageWrapper } from '@/components/Page';
+
+  import { columns, searchFormSchema } from '../projectInfo/projectInfo.data';
+
+  import { projectArchivePageList, archiveProject } from './projectArchive.api';
+  import { useUserStore } from '@/store/modules/user';
+  import { message } from 'ant-design-vue';
+
+  const userStore = useUserStore();
+  const [registerSubmitProjectArchive, { openModal: openModalSubmitProjectArchive, closeModal }] =
+    useModal();
+  let projectid = ref();
+  let showApprovalForm = ref<boolean>(false);
+  const [registerTable] = useTable({
+    title: '项目归档信息',
+    api: projectArchivePageList,
+    columns: columns,
+    useSearchForm: true,
+    rowKey: 'id',
+    showIndexColumn: false,
+    actionColumn: {
+      width: 140,
+      title: '操作',
+      dataIndex: 'action',
+      slots: { customRender: 'action' },
     },
+    //表单查询项设置
+    formConfig: {
+      schemas: searchFormSchema,
+    },
+    beforeFetch: (param) => {
+      if (param.stage == undefined || param.stage == null) {
+        param.stage = '2';
+      } else {
+        param.newStage = param.stage;
+        param.stage = '2';
+      }
+    },
+  });
+
+  function getTableAction(record): ActionItem[] {
+    return [
+      {
+        label: '详情',
+        ifShow: () => {
+          return record.stage >= 2;
+        },
+        onClick: handleDetailpage.bind(null, record),
+      },
+      {
+        label: '归档',
+        ifShow: () => {
+          return record.isArchive == true;
+        },
+        onClick: handleArchive.bind(null, record),
+      },
+    ];
+  }
 
-  ];
-}
-
-
-function handleDetailpage(record) {
-  projectid.value = record.id
-  showApprovalForm.value = true
-  openModalSubmitProjectArchive(true)
-
-}
-
-function close() {
-  closeModal()
-}
-
+  function handleDetailpage(record) {
+    projectid.value = record.id;
+    showApprovalForm.value = true;
+    openModalSubmitProjectArchive(true);
+  }
+  async function handleArchive(record) {
+    projectid.value = record.id;
+    const res = await archiveProject(projectid.value);
+    if (res == '归档项目成功!') {
+      message.success('归档成功');
+    }
+  }
+  function close() {
+    closeModal();
+  }
 </script>
 
 <style scoped>
-.timeline {
-  display: flex;
-  width: 100%;
-  margin-bottom: 100px;
-
-  .lineitem {
-    transform: translateX(50%);
-    width: 25%;
+  .timeline {
+    display: flex;
+    width: 100%;
+    margin-bottom: 100px;
+
+    .lineitem {
+      transform: translateX(50%);
+      width: 25%;
+    }
   }
-}
 
-::v-deep .el-timeline-item__tail {
-  border-left: none;
-  width: 100%;
-  border-top: 2px solid #e4e7ed;
-  position: absolute;
-  top: 6px;
-}
-
-::v-deep .el-timeline-item__wrapper {
-  padding-left: 0;
-  position: absolute;
-  top: 20px;
-  transform: translateX(-50%);
-  text-align: center;
-}
+  ::v-deep .el-timeline-item__tail {
+    border-left: none;
+    width: 100%;
+    border-top: 2px solid #e4e7ed;
+    position: absolute;
+    top: 6px;
+  }
 
-::v-deep .el-timeline-item__timestamp {
-  font-size: 14px;
-}
+  ::v-deep .el-timeline-item__wrapper {
+    padding-left: 0;
+    position: absolute;
+    top: 20px;
+    transform: translateX(-50%);
+    text-align: center;
+  }
 
-.nested-timeline {
-  margin-left: 20px;
-  border-left: 1px dashed #ccc;
-  padding-left: 20px;
-}
+  ::v-deep .el-timeline-item__timestamp {
+    font-size: 14px;
+  }
 
-.nested-timeline-item {
-  margin-bottom: 10px;
-}
+  .nested-timeline {
+    margin-left: 20px;
+    border-left: 1px dashed #ccc;
+    padding-left: 20px;
+  }
 
+  .nested-timeline-item {
+    margin-bottom: 10px;
+  }
 
-::v-deep .ant-table-expanded-row {
-  height: auto !important;
-  /* 其他样式 */
-}
-</style>
+  ::v-deep .ant-table-expanded-row {
+    height: auto !important;
+    /* 其他样式 */
+  }
+</style>

src/views/projectLib/projectArchive/projectArchive.api.ts

@@ -2,8 +2,8 @@ import { defHttp } from '@/utils/http/axios';
 
 export enum Api {
   projectArchivePageList = '/huzhouProject/projectArchivePageList',
-
   queryPlanModuleDetailPage = "/huzhouPlan/queryPlanModuleDetailPage",
+  archiveProject = "/huzhouProject/archiveProject",
 
 }
 /**
@@ -11,7 +11,7 @@ export enum Api {
  */
 
 export const projectArchivePageList = (params) => defHttp.get({ url: Api.projectArchivePageList, params })
-
+export const archiveProject = (params) => defHttp.get({ url:`${Api.archiveProject}?projectid=${params}`})
 // export const submitplaninfoUploadFile =  (params?) =>defHttp.post({ url: Api.submitplaninfoUploadFile,headers:{ "Content-Type": "multipart/form-data" }, params })
 
 

src/views/projectLib/projectPlan/index.vue

@@ -23,6 +23,7 @@
         :projectId="projectId"
         :projectStage="projectStage"
         :projectName="projectName"
+        :isArchiveFinish="isArchiveFinish"
       />
     </BasicModal>
 
@@ -73,6 +74,7 @@
 
   const router = useRouter();
   let projectId = ref();
+  let isArchiveFinish = ref(true)
   let type = ref();
   let projectStage = ref();
   let projectName = ref();
@@ -138,6 +140,7 @@
     projectId.value = record.id;
     projectStage.value = record.stage;
     projectName.value = record.projectName;
+    isArchiveFinish.value = record.isArchiveFinish
     let res = await queryIsSubProject({ projectid: record.id });
     console.log('queryIsSubProject', res);
     //判断是不是子项目，打开子项目的详情页面

src/views/projectLib/projectPlan/viewPlanDetail.vue

@@ -142,7 +142,7 @@
   import uploadURTfile from '@/views/projectLib/projectPlan/uploadURTfile.vue';
   import { queryHasSubProject } from '@/views/projectLib/projectInfo/projectInfo.api';
 
-  let dataTo = defineProps(['projectId', 'projectStage', 'projectName']);
+  let dataTo = defineProps(['projectId', 'projectStage', 'projectName','isArchiveFinish']);
   let projectId = ref(dataTo.projectId);
   let isfinish = ref();
   let activities = ref([]);
@@ -271,7 +271,7 @@
         ifShow: () => {
           if (
             record.isfinish == 2 &&
-            record.taskFile?.length > 0 &&
+            record.taskFile?.length > 0 &&dataTo.isArchiveFinish ==false&&
             (record.taskName == '可研报告初稿编制' ||
               record.taskName == '可研报告送审稿编制' ||
               record.taskName == '造价评估报告确认' ||