feat: 新增高级搜索和安需导出

src/components/Table/src/BasicTable.vue

@@ -230,7 +230,6 @@
 
   const { getFormProps, replaceFormSlotKey, getFormSlotKeys, handleSearchInfoChange } =
     useTableForm(getProps, slots, fetch, getLoading);
-  console.log(getFormProps);
 
   const getBindValues = computed(() => {
     const dataSource = unref(getDataSourceRef);
@@ -343,7 +342,9 @@
       background-color: #262626;
     }
   }
-
+  .toolbar {
+    margin-bottom: 10px;
+  }
   .@{prefix-cls} {
     max-width: 100%;
     height: 100%;

src/views/changeSignature/addChangeSignature.vue

 <template>
   <PageWrapper :title="getTitle" :contentBackground="false" headerSticky>
     <template #extra>
-      <a-button type="primary" @click="handleSubmit"  v-if="showSubmit" >提交</a-button>
+      <a-button type="primary" @click="handleSubmit" v-if="showSubmit">提交</a-button>
       <a-button type="default" @click="router.back()"> 返回</a-button>
-<!--      <a-button type="success" @click="examine" v-if="isUpdate == false && routerId >0"> 审核</a-button>-->
+      <!--      <a-button type="success" @click="examine" v-if="isUpdate == false && routerId >0"> 审核</a-button>-->
     </template>
     <PageCard v-for="(item, index) in tabsFormSchema" :key="index" :title="item.name">
       <template #right>
         <a-button
-            v-if="isUpdate==true"
+          v-if="isUpdate == true"
           type="text"
           preIcon="ant-design:delete-outlined"
           danger
-            @click="deleteItem(index,item)"
+          @click="deleteItem(index, item)"
         >
         </a-button>
       </template>
-      <BasicForm :loading="loading" @register="item.Form[0]">
-      </BasicForm>
-      <PageCard v-for="(content, contentIndex) in item.ContentFormList" :key="contentIndex"
-                :title="'合同'+contractName[index].contractNameList[contentIndex]">
-        <BasicForm :loading="loading" @register="content.ContentFormList"/>
+      <BasicForm :loading="loading" @register="item.Form[0]"> </BasicForm>
+      <PageCard
+        v-for="(content, contentIndex) in item.ContentFormList"
+        :key="contentIndex"
+        :title="'合同' + contractName[index].contractNameList[contentIndex]"
+      >
+        <BasicForm :loading="loading" @register="content.ContentFormList" />
       </PageCard>
     </PageCard>
-    <a-button type="dashed" @click="add" preIcon="ei:plus"  v-if="buttonShow"> 从合同中导入</a-button>
-    <a-button type="dashed" @click="handleAdd" class="ml-2" preIcon="ei:plus" v-if="buttonShow"> 新建合同</a-button>
-    <contractDrawer @register="registerDrawer" @success="handleSuccess"/>
-    <projectlibraryModel @register="register" @close="handleNewData"/>
+    <a-button type="dashed" @click="add" preIcon="ei:plus" v-if="buttonShow">
+      从合同中导入</a-button
+    >
+    <a-button type="dashed" @click="handleAdd" class="ml-2" preIcon="ei:plus" v-if="buttonShow">
+      新建合同</a-button
+    >
+    <contractDrawer @register="registerDrawer" @success="handleSuccess" />
+    <projectlibraryModel @register="register" @close="handleNewData" />
   </PageWrapper>
 </template>
 <script lang="ts" setup>
+  import { unref, computed, onMounted, reactive, ref } from 'vue';
+  import { router } from '@/router';
+  const getTitle = ref('');
+  //新建合同
+  import projectlibraryModel from '@/components/ContractModel/Contract.vue';
 
+  import { useRoute } from 'vue-router';
+  //分页查询
+  import { PageWrapper } from '@/components/Page';
+  //卡片
+  import PageCard from '@/components/Page/src/PageCard.vue';
+  //合同弹出框
+  import contractDrawer from '@/views/contract/contractDrawer.vue';
+  //表单
+  import { BasicForm, useForm, FormProps, UseFormReturnType } from '@/components/Form';
+  import { formSchema, Content } from './changeSignatrue.data';
+  //引入api
+  import { deepMerge } from '@/utils';
+  //引入弹框
+  import { useMessage } from '@/hooks/web/useMessage';
+  //引入弹框
+  import { useDrawer } from '@/components/Drawer';
+  //引入api
+  import { nextTick } from 'vue';
 
-import {unref, computed, onMounted, reactive,ref} from 'vue';
-import {router} from "@/router";
-const getTitle = ref('');
-//新建合同
-import projectlibraryModel from '@/components/ContractModel/Contract.vue';
+  const [registerDrawer, { openDrawer }] = useDrawer();
+  import { useModal } from '@/components/Modal';
+  import { EditModel } from '@/api/project/model/changeSignatureModel';
+  import { getItem, addItem, updateItem, deleteOne } from '@/api/changeSignatrue/changeSignatrue';
 
-import {useRoute} from 'vue-router';
-//分页查询
-import {PageWrapper} from '@/components/Page';
-//卡片
-import PageCard from '@/components/Page/src/PageCard.vue';
-//合同弹出框
-import contractDrawer from '@/views/contract/contractDrawer.vue';
-//表单
-import {BasicForm, useForm, FormProps, UseFormReturnType} from '@/components/Form';
-import {formSchema, Content} from './changeSignatrue.data';
-//引入api
-import {deepMerge} from '@/utils';
-//引入弹框
-import {useMessage} from '@/hooks/web/useMessage';
-//引入弹框
-import {useDrawer} from '@/components/Drawer';
-//引入api
-import {nextTick} from 'vue';
+  const [register, { openModal: openModal }] = useModal();
+  const { createMessage } = useMessage();
+  const formData = ref<EditModel>({ management: [], proClosingQuarter: undefined });
+  const loadingRef = ref(false);
+  //删除id集合
+  const idList = ref([]);
 
-const [registerDrawer, {openDrawer}] = useDrawer();
-import {useModal} from '@/components/Modal';
-import {EditModel} from "@/api/project/model/changeSignatureModel";
-import {getItem,addItem,updateItem,deleteOne} from '@/api/changeSignatrue/changeSignatrue';
-
-const [register, {openModal: openModal}] = useModal();
-const {createMessage} = useMessage();
-const formData = ref<EditModel>({management: [], proClosingQuarter: undefined});
-const loadingRef = ref(false);
-//删除id集合
-const  idList=ref([])
-
-//列表对象
-const tabsFormSchema = reactive<TabsFormType[]>([]);
-//获取id
-//合同名称
-const  contractName = ref([]);
-const  isUpdate=ref(false)
-const  routerId=ref(null)
-//提交按钮的显示
-const showSubmit = ref(false)
-// batton 显示
-const buttonShow= ref(true)
-//表单禁用
-const  disabled =ref(false)
+  //列表对象
+  const tabsFormSchema = reactive<TabsFormType[]>([]);
+  //获取id
+  //合同名称
+  const contractName = ref([]);
+  const isUpdate = ref(false);
+  const routerId = ref(null);
+  //提交按钮的显示
+  const showSubmit = ref(false);
+  // batton 显示
+  const buttonShow = ref(true);
+  //表单禁用
+  const disabled = ref(false);
 
-onMounted(async () => {
+  onMounted(async () => {
     const route = useRoute();
     var id = route.query.id;
     if (id) {
-    routerId.value= id
-    const  resData= await getItem({"id":id})
-    if(route.query.isUpdate==="true"){
-      getTitle.value="编辑变更签证"
-      showSubmit.value=true
-      isUpdate.value=true
-    }
-    else {
-      getTitle.value="查看变更签证"
-      buttonShow.value=false
-      isUpdate.value=false
-      disabled.value=true
+      routerId.value = id;
+      const resData = await getItem({ id: id });
+      if (route.query.isUpdate === 'true') {
+        getTitle.value = '编辑变更签证';
+        showSubmit.value = true;
+        isUpdate.value = true;
+      } else {
+        getTitle.value = '查看变更签证';
+        buttonShow.value = false;
+        isUpdate.value = false;
+        disabled.value = true;
       }
       //定义数据
-    formData.value.management= [];
-    for (let i = 0; i <resData.length; i++) {
+      formData.value.management = [];
+      for (let i = 0; i < resData.length; i++) {
         //构建id集合
         const source = resData[i];
-      let Name={
+        let Name = {
           //项目id
           projectId: source.projectId,
           //合同名称
-        contractNameList:[],
-      }
+          contractNameList: [],
+        };
         const item = {
           name: '序号' + (i + 1),
           projectId: source.projectId,
           forceRender: true,
-        Form: useForm(Object.assign({schemas: formSchema,disabled}, baseFormConfig) as FormProps),
+          Form: useForm(
+            Object.assign({ schemas: formSchema, disabled }, baseFormConfig) as FormProps,
+          ),
           ContentFormList: [],
         };
         tabsFormSchema.push(item);
-      contentAdd(item.Form[1],source,source.contractList[0].amountInvested)
+        contentAdd(item.Form[1], source, source.contractList[0].amountInvested);
         //合同名称集合
-        let  contractList=[]
+        let contractList = [];
         for (let j = 0; j < source.contractList.length; j++) {
           const sourceItem = source.contractList[j];
-        console.log(sourceItem,"数据查看")
+          console.log(sourceItem, '数据查看');
           const contentItem = {
-          ContentFormList: useForm(Object.assign({schemas: Content,disabled}, baseFormConfig) as FormProps),
+            ContentFormList: useForm(
+              Object.assign({ schemas: Content, disabled }, baseFormConfig) as FormProps,
+            ),
           };
-        item.ContentFormList.push(contentItem)
-        Name.contractNameList.push(sourceItem.contrcatName)
-        contentAdd(contentItem.ContentFormList[1],sourceItem,null)
+          item.ContentFormList.push(contentItem);
+          Name.contractNameList.push(sourceItem.contrcatName);
+          contentAdd(contentItem.ContentFormList[1], sourceItem, null);
           const contract = {
             contractId: sourceItem.contractId,
             id: sourceItem.id,
-          proChngeVisaQuarterId:sourceItem.proChngeVisaQuarterId
-        }
-        contractList.push(contract)
+            proChngeVisaQuarterId: sourceItem.proChngeVisaQuarterId,
+          };
+          contractList.push(contract);
         }
         formData.value.management.push({
           projectId: source.projectId,
           projectName: source.projectName,
           fundingSource: source.fundingSource,
-        contract: contractList
-      })
-      contractName.value.push(Name)
+          contract: contractList,
+        });
+        contractName.value.push(Name);
       }
     } else {
-    isUpdate.value=true
-    showSubmit.value=true
-    formData.value.proClosingQuarter={}
-    formData.value.proClosingQuarter.companyName="sdfh"
-    formData.value.proClosingQuarter.status="0"
-    formData.value.proClosingQuarter.quarter= route.query.quarter
-    formData.value.proClosingQuarter.givenYear= route.query.year
-    formData.value.proClosingQuarter.yearQuarter= route.query.year+"年第"+route.query.quarter+"季度"
+      isUpdate.value = true;
+      showSubmit.value = true;
+      formData.value.proClosingQuarter = {};
+      formData.value.proClosingQuarter.companyName = 'sdfh';
+      formData.value.proClosingQuarter.status = '0';
+      formData.value.proClosingQuarter.quarter = route.query.quarter;
+      formData.value.proClosingQuarter.givenYear = route.query.year;
+      formData.value.proClosingQuarter.yearQuarter =
+        route.query.year + '年第' + route.query.quarter + '季度';
       getTitle.value = '新建变更签证';
     }
-})
-type TabsFormType = {
+  });
+  type TabsFormType = {
     name: string;
     forceRender?: boolean;
     projectId: string | number;
     Form: UseFormReturnType;
     ContentFormList: Array<UseFormReturnType>;
-};
-//配置
-const baseFormConfig: Partial<FormProps> = {
+  };
+  //配置
+  const baseFormConfig: Partial<FormProps> = {
     showActionButtonGroup: false,
     labelWidth: 100,
     layout: 'vertical',
-};
+  };
 
-//导入合同的确认
-async function handleNewData(info: any) {
+  //导入合同的确认
+  async function handleNewData(info: any) {
     if (info) {
       info.map((i) => {
         handleNew(i);
       });
     }
-}
+  }
 
-// 构建表单
-async function handleNew(info: any) {
+  // 构建表单
+  async function handleNew(info: any) {
     //判断项目id是否相同
-  if (formData.value.management.some(obj => obj.projectId === info.projectId)) {
+    if (formData.value.management.some((obj) => obj.projectId === info.projectId)) {
       const item = {
-      ContentFormList: useForm(Object.assign({schemas: Content,disabled}, baseFormConfig) as FormProps),
+        ContentFormList: useForm(
+          Object.assign({ schemas: Content, disabled }, baseFormConfig) as FormProps,
+        ),
       };
-    const index = tabsFormSchema.findIndex(obj => obj.projectId === info.projectId);
-    const contractList = formData.value.management[index].contract
-  if(contractList.some(obj=>obj.contractId === info.id)){
-    console.log("id相同",contractList[index])
-  }
-  else {
+      const index = tabsFormSchema.findIndex((obj) => obj.projectId === info.projectId);
+      const contractList = formData.value.management[index].contract;
+      if (contractList.some((obj) => obj.contractId === info.id)) {
+        console.log('id相同', contractList[index]);
+      } else {
         for (let i = 0; i < contractList.length; i++) {
           if (contractList[i].contractId !== info.id) {
-        console.log("id不相同",contractList[i])
-        contractName.value[index].contractNameList.push(info.contrcatName)
+            console.log('id不相同', contractList[i]);
+            contractName.value[index].contractNameList.push(info.contrcatName);
             tabsFormSchema[index].ContentFormList.push(item);
-        if(isUpdate){
+            if (isUpdate) {
               formData.value.management[index].contract.push({
                 contractId: info.id,
-            proChngeVisaQuarterId:routerId.value
+                proChngeVisaQuarterId: routerId.value,
               });
-        }
-        else {
+            } else {
               formData.value.management[index].contract.push({
                 contractId: info.id,
               });
@@ -215,47 +223,51 @@ async function handleNew(info: any) {
       }
     } else {
       const contentItem = {
-      ContentFormList: useForm(Object.assign({schemas: Content,disabled}, baseFormConfig) as FormProps),
+        ContentFormList: useForm(
+          Object.assign({ schemas: Content, disabled }, baseFormConfig) as FormProps,
+        ),
       };
       //合同名称集合
-    const  contractNameList=[]
-    console.log("合同名称",info)
-    contractNameList.push(info.contrcatName)
+      const contractNameList = [];
+      console.log('合同名称', info);
+      contractNameList.push(info.contrcatName);
       //构建合同名称
-    let Name={
+      let Name = {
         //项目id
         projectId: info.projectId,
         //合同名称
         contractNameList: contractNameList,
-    }
-    contractName.value.push(Name)
+      };
+      contractName.value.push(Name);
 
       const list = [];
-    list.push(contentItem)
+      list.push(contentItem);
       const item = {
         name: '序号' + (tabsFormSchema.length + 1),
         projectId: info.projectId,
         forceRender: true,
-      Form: useForm(Object.assign({schemas: formSchema,disabled}, baseFormConfig) as FormProps),
+        Form: useForm(
+          Object.assign({ schemas: formSchema, disabled }, baseFormConfig) as FormProps,
+        ),
         ContentFormList: list,
       };
       const { setFieldsValue } = item.Form[1];
       tabsFormSchema.push(item);
-    const contractList = []
+      const contractList = [];
       const contract = {
         contractId: info.id,
-      proChngeVisaQuarterId:null
-    }
-    if( isUpdate){
+        proChngeVisaQuarterId: null,
+      };
+      if (isUpdate) {
         //proChngeVisaQuarterId
-      contract.proChngeVisaQuarterId=parseInt(routerId.value)
+        contract.proChngeVisaQuarterId = parseInt(routerId.value);
       }
-    contractList.push(contract)
+      contractList.push(contract);
       formData.value.management.push({
         projectId: info.projectId,
         projectName: info.projectName,
         fundingSource: info.fundingSource,
-      contract: contractList
+        contract: contractList,
       });
       nextTick(() => {
         setFieldsValue({
@@ -264,115 +276,110 @@ async function handleNew(info: any) {
         });
       });
     }
-}
-//提交
+  }
+  //提交
   async function handleSubmit() {
     //构建数据
-  const  data={
-    management:"",
-    idList:idList.value,
+    const data = {
+      management: '',
+      idList: idList.value,
       proClosingQuarter: formData.value.proClosingQuarter,
     };
     const management = [];
     loadingRef.value = true;
-  console.log(formData.value)
+    console.log(formData.value);
     for (let i = 0; i < tabsFormSchema.length; i++) {
       //数据构建
-    const  contrantData={
-      projectId:"",
-      contractList:[]
-    }
+      const contrantData = {
+        projectId: '',
+        contractList: [],
+      };
       let item = tabsFormSchema[i];
       const { validate } = item.Form[1];
-   const  data= await validate();
-    await handleNewContent(item.Form[1])
-    const { getFieldsValue } = item.Form[1]
+      const data = await validate();
+      await handleNewContent(item.Form[1]);
+      const { getFieldsValue } = item.Form[1];
       contrantData.projectId = tabsFormSchema[i].projectId;
-    var  projectInvoice = getFieldsValue().amountInvested
+      var projectInvoice = getFieldsValue().amountInvested;
       for (let j = 0; j < item.ContentFormList.length; j++) {
-      let  content=  item.ContentFormList[j]
-      const { getFieldsValue } = content.ContentFormList[1]
-     await  handleNewContent(content.ContentFormList[1])
+        let content = item.ContentFormList[j];
+        const { getFieldsValue } = content.ContentFormList[1];
+        await handleNewContent(content.ContentFormList[1]);
         let res = getFieldsValue();
-      if(!isUpdate){
-        let  itemConetnt =  Object.assign
-        (res,{amountInvested:projectInvoice,contractId: formData.value.management[i].contract[j].contractId})
-        contrantData.contractList.push(itemConetnt)
-      }
-      else {
-        let  itemConetnt =  Object.assign
-        (res,{id:formData.value.management[i].contract[j].id,
-          amountInvested:projectInvoice,
+        if (!isUpdate) {
+          let itemConetnt = Object.assign(res, {
+            amountInvested: projectInvoice,
             contractId: formData.value.management[i].contract[j].contractId,
-          proChngeVisaQuarterId:formData.value.management[i].contract[j].proChngeVisaQuarterId
-        })
-        contrantData.contractList.push(itemConetnt)
+          });
+          contrantData.contractList.push(itemConetnt);
+        } else {
+          let itemConetnt = Object.assign(res, {
+            id: formData.value.management[i].contract[j].id,
+            amountInvested: projectInvoice,
+            contractId: formData.value.management[i].contract[j].contractId,
+            proChngeVisaQuarterId: formData.value.management[i].contract[j].proChngeVisaQuarterId,
+          });
+          contrantData.contractList.push(itemConetnt);
         }
       }
-    management.push(contrantData)
+      management.push(contrantData);
     }
     data.management = management;
     //新增接口
-  if(routerId.value){
-    const  res=updateItem(data)
+    if (routerId.value) {
+      const res = updateItem(data);
       createMessage.success('提交成功!');
-    router.go(-1)
-  }
-  else {
-    const  res = await addItem(data)
+      router.go(-1);
+    } else {
+      const res = await addItem(data);
       createMessage.success('提交成功!');
-    router.go(-1)
+      router.go(-1);
     }
     //修改接口
-}
-async function add() {
+  }
+  async function add() {
     openModal();
-}
-//j
-
-
-function  contentAdd(contentItem,sourceItem,amountInvested) {
-  console.log("contentItem",contentItem,"sourceItem",sourceItem)
-  const { setFieldsValue } =contentItem;
-  if(amountInvested){
+  }
+  //j
 
-    sourceItem= Object.assign
-    (sourceItem,{amountInvested:amountInvested})
+  function contentAdd(contentItem, sourceItem, amountInvested) {
+    console.log('contentItem', contentItem, 'sourceItem', sourceItem);
+    const { setFieldsValue } = contentItem;
+    if (amountInvested) {
+      sourceItem = Object.assign(sourceItem, { amountInvested: amountInvested });
     }
     nextTick(() => {
       setFieldsValue({
         ...sourceItem,
       });
     });
-}
-//删除项目
-function  deleteItem(index,item){
-  idList.value.push(item.projectId)
-  console.log("idList",idList)
+  }
+  //删除项目
+  function deleteItem(index, item) {
+    idList.value.push(item.projectId);
+    console.log('idList', idList);
     // if(routerId.value){
     //   deleteOne({id:contractName.value[index].projectId})
     // }
-  tabsFormSchema.splice(index,1)
-  formData.value.management.splice(index,1)
-  contractName.value.splice(index,1)
-}
+    tabsFormSchema.splice(index, 1);
+    formData.value.management.splice(index, 1);
+    contractName.value.splice(index, 1);
+  }
 
-async function handleAdd() {
+  async function handleAdd() {
     openDrawer(true, {
       isUpdate: false,
     });
-}
+  }
 
-//  校验方法
+  //  校验方法
   function handleNewContent(params) {
     const { validate } = params;
-   const data=   validate()
+    const data = validate();
     return data;
-}
-
-async function handleSuccess(params: any) {
+  }
 
+  async function handleSuccess(params: any) {
     handleNew(params);
-}
-
+  }
 </script>

src/views/project/detail.vue

@@ -16,6 +16,9 @@
         <a-button type="default" class="btn" preIcon="mdi:book-add" @click="handleContent">
           添加合同
         </a-button>
+        <a-button type="default" class="btn" preIcon="mdi:book-add" @click="importContract">
+          导入合同
+        </a-button>
         <a-button type="default" class="btn" preIcon="humbleicons:upload" @click="handleUpload">
           上传附件
         </a-button>
@@ -79,13 +82,14 @@
     </div>
     <projectDrawer @register="registerDrawer" @success="handleSuccess" />
     <contractDrawer @register="register2" @success="handleRegisterSuccess" />
-
+    <uploadContractModal @register="registerModal2" />
     <uploadModal @register="registerModal" @close="handleNewFile" />
   </div>
 </template>
 <script lang="ts" setup>
   import projectDrawer from './projectDrawer.vue';
   import uploadModal from './uploadModal.vue';
+  import uploadContractModal from './uploadContractModal.vue';
   import { Tabs } from 'ant-design-vue';
   import { useModal } from '@/components/Modal';
   import { getItem, deleteItem } from '@/api/project/project';
@@ -112,6 +116,7 @@
   const [registerDrawer, { openDrawer }] = useDrawer();
   const [register2, { openDrawer: openDrawer2 }] = useDrawer();
   const [registerModal, { openModal: openModal }] = useModal();
+  const [registerModal2, { openModal: openModal2 }] = useModal();
   import contractDrawer from '@/views/contract/contractDrawer.vue';
   const tabs = {
     InvestmentPlan,
@@ -158,6 +163,11 @@
       projectId: detailId.value,
     });
   }
+  function importContract() {
+    openModal2(true, {
+      projectId: detailId.value,
+    });
+  }
   async function handleRegisterSuccess(params: any) {
     // handleNew(params);
   }

src/views/project/detail2.vue

-<template>
-  <div class="header">
-    <div class="header-tab">
-      <!-- <img class="header-tab-logo" src="../../assets/images/logo.png" alt="" /> -->
-      <img class="header-tab-logo" :src="detail.logo" />
-      <div class="header-tab-right">
-        <div class="header-tab-right-title">{{ detail.projectName }}</div>
-        <div class="header-tab-right-desc">{{ detail.projectName }}</div>
-      </div>
-    </div>
-    <div class="header-tool">
-      <a-button type="default" class="btn" preIcon="ri:edit-line" @click="handleEdit">
-        编辑项目
-      </a-button>
-      <a-button type="default" class="btn" preIcon="mdi:book-add" @click="handleContent">
-        添加合同
-      </a-button>
-      <a-button type="default" class="btn" preIcon="humbleicons:upload" @click="handleUpload">
-        上传附件
-      </a-button>
-      <a-button
-        type="default"
-        class="btn"
-        preIcon="ant-design:delete-outlined"
-        @click="handleDelete"
-      >
-        删除项目
-      </a-button>
-    </div>
-    <div class="header-body">
-      <div class="header-body-item">
-        <div class="header-body-item-title">实施主体</div>
-        <div class="header-body-item-value">{{ detail.implementingEntity }}</div>
-      </div>
-      <div class="header-body-item">
-        <div class="header-body-item-title">建设模式</div>
-        <div class="header-body-item-value">{{ detail.constructionMode }}</div>
-      </div>
-      <div class="header-body-item">
-        <div class="header-body-item-title">建设地点</div>
-        <div class="header-body-item-value">{{ detail.constructionSite }}</div>
-      </div>
-      <div class="header-body-item">
-        <div class="header-body-item-title">项目类型</div>
-        <div class="header-body-item-value">{{ detail.projectType }}</div>
-      </div>
-      <div class="header-body-item">
-        <div class="header-body-item-title">资金来源</div>
-        <div class="header-body-item-value">{{ detail.fundingSource }}</div>
-      </div>
-      <div class="header-body-item">
-        <div class="header-body-item-title">建设规模</div>
-        <div class="header-body-item-value">{{ detail.constructionScale }}</div>
-      </div>
-      <div class="header-body-item">
-        <div class="header-body-item-title">建设目的及项目功能</div>
-        <div class="header-body-item-value">{{ detail.constructionPurpose }}</div>
-      </div>
-      <div class="header-body-item">
-        <div class="header-body-item-title">更新人/更新时间</div>
-        <div class="header-body-item-value"
-          >{{ detail.updateBy || '--' }}/{{ detail.updateTime || '--' }}</div
-        >
-      </div>
-    </div>
-    <!-- <Descriptions></Descriptions> -->
-  </div>
-  <div class="body">
-    <Tabs>
-      <template v-for="item in tabList" :key="item.key">
-        <TabPane :tab="item.tab">
-          <component :is="tabs[item.component]" />
-        </TabPane>
-      </template>
-    </Tabs>
-  </div>
-  <projectDrawer @register="registerDrawer" @success="handleSuccess" />
-  <contractDrawer @register="register2" @success="handleRegisterSuccess" />
-
-  <uploadModal @register="registerModal" @close="handleNewFile" />
-</template>
-<script lang="ts" setup>
-  import projectDrawer from './projectDrawer.vue';
-  import uploadModal from './uploadModal.vue';
-  import { Tabs } from 'ant-design-vue';
-  import { useModal } from '@/components/Modal';
-  import { getItem, deleteItem } from '@/api/project/project';
-  import { tabList } from './project.data';
-  import { ref, onMounted, provide } from 'vue';
-  import { useRoute } from 'vue-router';
-  import { useDrawer } from '@/components/Drawer';
-  import { useMessage } from '@/hooks/web/useMessage';
-  import { router } from '@/router';
-  import InvestmentPlan from './tabs/InvestmentPlan.vue';
-  import performance from './tabs/performance.vue';
-  import annualPlan from './tabs/annualPlan.vue';
-  import monthlyPlan from './tabs/monthlyPlan.vue';
-  import completed from './tabs/completed.vue';
-  import biddingPlan from './tabs/biddingPlan.vue';
-  import biddingManagement from './tabs/biddingManagement.vue';
-  import settlementManagement from './tabs/settlementManagement.vue';
-  import changeSignature from './tabs/changeSignature.vue';
-  import potentialSafety from './tabs/potentialSafety.vue';
-  import safetyEducation from './tabs/safetyEducation.vue';
-  import contract from './tabs/contract.vue';
-  import annex from './tabs/annex.vue';
-  import updateRecords from './tabs/updateRecords.vue';
-  const [registerDrawer, { openDrawer }] = useDrawer();
-  const [register2, { openDrawer: openDrawer2 }] = useDrawer();
-  const [registerModal, { openModal: openModal }] = useModal();
-  import contractDrawer from '@/views/contract/contractDrawer.vue';
-  const tabs = {
-    InvestmentPlan,
-    performance,
-    annualPlan,
-    monthlyPlan,
-    completed,
-    biddingPlan,
-    biddingManagement,
-    settlementManagement,
-    changeSignature,
-    potentialSafety,
-    safetyEducation,
-    contract,
-    annex,
-    updateRecords,
-  };
-  const TabPane = Tabs.TabPane;
-  const { createMessage } = useMessage();
-
-  let detail = ref<any>({});
-  let detailId = ref<any>(0);
-  // onMounted(async () => {
-  const route = useRoute();
-  detailId.value = route.query.id; // 获取名为id的参数
-  provide('detailId', detailId.value);
-  handleDetail();
-  // });
-
-  function handleEdit() {
-    openDrawer(true, {
-      record: detail,
-      isUpdate: true,
-    });
-  }
-  function handleContent() {
-    openDrawer2(true, {
-      projectId: detailId.value,
-      isUpdate: false,
-    });
-  }
-  function handleUpload() {
-    openModal(true, {
-      projectId: detailId.value,
-    });
-  }
-  async function handleRegisterSuccess(params: any) {
-    // handleNew(params);
-  }
-  async function handleSuccess(record: any) {
-    // detail.value = record;
-    await handleDetail();
-  }
-  async function handleDetail() {
-    let res = await getItem({ id: detailId.value });
-    detail.value = res;
-    console.log(detail.value);
-  }
-  function handleDelete() {
-    deleteItem({ id: detailId.value }).then((res) => {
-      createMessage.success('删除成功!');
-      router.back();
-    });
-  }
-  function handleNewFile() {}
-</script>
-<style lang="less" scoped>
-  .header {
-    background-color: #ffffff;
-    margin: 0 16px;
-    margin-top: 16px;
-    height: 208px;
-    position: relative;
-    &-tool {
-      position: absolute;
-      right: 0;
-      top: 0;
-      padding-top: 20px;
-      padding-right: 20px;
-      .btn {
-        margin-left: 10px;
-      }
-    }
-    &-tab {
-      padding: 30px;
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-      &-logo {
-        border-radius: 100%;
-        width: 72px;
-        height: 72px;
-        margin-right: 10px;
-      }
-      &-right {
-        display: flex;
-        flex-flow: column;
-        color: #1c1c1c;
-        &-title {
-          font-size: 36px;
-        }
-        &-desc {
-          font-size: 14px;
-          margin-top: 6px;
-        }
-      }
-    }
-    &-body {
-      display: flex;
-      flex-wrap: wrap;
-      &-item {
-        flex: 1;
-        &-title {
-          text-align: center;
-          color: #536387;
-          font-size: 14px;
-        }
-        &-value {
-          text-align: center;
-          color: #000000;
-          margin-top: 16px;
-          font-size: 12px;
-        }
-      }
-    }
-  }
-</style>
-<style lang="less">
-  .body {
-    margin: 16px;
-    padding: 10px 22px;
-    background-color: #ffffff;
-    .vben-basic-table-form-container {
-      padding: 0 !important;
-    }
-    .page-card {
-      padding: 0 !important;
-    }
-    .page-card-body {
-      padding: 0 !important;
-    }
-  }
-</style>

src/views/project/tabs/InvestmentPlan.vue

 <template>
   <BasicTable @register="registerTable">
+    <template #toolbar>
+      <a-button type="primary" preIcon="mdi:plus" @click="handleExport"> 导出筛选结果 </a-button>
+      <a-button type="primary" class="ml5" preIcon="mdi:plus" @click="handleExport">
+        高级筛选
+      </a-button>
+    </template>
+
     <template #bodyCell="{ column, record, index }">
       <template v-if="column.key === 'serialNumber'">
         {{ index + 1 }}
@@ -19,15 +26,34 @@
       </template>
     </template>
   </BasicTable>
+  <exportModal @register="registerModal" />
+  <queryModal @register="registerModal2" />
 </template>
 <script lang="ts" setup>
+  import exportModal from './components/exportModal.vue';
+  import queryModal from './components/queryModal.vue';
   import { columns, searchFormSchema } from './data';
   import { BasicTable, useTable, TableAction } from '@/components/Table';
-  import { inject } from 'vue';
+  import { inject, ref } from 'vue';
   import { getEngineeringList } from '@/api/project/engineeringProject';
   import { router } from '@/router';
+  import { useModal } from '@/components/Modal';
+  const [registerModal, { openModal: openModal }] = useModal();
+  const [registerModal2, { openModal: openModal2 }] = useModal();
   let detailId = inject('detailId');
   console.log('detailId', detailId);
+
+  function getExportData() {
+    let exportData = [];
+    columns.map((i) => {
+      exportData.push({
+        label: i.title,
+        value: i.dataIndex,
+      });
+    });
+    return exportData;
+  }
+  getExportData();
   const [registerTable, { reload }] = useTable({
     api: getEngineeringList,
     columns,
@@ -50,6 +76,12 @@
       fixed: undefined,
     },
   });
+  function handleExport() {
+    openModal(true, {
+      projectId: detailId,
+      exportData: getExportData(),
+    });
+  }
   function handleDetail(record: Recordable, disabled: number) {
     if (record.planType === '工程') {
       router.push({

src/views/project/tabs/components/exportModal.vue

+<template>
+  <BasicModal
+    v-bind="$attrs"
+    @register="register"
+    title="导出筛选结果"
+    :minHeight="30"
+    okText="导出"
+    @ok="handleSubmit"
+    @visible-change="handleVisibleChange"
+  >
+    <BasicForm @register="registerForm" :model="modelRef" />
+  </BasicModal>
+</template>
+<script lang="ts" setup>
+  import { ref, nextTick, defineProps, defineEmits, unref } from 'vue';
+  import { BasicModal, useModalInner } from '@/components/Modal';
+  import { BasicForm, FormSchema, useForm } from '@/components/Form';
+  import { uploadApi } from '@/api/sys/upload';
+  import { AnnexAdd } from '@/api/project/project';
+  const projectId = ref(0);
+  const schemas: FormSchema[] = [
+    {
+      field: 'colums',
+      component: 'CheckboxGroup',
+      label: '',
+      required: true,
+      componentProps: {
+        options: [],
+      },
+      colProps: {
+        span: 24,
+      },
+    },
+  ];
+  const props = defineProps({
+    userData: { type: Object },
+  });
+  function handleVisibleChange(v) {
+    v && props.userData && nextTick(() => onDataReceive(props.userData));
+  }
+  const emit = defineEmits(['close', 'register']);
+  const modelRef = ref({});
+  const [
+    registerForm,
+    {
+      getFieldsValue,
+      validate,
+      updateSchema,
+      //   // setFieldsValue,
+      // setProps,
+    },
+  ] = useForm({
+    labelWidth: 120,
+    schemas,
+    showActionButtonGroup: false,
+    actionColOptions: {
+      span: 24,
+    },
+  });
+
+  const [register, { closeModal }] = useModalInner((data) => {
+    console.log(111);
+
+    data && onDataReceive(data);
+  });
+
+  // function handleVisibleChange(v) {
+  //   v && props.userData && nextTick(() => onDataReceive(props.userData));
+  // }
+
+  function onDataReceive(data) {
+    console.log('Data Received', data.exportData);
+    updateSchema({
+      field: 'colums',
+      componentProps: {
+        options: data.exportData,
+      },
+    });
+    // console.log(props.userData);
+
+    // projectId.value = data.projectId;
+    // console.log(projectId.value);
+  }
+  function handleSubmit() {
+    validate().then(async () => {
+      const value = getFieldsValue();
+      console.log(value);
+
+      emit('close');
+      closeModal();
+    });
+  }
+</script>

src/views/project/tabs/components/queryModal.vue

+<template>
+  <BasicModal
+    v-bind="$attrs"
+    @register="register"
+    title="高级筛选"
+    :minHeight="30"
+    okText="提交"
+    @ok="handleSubmit"
+    @visible-change="handleVisibleChange"
+  >
+    <BasicForm @register="registerForm" :model="modelRef" />
+  </BasicModal>
+</template>
+<script lang="ts" setup>
+  import { ref, nextTick, defineProps, defineEmits, unref } from 'vue';
+  import { BasicModal, useModalInner } from '@/components/Modal';
+  import { BasicForm, FormSchema, useForm } from '@/components/Form';
+  import { uploadApi } from '@/api/sys/upload';
+  import { AnnexAdd } from '@/api/project/project';
+  const projectId = ref(0);
+  const schemas: FormSchema[] = [
+    {
+      field: 'colums',
+      component: 'CheckboxGroup',
+      label: '',
+      required: true,
+      componentProps: {
+        options: [],
+      },
+      colProps: {
+        span: 24,
+      },
+    },
+  ];
+  const props = defineProps({
+    userData: { type: Object },
+  });
+  function handleVisibleChange(v) {
+    v && props.userData && nextTick(() => onDataReceive(props.userData));
+  }
+  const emit = defineEmits(['close', 'register']);
+  const modelRef = ref({});
+  const [
+    registerForm,
+    {
+      getFieldsValue,
+      validate,
+      updateSchema,
+      //   // setFieldsValue,
+      // setProps,
+    },
+  ] = useForm({
+    labelWidth: 120,
+    schemas,
+    showActionButtonGroup: false,
+    actionColOptions: {
+      span: 24,
+    },
+  });
+
+  const [register, { closeModal }] = useModalInner((data) => {
+    console.log(111);
+
+    data && onDataReceive(data);
+  });
+
+  // function handleVisibleChange(v) {
+  //   v && props.userData && nextTick(() => onDataReceive(props.userData));
+  // }
+
+  function onDataReceive(data) {
+    console.log('Data Received', data.exportData);
+    updateSchema({
+      field: 'colums',
+      componentProps: {
+        options: data.exportData,
+      },
+    });
+    // console.log(props.userData);
+
+    // projectId.value = data.projectId;
+    // console.log(projectId.value);
+  }
+  function handleSubmit() {
+    validate().then(async () => {
+      const value = getFieldsValue();
+      console.log(value);
+
+      emit('close');
+      closeModal();
+    });
+  }
+</script>

src/views/project/tabs/data.ts

@@ -17,6 +17,7 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 5 },
   },
 ];
+
 export const columns: BasicColumn[] = [
   {
     title: '序号',
@@ -25,22 +26,22 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '填报周期',
-    dataIndex: 'serialNumber',
+    dataIndex: 'filingCycle',
     width: 180,
   },
   {
     title: '项目名称',
-    dataIndex: 'serialNumber',
+    dataIndex: 'projectName',
     width: 180,
   },
   {
     title: '建设地点',
-    dataIndex: 'serialNumber',
+    dataIndex: 'constructionSite',
     width: 180,
   },
   {
     title: '项目概况',
-    dataIndex: 'serialNumber',
+    dataIndex: 'projectOverview',
     width: 180,
   },
   {
@@ -50,27 +51,27 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '建设目的及项目功能',
-    dataIndex: 'serialNumber',
+    dataIndex: 'constructionPurpose',
     width: 180,
   },
   {
     title: '建设模式',
-    dataIndex: 'serialNumber',
+    dataIndex: 'constructionMode',
     width: 180,
   },
   {
     title: '资金来源',
-    dataIndex: 'serialNumber',
+    dataIndex: 'fundingSource',
     width: 180,
   },
   {
     title: '项目类型',
-    dataIndex: 'serialNumber',
+    dataIndex: 'projectType',
     width: 180,
   },
   {
     title: '总投资',
-    dataIndex: 'serialNumber',
+    dataIndex: 'totalInvestment',
     width: 180,
   },
   {

src/views/project/uploadContractModal.vue

+<template>
+  <BasicModal
+    v-bind="$attrs"
+    @register="register"
+    title="上传附件"
+    :minHeight="30"
+    okText="保存"
+    @ok="handleSubmit"
+    @visible-change="handleVisibleChange"
+  >
+    <BasicForm @register="registerForm" :model="modelRef" />
+  </BasicModal>
+</template>
+<script lang="ts" setup>
+  import { ref, nextTick, reactive } from 'vue';
+  import { BasicModal, useModalInner } from '@/components/Modal';
+  import { BasicForm, FormSchema, useForm } from '@/components/Form';
+  import { uploadApi } from '@/api/sys/upload';
+  import { AnnexAdd } from '@/api/project/project';
+  const projectId = ref(0);
+  const schemas: FormSchema[] = [
+    {
+      field: 'url',
+      component: 'Upload',
+      label: '上传附件',
+      required: true,
+      componentProps: {
+        api: uploadApi,
+        resultField: 'data.data.fullPath',
+        accept: ['rar', 'zip', 'doc', 'docx', 'pdf'],
+        multiple: false,
+        maxSize: 20,
+        maxNumber: 1,
+        name: 'multipartFile',
+      },
+      colProps: {
+        span: 24,
+      },
+    },
+    {
+      field: 'remarks',
+      label: '备注内容',
+      // required: true,
+      component: 'InputTextArea',
+      componentProps: {
+        maxlength: 300,
+        showCount: true,
+      },
+      colProps: { span: 24 },
+    },
+  ];
+  const props = defineProps({
+    userData: { type: Object },
+  });
+  const emit = defineEmits(['close', 'register']);
+  const modelRef = ref({});
+  const [
+    registerForm,
+    {
+      getFieldsValue,
+      validate,
+      //   // setFieldsValue,
+      //   // setProps
+    },
+  ] = useForm({
+    labelWidth: 120,
+    schemas,
+    showActionButtonGroup: false,
+    actionColOptions: {
+      span: 24,
+    },
+  });
+
+  const [register, { closeModal }] = useModalInner((data) => {
+    data && onDataReceive(data);
+  });
+
+  function onDataReceive(data) {
+    console.log('Data Received', data);
+    projectId.value = data.projectId;
+    console.log(projectId.value);
+  }
+
+  function handleVisibleChange(v) {
+    v && props.userData && nextTick(() => onDataReceive(props.userData));
+  }
+
+  function handleSubmit() {
+    validate().then(async () => {
+      const value = getFieldsValue();
+      let url: String = value.url[0];
+      let res = await AnnexAdd({
+        url,
+        remark: value.remarks,
+        proId: projectId.value,
+      });
+      //   console.log(res);
+
+      emit('close');
+      closeModal();
+    });
+  }
+</script>

src/views/project/uploadModal.vue

@@ -52,7 +52,6 @@
   const props = defineProps({
     userData: { type: Object },
   });
-  const emit = defineEmits(['close']);
   const modelRef = ref({});
   const [
     registerForm,
@@ -84,7 +83,7 @@
   function handleVisibleChange(v) {
     v && props.userData && nextTick(() => onDataReceive(props.userData));
   }
-
+  const emit = defineEmits(['close', 'register']);
   function handleSubmit() {
     validate().then(async () => {
       const value = getFieldsValue();