添加树形结构表格组件

src/api/changeSignatrue/changeSignatrue.ts

@@ -18,7 +18,8 @@ enum Api {
     //http://58.223.177.48:8088/pro/change-visa/byId-examine
     //批量删除
     DeleteList = '/pro/change-visa/delete-id',
-    //http://58.223.177.48:8088/pro/change-visa/delete-id
+  // 判断季度选是否已存在
+    CheckQuarter = '/pro/change-visa/is-change',
 }
 export const getSettlementManageList = (params?: ProjectParams) =>
     defHttp.post<ProjectModel>({ url: Api.GetList, data: params });
@@ -83,3 +84,12 @@ export const deleteOne = (params?: any) =>
         url: Api.DeleteOne,
         params,
     });
+
+
+
+export const checkQuarter = (params?: any) =>
+    defHttp.get<ProjectModel>(
+    {
+        url: Api.CheckQuarter,
+        params,
+    });

src/api/contract/contract.ts

@@ -10,6 +10,8 @@ enum Api {
   GetList = '/pro/settlement/select-contract',
   //查询项目下拉框集合
   ProjectSelect = '/pro/investmentPlan/project-list',
+  //查询分组的合同集合
+  GetGroupList = '/pro/settlement/contract-list',
   //新增合同
   Add = '/pro/settlement/add-contract',
 }
@@ -28,3 +30,5 @@ export const addItem = (params?: any) =>
       'Content-Type': 'application/json;charset=UTF-8',
     },
   });
+export const getGroupList = (params?: any) =>
+  defHttp.get<ProjectModel>({ url: Api.GetGroupList, data: params });

src/api/project/settlementManage.ts

@@ -20,6 +20,9 @@ enum Api {
   deleteList = '/pro/settlement/del',
     //查询部门列表
   getDepartmentList = '/pro/sys/sysDept',
+    // 查询季度是否已经存在
+    isSettlement = '/pro/settlement/is-settlement',
+
 }
 export const getSettlementManageList = (params?: ProjectParams) =>
   defHttp.post<ProjectParams>({ url: Api.GetList, data: params });
@@ -82,3 +85,9 @@ export  const  getDepartmentList = () =>
   defHttp.post<ProjectModel>({
     url: Api.getDepartmentList,
   });
+
+export  const  isSettlement = (params?: any) =>
+  defHttp.get<ProjectModel>({
+    url: Api.isSettlement,
+    params,
+  });

src/components/ContractModel/Contract.vue

 <template>
   <BasicModal
-    width="70%"
-    v-bind="$attrs"
-    @register="register"
-    title="选择合同导入"
-    :minHeight="30"
-    okText="导入"
-    @ok="handleSubmit"
-    @visible-change="handleVisibleChange"
+      width="70%"
+      v-bind="$attrs"
+      @register="register"
+      title="选择合同导入"
+      :minHeight="30"
+      okText="导入"
+      @ok="handleSubmit"
+      @visible-change="handleVisibleChange"
   >
-    <BasicTable @register="registerTable">
-      <template #bodyCell="{ column, text, record, index }">
-        <!-- 当前列是序号列时，显示序号 -->
-        <span v-if="column.dataIndex === 'serialNumber'">{{ index + 1 }}</span>
-        <!-- 其他列正常显示 -->
-        <span v-else>{{ text }}</span>
-      </template>
-    </BasicTable>
-    <!--    <button @click="getSelectRowList">获取数据</button>-->
+        <BasicTable @register="registerTable">
+
+        </BasicTable>
+
   </BasicModal>
 </template>
 <script lang="ts" setup>
-  import { BasicModal, useModalInner } from '@/components/Modal';
-  import { BasicTable, useTable, TableAction } from '@/components/Table';
-  import { getContractListPage } from '@/api/contract/contract';
-  import { useMessage } from '@/hooks/web/useMessage';
-  import { columns, searchFormSchema } from './data';
-  const [registerTable, { reload, getSelectRows }] = useTable({
-    api: getContractListPage,
-    title: '123',
-    columns,
-    formConfig: {
-      labelWidth: 120,
-      schemas: searchFormSchema,
-    },
-    useSearchForm: true,
-    showTableSetting: false,
-    bordered: true,
-    showIndexColumn: false,
-    rowSelection: {
-      type: 'checkbox',
+import { BasicModal, useModalInner } from '@/components/Modal';
+import { BasicTable, useTable } from '@/components/Table';
+import {getGroupList } from '@/api/contract/contract';
+import { useMessage } from '@/hooks/web/useMessage';
+import {getBasicColumns } from './data';
+import  {onMounted,ref} from "vue";
+const  tableList = ref([]);
+onMounted( async () =>{
+  const  list=await getGroupList();
+  for (let i = 0; i < list.length; i++) {
+       list[i].id=  list[i].id+"_"+Math.random().toString(36).substring(2,10)
+    let  item=list[i].children;
+    let childrenList=[]
+    for (let j = 0; j < item.length; j++) {
+      childrenList.push(Object.assign(item[j],{markers:"1"}));
+    }
+    list[i].children=childrenList
+  }
+  tableList.value=list
+  console.log(list,"数据查看list")
+})
+const [registerTable, { expandAll,getSelectRows }] = useTable({
+  title: '树形表格',
+  isTreeTable: true,
+  accordion: true, // 手风琴效果
+  rowSelection: {
+    type: 'checkbox',
+    getCheckboxProps(record: Recordable) {
+      // Demo: 第一行（id为0）的选择框禁用
+      if (record.id === "0") {
+        return { disabled: true };
+      } else {
+        return { disabled: false };
+      }
     },
-    // actionColumn: {
-    //   width: 80,
-    //   title: '操作',
-    //   dataIndex: 'action',
-    //   // slots: { customRender: 'action' },
-    //   fixed: undefined,
-    // },
-  });
 
-  const { createMessage } = useMessage();
-  function getSelectRowList() {
-    // createMessage.info('请在控制台查看！');
-    // console.log(getSelectRows());
-    emit('close', getSelectRows());
+  },
+  titleHelpMessage: '树形组件不能和序列号列同时存在',
+  columns: getBasicColumns(),
+  dataSource: tableList,
+  rowKey: 'id',
+  showSelectionBar: true, // 显示多选状态栏
+});
+
+const { createMessage } = useMessage();
+function getSelectRowList() {
+  let  selectData=getSelectRows()
+  let data=[]
+  for (let i = 0; i <selectData.length; i++) {
+    let  item=selectData[i]
+    if(item.markers === "0"){
+      for (let j = 0; j <item.children.length; j++) {
+        data.push(item.children[j])
+      }
+    }
+    if(item.markers=="1"){
+      data.push(item)
+    }
   }
+  console.log(data)
+  emit('close', data);
+}
 
-  const emit = defineEmits(['close']);
+const emit = defineEmits(['close']);
 
-  function handleVisibleChange(v) {}
-  const [register, { closeModal }] = useModalInner((data) => {
-    data;
-  });
+function handleVisibleChange(v) {}
+const [register, { closeModal }] = useModalInner((data) => {
+  data;
+});
 
-  function handleSubmit() {
-    getSelectRowList();
-    closeModal();
-  }
+function handleSubmit() {
+  getSelectRowList();
+  closeModal();
+}
 </script>

src/components/ContractModel/ContractTree.vue

+<template>
+  <div class="p-4">
+    <BasicTable @register="register">
+      <template #toolbar>
+        <a-button type="primary" @click="expandAll">展开全部</a-button>
+        <a-button type="primary" @click="collapseAll">折叠全部</a-button>
+        <a-button type="primary" @click="collapseRows(['4'])">折叠第五行</a-button>
+        <a-button type="primary" @click="expandRows(['4'])">展开第五行</a-button>
+      </template>
+    </BasicTable>
+  </div>
+</template>
+<script lang="ts" setup>
+import { BasicTable, useTable } from '@/components/Table';
+import { getBasicColumns, getTreeTableData } from './tableData';
+
+const [register, { expandAll, collapseAll, expandRows, collapseRows }] = useTable({
+  title: '树形表格',
+  isTreeTable: true,
+  accordion: true, // 手风琴效果
+  rowSelection: {
+    type: 'checkbox',
+    getCheckboxProps(record: Recordable) {
+      // Demo: 第一行（id为0）的选择框禁用
+      if (record.id === '0') {
+        return { disabled: true };
+      } else {
+        return { disabled: false };
+      }
+    },
+  },
+  titleHelpMessage: '树形组件不能和序列号列同时存在',
+  columns: getBasicColumns(),
+  dataSource: getTreeTableData(),
+  rowKey: 'id',
+  showSelectionBar: true, // 显示多选状态栏
+});
+</script>

src/components/ContractModel/data.tsx

@@ -5,6 +5,13 @@ import { setRoleStatus } from '@/api/demo/system';
 import { useMessage } from '@/hooks/web/useMessage';
 
 type CheckedType = boolean | string | number;
+
+export interface Data {
+  table: {
+    items: any[]
+    total: number
+  }
+}
 export const columns: (
   | { dataIndex: string; width: number; title: string }
   | { dataIndex: string; width: number; title: string }
@@ -71,3 +78,33 @@ export const formSchema: FormSchema[] = [
   },
 
 ];
+
+export function getBasicColumns(): BasicColumn[] {
+  return [
+    {
+      title: '项目名称',
+      dataIndex: 'projectName',
+      width: 180,
+    },
+    {
+      title: '合同名称',
+      dataIndex: 'contrcatName',
+      width: 180,
+    },
+    {
+      title: '收款单位',
+      dataIndex: 'collectingUnit',
+      width: 200,
+    },
+    {
+      title: '投资金额',
+      dataIndex: 'investmentAount',
+      width: 180,
+    },
+    {
+      title: '合同额',
+      dataIndex: 'contractAmount',
+      width: 180,
+    }
+  ]
+}

src/components/ContractModel/tableData.tsx

+import { optionsListApi } from '@/api/demo/select';
+import { FormProps, FormSchema, BasicColumn } from '@/components/Table';
+import { VxeFormItemProps, VxeGridPropTypes } from '@/components/VxeTable';
+import { ref } from 'vue';
+import { Input } from 'ant-design-vue';
+
+export function getBasicColumns(): BasicColumn[] {
+  return [
+    {
+      title: 'ID',
+      dataIndex: 'id',
+      fixed: 'left',
+      width: 200,
+    },
+    {
+      title: '姓名',
+      dataIndex: 'name',
+      width: 150,
+      filters: [
+        { text: 'Male', value: 'male' },
+        { text: 'Female', value: 'female' },
+      ],
+    },
+    {
+      title: '地址',
+      dataIndex: 'address',
+    },
+    {
+      title: '编号',
+      dataIndex: 'no',
+      width: 150,
+      sorter: true,
+      defaultHidden: true,
+    },
+    {
+      title: '开始时间',
+      width: 150,
+      sorter: true,
+      dataIndex: 'beginTime',
+    },
+    {
+      title: '结束时间',
+      width: 150,
+      sorter: true,
+      dataIndex: 'endTime',
+    },
+  ];
+}
+
+
+
+export const getAdvanceSchema = (itemNumber = 6): FormSchema[] => {
+  const arr: FormSchema[] = [];
+  for (let index = 0; index < itemNumber; index++) {
+    arr.push({
+      field: `field${index}`,
+      label: `字段${index}`,
+      component: 'Input',
+      colProps: {
+        xl: 12,
+        xxl: 8,
+      },
+    });
+  }
+  return arr;
+};
+
+
+
+export function getTreeTableData() {
+  return (() => {
+    const arr: any = [];
+    for (let index = 0; index < 40; index++) {
+      arr.push({
+        id: `${index}`,
+        name: 'John Brown',
+        age: `1${index}`,
+        no: `${index + 10}`,
+        address: 'New York No. 1 Lake ParkNew York No. 1 Lake Park',
+        beginTime: new Date().toLocaleString(),
+        endTime: new Date().toLocaleString(),
+        children: [
+          {
+            id: `l2-${index}-1`,
+            name: 'John Brown',
+            age: `1`,
+            no: `${index + 10}`,
+            address: 'New York No. 1 Lake ParkNew York No. 1 Lake Park',
+            beginTime: new Date().toLocaleString(),
+            endTime: new Date().toLocaleString(),
+            children: [
+              {
+                id: `l3-${index}-1-1`,
+                name: 'John Brown',
+                age: `11`,
+                no: `11`,
+                address: 'New York No. 1 Lake ParkNew York No. 1 Lake Park',
+                beginTime: new Date().toLocaleString(),
+                endTime: new Date().toLocaleString(),
+              },
+              {
+                id: `l3-${index}-1-2`,
+                name: 'John Brown',
+                age: `12`,
+                no: `12`,
+                address: 'New York No. 1 Lake ParkNew York No. 1 Lake Park',
+                beginTime: new Date().toLocaleString(),
+                endTime: new Date().toLocaleString(),
+              },
+            ],
+          },
+          {
+            id: `l2-${index}-2`,
+            name: 'John Brown',
+            age: `2`,
+            no: `${index + 10}`,
+            address: 'New York No. 1 Lake ParkNew York No. 1 Lake Park',
+            beginTime: new Date().toLocaleString(),
+            endTime: new Date().toLocaleString(),
+            children: [
+              {
+                id: `l3-${index}-2-1`,
+                name: 'John Brown',
+                age: `21`,
+                no: `21`,
+                address: 'New York No. 1 Lake ParkNew York No. 1 Lake Park',
+                beginTime: new Date().toLocaleString(),
+                endTime: new Date().toLocaleString(),
+              },
+              {
+                id: `l3-${index}-2-2`,
+                name: 'John Brown',
+                age: `22`,
+                no: `22`,
+                address: 'New York No. 1 Lake ParkNew York No. 1 Lake Park',
+                beginTime: new Date().toLocaleString(),
+                endTime: new Date().toLocaleString(),
+              },
+            ],
+          },
+        ],
+      });
+    }
+    return arr;
+  })();
+}

src/components/YearSelect/YearSelect.vue

@@ -7,15 +7,11 @@
 
 </template>
 <script lang="ts" setup>
-import { unref, computed, onMounted, ref, reactive } from 'vue';
+import { ref} from 'vue';
 import { BasicForm, useForm, FormActionType } from '@/components/Form';
 import { formSchema } from './project.data';
 const emit = defineEmits(['success', 'register']);
-const isUpdate = ref(true);
-const projectId = ref(0);
-const detailId = ref(0);
 const formElRef = ref<Nullable<FormActionType>>(null);
-const stype = ref(null);
 const [registerForm, { resetFields, setFieldsValue, validate, updateSchema }] = useForm({
   labelWidth: 90,
   baseColProps: { span: 24 },

src/components/yearModal/yearModal.vue

+<template>
+  <BasicModal
+    v-bind="$attrs"
+    @register="register"
+    title="选择填报周期"
+    :minHeight="30"
+    okText="新建"
+    @ok="handleSubmit"
+    @cancel="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';
+
+  let schemas = reactive<FormSchema[]>([]);
+  const props = defineProps({
+    userData: { type: Object },
+  });
+  const emit = defineEmits(['close']);
+  const modelRef = ref({});
+  const [
+    registerForm,
+    {
+      getFieldsValue,
+      validate,
+      //   // setFieldsValue,
+      //   // setProps
+    },
+  ] = useForm({
+    labelWidth: 120,
+    schemas: schemas,
+    showActionButtonGroup: false,
+    actionColOptions: {
+      span: 24,
+    },
+  });
+
+  const [register, { closeModal }] = useModalInner((data) => {
+    data && onDataReceive(data);
+  });
+
+  function onDataReceive(data) {
+    console.log('Data Received', data);
+    data.data.map((i) => {
+      if (i == 'year') {
+        schemas.push({
+          field: 'year',
+          label: '',
+          component: 'DatePicker',
+          required: true,
+          componentProps: {
+            placeholder: '年份',
+            picker: 'year',
+            valueFormat: 'YYYY',
+            format: 'YYYY',
+            style: {
+              width: '100%',
+            },
+          },
+          colProps: { span: 11, offset: 1 },
+        });
+      }
+      if (i == 'month') {
+        schemas.push({
+          field: 'month',
+          label: '',
+          component: 'DatePicker',
+          required: true,
+          componentProps: {
+            placeholder: '月份',
+            picker: 'month',
+            valueFormat: 'YYYY-MM',
+            format: 'YYYY-MM',
+            style: {
+              width: '100%',
+            },
+          },
+          colProps: { span: 11, offset: 1 },
+        });
+      }
+      if (i == 'quarter') {
+        schemas.push({
+          field: 'quarter',
+          label: '',
+          required: true,
+          component: 'Select',
+          componentProps: {
+            placeholder: '季度',
+            options: [
+              {
+                label: '第一季度',
+                value: '第一季度',
+              },
+              {
+                label: '第二季度',
+                value: '第二季度',
+              },
+              {
+                label: '第三季度',
+                value: '第三季度',
+              },
+              {
+                label: '第四季度',
+                value: '第四季度',
+              },
+            ],
+          },
+          colProps: { span: 11, offset: 1 },
+        });
+      }
+    });
+
+    // 方式1;
+    // setFieldsValue({
+    //   field2: data.data,
+    //   field1: data.info,
+    // });
+
+    // // 方式2
+    // modelRef.value = { field2: data.data, field1: data.info };
+
+    // setProps({
+    //   model:{ field2: data.data, field1: data.info }
+    // })
+  }
+
+  function handleVisibleChange(v) {
+    schemas = [];
+  }
+
+  function handleSubmit() {
+    validate().then(() => {
+      const value = getFieldsValue();
+      console.log(value);
+      schemas = [];
+      console.log('submit');
+      emit('close', value);
+      // closeModal();
+    });
+  }
+</script>

src/views/changeSignature/addChangeSignature.vue

@@ -3,7 +3,7 @@
     <template #extra>
       <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>
@@ -121,7 +121,7 @@ onMounted(async () => {
       tabsFormSchema.push(item);
       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,"数据查看")
@@ -190,29 +190,29 @@ async function handleNew(info: any) {
     };
     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)
-        tabsFormSchema[index].ContentFormList.push(item);
-        if(isUpdate){
-          formData.value.management[index].contract.push({
-            contractId: info.id,
-            proChngeVisaQuarterId:routerId.value
-          });
-        }
-        else {
-          formData.value.management[index].contract.push({
-            contractId: info.id,
-          });
+    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)
+          tabsFormSchema[index].ContentFormList.push(item);
+          if(isUpdate){
+            formData.value.management[index].contract.push({
+              contractId: info.id,
+              proChngeVisaQuarterId:routerId.value
+            });
+          }
+          else {
+            formData.value.management[index].contract.push({
+              contractId: info.id,
+            });
+          }
         }
       }
     }
-  }
   } else {
     const contentItem = {
       ContentFormList: useForm(Object.assign({schemas: Content,disabled}, baseFormConfig) as FormProps),
@@ -266,7 +266,7 @@ async function handleNew(info: any) {
   }
 }
 //提交
-  async function handleSubmit() {
+async function handleSubmit() {
   //构建数据
   const  data={
     management:"",
@@ -284,7 +284,7 @@ async function handleNew(info: any) {
     }
     let item = tabsFormSchema[i];
     const { validate  } = item.Form[1];
-   const  data= await validate();
+    const  data= await validate();
     await handleNewContent(item.Form[1])
     const { getFieldsValue } = item.Form[1]
     contrantData.projectId = tabsFormSchema[i].projectId;
@@ -292,7 +292,7 @@ async function handleNew(info: any) {
     for (let j = 0; j < item.ContentFormList.length; j++) {
       let  content=  item.ContentFormList[j]
       const { getFieldsValue } = content.ContentFormList[1]
-     await  handleNewContent(content.ContentFormList[1])
+      await  handleNewContent(content.ContentFormList[1])
       let res = getFieldsValue();
       if(!isUpdate){
         let  itemConetnt =  Object.assign
@@ -312,7 +312,7 @@ async function handleNew(info: any) {
     management.push(contrantData)
   }
   data.management = management;
-   //新增接口
+  //新增接口
   if(routerId.value){
     const  res=updateItem(data)
     createMessage.success('提交成功!');
@@ -364,10 +364,10 @@ async function handleAdd() {
 }
 
 //  校验方法
- function handleNewContent(params) {
+function handleNewContent(params) {
   const { validate } = params;
-   const data=   validate()
-   return data;
+  const data=   validate()
+  return data;
 }
 
 async function handleSuccess(params: any) {

src/views/changeSignature/changeSignatrue.data.ts

@@ -284,7 +284,7 @@ export const Content: FormSchema[] = [
     field: 'changeNumber',
     label: '变更编号',
     required: true,
-    component: 'InputNumber',
+    component: 'input',
     colProps: { span: 7, offset: 1 },
   },
   {
@@ -320,7 +320,7 @@ export const Content: FormSchema[] = [
     field: 'responsibleParty',
     label: '责任方',
     required: true,
-    component: 'InputNumber',
+    component: 'input',
     colProps: { span: 7, offset: 1 },
   },
     {
@@ -344,7 +344,7 @@ export const Content: FormSchema[] = [
     label: '预估变更金额占合同金额比例:',
     labelWidth:"300px",
     required: true,
-    component: 'InputNumber',
+    component: 'input',
     colProps: { span: 7, offset: 1 },
   },
 //签证编号:
@@ -352,7 +352,7 @@ export const Content: FormSchema[] = [
       field: 'visaNumber',
       label: '签证编号:',
       required: true,
-      component: 'InputNumber',
+      component: 'input',
       colProps: { span: 7, offset: 1 },
     },
 //签证类型:
@@ -360,7 +360,7 @@ export const Content: FormSchema[] = [
     field: 'visaType',
     label: '签证类型:',
     required: true,
-    component: 'InputNumber',
+    component: 'input',
     colProps: { span: 7, offset: 1 },
   },
 

src/views/changeSignature/index.vue

@@ -55,20 +55,21 @@
 <script setup lang="ts">
 
 import {useModal} from "@/components/Modal";
-import yearModal from '@/components/yearModal.vue';
+import yearModal from '@/components/yearModal/yearModal.vue';
+const { createMessage } = useMessage();
 const { push } = useRouter();
-const [register, { openModal: openModal }] = useModal();
+const [register, { openModal: openModal,closeModal:closeModal }] = useModal();
   import { BasicTable, useTable, TableAction } from '@/components/Table';
-  import { getSettlementManageList,auditItem,deleteList} from '@/api/changeSignatrue/changeSignatrue';
+  import { getSettlementManageList,auditItem,deleteList,checkQuarter} from '@/api/changeSignatrue/changeSignatrue';
   import {
     columns,
     searchFormSchema,
   } from '@/views/changeSignature/changeSignatrue.data';
   import {Tag} from "ant-design-vue";
-import {router} from "@/router";
 import {useRouter} from "vue-router";
 import {onMounted} from "vue";
 import {getDepartmentList} from "@/api/project/settlementManage";
+import {useMessage} from "@/hooks/web/useMessage";
 
   const [registerTable, { reload }] = useTable({
     api: getSettlementManageList,
@@ -121,11 +122,23 @@ function handleEdit(record: Recordable,isUpdate:boolean){
   });
 }
   //新建变更签证管理   页面跳转
-function  handleNew(e){
-  push({
-    path: '/changeSignature/edit',
-    query: e,
-  });
+async  function  handleNew(e){
+  const  secrch:dateType={
+    givenYear:e.year,
+    quarter:e.quarter
+  }
+  const res = await checkQuarter(secrch)
+  if(!res){
+    closeModal()
+    push({
+      path: '/changeSignature/edit',
+      query: e,
+    });
+  }
+  else {
+    createMessage.error("该季度已结算，请选择其他季度");
+  }
+
 }
 async function examine(record: Recordable, disabled: boolean) {
   const id = record.id
@@ -133,6 +146,14 @@ async function examine(record: Recordable, disabled: boolean) {
   console.log(res)
   reload();
 }
+//搜索类型
+type dateType={
+  givenYear:string,
+  quarter:string
+}
+
+
+
 </script>
 
 <style scoped lang="less"></style>

src/views/contract/contractDrawer.vue

@@ -93,12 +93,8 @@
       }
       // TODO custom api
       console.log(values);
-
       let res = await addItem(values);
-
-      console.log(res,"合同查看")
       console.log(res);
-
       closeDrawer();
       emit('success', res);
     } finally {

src/views/settlementManagement/index.vue

@@ -15,10 +15,6 @@
         <template v-if="column.key === 'action'">
           <TableAction v-if="record.statusResult == '0'"
               :actions="[
-              //   {
-              //   label: '详情',
-              //   onClick: handleEdit.bind(null, record,false),
-              // },
                  {
                 label: '审核',
                 color: 'success',
@@ -59,17 +55,18 @@
 </template>
 <script lang="ts" setup>
 import { BasicTable, useTable, TableAction } from '@/components/Table';
-import yearModal from '@/components/yearModal.vue';
+import yearModal from '@/components/yearModal/yearModal.vue';
 import { useModal } from '@/components/Modal';
 const { push } = useRouter();
 import {useRouter} from "vue-router";
 import {onMounted}from "vue"
-const [register, { openModal: openModal }] = useModal();
-import {getSettlementManageList, auditItem,deleteLis,getDepartmentList} from '@/api/project/settlementManage';
+const [register, { openModal: openModal,closeModal:closeModal }] = useModal();
+import {getSettlementManageList, auditItem,deleteLis,getDepartmentList,isSettlement} from '@/api/project/settlementManage';
 import { columns, searchFormSchema } from './data';
 import { useDrawer } from '@/components/Drawer';
-import {router} from "@/router";
+const { createMessage } = useMessage();
 import {Tag} from "ant-design-vue";
+import {useMessage} from "@/hooks/web/useMessage";
 defineOptions({ name: 'SettlementManagement' });
 const [registerDrawer, { openDrawer }] = useDrawer();
 const [registerTable, { reload }] = useTable({
@@ -135,15 +132,35 @@ function handleSuccess() {
   reload();
 }
 
-const handleNew = (e) => {
+// 关闭弹出框
+  const  handleNew  =  (e)  => {
   console.log(e);
-  push({
-    path: '/settlementManagement/edit',
-    query: {
-      quarter:e.quarter,
-      year:e.year,
-      add:"add"
+    type dateType={
+      givenYear:string,
+      quarter:string
     }
-  });
+    const  search:dateType={
+      givenYear:e.year,
+      quarter:e.quarter
+    }
+    // 判断是否已结算
+    isSettlement(search).then(res=>{
+      if(res){
+        createMessage.error("该季度已结算，请选择其他季度");
+        return
+      }
+      else {
+        push({
+          path: '/settlementManagement/edit',
+          query: {
+            quarter:e.quarter,
+            year:e.year,
+            add:"add"
+          }
+        });
+        closeModal()
+      }
+    });
+
 };
 </script>