Merge remote-tracking branch 'origin/develop' into develop

src/views/completed/completedModel/completedModel.vue

@@ -27,11 +27,12 @@
 </template>
 <script lang="ts" setup>
   import { BasicModal, useModalInner } from '@/components/Modal';
-  import { BasicTable, useTable, TableAction } from '@/components/Table';
+  import { BasicTable, useTable } from '@/components/Table';
   import { columns, searchFormSchema } from './data';
   import { useMessage } from '@/hooks/web/useMessage';
   import { getCompletedProjectList } from '@/api/project/completed';
   import { Tag } from 'ant-design-vue';
+
   const [registerTable, { reload, getSelectRows, clearSelectedRowKeys }] = useTable({
     api: getCompletedProjectList,
     title: '123',

src/views/project/completedDrawer/drawerData.ts

@@ -11,7 +11,7 @@ export const completedFormSchema: FormSchema[] = [
   },
   {
     label: '公司名称',
-    field: 'companyName',
+    field: 'company',
     labelWidth: '140px',
     required: false,
     component: 'Input',

src/views/project/performanceDrawer/drawerData.ts

@@ -95,16 +95,6 @@ export const performanceFormSchema: FormSchema[] = [
       addonAfter: '万元',
     },
   },
-  {
-    label: '该年实际完成投资额',
-    labelWidth: '140px',
-    field: 'actualOutputValue',
-    required: false,
-    component: 'Input',
-    componentProps: {
-      addonAfter: '万元',
-    },
-  },
   {
     label: '该年计划资金',
     labelWidth: '140px',

src/views/project/tabs/annex.vue

@@ -36,7 +36,8 @@
         </template>
       </template>
     </BasicTable>
-    <annex-drawer />
+
+    <AnnexDrawer @register="registerDrawer" @success="handleSuccess" />
   </div>
 </template>
 <script lang="ts" setup>

src/views/project/tabs/contract.vue

@@ -37,7 +37,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { contractColumns, searchFormSchema } from './listData';
+  import { contractColumns } from './listData';
   import { BasicTable, useTable, TableAction } from '@/components/Table';
   import { getContractListPage, deleteItem } from '@/api/contract/contract';
   import { inject } from 'vue';

src/views/project/tabs/listData.ts

@@ -199,11 +199,6 @@ export const performanceColumns: BasicColumn[] = [
     dataIndex: 'planNum',
     width: 180,
   },
-  {
-    title: '该年实际完成投资额',
-    dataIndex: 'actualOutputValue',
-    width: 180,
-  },
   {
     title: '该年计划资金',
     dataIndex: 'planFunds',

src/views/safetyEducation/educationDrawer.vue

@@ -15,7 +15,7 @@
 <script lang="ts" setup>
   import { onMounted, ref, unref } from 'vue';
   import { BasicForm, useForm, FormActionType } from '@/components/Form';
-  import { formSchema, searchFormSchema } from './data';
+  import { formSchema } from './data';
   import { BasicDrawer, useDrawerInner } from '@/components/Drawer';
   import { addItem, getUserList, updateItem } from '@/api/project/safetyEducation';
 

src/views/statement/biddingManagement/detail.data.ts

@@ -500,8 +500,8 @@ export function getFormConfig(): Partial<FormProps> {
     labelWidth: 100,
     schemas: [
       {
-        field: 'fillingPeriod',
-        label: '填报周期',
+        field: 'tenderYear',
+        label: '填报年份',
         component: 'DatePicker',
         componentProps: {
           placeholder: '选择填报周期',
@@ -517,6 +517,40 @@ export function getFormConfig(): Partial<FormProps> {
           xxl: 4,
         },
       },
+      {
+        label: '填报季度',
+        field: 'biddingQuarter',
+        labelWidth: '140px',
+        component: 'Select',
+        componentProps: {
+          options: [
+            {
+              label: '第一季度',
+              value: '第一季度',
+              key: '第一季度',
+            },
+            {
+              label: '第二季度',
+              value: '第二季度',
+              key: '第二季度',
+            },
+            {
+              label: '第三季度',
+              value: '第三季度',
+              key: '第三季度',
+            },
+            {
+              label: '第四季度',
+              value: '第四季度',
+              key: '第四季度',
+            },
+          ],
+        },
+        colProps: {
+          xl: 8,
+          xxl: 4,
+        },
+      },
       {
         label: '项目名称',
         field: 'projectName',

src/views/statement/biddingPlan/detail.data.ts

@@ -427,8 +427,8 @@ export function getFormConfig(): Partial<FormProps> {
     labelWidth: 100,
     schemas: [
       {
-        field: 'fillingPeriod',
-        label: '填报周期',
+        field: 'tenderYear',
+        label: '填报年份',
         component: 'DatePicker',
         componentProps: {
           placeholder: '选择填报周期',
@@ -444,6 +444,40 @@ export function getFormConfig(): Partial<FormProps> {
           xxl: 4,
         },
       },
+      {
+        label: '填报季度',
+        field: 'biddingQuarter',
+        labelWidth: '140px',
+        component: 'Select',
+        componentProps: {
+          options: [
+            {
+              label: '第一季度',
+              value: '第一季度',
+              key: '第一季度',
+            },
+            {
+              label: '第二季度',
+              value: '第二季度',
+              key: '第二季度',
+            },
+            {
+              label: '第三季度',
+              value: '第三季度',
+              key: '第三季度',
+            },
+            {
+              label: '第四季度',
+              value: '第四季度',
+              key: '第四季度',
+            },
+          ],
+        },
+        colProps: {
+          xl: 8,
+          xxl: 4,
+        },
+      },
       {
         label: '项目名称',
         field: 'projectName',

src/views/statement/monthlyPlanDrawer/detail.data.ts

 import { FormSchema, BasicColumn, FormProps } from '@/components/Table';
-import { uploadApi } from '@/api/sys/upload';
 
+// 月季度-详情
 export const formSchema: FormSchema[] = [
   {
     field: 'projectName',

src/views/statement/tabs/InvestmentPlan.vue

@@ -9,7 +9,7 @@
       </template>
       <template v-if="column.key === 'action'">
         <TableAction
-            :actions="[
+          :actions="[
             {
               label: '查看详情',
               onClick: handleDetail.bind(null, record, 1),
@@ -23,98 +23,96 @@
     </template>
   </BasicTable>
   <exportModal @register="registerModal" />
-  <detaildrawer @register="registerDrawer"></detaildrawer>
+  <detaildrawer @register="registerDrawer" />
 </template>
 <script lang="ts" setup>
-import  exportModal from '../components/exportModal.vue';
-import detaildrawer from '@/views/statement/InvestmentPlanlDrawer/detailDrawer.vue';
-import { columns, searchFormSchema } from './data';
-import { exportUrl } from '../InvestmentPlanlDrawer/detail.data';
-import { BasicTable, useTable, TableAction } from '@/components/Table';
-import { inject } from 'vue';
-import {getInvestmentPlanDetail, getInvestmentPlanList} from '@/api/project/statement';
-import { router } from '@/router';
-import DetailDrawer from "@/views/statement/InvestmentPlanlDrawer/detailDrawer.vue";
-import {useDrawer} from "@/components/Drawer";
-import {useModal} from "@/components/Modal";
-import {getFormConfig} from "@/views/statement/InvestmentPlanlDrawer/detail.data";
-const [registerDrawer, { openDrawer }] = useDrawer();
-const [registerModal, { openModal: openModal }] = useModal();
-const [registerTable, { reload, getForm }] = useTable({
-  api: getInvestmentPlanList,
-  columns,
-  formConfig: getFormConfig(),
-  useSearchForm: true,
-  showTableSetting: false,
-  bordered: true,
-  showIndexColumn: false,
-  actionColumn: {
-    width: 200,
-    title: '操作',
-    dataIndex: 'action',
-    // slots: { customRender: 'action' },
-    fixed: undefined,
-  },
-});
+  import exportModal from '../components/exportModal.vue';
+  import detaildrawer from '@/views/statement/InvestmentPlanlDrawer/detailDrawer.vue';
+  import { columns } from './data';
+  import { exportUrl } from '../InvestmentPlanlDrawer/detail.data';
+  import { BasicTable, useTable, TableAction } from '@/components/Table';
+  import { getInvestmentPlanDetail, getInvestmentPlanList } from '@/api/project/statement';
+  import { useDrawer } from '@/components/Drawer';
+  import { useModal } from '@/components/Modal';
+  import { getFormConfig } from '@/views/statement/InvestmentPlanlDrawer/detail.data';
 
-function handleExport() {
-  openModal(true, {
-    projectId: null,
-    exportUrl: exportUrl,
-    title:"投资计划",
-    searchData:getForm().getFieldsValue(),
-    exportData: getExportData(),
+  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal: openModal }] = useModal();
+  const [registerTable, { reload, getForm }] = useTable({
+    api: getInvestmentPlanList,
+    columns,
+    formConfig: getFormConfig(),
+    useSearchForm: true,
+    showTableSetting: false,
+    bordered: true,
+    showIndexColumn: false,
+    actionColumn: {
+      width: 200,
+      title: '操作',
+      dataIndex: 'action',
+      // slots: { customRender: 'action' },
+      fixed: undefined,
+    },
   });
-}
 
-//导出相关操作
-function getExportData() {
-  let exportData = [];
-  columns.map((i) => {
-    exportData.push({
-      label: i.title,
-      value: i.dataIndex,
+  function handleExport() {
+    openModal(true, {
+      projectId: null,
+      exportUrl: exportUrl,
+      title: '投资计划',
+      searchData: getForm().getFieldsValue(),
+      exportData: getExportData(),
     });
-  });
-  return exportData;
-}
+  }
 
-async function handleDetail(record: Recordable, disabled: number) {
-  console.log('record', record)
-  console.log('disabled', disabled)
-  const res = await getInvestmentPlanDetail({ id: record.id})
-  console.log('res', res)
-  openDrawer(true, {
-    record: res,
-    disabled,
-    isUpdate: true,
-    type: '工程'
-  });
+  //导出相关操作
+  function getExportData() {
+    let exportData = [];
+    columns.map((i) => {
+      exportData.push({
+        label: i.title,
+        value: i.dataIndex,
+      });
+    });
+    return exportData;
+  }
+
+  async function handleDetail(record: Recordable, disabled: number) {
+    console.log('record', record);
+    console.log('disabled', disabled);
+    const res = await getInvestmentPlanDetail({ id: record.id });
+    console.log('res', res);
+    openDrawer(true, {
+      record: res,
+      disabled,
+      isUpdate: true,
+      type: '工程',
+    });
 
-  // if (record.planType === '工程') {
-  //   router.push({
-  //     path: '/engineeringProject/engineeringEdit',
-  //     query: {
-  //       id: record.id,
-  //       disabled: String(disabled),
-  //     },
-  //   });
-  // } else if (record.planType === '承建') {
-  //   router.push({
-  //     path: '/engineeringProject/constructionEdit',
-  //     query: {
-  //       id: record.id,
-  //       disabled: String(disabled),
-  //     },
-  //   });
-  // } else if (record.planType === '储备') {
-  //   router.push({
-  //     path: '/engineeringProject/reserveEdit',
-  //     query: {
-  //       id: record.id,
-  //       disabled: String(disabled),
-  //     },
-  //   });
-  // }
-}
+    // if (record.planType === '工程') {
+    //   router.push({
+    //     path: '/engineeringProject/engineeringEdit',
+    //     query: {
+    //       id: record.id,
+    //       disabled: String(disabled),
+    //     },
+    //   });
+    // } else if (record.planType === '承建') {
+    //   router.push({
+    //     path: '/engineeringProject/constructionEdit',
+    //     query: {
+    //       id: record.id,
+    //       disabled: String(disabled),
+    //     },
+    //   });
+    // } else if (record.planType === '储备') {
+    //   router.push({
+    //     path: '/engineeringProject/reserveEdit',
+    //     query: {
+    //       id: record.id,
+    //       disabled: String(disabled),
+    //     },
+    //   });
+    // }
+  }
 </script>

src/views/statement/tabs/annex.vue

@@ -37,8 +37,7 @@
   import { BasicTable, useTable, TableAction } from '@/components/Table';
   import { getAnnexList, deleteAnnex } from '@/api/project/project';
   import { inject } from 'vue';
-  import { router } from '@/router';
-  import { Tag } from 'ant-design-vue';
+
   let detailId = inject('detailId');
   console.log('detailId', detailId);
   const [registerTable, { reload }] = useTable({

src/views/statement/tabs/annualPlan.vue

@@ -23,21 +23,22 @@
     </template>
   </BasicTable>
   <exportModal @register="registerModal" />
-  <detaildrawer @register="registerDrawer"></detaildrawer>
+  <detaildrawer @register="registerDrawer" />
 </template>
 <script lang="ts" setup>
-  import  exportModal from '../components/exportModal.vue';
+  import exportModal from '../components/exportModal.vue';
   import detaildrawer from '@/views/statement/annualPlanDrawer/detailDrawer.vue';
-  import { annualPlanColumns, searchFormSchema } from './data';
-  import {exportUrl} from '../annualPlanDrawer/detail.data'
+  import { annualPlanColumns } from './data';
+  import { exportUrl } from '../annualPlanDrawer/detail.data';
   import { BasicTable, useTable, TableAction } from '@/components/Table';
   import { inject } from 'vue';
-  import {getAnnualPlanDetail, getAnnualPlanTotalList} from '@/api/project/annualPlan';
+  import { getAnnualPlanDetail, getAnnualPlanTotalList } from '@/api/project/annualPlan';
   import { router } from '@/router';
-  import {useDrawer} from "@/components/Drawer";
-  import {getFormConfig} from "@/views/statement/annualPlanDrawer/detail.data";
+  import { useDrawer } from '@/components/Drawer';
+  import { getFormConfig } from '@/views/statement/annualPlanDrawer/detail.data';
+  import { useModal } from '@/components/Modal';
+
   const [registerDrawer, { openDrawer }] = useDrawer();
-  import {useModal} from "@/components/Modal";
   const [registerModal, { openModal: openModal }] = useModal();
   let detailId = inject('detailId');
   console.log('detailId', detailId);
@@ -64,8 +65,8 @@
     openModal(true, {
       projectId: null,
       exportUrl: exportUrl,
-      title:"年度资金计划",
-      searchData:getForm().getFieldsValue(),
+      title: '年度资金计划',
+      searchData: getForm().getFieldsValue(),
       exportData: getExportData(),
     });
   }
@@ -81,8 +82,8 @@
     });
     return exportData;
   }
-   async function handleDetail(record: Recordable, disabled: number) {
-    const res = await getAnnualPlanDetail({ id: record.id})
+  async function handleDetail(record: Recordable, disabled: number) {
+    const res = await getAnnualPlanDetail({ id: record.id });
     console.log('res', res);
     openDrawer(true, {
       record: res,

src/views/statement/tabs/biddingManagement.vue

@@ -28,11 +28,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import {
-    biddingManagementColumns,
-    exportBiddingManagementColumns,
-    searchFormSchema,
-  } from './data';
+  import { biddingManagementColumns, exportBiddingManagementColumns } from './data';
   import { BasicTable, useTable, TableAction } from '@/components/Table';
   import { tendermanageGetListByPage } from '@/api/project/biddingManagement';
   import { inject } from 'vue';

src/views/statement/tabs/biddingPlan.vue

@@ -30,7 +30,7 @@
 <script lang="ts" setup>
   import exportModal from '../biddingPlan/exportModal.vue';
   import { getFormConfig } from '@/views/statement/biddingPlan/detail.data';
-  import { biddingPlanColumns, exportBiddingPlanColumns, searchFormSchema } from './data';
+  import { biddingPlanColumns, exportBiddingPlanColumns } from './data';
   import { BasicTable, useTable, TableAction } from '@/components/Table';
   import { getListTenderPlanGetList } from '@/api/project/biddingPlan';
   import { inject } from 'vue';

src/views/statement/tabs/changeSignature.vue

@@ -30,26 +30,29 @@
     </template>
   </BasicTable>
   <exportModal @register="registerModal" />
-  <detaildrawer @register="registerDrawer"></detaildrawer>
+  <detaildrawer @register="registerDrawer" />
 </template>
 <script lang="ts" setup>
-import detaildrawer from '@/views/statement/changeSignatureDrawer/detailDrawer.vue';
-  import { changeSignatureColumns, searchFormSchema } from './data';
+  import detaildrawer from '@/views/statement/changeSignatureDrawer/detailDrawer.vue';
+  import { changeSignatureColumns } from './data';
   import { BasicTable, useTable, TableAction } from '@/components/Table';
-  import {getChangeSignatureList, getSettlementManageList} from '@/api/changeSignatrue/changeSignatrue';
-  import {useDrawer} from "@/components/Drawer";
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  import { getChangeSignatureList } from '@/api/changeSignatrue/changeSignatrue';
+  import { useDrawer } from '@/components/Drawer';
   import { inject } from 'vue';
-  let detailId = inject('detailId');
   //导出相关操作
-  import {biddingPlanColumns,exportUrl} from "@/views/statement/components/changeSignature/data";
-  import  exportModal from '../components/exportModal.vue';
-  import {useModal} from "@/components/Modal";
-  const [registerModal, { openModal: openModal }] = useModal();
+  import { biddingPlanColumns, exportUrl } from '@/views/statement/components/changeSignature/data';
+  import exportModal from '../components/exportModal.vue';
+  import { useModal } from '@/components/Modal';
   //高级搜索相关
-import {getFormConfig} from "@/views/statement/changeSignatureDrawer/detail.data"
+  import { getFormConfig } from '@/views/statement/changeSignatureDrawer/detail.data';
+
+  const [registerDrawer, { openDrawer }] = useDrawer();
+  let detailId = inject('detailId');
+
+  const [registerModal, { openModal: openModal }] = useModal();
+
   console.log('detailId', detailId);
-  const [registerTable, { reload,getForm }] = useTable({
+  const [registerTable, { reload, getForm }] = useTable({
     api: getChangeSignatureList,
     columns: changeSignatureColumns,
     useSearchForm: true,
@@ -94,8 +97,8 @@ import {getFormConfig} from "@/views/statement/changeSignatureDrawer/detail.data
     openModal(true, {
       projectId: null,
       exportUrl: exportUrl,
-      title :"变更签证管理",
-      searchData:getForm().getFieldsValue(),
+      title: '变更签证管理',
+      searchData: getForm().getFieldsValue(),
       exportData: getExportData(),
     });
   }
@@ -124,6 +127,3 @@ function  changeTypeShow(value:any){
   return changeTypDta.find((item:any)=>item.value==value)?.label;
 }
 </script>
-
-
-

src/views/statement/tabs/completed.vue

@@ -23,20 +23,20 @@
     </template>
   </BasicTable>
   <exportModal @register="registerModal" />
-  <detaildrawer @register="registerDrawer"></detaildrawer>
+  <detaildrawer @register="registerDrawer" />
 </template>
 <script lang="ts" setup>
-  import  exportModal from '../components/exportModal.vue';
+  import exportModal from '../components/exportModal.vue';
   import detaildrawer from '@/views/statement/completedDrawer/detailDrawer.vue';
-  import { completedColumns, searchFormSchema} from './data';
+  import { completedColumns } from './data';
   import { exportUrl, getFormConfig } from '../completedDrawer/detail.data';
   import { BasicTable, useTable, TableAction } from '@/components/Table';
   import { inject } from 'vue';
-  import {getCompletedDetail, getCompletedTotalList} from '@/api/project/completed';
-  import { router } from '@/router';
+  import { getCompletedDetail, getCompletedTotalList } from '@/api/project/completed';
   import { useDrawer } from '@/components/Drawer';
+  import { useModal } from '@/components/Modal';
+
   const [registerDrawer, { openDrawer }] = useDrawer();
-  import {useModal} from "@/components/Modal";
   const [registerModal, { openModal: openModal }] = useModal();
   let detailId = inject('detailId');
   console.log('detailId', detailId);
@@ -64,8 +64,8 @@
     openModal(true, {
       projectId: null,
       exportUrl: exportUrl,
-      title:"已竣工验收项目陈欠资金计划",
-      searchData:getForm().getFieldsValue(),
+      title: '已竣工验收项目陈欠资金计划',
+      searchData: getForm().getFieldsValue(),
       exportData: getExportData(),
     });
   }
@@ -85,7 +85,7 @@
   async function handleDetail(record: Recordable, disabled: number) {
     console.log('record', record);
     console.log('disabled', disabled);
-    const res = await getCompletedDetail({ id: record.id})
+    const res = await getCompletedDetail({ id: record.id });
     console.log('res', res);
     openDrawer(true, {
       record: res,