Merge branch 'develop' of http://gitlab.91isoft.com:90/purple-cloud/web-progeam into develop

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

 import { FormSchema, BasicColumn } from '@/components/Table';
-import { uploadApi } from '@/api/sys/upload';
+
 export const formSchema: FormSchema[] = [
   {
     label: '填报周期',
@@ -317,3 +317,138 @@ export const tabList = [
     component: 'updateRecords',
   },
 ];
+export const searchExportFormSchema: FormSchema[] = [
+  {
+    field: 'fillingPeriod',
+    label: '填报周期',
+    component: 'DatePicker',
+    componentProps: {
+      placeholder: '填报周期',
+      style: { width: '100%' },
+      valueFormat: 'YYYY-MM-DD',
+      format: 'YYYY-MM-DD',
+    },
+    colProps: {
+      xl: 8,
+      xxl: 4,
+    },
+  },
+  {
+    label: '隐患描述',
+    field: 'describe',
+    component: 'Input',
+    colProps: {
+      xl: 8,
+      xxl: 4,
+    },
+  },
+  {
+    label: '隐患级别',
+    field: 'level',
+    component: 'Select',
+    componentProps: {
+      options: [
+        {
+          label: '一级',
+          value: '一级',
+        },
+        {
+          label: '二级',
+          value: '二级',
+        },
+        {
+          label: '三级',
+          value: '三级',
+        },
+      ],
+    },
+    colProps: {
+      xl: 8,
+      xxl: 4,
+    },
+  },
+  {
+    label: '计划费用(万元)',
+    field: 'planCost',
+    component: 'Input',
+    componentProps: {
+      addonAfter: '万元',
+    },
+    colProps: {
+      xl: 8,
+      xxl: 4,
+    },
+  },
+  {
+    label: '实际费用(万元)',
+    field: 'actualCost',
+    component: 'Input',
+    componentProps: {
+      addonAfter: '万元',
+    },
+    colProps: {
+      xl: 8,
+      xxl: 4,
+    },
+  },
+  {
+    field: 'actualTime',
+    label: '实际时间',
+    component: 'DatePicker',
+    componentProps: {
+      placeholder: '选择实际时间',
+      style: { width: '100%' },
+      valueFormat: 'YYYY-MM-DD',
+      format: 'YYYY-MM-DD',
+    },
+    colProps: {
+      xl: 8,
+      xxl: 4,
+    },
+  },
+  {
+    field: 'planTime',
+    label: '计划时间',
+    component: 'DatePicker',
+    componentProps: {
+      placeholder: '选择计划时间',
+      style: { width: '100%' },
+      valueFormat: 'YYYY-MM-DD',
+      format: 'YYYY-MM-DD',
+    },
+    colProps: {
+      xl: 8,
+      xxl: 4,
+    },
+  },
+  {
+    label: '隐患后的评估情况',
+    field: 'assessmentSituation',
+    component: 'Input',
+    colProps: {
+      xl: 8,
+      xxl: 4,
+    },
+  },
+  {
+    label: '责任人',
+    field: 'responsiblePerson',
+    component: 'Select',
+    componentProps: {
+      options: [
+        {
+          label: '责任人一',
+          value: '责任人一',
+        },
+        {
+          label: '责任人二',
+          value: '责任人二',
+        },
+      ],
+    },
+    colProps: {
+      xl: 8,
+      xxl: 4,
+    },
+  },
+];

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

 import { FormSchema, BasicColumn } from '@/components/Table';
-import { uploadApi } from '@/api/sys/upload';
+
 export const formSchema: FormSchema[] = [
   {
     label: '填报周期',
@@ -362,3 +362,131 @@ export const tabList = [
     component: 'updateRecords',
   },
 ];
+export const searchExportFormSchema: FormSchema[] = [
+  {
+    field: 'fillingPeriod',
+    label: '填报周期',
+    component: 'DatePicker',
+    componentProps: {
+      placeholder: '选择填报周期',
+      style: { width: '100%' },
+      valueFormat: 'YYYY-MM-DD',
+      format: 'YYYY-MM-DD',
+    },
+    colProps: {
+      xl: 8,
+      xxl: 4,
+    },
+  },
+  {
+    field: 'trainingTime',
+    label: '培训时间',
+    component: 'DatePicker',
+    componentProps: {
+      placeholder: '选择培训时间',
+      style: { width: '100%' },
+      valueFormat: 'YYYY-MM-DD',
+      format: 'YYYY-MM-DD',
+    },
+    colProps: {
+      xl: 8,
+      xxl: 4,
+    },
+  },
+  {
+    label: '培训主题',
+    field: 'trainingTheme',
+    component: 'Input',
+    colProps: {
+      xl: 8,
+      xxl: 4,
+    },
+  },
+  {
+    label: '培训类型',
+    field: 'trainingType',
+    component: 'Select',
+    componentProps: {
+      options: [
+        {
+          label: '类型一',
+          value: '类型一',
+        },
+        {
+          label: '类型二',
+          value: '类型二',
+        },
+      ],
+    },
+    colProps: {
+      xl: 8,
+      xxl: 4,
+    },
+  },
+  {
+    label: '培训形式',
+    field: 'trainingFormat',
+    component: 'Input',
+    colProps: {
+      xl: 8,
+      xxl: 4,
+    },
+  },
+  {
+    field: 'trainingMeet',
+    label: '培训会议',
+    component: 'Input',
+    colProps: {
+      xl: 8,
+      xxl: 4,
+    },
+  },
+  {
+    field: 'trainers',
+    label: '培训人员',
+    component: 'Select',
+    componentProps: {
+      options: [
+        {
+          label: '人员一',
+          value: '人员一',
+        },
+        {
+          label: '人员二',
+          value: '人员二',
+        },
+      ],
+    },
+    colProps: {
+      xl: 8,
+      xxl: 4,
+    },
+  },
+  {
+    label: '学识(合计)',
+    field: 'knowledge',
+    component: 'Input',
+    colProps: {
+      xl: 8,
+      xxl: 4,
+    },
+  },
+  {
+    label: '人数(人)',
+    field: 'numberOfPeople',
+    component: 'Input',
+    colProps: {
+      xl: 8,
+      xxl: 4,
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    component: 'Input',
+    colProps: {
+      xl: 8,
+      xxl: 4,
+    },
+  },
+];

src/views/statement/tabs/potentialSafety.vue

@@ -29,27 +29,29 @@
   <exportModal @register="registerModal" />
 </template>
 <script lang="ts" setup>
+import {getFormConfig, searchExportFormSchema} from "@/views/statement/potentialSafetyDrawer/detail.data"
 import detaildrawer from '@/views/statement/potentialSafetyDrawer/detailDrawer.vue';
 import {exportPotentialUrl, potentialSafetyColumns, searchFormSchema} from './data';
 import { BasicTable, useTable, TableAction } from '@/components/Table';
 import { getListByPage } from '@/api/project/saftyManage';
-import { inject } from 'vue';
+import {inject, onMounted} from 'vue';
 import { router } from '@/router';
 import { Tag } from 'ant-design-vue';
 import {useDrawer} from "@/components/Drawer";
 import {biddingPlanColumns, exportUrl} from "@/views/statement/components/changeSignature/data";
 import  exportModal from '../components/exportModal.vue';
 import {useModal} from "@/components/Modal";
+import {getUserList} from "@/api/project/safetyEducation";
 const [registerModal, { openModal: openModal }] = useModal();
 const [registerDrawer, { openDrawer }] = useDrawer();
 let detailId = inject('detailId');
 console.log('detailId', detailId);
-const [registerTable, { reload }] = useTable({
+const [registerTable, { reload,getForm }] = useTable({
   api: getListByPage,
   columns: potentialSafetyColumns,
   formConfig: {
-    labelWidth: 120,
-    schemas: searchFormSchema,
+    labelWidth: 100,
+    schemas: searchExportFormSchema,
   },
   searchInfo: {
     proId: detailId,
@@ -66,6 +68,10 @@ const [registerTable, { reload }] = useTable({
     fixed: undefined,
   },
 });
+onMounted(async () => {
+  const data = await getUserList()
+  searchExportFormSchema[8].componentProps.options = data
+})
 async function handleDetail(record: Recordable, disabled: number) {
   openDrawer(true, {
     record,
@@ -80,6 +86,7 @@ function handleExport() {
     exportUrl: exportPotentialUrl,
     title :"安全隐患管理",
     exportData: getExportData(),
+    searchData:getForm().getFieldsValue(),
   });
 }
 function getExportData() {

src/views/statement/tabs/safetyEducation.vue

@@ -35,21 +35,22 @@ const [registerModal, { openModal: openModal }] = useModal();
   import detaildrawer from '@/views/statement/safetyEducationDrawer/detailDrawer.vue';
 import {exportEducationUrl, exportSafetyEducationColumns, safetyEducationColumns, searchFormSchema} from './data';
   import { BasicTable, useTable, TableAction } from '@/components/Table';
-  import { getListByPage } from '@/api/project/safetyEducation';
-  import { inject } from 'vue';
+import {getListByPage, getUserList} from '@/api/project/safetyEducation';
+import {inject, onMounted} from 'vue';
   import { router } from '@/router';
   import { Tag } from 'ant-design-vue';
   import {useDrawer} from "@/components/Drawer";
 import {biddingPlanColumns, exportUrl} from "@/views/statement/components/changeSignature/data";
+import {searchExportFormSchema} from "@/views/statement/safetyEducationDrawer/detail.data";
   const [registerDrawer, { openDrawer }] = useDrawer();
   let detailId = inject('detailId');
   console.log('detailId', detailId);
-  const [registerTable, { reload }] = useTable({
+  const [registerTable, { reload,getForm }] = useTable({
     api: getListByPage,
     columns: safetyEducationColumns,
     formConfig: {
-      labelWidth: 120,
-      schemas: searchFormSchema,
+      labelWidth: 100,
+      schemas: searchExportFormSchema,
     },
     searchInfo: {
       proId: detailId,
@@ -66,6 +67,11 @@ import {biddingPlanColumns, exportUrl} from "@/views/statement/components/change
       fixed: undefined,
     },
   });
+
+onMounted(async () => {
+  const data = await getUserList()
+  searchExportFormSchema[6].componentProps.options = data
+})
   async function handleDetail(record: Recordable, disabled: number) {
     openDrawer(true, {
       record,
@@ -87,6 +93,7 @@ function handleExport() {
     exportUrl: exportEducationUrl,
     title :"安全教育培训",
     exportData: getExportData(),
+    searchData:getForm().getFieldsValue(),
   });
 }
 function getExportData() {