reactor:工单待办新增是否会签查询条件;业务待办表格重构;

src/components/ProTable/components/ColSetting.vue

@@ -1,23 +1,39 @@
 <template>
 	<!-- 列设置 -->
-	<el-drawer v-model="drawerVisible" title="列设置" size="350px">
-		<div class="table-main">
-			<el-table
-				:data="colSetting"
-				row-key="prop"
-				default-expand-all
-        border
-				:tree-props="{ children: '_children'}"
-			>
-				<el-table-column prop="label" align="center" label="列名" />
-				<el-table-column v-slot="scope" prop="isShow" align="center" label="显示">
-					<el-checkbox v-model="scope.row.isShow" @change="update"></el-checkbox>
-				</el-table-column>
-				<template #empty>
-					<Empty />
-				</template>
-			</el-table>
-		</div>
+	<el-drawer v-model="drawerVisible" title="列设置" size="450px">
+		<el-table :data="colSetting" row-key="prop" default-expand-all border :tree-props="{ children: '_children' }">
+			<el-table-column prop="label" align="center" label="列名" />
+			<el-table-column v-slot="scope" prop="isShow" align="center" label="显示" width="80">
+				<el-checkbox v-model="scope.row.isShow" @change="update"></el-checkbox>
+			</el-table-column>
+			<el-table-column v-slot="scope" prop="fixed" align="center" label="固定">
+				<el-radio-group v-model="scope.row.fixed">
+					<el-radio-button
+						label="left"
+						@click.native.prevent="
+							() => {
+								scope.row.fixed = 'left' === scope.row.fixed ? null : 'left';
+								update();
+							}
+						"
+						>左侧</el-radio-button
+					>
+					<el-radio-button
+						label="right"
+						@click.native.prevent="
+							() => {
+								scope.row.fixed = 'right' === scope.row.fixed ? null : 'right';
+								update();
+							}
+						"
+						>右侧</el-radio-button
+					>
+				</el-radio-group>
+			</el-table-column>
+			<template #empty>
+				<Empty />
+			</template>
+		</el-table>
 	</el-drawer>
 </template>
 
@@ -29,8 +45,9 @@ const props = defineProps<{ colSetting: ColumnProps[] }>();
 const drawerVisible = ref<boolean>(false);
 const emit = defineEmits(['update:colSetting']);
 const update = () => {
-  emit('update:colSetting', props.colSetting);
+	emit('update:colSetting', props.colSetting);
 };
+const fixed = ref<string>('');
 
 const openColSetting = () => {
 	drawerVisible.value = true;

src/components/ProTable/components/Pagination.vue

@@ -1,12 +1,10 @@
 <template>
-	<div :class="{ hidden: hidden }" class="pagination-container">
+	<div class="pagination-container">
 		<el-pagination
 			:background="background"
 			v-model:current-page="currentPage"
 			v-model:page-size="pageSize"
 			:layout="layout"
-			:page-sizes="pageSizes"
-			:pager-count="pagerCount"
 			:total="total"
 			:small="small"
 			@size-change="handleSizeChange"
@@ -23,11 +21,11 @@ const props = defineProps({
 		required: true,
 		type: Number,
 	},
-	page: {
+	currentPage: {
 		type: Number,
 		default: 1,
 	},
-	limit: {
+	pageSize: {
 		type: Number,
 		default: 10,
 	},
@@ -54,45 +52,46 @@ const props = defineProps({
 		type: Boolean,
 		default: true,
 	},
-	hidden: {
-		type: Boolean,
-		default: false,
-	},
 });
 
 // 定义子组件向父组件传值/事件
-const emit = defineEmits(['update:page', 'update:limit', 'pagination']);
+const emit = defineEmits(['update:current-page', 'update:page-size', 'paginationEvent']);
 
 // 定义变量内容
 const small = ref(false);
 const currentPage = computed({
 	get() {
-		return props.page;
+		return props.currentPage;
 	},
 	set(val) {
-		emit('update:page', val);
+		emit('update:current-page', val);
 	},
 });
 const pageSize = computed({
 	get() {
-		return props.limit;
+		return props.pageSize;
 	},
 	set(val) {
-		emit('update:limit', val);
+		emit('update:page-size', val);
 	},
 });
 const handleSizeChange = (val: any) => {
+	pageSize.value = val;
 	/**
 	 * 场景：API返回总数为25条，按照10条每页，一共有3页。选了2的页数之后，然后把size选择成30条，
 	 * 这个时候，分页就会同时触发size选择函数以及current选择函数。{page: 2, size: 30}，{page: 1, size: 30}请求两次，会导致列表会有暂无数据的情况
-	 * 解决办法：用setTimeout(函数，0)，用延迟，虽然还是两次请求，但是每次都是{page: 1, size: 30}
+	 * 解决办法：如果当前页大于最大页数，就把当前页设置成最大页数
 	 */
-	setTimeout(() => {
-		emit('pagination', { page: currentPage.value, limit: val });
-	}, 0);
+	// 获取最大页数
+	let pageMax = Math.ceil(props.total / val);
+	if (currentPage.value > pageMax) {
+		currentPage.value = pageMax;
+	}
+	emit('paginationEvent', { page: currentPage.value, limit: val });
 };
 const handleCurrentChange = (val: any) => {
-	emit('pagination', { page: val, limit: pageSize.value });
+	currentPage.value = val;
+	emit('paginationEvent', { page: val, limit: pageSize.value });
 };
 onMounted(() => {
 	// 监听布局大小 改变分页的大小
@@ -106,7 +105,4 @@ onMounted(() => {
 	display: flex;
 	justify-content: flex-end;
 }
-.pagination-container.hidden {
-	display: none;
-}
 </style>

src/components/ProTable/components/TableColumn.vue

@@ -15,7 +15,7 @@ const enumMap = inject("enumMap", ref(new Map()));
 
 // 渲染表格数据
 const renderCellData = (item: ColumnProps, scope: RenderScope<any>) => {
-  return enumMap.value.get(item.prop) && item.isFilterEnum
+  return enumMap.value.get(item.prop)
     ? filterEnum(handleRowAccordingToProp(scope.row, item.prop!), enumMap.value.get(item.prop)!, item.fieldNames)
     : formatValue(handleRowAccordingToProp(scope.row, item.prop!));
 };
@@ -33,7 +33,7 @@ const RenderTableColumn = (item: ColumnProps) => {
       {item.isShow && (
         <el-table-column
           {...item}
-          align={item.align ?? "center"}
+          align={item.align ?? "left"}
           showOverflowTooltip={item.showOverflowTooltip ?? item.prop !== "operation"}
         >
           {{

src/components/ProTable/index.vue

@@ -9,13 +9,31 @@
 			</div>
 			<div v-if="toolButton" class="header-button-ri">
 				<slot name="toolButton">
-					<el-button v-if="showToolButton('refresh')" :icon="Refresh" circle @click="onRefresh" title="刷新表格" />
-					<el-button v-if="showToolButton('setting') && columns.length" :icon="Operation" circle @click="openColSetting" title="列设置" />
+					<el-button v-if="showToolButton('refresh')" circle @click="onRefresh" title="刷新表格">
+						<SvgIcon name="ele-Refresh" />
+					</el-button>
+					<el-button v-if="showToolButton('setting') && columns.length" circle @click="openColSetting" title="列设置">
+						<SvgIcon name="ele-Setting" />
+					</el-button>
+					<el-button v-if="showToolButton('exportCurrent') && columns.length" circle @click="exportCurrent" title="导出当前页">
+						<SvgIcon name="iconfont icon-daochu" />
+					</el-button>
+					<el-button v-if="showToolButton('exportAll') && columns.length" circle @click="exportAll" title="导出全部">
+						<SvgIcon name="iconfont icon-export" />
+					</el-button>
 				</slot>
 			</div>
 		</div>
 		<!-- 表格主体 -->
-		<el-table ref="tableRef" v-bind="$attrs" :data="processTableData" :border="border" :row-key="rowKey" @selection-change="selectionChange" v-loading="loading">
+		<el-table
+			ref="tableRef"
+			v-bind="$attrs"
+			:data="processTableData"
+			:border="border"
+			:row-key="rowKey"
+			@selection-change="selectionChange"
+			v-loading="loading"
+		>
 			<!-- 默认插槽 -->
 			<slot />
 			<template v-for="item in tableColumns" :key="item">
@@ -23,7 +41,7 @@
 				<el-table-column
 					v-if="item.type && columnTypes.includes(item.type)"
 					v-bind="item"
-					:align="item.align ?? 'center'"
+					:align="item.align ?? 'left'"
 					:reserve-selection="item.type == 'selection'"
 				>
 					<template #default="scope">
@@ -60,7 +78,7 @@
 		</el-table>
 		<!-- 分页组件 -->
 		<slot name="pagination">
-			<Pagination v-if="pagination" @pagination="pageChange" :total="total" />
+			<PaginationEl v-if="pagination" @paginationEvent="onRefresh" :total="total" v-model:current-page="pageIndex" v-model:page-size="pageSize" />
 		</slot>
 	</div>
 	<!-- 列设置 -->
@@ -68,13 +86,11 @@
 </template>
 
 <script setup lang="ts" name="ProTable">
-import { ref, watch, provide, onMounted, unref, computed, reactive, PropType } from 'vue';
+import { ref, provide, onMounted, unref, computed, reactive, PropType } from 'vue';
 import { ElTable } from 'element-plus';
-import { useTable } from '@/hooks/useTable';
 import { useSelection } from '@/hooks/useSelection';
 import { ColumnProps, TypeProps } from '@/components/ProTable/interface';
-import { Refresh, Operation } from '@element-plus/icons-vue';
-import Pagination from './components/Pagination.vue';
+import PaginationEl from './components/Pagination.vue';
 import ColSetting from './components/ColSetting.vue';
 import TableColumn from './components/TableColumn.vue';
 import Sortable from 'sortablejs';
@@ -91,6 +107,7 @@ const props = defineProps({
 		// 静态 table data 数据
 		type: Array,
 		default: () => [],
+		required: true,
 	},
 	pagination: {
 		// 是否需要分页组件 ==> 非必传（默认为true）
@@ -98,10 +115,17 @@ const props = defineProps({
 		default: true,
 	},
 	total: {
-		// 总条数 ==> 非必传（默认为0）
 		type: Number,
 		default: 0,
 	},
+	pageIndex: {
+		type: Number,
+		default: 1,
+	},
+	pageSize: {
+		type: Number,
+		default: 10,
+	},
 	border: {
 		// 是否带有纵向边框 ==> 非必传（默认为false）
 		type: Boolean,
@@ -117,13 +141,39 @@ const props = defineProps({
 		type: String,
 		default: 'id',
 	},
-  loading: {
-    // 是否显示加载中
-    type: Boolean,
-    default: false,
-  },
+	loading: {
+		// 是否显示加载中
+		type: Boolean,
+		default: false,
+	},
+});
+const emit = defineEmits([
+	'dargSort',
+	'updateColSetting',
+	'selectChange',
+	'updateTable',
+	'update:pagination',
+	'exportCurrent',
+	'exportAll',
+	'update:pageSize',
+	'update:pageIndex',
+]);
+const pageSize = computed({
+	get() {
+		return props.pageSize;
+	},
+	set(val) {
+		emit('update:pageSize', val);
+	},
+});
+const pageIndex = computed({
+	get() {
+		return props.pageIndex;
+	},
+	set(val) {
+		emit('update:pageIndex', val);
+	},
 });
-
 // table 实例
 const tableRef = ref<InstanceType<typeof ElTable>>();
 
@@ -131,7 +181,7 @@ const tableRef = ref<InstanceType<typeof ElTable>>();
 const columnTypes: TypeProps[] = ['selection', 'radio', 'index', 'expand', 'sort'];
 
 // 控制 ToolButton 显示
-const showToolButton = (key: 'refresh' | 'setting') => {
+const showToolButton = (key: 'refresh' | 'setting' | 'exportCurrent' | 'exportAll') => {
 	return Array.isArray(props.toolButton) ? props.toolButton.includes(key) : props.toolButton;
 };
 
@@ -141,23 +191,19 @@ const radio = ref('');
 // 表格多选 Hooks
 const { selectionChange, selectedList, selectedListIds, isSelected } = useSelection(props.rowKey);
 
-// 表格操作 Hooks
-const { tableData, pageable, searchInitParam, searchParam, getTableList, reset } = useTable();
-
 // 清空选中数据列表
 const clearSelection = () => tableRef.value!.clearSelection();
 
 // 初始化表格数据 && 拖拽排序
 onMounted(() => {
 	dragSort();
-	props.data && (pageable.value.total = props.data.length);
+	getSelectColumns();
 });
 
 // 处理表格数据
 const processTableData = computed(() => {
-	if (!props.data) return tableData.value;
 	if (!props.pagination) return props.data;
-	return props.data.slice((pageable.value.pageNum - 1) * pageable.value.pageSize, pageable.value.pageSize * pageable.value.pageNum);
+	return props.data;
 });
 
 // 接收 columns 并设置为响应式
@@ -193,10 +239,8 @@ const flatColumnsFunc = (columns: ColumnProps[], flatArr: ColumnProps[] = []) =>
 		if (col._children?.length) flatArr.push(...flatColumnsFunc(col._children));
 		flatArr.push(col);
 
-		// column 添加默认 isShow && isFilterEnum 属性值
+		// column 添加默认 isShow
 		col.isShow = col.isShow ?? true;
-		col.isFilterEnum = col.isFilterEnum ?? true;
-
 		// 设置 enumMap
 		await setEnumMap(col);
 	});
@@ -213,10 +257,6 @@ searchColumns.value?.forEach((column, index) => {
 	column.search!.order = column.search?.order ?? index + 2;
 	const key = column.search?.key ?? handleProp(column.prop!);
 	const defaultValue = column.search?.defaultValue;
-	if (defaultValue !== undefined && defaultValue !== null) {
-		searchInitParam.value[key] = defaultValue;
-		searchParam.value[key] = defaultValue;
-	}
 });
 
 // 列设置 ==> 需要过滤掉不需要设置的列
@@ -240,50 +280,56 @@ const dragSort = () => {
 		},
 	});
 };
-const emit = defineEmits(['dargSort', 'updateColSetting', 'selectChange', 'updateTable']);
 // 刷新事件
 const onRefresh = () => {
 	emit('updateTable');
 };
-// 分页事件
-const pageChange = (val: any) => {
-	getTableList();
-	emit('updateTable', val);
+const filterColumns = ref([]);
+const filterColumnsProp = ref([]);
+// 获取需要显示的列
+const getSelectColumns = () => {
+	const flatColumns = flatColumnsFunc(tableColumns);
+	filterColumns.value = flatColumns.filter((item) => item.isShow && item.prop !== 'operation' && item.prop);
+	filterColumnsProp.value = filterColumns.value.map((item) => item.prop);
 };
 // 更新列设置
-const updateColSetting = (colSetting: ColumnProps[]) => {
-	//  平铺数组后获取isShow为true的对象
-	const flatColumns = flatColumnsFunc(colSetting);
-	const newColumns = flatColumns.filter((item) => item.isShow);
-	// 获取prop
-	const newColumnsProp = newColumns.map((item) => item.prop);
-	emit('updateColSetting', newColumns, newColumnsProp);
+const updateColSetting = () => {
+	getSelectColumns();
+	emit('updateColSetting');
+};
+// 导出当前页
+const exportCurrent = () => {
+	emit('exportCurrent');
+};
+// 导出全部
+const exportAll = () => {
+	emit('exportAll');
 };
 // 暴露给父组件的参数和方法 (外部需要什么，都可以从这里暴露出去)
 defineExpose({
 	element: tableRef,
 	tableData: processTableData,
 	radio,
-	pageable,
-	searchInitParam,
-	getTableList,
-	reset,
 	clearSelection,
 	enumMap,
 	isSelected,
 	selectedList,
 	selectedListIds,
+	filterColumns,
+	filterColumnsProp,
 });
 </script>
 <style scoped lang="scss">
 .table-header {
-	margin-bottom: 20px;
+
 	display: flex;
 	justify-content: space-between;
 }
 .header-button-lf {
+  margin-bottom: 20px;
 	flex: 1;
 }
 .header-button-ri {
+  margin-bottom: 20px;
 }
 </style>

src/components/ProTable/interface/index.ts

@@ -71,9 +71,7 @@ export interface ColumnProps<T = any>
   type?: TypeProps; // 列类型
   tag?: boolean | Ref<boolean>; // 是否是标签展示
   isShow?: boolean | Ref<boolean>; // 是否显示在表格当中
-  search?: SearchProps | undefined; // 搜索项配置
   enum?: EnumProps[] | Ref<EnumProps[]> | ((params?: any) => Promise<any>); // 枚举字典
-  isFilterEnum?: boolean | Ref<boolean>; // 当前单元格值是否根据 enum 格式化（示例：enum 只作为搜索项数据）
   fieldNames?: FieldNamesProps; // 指定 label && value && children 的 key 值
   headerRender?: (scope: HeaderRenderScope<T>) => VNode; // 自定义表头内容渲染（tsx语法）
   render?: (scope: RenderScope<T>) => VNode | string; // 自定义单元格内容渲染（tsx语法）

src/hooks/useTable.ts

@@ -1,151 +0,0 @@
-import { reactive, computed, toRefs } from "vue";
-/**
- * @description table 页面操作方法封装
- * @param {Function} api 获取表格数据 api 方法 (必传)
- * @param {Object} initParam 获取数据初始化参数 (非必传，默认为{})
- * @param {Boolean} isPageable 是否有分页 (非必传，默认为true)
- * @param {Function} dataCallBack 对后台返回的数据进行处理的方法 (非必传)
- * @param requestError
- * */
-export const useTable = (
-  api?: (params: any) => Promise<any>,
-  initParam: object = {},
-  isPageable: boolean = true,
-  dataCallBack?: (data: any) => any,
-  requestError?: (error: any) => void
-) => {
-  const state = reactive<any>({
-    // 表格数据
-    tableData: [],
-    // 分页数据
-    pageable: {
-      // 当前页数
-      pageNum: 1,
-      // 每页显示条数
-      pageSize: 10,
-      // 总条数
-      total: 0
-    },
-    // 查询参数(只包括查询)
-    searchParam: {},
-    // 总参数(包含分页和查询参数)
-    totalParam: {}
-  });
-
-  /**
-   * @description 分页查询参数(只包括分页和表格字段排序,其他排序方式可自行配置)
-   * */
-  const pageParam = computed({
-    get: () => {
-      return {
-        pageNum: state.pageable.pageNum,
-        pageSize: state.pageable.pageSize
-      };
-    },
-    set: (newVal: any) => {
-      console.log("我是分页更新之后的值", newVal);
-    }
-  });
-
-  /**
-   * @description 获取表格数据
-   * @return void
-   * */
-  const getTableList = async () => {
-    if (!api) return;
-    try {
-      // 先把初始化参数和分页参数放到总参数里面
-      Object.assign(state.totalParam, initParam, isPageable ? pageParam.value : {});
-      let { data } = await api({ ...state.searchInitParam, ...state.totalParam });
-      dataCallBack && (data = dataCallBack(data));
-      state.tableData = isPageable ? data.list : data;
-      // 解构后台返回的分页数据 (如果有分页更新分页信息)
-      if (isPageable) {
-        const { pageNum, pageSize, total } = data;
-        updatePageable({ pageNum, pageSize, total });
-      }
-    } catch (error) {
-      requestError && requestError(error);
-    }
-  };
-
-  /**
-   * @description 更新查询参数
-   * @return void
-   * */
-  const updatedTotalParam = () => {
-    state.totalParam = {};
-    // 处理查询参数，可以给查询参数加自定义前缀操作
-    let nowSearchParam: Table.StateProps["searchParam"] = {};
-    // 防止手动清空输入框携带参数（这里可以自定义查询参数前缀）
-    for (let key in state.searchParam) {
-      // 某些情况下参数为 false/0 也应该携带参数
-      if (state.searchParam[key] || state.searchParam[key] === false || state.searchParam[key] === 0) {
-        nowSearchParam[key] = state.searchParam[key];
-      }
-    }
-    Object.assign(state.totalParam, nowSearchParam, isPageable ? pageParam.value : {});
-  };
-
-  /**
-   * @description 更新分页信息
-   * @param {Object} pageable 后台返回的分页数据
-   * @return void
-   * */
-  const updatePageable = (pageable: any) => {
-    Object.assign(state.pageable, pageable);
-  };
-
-  /**
-   * @description 表格数据查询
-   * @return void
-   * */
-  const search = () => {
-    state.pageable.pageNum = 1;
-    updatedTotalParam();
-    getTableList();
-  };
-
-  /**
-   * @description 表格数据重置
-   * @return void
-   * */
-  const reset = () => {
-    state.pageable.pageNum = 1;
-    // 重置搜索表单的时，如果有默认搜索参数，则重置默认的搜索参数
-    state.searchParam = { ...state.searchInitParam };
-    updatedTotalParam();
-    getTableList();
-  };
-
-  /**
-   * @description 每页条数改变
-   * @param {Number} val 当前条数
-   * @return void
-   * */
-  const handleSizeChange = (val: number) => {
-    state.pageable.pageNum = 1;
-    state.pageable.pageSize = val;
-    getTableList();
-  };
-
-  /**
-   * @description 当前页改变
-   * @param {Number} val 当前页
-   * @return void
-   * */
-  const handleCurrentChange = (val: number) => {
-    state.pageable.pageNum = val;
-    getTableList();
-  };
-
-  return {
-    ...toRefs(state),
-    getTableList,
-    search,
-    reset,
-    handleSizeChange,
-    handleCurrentChange,
-    updatedTotalParam
-  };
-};

src/main.ts

@@ -12,7 +12,8 @@ import '@/theme/index.scss';
 import Pagination from '@/components/Pagination/index.vue';
 // 空组件
 import Empty from '@/components/Empty/index.vue';
-
+// 表格组件
+import ProTable from '@/components/ProTable/index.vue';
 import { MotionPlugin } from '@vueuse/motion';
 
 const app = createApp(App);
@@ -23,4 +24,5 @@ other.elSvg(app);
 // 全局组件挂载
 app.component('Pagination', Pagination);
 app.component('Empty', Empty);
+app.component('ProTable', ProTable);
 app.use(pinia).use(router).use(ElementPlus).use(MotionPlugin).mount('#app');

src/theme/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3778985 */
-  src: url('iconfont.woff2?t=1675926954932') format('woff2'),
-       url('iconfont.woff?t=1675926954932') format('woff'),
-       url('iconfont.ttf?t=1675926954932') format('truetype');
+  src: url('iconfont.woff2?t=1710379620305') format('woff2'),
+       url('iconfont.woff?t=1710379620305') format('woff'),
+       url('iconfont.ttf?t=1710379620305') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-daochu1:before {
+  content: "\e621";
+}
+
+.icon-export:before {
+  content: "\e677";
+}
+
 .icon-pdf:before {
   content: "\e8e8";
 }

src/views/business/order/index.vue

@@ -18,33 +18,33 @@
 							<el-input v-model="state.queryParams.ProvinceNo" placeholder="省本地编号" clearable @keyup.enter="queryList" />
 						</el-form-item>
 					</el-col>
-          <transition name="el-zoom-in-top" v-show="!searchCol">
-            <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6">
-              <el-form-item label="来电人姓名" prop="FromName">
-                <el-input v-model="state.queryParams.FromName" placeholder="来电人姓名" clearable @keyup.enter="queryList" />
-              </el-form-item>
-            </el-col>
-          </transition>
-          <transition name="el-zoom-in-top" v-show="!searchCol">
-            <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6">
-                <el-form-item label="事发地址" prop="AreaCodes">
-                  <el-cascader
-                    :options="state.areaOptions"
-                    filterable
-                    :show-all-levels="false"
-                    :props="{ checkStrictly: true, value: 'id', label: 'areaName', multiple: true }"
-                    placeholder="请选择事发地址"
-                    clearable
-                    class="w100"
-                    v-model="state.queryParams.AreaCodes"
-                    collapse-tags
-                    collapse-tags-tooltip
-                    :max-collapse-tags="2"
-                  >
-                  </el-cascader>
-              </el-form-item>
-            </el-col>
-          </transition>
+					<transition name="el-zoom-in-top" v-show="!searchCol">
+						<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6">
+							<el-form-item label="来电人姓名" prop="FromName">
+								<el-input v-model="state.queryParams.FromName" placeholder="来电人姓名" clearable @keyup.enter="queryList" />
+							</el-form-item>
+						</el-col>
+					</transition>
+					<transition name="el-zoom-in-top" v-show="!searchCol">
+						<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6">
+							<el-form-item label="事发地址" prop="AreaCodes">
+								<el-cascader
+									:options="state.areaOptions"
+									filterable
+									:show-all-levels="false"
+									:props="{ checkStrictly: true, value: 'id', label: 'areaName', multiple: true }"
+									placeholder="请选择事发地址"
+									clearable
+									class="w100"
+									v-model="state.queryParams.AreaCodes"
+									collapse-tags
+									collapse-tags-tooltip
+									:max-collapse-tags="2"
+								>
+								</el-cascader>
+							</el-form-item>
+						</el-col>
+					</transition>
 					<transition name="el-zoom-in-top" v-show="!searchCol">
 						<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6">
 							<el-form-item label="转接来源" prop="TransferPhone">
@@ -165,13 +165,13 @@
 							</el-form-item>
 						</el-col>
 					</transition>
-          <transition name="el-zoom-in-top">
-            <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" v-show="!searchCol">
-              <el-form-item label="来电号码" prop="FromPhone">
-                <el-input v-model="state.queryParams.FromPhone" placeholder="来电号码" clearable @keyup.enter="queryList" />
-              </el-form-item>
-            </el-col>
-          </transition>
+					<transition name="el-zoom-in-top">
+						<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" v-show="!searchCol">
+							<el-form-item label="来电号码" prop="FromPhone">
+								<el-input v-model="state.queryParams.FromPhone" placeholder="来电号码" clearable @keyup.enter="queryList" />
+							</el-form-item>
+						</el-col>
+					</transition>
 					<transition name="el-zoom-in-top">
 						<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" v-show="!searchCol">
 							<el-form-item label="联系电话" prop="PhoneNo">
@@ -285,115 +285,59 @@
 			</el-form>
 		</el-card>
 		<el-card shadow="never">
-			<!-- 功能按钮 -->
-			<div class="mb20 flex-center-between">
-				<div>
+			<!-- 表格 -->
+			<ProTable
+				ref="proTableRef"
+				:columns="columns"
+				:data="state.tableData"
+				@updateTable="queryList"
+				:loading="state.loading"
+				:total="state.total"
+				v-model:page-index="state.queryParams.PageIndex"
+				v-model:page-size="state.queryParams.PageSize"
+				@export-current="exportCurrent"
+				@export-all="exportAll"
+			>
+				<!-- 表格 header 按钮 -->
+				<template #tableHeader="scope">
 					<el-button type="primary" @click="onCreateRepeatEvent"> <SvgIcon name="ele-Plus" class="mr5" /> 创建重复性事件 </el-button>
-					<el-button type="primary" @click="onObserve" v-auth="'business:order:observe'" :disabled="!multipleSelection.length">
+					<el-button type="primary" @click="onObserve" v-auth="'business:order:observe'" :disabled="!scope.isSelected">
 						<SvgIcon name="ele-View" class="mr5" />设置观察件
 					</el-button>
-					<el-button type="primary" @click="onEnd" v-auth="'business:order:end'" :disabled="!multipleSelection.length">
+					<el-button type="primary" @click="onEnd" v-auth="'business:order:end'" :disabled="!scope.isSelected">
 						<SvgIcon name="ele-Stopwatch" class="mr5" />设置终结件
 					</el-button>
-				</div>
-				<!-- 筛选按钮 -->
-<!--				<el-popover trigger="click" width="165" placement="bottom-end">
-            <el-scrollbar wrap-class="scrollbar-wrapper" max-height="400px">
-              <el-checkbox-group v-model="checkedColumns">
-                <el-checkbox v-for="item in checkBoxGroup" :key="item.prop" :label="item.label" :value="item.prop"></el-checkbox>
-              </el-checkbox-group>
-            </el-scrollbar>
-					<template #reference>
-						<el-button><SvgIcon name="ele-Operation" /></el-button>
-					</template>
-				</el-popover>-->
-			</div>
-			<!-- 表格 -->
-			<el-table
-				:data="state.tableData"
-				v-loading="state.loading"
-				row-key="id"
-				@sort-change="sortChange"
-				ref="multipleTableRef"
-				@selection-change="handleSelectionChange"
-				stripe
-				:key="reload"
-			>
-				<el-table-column type="selection" width="55" />
-				<el-table-column label="超期状态" width="80" align="center" v-if="checkedColumns.includes('超期状态')">
-					<template #default="{ row }">
-						<span :class="'overdue-status-' + row.expiredStatus" :title="row.expiredStatusText"></span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="no" label="工单编码" show-overflow-tooltip width="150" v-if="checkedColumns.includes('工单编码')"></el-table-column>
-				<el-table-column width="100" label="省/市工单" prop="isProvince" v-if="checkedColumns.includes('省/市工单')">
-					<template #default="{ row }">
-						<span>{{ row.isProvince ? '省工单' : '市工单' }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="currentStepName" label="办理节点" show-overflow-tooltip width="150" v-if="checkedColumns.includes('办理节点')"></el-table-column>
-				<el-table-column label="工单状态" show-overflow-tooltip width="100" prop="statusText" v-if="checkedColumns.includes('工单状态')"></el-table-column>
-				<el-table-column label="标题" show-overflow-tooltip width="300" v-if="checkedColumns.includes('标题')">
-					<template #default="{ row }">
-						<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
-					</template>
-				</el-table-column>
-				<el-table-column label="受理时间" show-overflow-tooltip width="170" v-if="checkedColumns.includes('受理时间')">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="expiredTime" label="工单期满时间" show-overflow-tooltip width="170" v-if="checkedColumns.includes('工单期满时间')">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column label="办结时间" show-overflow-tooltip width="170" v-if="checkedColumns.includes('办结时间')">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.filedTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="orgLevelOneName" label="一级部门" show-overflow-tooltip width="170" v-if="checkedColumns.includes('一级部门')"></el-table-column>
-				<el-table-column prop="actualHandleOrgName" label="接办部门" show-overflow-tooltip width="170" v-if="checkedColumns.includes('接办部门')"></el-table-column>
-				<el-table-column prop="acceptType" label="受理类型" show-overflow-tooltip width="150" v-if="checkedColumns.includes('受理类型')"></el-table-column>
-				<el-table-column prop="counterSignTypeText" label="中心会签" show-overflow-tooltip width="100" v-if="checkedColumns.includes('中心会签')"></el-table-column>
-				<el-table-column prop="sourceChannel" label="来源方式" show-overflow-tooltip width="100" v-if="checkedColumns.includes('来源方式')"></el-table-column>
-				<el-table-column prop="hotspotName" label="热点分类" show-overflow-tooltip width="200" v-if="checkedColumns.includes('热点分类')"></el-table-column>
-				<el-table-column prop="tagNames" label="工单标签" show-overflow-tooltip width="200" v-if="checkedColumns.includes('工单标签')"></el-table-column>
-				<el-table-column prop="employeeName" label="受理人" show-overflow-tooltip width="120" v-if="checkedColumns.includes('受理人')">
-					<template #default="{ row }">
-						<span
-							>{{ row.acceptorName }} <span v-if="row.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
-						</span>
-					</template>
-				</el-table-column>
-				<el-table-column label="操作" width="140" fixed="right" align="center">
-					<template #default="{ row }">
-						<el-button link type="success" @click="onOrderEdit(row)" title="编辑工单" v-if="row.canEdit" v-auth="'business:order:edit'">
-							修改
-						</el-button>
-						<order-detail :order="row" @updateList="queryList" />
-					</template>
-				</el-table-column>
-				<template #empty>
-					<Empty />
 				</template>
-			</el-table>
-
-			<!-- 分页 -->
-			<pagination
-				:total="state.total"
-				v-model:page="state.queryParams.PageIndex"
-				v-model:limit="state.queryParams.PageSize"
-				@pagination="queryList"
-			/>
+				<template #expiredStatus="{ row }">
+					<span :class="'overdue-status-' + row.expiredStatus" :title="row.expiredStatusText"></span>
+				</template>
+				<template #isProvince="{ row }">
+					<span>{{ row.isProvince ? '省工单' : '市工单' }}</span>
+				</template>
+				<template #title="{ row }">
+					<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
+				</template>
+				<template #employeeName="{ row }">
+					<span
+						>{{ row.acceptorName }} <span v-if="row.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
+					</span>
+				</template>
+				<!-- 表格操作 -->
+				<template #operation="{ row }">
+					<el-button link type="success" @click="onOrderEdit(row)" title="编辑工单" v-if="row.canEdit" v-auth="'business:order:edit'">
+						修改
+					</el-button>
+					<order-detail :order="row" @updateList="queryList" />
+				</template>
+			</ProTable>
 		</el-card>
+
 		<!-- 编辑重复性事件 -->
 		<repeat-event-edit ref="repeatEventEditRef" @updateList="queryList" />
 	</div>
 </template>
-<script setup lang="ts" name="order">
-import { defineAsyncComponent, onMounted, reactive, ref, watch } from 'vue';
+<script setup lang="tsx" name="order">
+import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import type { FormInstance } from 'element-plus';
 import { ElButton, ElMessage, ElMessageBox } from 'element-plus';
 import { throttle } from '@/utils/tools';
@@ -404,7 +348,7 @@ import { formatDate } from '@/utils/formatTime';
 import { listBaseData, orderList } from '@/api/business/order';
 import { addObserve } from '@/api/query/observe';
 import { addEnd } from '@/api/query/end';
-import { treeArea } from "@/api/auxiliary/area";
+import { treeArea } from '@/api/auxiliary/area';
 
 // 引入组件
 const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/index.vue')); // 工单详情
@@ -412,11 +356,12 @@ const RepeatEventEdit = defineAsyncComponent(() => import('@/views/business/repe
 const HotSpotSelect = defineAsyncComponent(() => import('@/components/Hotspot/index.vue')); // 选择热点
 
 // 定义变量内容
-const state = reactive(<any>{
+const paginationModel = reactive({});
+const state = reactive({
 	queryParams: {
-		// 查询条件
 		PageIndex: 1, // 当前页
 		PageSize: 10, // 每页条数
+		// 查询条件
 		No: null, // 工单编码
 		ProvinceNo: null, // 省本地编号
 		EmergencyLevels: [], // 紧急程度
@@ -424,9 +369,9 @@ const state = reactive(<any>{
 		IsScreen: null, // 是否甄别
 		CurrentStepCode: null, // 当前办理节点
 		IsOverTime: null, // 是否超期
-    FromName: null, // 来电人姓名
-    AreaCodes: [], // 事发地址
-    FromPhone: null, // 来电号码
+		FromName: null, // 来电人姓名
+		AreaCodes: [], // 事发地址
+		FromPhone: null, // 来电号码
 		Keyword: null, // 关键字
 		Content: null, // 工单内容
 		AcceptTypes: null, // 受理类型
@@ -459,110 +404,56 @@ const state = reactive(<any>{
 	orgsOptions: [], // 部门
 	pushTypeOptions: [], //推送分类
 	orgData: [], // 机构数据
-  areaOptions: [], // 省市区数据
+	areaOptions: [], // 省市区数据
 });
 const ruleFormRef = ref<RefType>(); // 表单ref
 const searchCol = ref(true); // 展开/收起
 const route = useRoute(); // 路由
 const router = useRouter(); // 路由
-const checkedColumns = ref<EmptyArrayType>([
-  '超期状态',
-  '工单编码',
-  '省/市工单',
-  '办理节点',
-  '工单状态',
-  '标题',
-  '受理时间',
-  '工单期满时间',
-  '办结时间',
-  '一级部门',
-  '接办部门',
-  '受理类型',
-  '中心会签',
-  '来源方式',
-  '热点分类',
-  '工单标签',
-  '受理人',
-]); // 筛选列
-
-const checkBoxGroup = ref<EmptyArrayType>([
-  {
-    prop: 'cq',
-    label: '超期状态',
-  },
-	{
-		prop: 'no',
-		label: '工单编码',
-	},
-	{
-		prop: 'isProvince',
-		label: '省/市工单',
-	},
-	{
-		prop: 'currentStepName',
-		label: '办理节点',
-	},
-	{
-		prop: 'statusText',
-		label: '工单状态',
-	},
-	{
-		prop: 'title',
-		label: '标题',
-	},
+const proTableRef = ref<RefType>(); // 表格ref
+// 表格配置项
+const columns = ref<any[]>([
+	{ type: 'selection', fixed: 'left', width: 55 },
+	{ prop: 'expiredStatus', label: '超期状态', align: 'center' },
+	{ prop: 'no', label: '工单编码', width: 150 },
+	{ prop: 'isProvince', label: '省/市工单', width: 100 },
+	{ prop: 'currentStepName', label: '办理节点', width: 150 },
+	{ prop: 'statusText', label: '工单状态', width: 100 },
+	{ prop: 'title', label: '工单标题', width: 300 },
 	{
 		prop: 'startTime',
 		label: '受理时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.startTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
 	},
 	{
 		prop: 'expiredTime',
 		label: '工单期满时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.expiredTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
 	},
 	{
 		prop: 'filedTime',
 		label: '办结时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.filedTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
 	},
-	{
-		prop: 'orgLevelOneName',
-		label: '一级部门',
-	},
-	{
-		prop: 'actualHandleOrgName',
-		label: '接办部门',
-	},
-	{
-		prop: 'acceptType',
-		label: '受理类型',
-	},
-	{
-		prop: 'counterSignTypeText',
-		label: '中心会签',
-	},
-	{
-		prop: 'sourceChannel',
-		label: '来源方式',
-	},
-	{
-		prop: 'hotspotName',
-		label: '热点分类',
-	},
-	{
-		prop: 'tagNames',
-		label: '工单标签',
-	},
-	{
-		prop: 'employeeName',
-		label: '受理人',
-	},
+	{ prop: 'orgLevelOneName', label: '一级部门', width: 170 },
+	{ prop: 'actualHandleOrgName', label: '接办部门', width: 170 },
+	{ prop: 'acceptType', label: '受理类型', width: 150 },
+	{ prop: 'counterSignTypeText', label: '中心会签', width: 100 },
+	{ prop: 'sourceChannel', label: '来源方式', width: 100 },
+	{ prop: 'hotspotName', label: '热点分类', width: 200 },
+	{ prop: 'tagNames', label: '工单标签', width: 200 },
+	{ prop: 'employeeName', label: '受理人', width: 120 },
+	{ prop: 'operation', label: '操作', fixed: 'right', width: 140, align: 'center' },
 ]);
-const reload = ref<string>('');
-watch(
-	() => checkedColumns.value,
-	(val) => {
-		reload.value = String(Math.random());
-    console.log(val)
-	}
-);
 // 获取选择组织name值
 const cascadeRef = ref<RefType>();
 const getKnowledgeList = () => {
@@ -596,30 +487,31 @@ const timeStartChangeDone = (val: string[]) => {
 };
 // 获取查询条件基础信息
 const getBaseData = async () => {
-  try {
-    const res: any = await listBaseData();
-    const mappings: any = {
-      acceptTypeOptions: 'acceptTypeOptions',
-      channelOptions: 'channelOptions',
-      emergencyLevelOptions: 'emergencyLevelOptions',
-      orgsOptions: 'orgsOptions',
-      pushTypeOptions: 'pushTypeOptions',
-      orderStatusOptions: 'orderStatusOptions',
-      identityTypeOptions: 'identityTypeOptions',
-      currentStepOptions: 'currentStepOptions',
-    };
-    for (const key in mappings) {
-      state[key] = res.result?.[mappings[key]] ?? [];
-    }
-    const area = await treeArea();
-    state.areaOptions = area.result ?? []; //省市区数据
-  } catch (error) {
-    console.log(error);
-  }
+	try {
+		const res: any = await listBaseData();
+		const mappings: any = {
+			acceptTypeOptions: 'acceptTypeOptions',
+			channelOptions: 'channelOptions',
+			emergencyLevelOptions: 'emergencyLevelOptions',
+			orgsOptions: 'orgsOptions',
+			pushTypeOptions: 'pushTypeOptions',
+			orderStatusOptions: 'orderStatusOptions',
+			identityTypeOptions: 'identityTypeOptions',
+			currentStepOptions: 'currentStepOptions',
+		};
+		for (const key in mappings) {
+			state[key] = res.result?.[mappings[key]] ?? [];
+		}
+		const area = await treeArea();
+		state.areaOptions = area.result ?? []; //省市区数据
+	} catch (error) {
+		console.log(error);
+	}
 };
 /** 获取列表 */
 const queryList = () => {
 	let request = other.deepClone(state.queryParams);
+	request = { ...request, ...paginationModel };
 	Reflect.deleteProperty(request, 'crTime'); // 删除无用的参数
 	Reflect.deleteProperty(request, 'exTime'); // 删除无用的参数
 	Reflect.deleteProperty(request, 'doneTime'); // 删除无用的参数
@@ -634,10 +526,6 @@ const queryList = () => {
 			state.loading = false;
 		});
 };
-// 表格排序
-const sortChange = (column: any) => {
-	console.log(column);
-};
 const hotSpotRef = ref<RefType>();
 /** 重置按钮操作 */
 const resetQuery = throttle((formEl: FormInstance | undefined) => {
@@ -650,20 +538,14 @@ const resetQuery = throttle((formEl: FormInstance | undefined) => {
 	hotSpotRef.value.reset();
 	queryList();
 }, 300);
-// 表格多选
-const multipleTableRef = ref<RefType>();
-const multipleSelection = ref<any>([]);
-const handleSelectionChange = (val: any[]) => {
-	multipleSelection.value = val;
-};
 // 导出
 const onExport = () => {
 	console.log('导出');
 };
 // 设置终结件
 const onObserve = () => {
-	const titles = multipleSelection.value.map((item: any) => item.title).join(',');
-	const ids = multipleSelection.value.map((item: any) => {
+	const titles = proTableRef.value.selectedList.map((item: any) => item.title).join(',');
+	const ids = proTableRef.value.selectedList.map((item: any) => {
 		return {
 			orderId: item.id,
 		};
@@ -678,6 +560,7 @@ const onObserve = () => {
 		.then(() => {
 			addObserve({ orderIds: ids }).then(() => {
 				ElMessage.success('操作成功');
+        proTableRef.value.clearSelection();
 				queryList();
 			});
 		})
@@ -685,8 +568,8 @@ const onObserve = () => {
 };
 // 设置终结件
 const onEnd = () => {
-	const titles = multipleSelection.value.map((item: any) => item.title).join(',');
-	const ids = multipleSelection.value.map((item: any) => {
+	const titles = proTableRef.value.selectedList.map((item: any) => item.title).join(',');
+	const ids = proTableRef.value.selectedList.map((item: any) => {
 		return {
 			orderId: item.id,
 		};
@@ -701,6 +584,7 @@ const onEnd = () => {
 		.then(() => {
 			addEnd({ orderIds: ids }).then(() => {
 				ElMessage.success('操作成功');
+        proTableRef.value.clearSelection();
 				queryList();
 			});
 		})
@@ -722,6 +606,12 @@ const onOrderEdit = (row: any) => {
 		},
 	});
 };
+const exportCurrent = () => {
+	console.log('导出当前页', proTableRef.value);
+};
+const exportAll = () => {
+	console.log('导出全部', proTableRef.value);
+};
 onMounted(() => {
 	getBaseData();
 	queryList();

src/views/business/return/components/Apply.vue

@@ -9,27 +9,27 @@
 					<el-form-item label="工单标题"> {{ state.ruleForm.order?.title }} </el-form-item>
 				</el-col>
 				<template v-if="isAudit">
-          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-            <el-form-item label="申请人"> {{ state.ruleForm.creatorName }} </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-            <el-form-item label="申请部门"> {{ state.ruleForm.creatorOrgName }} </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-            <el-form-item label="退回申请时间"> {{ formatDate(state.ruleForm.creationTime,'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
-          </el-col>
-        </template>
-        <template v-else>
-          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-            <el-form-item label="申请人"> {{ userInfos.name }} </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-            <el-form-item label="申请部门"> {{ userInfos.orgName }} </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-            <el-form-item label="退回申请时间"> {{ formatDate(Date(), 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
-          </el-col>
-        </template>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+						<el-form-item label="申请人"> {{ state.ruleForm.creatorName }} </el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+						<el-form-item label="申请部门"> {{ state.ruleForm.creatorOrgName }} </el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+						<el-form-item label="退回申请时间"> {{ formatDate(state.ruleForm.creationTime, 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
+					</el-col>
+				</template>
+				<template v-else>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+						<el-form-item label="申请人"> {{ userInfos.name }} </el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+						<el-form-item label="申请部门"> {{ userInfos.orgName }} </el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+						<el-form-item label="退回申请时间"> {{ formatDate(Date(), 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
+					</el-col>
+				</template>
 				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 					<el-form-item label="申请理由" prop="content" :rules="[{ required: true, message: '请填写退回申请理由', trigger: 'blur' }]">
 						<el-input
@@ -43,7 +43,13 @@
 				</el-col>
 				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 					<el-form-item label="附件" prop="handleResult" :rules="[{ required: false, message: '请选择附件', trigger: 'change' }]" class="mb1">
-            <annex-list name="退回附件" v-model="state.ruleForm.files" v-model:format="filesFormat" :businessId="state.ruleForm?.id" classify="退回附件" />
+						<annex-list
+							name="退回附件"
+							v-model="state.ruleForm.files"
+							v-model:format="filesFormat"
+							:businessId="state.ruleForm?.id"
+							classify="退回附件"
+						/>
 					</el-form-item>
 				</el-col>
 				<template v-if="isAudit">
@@ -83,7 +89,7 @@ import { storeToRefs } from 'pinia';
 import { useUserInfo } from '@/stores/userInfo';
 import { formatDate } from '@/utils/formatTime';
 import { returnAdd, returnDetail, returnAudit } from '@/api/business/return';
-import {transformFile} from "@/utils/tools";
+import { transformFile } from '@/utils/tools';
 
 // 引入组件
 const AnnexList = defineAsyncComponent(() => import('@/components/AnnexList/index.vue'));
@@ -110,11 +116,15 @@ const isAudit = ref<boolean>(false); // 是否是审核
  */
 const openDialog = (val: any, audit = false) => {
 	state.ruleForm = val;
+	if (!state.ruleForm.order) {
+		state.ruleForm.order = val;
+		state.ruleForm.files = transformFile(state.ruleForm.order.files);
+	}
 	isAudit.value = audit;
 	if (audit) {
 		returnDetail(val.id).then((res) => {
 			state.ruleForm = res.result;
-      state.ruleForm.files = transformFile(state.ruleForm.files);
+			state.ruleForm.files = transformFile(state.ruleForm.files);
 		});
 	}
 	state.dialogVisible = true;
@@ -140,7 +150,7 @@ const onSubmit = (formEl: FormInstance | undefined) => {
 		let request = {
 			orderId: state.ruleForm.id,
 			content: state.ruleForm.content,
-      files: filesFormat.value,
+			files: filesFormat.value,
 		};
 		returnAdd(request)
 			.then(() => {

src/views/business/returnAudit/index.vue

@@ -35,55 +35,36 @@
 			</el-form>
 		</el-card>
 		<el-card shadow="never">
-			<!-- 表格 -->
-			<el-table :data="state.tableData" v-loading="state.loading" row-key="id" ref="multipleTableRef" @selection-change="handleSelectionChange">
-				<el-table-column type="selection" width="55" />
-				<el-table-column prop="order.no" label="工单编码" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column width="100" label="省/市工单" prop="isProvince">
-					<template #default="{ row }">
-						<span>{{ row.order?.isProvince ? '省工单' : '市工单' }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column label="工单标题" show-overflow-tooltip width="300">
-					<template #default="{ row }">
-            <order-detail :order="row.order" @updateList="queryList">{{ row.order?.title }}</order-detail>
-					</template>
-				</el-table-column>
-				<el-table-column prop="order.sourceChannel" label="来源方式" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="order.acceptType" label="受理类型" show-overflow-tooltip width="100"></el-table-column>
-				<el-table-column prop="order.hotspotName" label="热点分类" show-overflow-tooltip min-width="150"></el-table-column>
-				<el-table-column label="受理人" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span
-							>{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
-						</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="order.orgLevelOneName" label="一级部门" show-overflow-tooltip width="170"></el-table-column>
-				<el-table-column prop="stateText" label="退回审批状态" show-overflow-tooltip width="120"></el-table-column>
-				<el-table-column prop="creatorName" label="申请人" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="creatorOrgName" label="申请部门" show-overflow-tooltip min-width="120"></el-table-column>
-				<el-table-column prop="content" label="申请理由" show-overflow-tooltip width="200"></el-table-column>
-				<el-table-column label="操作" width="170" fixed="right" align="center">
-					<template #default="{ row }">
-						<el-button link type="primary" @click="onAudit(row)" title="退回特提" v-auth="'business:return:audit'" v-if="[0].includes(row.state)">
-							审批
-						</el-button>
-						<el-button link type="primary" @click="onAuditDetail(row)" title="查看审批详情" v-if="[1, 2].includes(row.state)"> 审批详情 </el-button>
-						<order-detail :order="row.order" @updateList="queryList" />
-					</template>
-				</el-table-column>
-				<template #empty>
-					<Empty />
-				</template>
-			</el-table>
-			<!-- 分页 -->
-			<pagination
-				:total="state.total"
-				v-model:page="state.queryParams.PageIndex"
-				v-model:limit="state.queryParams.PageSize"
-				@pagination="queryList"
-			/>
+      <ProTable
+        ref="proTableRef"
+        :columns="columns"
+        :data="state.tableData"
+        @updateTable="queryList"
+        :loading="state.loading"
+        :total="state.total"
+        v-model:page-index="state.queryParams.PageIndex"
+        v-model:page-size="state.queryParams.PageSize"
+      >
+        <template #isProvince="{ row }">
+          <span>{{ row.order?.isProvince ? '省工单' : '市工单' }}</span>
+        </template>
+        <template #title="{ row }">
+          <order-detail :order="row.order" @updateList="queryList">{{ row.order?.title }}</order-detail>
+        </template>
+        <template #employeeName="{ row }">
+					<span
+          >{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
+					</span>
+        </template>
+        <!-- 表格操作 -->
+        <template #operation="{ row }">
+          <el-button link type="primary" @click="onAudit(row)" title="退回特提" v-auth="'business:return:audit'" v-if="[0].includes(row.state)">
+            审批
+          </el-button>
+          <el-button link type="primary" @click="onAuditDetail(row)" title="查看审批详情" v-if="[1, 2].includes(row.state)"> 审批详情 </el-button>
+          <order-detail :order="row.order" @updateList="queryList" />
+        </template>
+      </ProTable>
 		</el-card>
 		<!-- 退回审批 -->
 		<return-audit ref="returnAuditRef" @updateList="queryList" />
@@ -91,13 +72,14 @@
 		<return-audit-detail ref="returnAuditDetailRef" />
 	</div>
 </template>
-<script setup lang="ts" name="orderReturnAudit">
+<script setup lang="tsx" name="orderReturnAudit">
 import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { ElButton, FormInstance } from 'element-plus';
 import { throttle } from '@/utils/tools';
 import { useRouter } from 'vue-router';
 import { returnAuditList } from '@/api/business/return';
 import { shortcuts } from '@/utils/constants';
+import { formatDate } from "@/utils/formatTime";
 // 引入组件
 const ReturnAudit = defineAsyncComponent(() => import('@/views/business/returnAudit/components/Return-audit.vue')); // 审批
 const ReturnAuditDetail = defineAsyncComponent(() => import('@/views/business/returnAudit/components/Return-audit-detail.vue')); // 审批详情
@@ -105,12 +87,31 @@ const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/
 // 定义变量内容
 const ruleFormRef = ref<RefType>(); // 表单ref
 const router = useRouter(); // 路由
-const state = reactive(<any>{
+const proTableRef = ref<RefType>(); // 表格ref
+// 表格配置项
+const columns = ref<any[]>([
+  { type: 'selection', fixed: 'left', width: 55 },
+  { prop: 'order.no', label: '工单编码', width: 150 },
+  { prop: 'isProvince', label: '省/市工单', width: 100 },
+  { prop: 'title', label: '工单标题', width: 300 },
+  { prop: 'order.sourceChannel', label: '来源方式', width: 100 },
+  { prop: 'order.acceptType', label: '受理类型', width: 150 },
+  { prop: 'order.hotspotName', label: '热点分类', width: 100 },
+  { prop: 'order.acceptorName', label: '受理人', width: 170 },
+  { prop: 'order.orgLevelOneName', label: '一级部门', width: 170 },
+  { prop: 'stateText', label: '退回审批状态', width: 120 },
+  { prop: 'creatorName', label: '申请人', width: 120 },
+  { prop: 'creatorOrgName', label: '申请部门', width: 150 },
+  { prop: 'content', label: '申请理由', width: 200 },
+  { prop: 'operation', label: '操作', fixed: 'right', width: 170, align: 'center' },
+]);
+const state = reactive({
 	queryParams: {
 		// 查询条件
 		PageIndex: 1,
 		PageSize: 10,
 		Keyword: null, // 关键字
+    State: null, // 审批状态
 	},
 	tableData: [], //表单
 	loading: false, // 加载

src/views/business/special/index.vue

@@ -78,12 +78,45 @@
 				v-model:limit="state.queryParams.PageSize"
 				@pagination="queryList"
 			/>
+
+      <ProTable
+        ref="proTableRef"
+        :columns="columns"
+        :data="state.tableData"
+        @updateTable="queryList"
+        :loading="state.loading"
+        :total="state.total"
+        v-model:page-index="state.queryParams.PageIndex"
+        v-model:page-size="state.queryParams.PageSize"
+      >
+        <template #tableHeader="scope">
+          <el-button type="primary" @click="publishMultiple" v-auth="'todo:publish:multiple'" :disabled="!scope.isSelected">
+            <SvgIcon name="iconfont icon-tianjiawenjian" class="mr5" />批量发布
+          </el-button>
+        </template>
+        <template #isProvince="{ row }">
+          <span>{{ row.isProvince ? '省工单' : '市工单' }}</span>
+        </template>
+        <template #title="{ row }">
+          <order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
+        </template>
+        <template #employeeName="{ row }">
+					<span
+          >{{ row.acceptorName }} <span v-if="row.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
+					</span>
+        </template>
+        <!-- 表格操作 -->
+        <template #operation="{ row }">
+          <el-button link type="primary" @click="approve(row)" title="退回审批" v-auth="'todo:return:audit'"> 退回审批 </el-button>
+          <order-detail :order="row" @updateList="queryList" />
+        </template>
+      </ProTable>
 		</el-card>
 		<!-- 特提申请 -->
 		<special-apply ref="specialApplyRef" @updateList="queryList" />
 	</div>
 </template>
-<script setup lang="ts" name="orderSpecial">
+<script setup lang="tsx" name="orderSpecial">
 import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { ElButton, ElMessage, FormInstance } from 'element-plus';
 import { auth } from '@/utils/authFunction';
@@ -97,7 +130,46 @@ const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/
 // 定义变量内容
 const ruleFormRef = ref<RefType>(); // 表单ref
 const router = useRouter(); // 路由
-const state = reactive(<any>{
+const proTableRef = ref<RefType>(); // 表格ref
+// 表格配置项
+const columns = ref<any[]>([
+  { type: 'selection', fixed: 'left', width: 55 },
+  { prop: 'no', label: '工单编码', width: 150 },
+  { prop: 'isProvince', label: '省/市工单', width: 100 },
+  { prop: 'statusText', label: '发布状态', width: 100 },
+  { prop: 'title', label: '工单标题', width: 300 },
+  { prop: 'sourceChannel', label: '来源方式', width: 100 },
+  { prop: 'acceptType', label: '受理类型', width: 150 },
+  { prop: 'counterSignTypeText', label: '中心会签', width: 100 },
+  { prop: 'actualHandleOrgName', label: '接办部门', width: 150 },
+  { prop: 'employeeName', label: '受理人', width: 120 },
+  {
+    prop: 'actualHandleTime',
+    label: '接办时间',
+    width: 170,
+    render: (scope) => {
+      return <span>{formatDate(scope.row.actualHandleTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+    },
+  },
+  {
+    prop: 'startTime',
+    label: '受理时间',
+    width: 170,
+    render: (scope) => {
+      return <span>{formatDate(scope.row.startTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+    },
+  },
+  {
+    prop: 'filedTime',
+    label: '办结时间',
+    width: 170,
+    render: (scope) => {
+      return <span>{formatDate(scope.row.filedTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+    },
+  },
+  { prop: 'operation', label: '操作', fixed: 'right', width: 140, align: 'center' },
+]);
+const state = reactive({
 	queryParams: {
 		// 查询条件
 		PageIndex: 1,

src/views/business/specialAudit/index.vue

@@ -15,56 +15,36 @@
 			</el-form>
 		</el-card>
 		<el-card shadow="never">
-			<!-- 表格 -->
-			<el-table :data="state.tableData" v-loading="state.loading" row-key="id" ref="multipleTableRef" @selection-change="handleSelectionChange">
-				<el-table-column type="selection" width="55" />
-				<el-table-column prop="order.no" label="工单编码" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column width="100" label="省/市工单" prop="isProvince">
-					<template #default="{ row }">
-						<span>{{ row.order?.isProvince ? '省工单' : '市工单' }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column label="工单标题" show-overflow-tooltip width="300">
-					<template #default="{ row }">
-            <order-detail :order="row.order" @updateList="queryList">{{ row.order?.title }}</order-detail>
-					</template>
-				</el-table-column>
-				<el-table-column prop="order.sourceChannel" label="来源方式" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="order.acceptType" label="受理类型" show-overflow-tooltip width="100"></el-table-column>
-				<el-table-column prop="order.hotspotName" label="热点分类" show-overflow-tooltip width="100"></el-table-column>
-				<el-table-column label="受理人" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span
-							>{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
-						</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="order.orgLevelOneName" label="一级部门" show-overflow-tooltip width="170"></el-table-column>
-				<el-table-column prop="stateText" label="特提审批状态" show-overflow-tooltip width="120"></el-table-column>
-				<el-table-column prop="cause" label="特提原因" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column prop="creatorName" label="申请人" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="creatorOrgName" label="申请部门" show-overflow-tooltip width="120"></el-table-column>
-				<el-table-column prop="reason" label="申请理由" show-overflow-tooltip width="200"></el-table-column>
-				<el-table-column label="操作" width="170" fixed="right" align="center">
-					<template #default="{ row }">
-						<el-button link type="primary" @click="onAudit(row)" title="审批特提" v-auth="'business:special:audit'" v-if="[0].includes(row.state)">
-							审批
-						</el-button>
-						<el-button link type="primary" @click="onAuditDetail(row)" title="查看审批详情" v-if="[1, 2].includes(row.state)"> 审批详情 </el-button>
-						<order-detail :order="row.order" @updateList="queryList" />
-					</template>
-				</el-table-column>
-				<template #empty>
-					<Empty />
-				</template>
-			</el-table>
-			<!-- 分页 -->
-			<pagination
-				:total="state.total"
-				v-model:page="state.queryParams.PageIndex"
-				v-model:limit="state.queryParams.PageSize"
-				@pagination="queryList"
-			/>
+      <ProTable
+        ref="proTableRef"
+        :columns="columns"
+        :data="state.tableData"
+        @updateTable="queryList"
+        :loading="state.loading"
+        :total="state.total"
+        v-model:page-index="state.queryParams.PageIndex"
+        v-model:page-size="state.queryParams.PageSize"
+      >
+        <template #isProvince="{ row }">
+          <span>{{ row.order?.isProvince ? '省工单' : '市工单' }}</span>
+        </template>
+        <template #title="{ row }">
+          <order-detail :order="row.order" @updateList="queryList">{{ row.order?.title }}</order-detail>
+        </template>
+        <template #employeeName="{ row }">
+					<span
+          >{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
+					</span>
+        </template>
+        <!-- 表格操作 -->
+        <template #operation="{ row }">
+          <el-button link type="primary" @click="onAudit(row)" title="审批特提" v-auth="'business:special:audit'" v-if="[0].includes(row.state)">
+            审批
+          </el-button>
+          <el-button link type="primary" @click="onAuditDetail(row)" title="查看审批详情" v-if="[1, 2].includes(row.state)"> 审批详情 </el-button>
+          <order-detail :order="row.order" @updateList="queryList" />
+        </template>
+      </ProTable>
 		</el-card>
 		<!-- 特提审批 -->
 		<special-audit ref="specialAuditRef" @updateList="queryList" />
@@ -72,13 +52,14 @@
 		<special-audit-detail ref="specialAuditDetailRef" />
 	</div>
 </template>
-<script setup lang="ts" name="orderSpecialAudit">
+<script setup lang="tsx" name="orderSpecialAudit">
 import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { ElButton, ElMessage, FormInstance } from 'element-plus';
 import { auth } from '@/utils/authFunction';
 import { throttle } from '@/utils/tools';
 import { useRouter } from 'vue-router';
 import { specialList } from '@/api/business/special';
+import { formatDate } from "@/utils/formatTime";
 // 引入组件
 const SpecialAudit = defineAsyncComponent(() => import('@/views/business/special/components/Special-audit.vue')); // 审批
 const SpecialAuditDetail = defineAsyncComponent(() => import('@/views/business/special/components/Special-audit-detail.vue')); // 审批详情
@@ -86,7 +67,26 @@ const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/
 // 定义变量内容
 const ruleFormRef = ref<RefType>(); // 表单ref
 const router = useRouter(); // 路由
-const state = reactive(<any>{
+const proTableRef = ref<RefType>(); // 表格ref
+// 表格配置项
+const columns = ref<any[]>([
+  { type: 'selection', fixed: 'left', width: 55 },
+  { prop: 'order.no', label: '工单编码', width: 150 },
+  { prop: 'isProvince', label: '省/市工单', width: 100 },
+  { prop: 'title', label: '工单标题', width: 300 },
+  { prop: 'order.sourceChannel', label: '来源方式', width: 100 },
+  { prop: 'order.acceptType', label: '受理类型', width: 150 },
+  { prop: 'order.hotspotName', label: '热点分类', width: 100 },
+  { prop: 'employeeName', label: '受理人', width: 170 },
+  { prop: 'order.orgLevelOneName', label: '一级部门', width: 170 },
+  { prop: 'stateText', label: '特提审批状态', width: 120 },
+  { prop: 'cause', label: '特提原因', width: 150 },
+  { prop: 'creatorName', label: '申请人', width: 140 },
+  { prop: 'creatorOrgName', label: '申请部门', width: 120 },
+  { prop: 'reason', label: '申请理由', width: 200 },
+  { prop: 'operation', label: '操作', fixed: 'right', width: 170, align: 'center' },
+]);
+const state = reactive({
 	queryParams: {
 		// 查询条件
 		PageIndex: 1,
@@ -121,12 +121,6 @@ const resetQuery = throttle((formEl: FormInstance | undefined) => {
 	formEl.resetFields();
 	queryList();
 }, 300);
-// 表格多选
-const multipleTableRef = ref<RefType>();
-const multipleSelection = ref<any>([]);
-const handleSelectionChange = (val: any[]) => {
-	multipleSelection.value = val;
-};
 // 导出
 const onExport = () => {
 	console.log('导出');

src/views/knowledge/index/index.vue

@@ -15,7 +15,7 @@
 							<el-input v-model="filterHot" placeholder="请输入热点名称" class="input-with-select mb10" clearable> </el-input>
 						</el-tab-pane>
 					</el-tabs>
-					<el-scrollbar style="height: calc(100% - 100px);'" ref="scrollBarRef">
+					<el-scrollbar style="height: calc(100% - 100px);'" ref="scrollBarRef" v-loading="state.loading">
 						<el-tree-v2
 							v-show="state.activeName === '0'"
 							:data="state.orgData"
@@ -28,7 +28,6 @@
 							:item-size="40"
 							:height="treeHeight"
 							empty-text="暂无组织数据"
-              v-loading="state.loading"
 						>
 							<template #default="{ node }">
 								<span :title="node.label">{{ node.label }}</span>
@@ -41,7 +40,6 @@
 							:props="{ children: 'children', label: 'name' }"
 							@node-click="handleNodeClick"
 							ref="typeRef"
-							v-loading="state.loading"
 							:filter-node-method="filterNodeType"
 							node-key="id"
 							:style="state.activeName === '1' ? 'min-width: 100%; display: inline-block' : 'display:none'"

src/views/knowledge/retrieval/index.vue

@@ -20,7 +20,7 @@
 							<el-input v-model="filterHot" placeholder="请输入热点名称" class="input-with-select mb10" clearable> </el-input>
 						</el-tab-pane>
 					</el-tabs>
-					<el-scrollbar style="height: calc(100% - 140px);'" ref="scrollBarRef">
+					<el-scrollbar style="height: calc(100% - 140px);'" ref="scrollBarRef" v-loading="state.loading">
 						<el-tree-v2
 							v-show="state.activeName === '0'"
 							:data="state.orgData"

src/views/statistics/order/departmentAcceptType.vue

@@ -39,7 +39,6 @@
 				:columns="columns"
 				:data="state.tableData"
 				@updateTable="queryList"
-				:toolButton="false"
 				:loading="state.loading"
         show-summary
 			>

src/views/todo/delay/index.vue

@@ -18,164 +18,61 @@
 				</el-form-item>
 			</el-form>
 			<!-- 表格 -->
-			<el-table :data="state.tableData" v-loading="state.loading" row-key="id" ref="multipleTableRef" @selection-change="handleSelectionChange">
-				<el-table-column type="selection" width="55" />
-        <el-table-column label="超期状态" width="80" align="center">
-          <template #default="{ row }">
-            <span :class="'overdue-status-'+row.order?.expiredStatus" :title="row.order?.expiredStatusText"></span>
-          </template>
-        </el-table-column>
-				<template v-if="state.queryParams.IsApply === 'false'">
-					<el-table-column prop="order.no" label="工单编码" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column width="100" label="省/市工单" prop="isProvince">
-						<template #default="{ row }">
-							<span>{{ row.order?.isProvince ? '省工单' : '市工单' }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="工单标题" show-overflow-tooltip width="300">
-						<template #default="{ row }">
-              <order-detail :order="row.order" @updateList="queryList">{{row.order?.title}}</order-detail>
-						</template>
-					</el-table-column>
-					<el-table-column prop="delayStateText" label="延期审批状态" show-overflow-tooltip width="120"></el-table-column>
-					<el-table-column label="受理时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.order?.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="acceptorName" label="受理人" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span
-								>{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
-							</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="order.hotspotName" label="热点分类" show-overflow-tooltip width="120"></el-table-column>
-					<el-table-column prop="order.acceptType" label="受理类型" show-overflow-tooltip></el-table-column>
-					<el-table-column prop="order.orgLevelOneName" label="一级部门" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column prop="order.actualHandleOrgName" label="接办部门" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column label="接办时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.order?.actualHandleTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="延期申请时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="creatorOrgName" label="延期申请部门" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column prop="creatorName" label="延期申请人" show-overflow-tooltip width="120"></el-table-column>
-					<el-table-column prop="delayNum" label="延期申请时限" show-overflow-tooltip width="120"></el-table-column>
-					<el-table-column prop="delayUnitText" label="延期申请单位" show-overflow-tooltip width="120"></el-table-column>
-					<el-table-column prop="delayReason" label="申请理由" show-overflow-tooltip width="120"></el-table-column>
-					<el-table-column label="申请前期满时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.applyDelayTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="通过后期满时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.afterDelay, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
+
+			<!-- 表格 -->
+			<ProTable
+				ref="proTableRef"
+				:columns="columns"
+				:data="state.tableData"
+				@updateTable="queryList"
+				:loading="state.loading"
+				:total="state.total"
+				v-model:page-index="state.queryParams.PageIndex"
+				v-model:page-size="state.queryParams.PageSize"
+				:key="Math.random()"
+			>
+				<template #expiredStatus="{ row }">
+					<span :class="'overdue-status-' + row.order?.expiredStatus" :title="row.order?.expiredStatusText"></span>
 				</template>
-				<template v-if="state.queryParams.IsApply === 'true'">
-					<el-table-column prop="order.no" label="工单编码" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column width="100" label="省/市工单" prop="isProvince">
-						<template #default="{ row }">
-							<span>{{ row.order?.isProvince ? '省工单' : '市工单' }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="currentStepName" label="当前节点" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column prop="actualHandlerName" label="当前审批人" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column prop="delayStateText" label="延期申请状态" show-overflow-tooltip width="120"></el-table-column>
-					<el-table-column label="工单标题" show-overflow-tooltip width="300">
-						<template #default="{ row }">
-							<span class="color-primary">{{ row.order?.title }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="受理时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.order?.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="acceptorName" label="受理人" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span
-								>{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
-							</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="order.hotspotName" label="热点分类" show-overflow-tooltip width="120"></el-table-column>
-					<el-table-column prop="order.acceptType" label="受理类型" show-overflow-tooltip></el-table-column>
-					<el-table-column prop="order.orgLevelOneName" label="一级部门" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column prop="order.actualHandleOrgName" label="接办部门" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column label="接办时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.order?.actualHandleTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="延期申请时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="creatorOrgName" label="延期申请部门" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column prop="creatorName" label="延期申请人" show-overflow-tooltip width="120"></el-table-column>
-					<el-table-column prop="delayNum" label="延期申请时限" show-overflow-tooltip width="120"></el-table-column>
-					<el-table-column prop="delayUnitText" label="延期申请单位" show-overflow-tooltip width="120"></el-table-column>
-					<el-table-column prop="delayReason" label="申请理由" show-overflow-tooltip width="120"></el-table-column>
-					<el-table-column label="申请前期满时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.applyDelayTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="通过后期满时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.afterDelay, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
+				<template #isProvince="{ row }">
+					<span>{{ row.order?.isProvince ? '省工单' : '市工单' }}</span>
 				</template>
-				<el-table-column label="操作" width="160" fixed="right" align="center">
-					<template #default="{ row }">
-						<el-button link type="primary" @click="onDetail(row)" title="延期详情" v-auth="'todo:delay:audit'"> 延期详情 </el-button>
-						<order-detail :order="row.order" @updateList="queryList" />
-					</template>
-				</el-table-column>
-				<template #empty>
-					<Empty />
+				<template #title="{ row }">
+					<order-detail :order="row" @updateList="queryList">{{ row.order?.title }}</order-detail>
 				</template>
-			</el-table>
-			<!-- 分页 -->
-			<pagination
-				:total="state.total"
-				v-model:page="state.queryParams.PageIndex"
-				v-model:limit="state.queryParams.PageSize"
-				@pagination="queryList"
-			/>
+				<template #employeeName="{ row }">
+					<span
+						>{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
+					</span>
+				</template>
+				<!-- 表格操作 -->
+				<template #operation="{ row }">
+					<el-button link type="primary" @click="onDetail(row)" title="延期详情" v-auth="'todo:delay:audit'"> 延期详情 </el-button>
+					<order-detail :order="row.order" @updateList="queryList" />
+				</template>
+			</ProTable>
 		</el-card>
 		<!--  延期详情  -->
 		<delay-detail-com ref="delayDetailRef" @updateList="queryList" />
-    <!--  延期修改  -->
-    <delay-edit ref="delayEditRef" @updateList="queryList" />
+		<!--  延期修改  -->
+		<delay-edit ref="delayEditRef" @updateList="queryList" />
 	</div>
 </template>
-<script setup lang="ts" name="todoDelay">
+<script setup lang="tsx" name="todoDelay">
 import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { ElButton, FormInstance } from 'element-plus';
 import { throttle } from '@/utils/tools';
 import { formatDate } from '@/utils/formatTime';
 import { useRouter } from 'vue-router';
 import { delayList } from '@/api/todo/delay';
-import { delayDetail } from "@/api/business/delay";
+import { delayDetail } from '@/api/business/delay';
 // 引入组件
 const DelayDetailCom = defineAsyncComponent(() => import('@/views/business/delay/components/Delay-detail.vue')); // 延期详情
 const DelayEdit = defineAsyncComponent(() => import('@/views/business/delay/components/Delay-edit.vue')); // 延期修改
 const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/index.vue')); // 工单详情
 
 // 定义变量内容
-const state = reactive(<any>{
+const state = reactive({
 	queryParams: {
 		// 查询条件
 		PageIndex: 1,
@@ -189,11 +86,87 @@ const state = reactive(<any>{
 });
 const ruleFormRef = ref<RefType>(); // 表单ref
 const router = useRouter(); // 路由
+const proTableRef = ref<RefType>(); // 表格ref
+// 表格配置项
+const columns = ref<any[]>([
+	{ type: 'selection', fixed: 'left', width: 55 },
+	{ prop: 'expiredStatus', label: '超期状态', align: 'center' },
+	{ prop: 'no', label: '工单编码', width: 150 },
+	{ prop: 'isProvince', label: '省/市工单', width: 100 },
+	{ prop: 'title', label: '工单标题', width: 300 },
+	{ prop: 'delayStateText', label: '延期审批状态', width: 120 },
+	{
+		prop: 'order.startTime',
+		label: '受理时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.order?.startTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{ prop: 'employeeName', label: '受理人', width: 120 },
+	{ prop: 'order.hotspotName', label: '热点分类', width: 200 },
+	{ prop: 'order.acceptType', label: '受理类型', width: 150 },
+	{ prop: 'order.orgLevelOneName', label: '一级部门', width: 150 },
+	{ prop: 'order.actualHandleOrgName', label: '接办部门', width: 150 },
+	{
+		prop: 'order.actualHandleTime',
+		label: '接办时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.order?.actualHandleTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{
+		prop: 'creationTime',
+		label: '延期申请时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.creationTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{ prop: 'creatorOrgName', label: '延期申请部门', width: 120 },
+	{ prop: 'creatorName', label: '延期申请人', width: 150 },
+	{ prop: 'delayNum', label: '延期申请时限', width: 120 },
+	{ prop: 'delayUnitText', label: '延期申请单位', width: 120 },
+	{ prop: 'delayReason', label: '申请理由', width: 120 },
+	{
+		prop: 'applyDelayTime',
+		label: '申请前期满时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.applyDelayTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{
+		prop: 'afterDelay',
+		label: '通过后期满时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.afterDelay, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{ prop: 'operation', label: '操作', fixed: 'right', width: 160, align: 'center' },
+]);
 /** 获取列表 */
 const queryList = throttle(() => {
 	state.loading = true;
 	delayList(state.queryParams)
 		.then((res: any) => {
+			const index = columns.value.findIndex((item) => item.prop === 'delayStateText');
+			if (state.queryParams.IsApply === 'true') {
+				if (!columns.value.find((item) => item.prop === 'currentStepName')) {
+					columns.value.splice(
+						index,
+						0,
+						{ prop: 'currentStepName', label: '当前节点', width: 150 },
+						{ prop: 'actualHandlerName', label: '当前审批人', width: 150 }
+					);
+				}
+			} else {
+				if (columns.value.find((item) => item.prop === 'currentStepName')) {
+					columns.value = columns.value.filter((item) => item.prop !== 'currentStepName' && item.prop !== 'actualHandlerName');
+				}
+			}
 			state.tableData = res.result?.items ?? [];
 			state.total = res.result?.total ?? 0;
 			state.loading = false;
@@ -216,16 +189,17 @@ const resetQuery = throttle((formEl: FormInstance | undefined) => {
 const delayDetailRef = ref<RefType>();
 const delayEditRef = ref<RefType>();
 const onDetail = async (row: any) => {
-  try {
-    const {result} = await delayDetail(row.id);
-    if(result.handle) { // 退回到了开始 需要重新打开编辑页面在发起流程
-      delayEditRef.value.openDialog(row);
-    } else {
-      delayDetailRef.value.openDialog(row);
-    }
-  } catch (e) {
-    console.log(e);
-  }
+	try {
+		const { result } = await delayDetail(row.id);
+		if (result.handle) {
+			// 退回到了开始 需要重新打开编辑页面在发起流程
+			delayEditRef.value.openDialog(row);
+		} else {
+			delayDetailRef.value.openDialog(row);
+		}
+	} catch (e) {
+		console.log(e);
+	}
 };
 // 表格多选
 const multipleTableRef = ref<RefType>();

src/views/todo/discern/index.vue

@@ -6,9 +6,9 @@
 				<el-tab-pane name="0" label="甄别待办"></el-tab-pane>
 				<el-tab-pane name="4" label="甄别已办"></el-tab-pane>
 			</el-tabs>
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent  inline>
+			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
 				<el-form-item label="关键字" prop="Keyword">
-					<el-input v-model="state.queryParams.Keyword" placeholder="工单编码/标题" clearable @keyup.enter="queryList" class="keyword-input"/>
+					<el-input v-model="state.queryParams.Keyword" placeholder="工单编码/标题" clearable @keyup.enter="queryList" class="keyword-input" />
 				</el-form-item>
 				<el-form-item label="甄别时间" prop="crTime">
 					<el-date-picker
@@ -31,143 +31,51 @@
 				</el-form-item>
 			</el-form>
 			<!-- 表格 -->
-			<el-table :data="state.tableData" v-loading="state.loading" row-key="id" ref="multipleTableRef" @selection-change="handleSelectionChange">
-				<el-table-column type="selection" width="55" />
-        <el-table-column label="超期状态" width="80" align="center">
-          <template #default="{ row }">
-            <span :class="'overdue-status-'+row.order?.expiredStatus" :title="row.order?.expiredStatusText"></span>
-          </template>
-        </el-table-column>
-				<template v-if="state.queryParams.Status === '0'">
-					<el-table-column prop="order.no" label="工单编码" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column width="100" label="省/市工单" prop="isProvince">
-						<template #default="{ row }">
-							<span>{{ row.order?.isProvince ? '省工单' : '市工单' }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="工单标题" show-overflow-tooltip width="300">
-						<template #default="{ row }">
-              <order-detail :order="row.order" @updateList="queryList">{{row.order?.title}}</order-detail>
-						</template>
-					</el-table-column>
-					<el-table-column prop="order.sourceChannel" label="来源方式" show-overflow-tooltip></el-table-column>
-					<el-table-column prop="order.acceptType" label="受理类型" show-overflow-tooltip width="120"></el-table-column>
-					<el-table-column prop="expiredTime" label="受理人" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span
-								>{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
-							</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="order.orgLevelOneName" label="一级部门" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column prop="order.actualHandleOrgName" label="接办部门" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column prop="actualHandleTime" label="接办时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.order?.actualHandleTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="受理时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.order?.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="visit.visitTime" label="回访时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.visit?.visitTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="creationTime" label="甄别申请时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="creatorName" label="甄别申请人" show-overflow-tooltip width="170"></el-table-column>
-					<el-table-column prop="creatorOrgName" label="甄别申请部门" show-overflow-tooltip width="200"></el-table-column>
-					<el-table-column prop="typeDicName" label="甄别申请类型" show-overflow-tooltip width="170"></el-table-column>
-					<el-table-column prop="content" label="甄别申请原因" show-overflow-tooltip width="200"></el-table-column>
+			<ProTable
+				ref="proTableRef"
+				:columns="columns"
+				:data="state.tableData"
+				@updateTable="queryList"
+				:loading="state.loading"
+				:total="state.total"
+				v-model:page-index="state.queryParams.PageIndex"
+				v-model:page-size="state.queryParams.PageSize"
+				:key="Math.random()"
+			>
+				<template #expiredStatus="{ row }">
+					<span :class="'overdue-status-' + row.order?.expiredStatus" :title="row.order?.expiredStatusText"></span>
 				</template>
-				<template v-if="state.queryParams.Status === '4'">
-					<el-table-column prop="order.no" label="工单编码" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column width="100" label="省/市工单" prop="isProvince">
-						<template #default="{ row }">
-							<span>{{ row.order?.isProvince ? '省工单' : '市工单' }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="statusText" label="甄别状态" show-overflow-tooltip width="120"></el-table-column>
-					<el-table-column prop="currentStepName" label="当前节点" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column prop="actualHandlerName" label="当前审批人" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column label="工单标题" show-overflow-tooltip width="300">
-						<template #default="{ row }">
-              <order-detail :order="row.order" @updateList="queryList">{{row.order?.title}}</order-detail>
-						</template>
-					</el-table-column>
-					<el-table-column prop="order.sourceChannel" label="来源方式" show-overflow-tooltip></el-table-column>
-					<el-table-column prop="order.acceptType" label="受理类型" show-overflow-tooltip width="120"></el-table-column>
-					<el-table-column prop="expiredTime" label="受理人" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span
-								>{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
-							</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="order.orgLevelOneName" label="一级部门" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column prop="order.actualHandleOrgName" label="接办部门" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column prop="actualHandleTime" label="接办时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.order?.actualHandleTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="受理时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.order?.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="visit.visitTime" label="回访时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.visit?.visitTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="creationTime" label="甄别申请时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="creatorName" label="甄别申请人" show-overflow-tooltip width="170"></el-table-column>
-					<el-table-column prop="creatorOrgName" label="甄别申请部门" show-overflow-tooltip width="200"></el-table-column>
-					<el-table-column prop="typeDicName" label="甄别申请类型" show-overflow-tooltip width="170"></el-table-column>
-					<el-table-column prop="content" label="甄别申请原因" show-overflow-tooltip width="200"></el-table-column>
+				<template #isProvince="{ row }">
+					<span>{{ row.order?.isProvince ? '省工单' : '市工单' }}</span>
 				</template>
-				<el-table-column label="操作" width="160" fixed="right" align="center">
-					<template #default="{ row }">
-						<el-button link type="primary" @click="onDetail(row)" title="查看甄别详情"> 甄别详情 </el-button>
-						<order-detail :order="row.order" @updateList="queryList" />
-					</template>
-				</el-table-column>
-				<template #empty>
-					<Empty />
+				<template #title="{ row }">
+					<order-detail :order="row.order" @updateList="queryList">{{ row.order?.title }}</order-detail>
 				</template>
-			</el-table>
-			<!-- 分页 -->
-			<pagination
-				:total="state.total"
-				v-model:page="state.queryParams.PageIndex"
-				v-model:limit="state.queryParams.PageSize"
-				@pagination="queryList"
-			/>
+				<template #acceptorName="{ row }">
+					<span
+						>{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
+					</span>
+				</template>
+				<!-- 表格操作 -->
+				<template #operation="{ row }">
+					<el-button link type="primary" @click="onDetail(row)" title="查看甄别详情"> 甄别详情 </el-button>
+					<order-detail :order="row.order" @updateList="queryList" />
+				</template>
+			</ProTable>
 		</el-card>
 		<!-- 甄别详情 -->
 		<discern-detail ref="discernDetailRef" @updateList="queryList" />
-    <!-- 甄别修改 -->
-    <discern-edit ref="discernEditRef" @updateList="queryList" />
+		<!-- 甄别修改 -->
+		<discern-edit ref="discernEditRef" @updateList="queryList" />
 	</div>
 </template>
-<script setup lang="ts" name="todoDiscern">
+<script setup lang="tsx" name="todoDiscern">
 import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { ElButton, FormInstance } from 'element-plus';
-import { throttle, transformFile } from "@/utils/tools";
+import { throttle } from '@/utils/tools';
 import { shortcuts } from '@/utils/constants';
 import { formatDate } from '@/utils/formatTime';
-import { screenBaseData, screenDetail, screenList } from "@/api/business/discern";
+import { screenBaseData, screenDetail, screenList } from '@/api/business/discern';
 import other from '@/utils/other';
 
 // 引入组件
@@ -176,7 +84,58 @@ const DiscernEdit = defineAsyncComponent(() => import('@/views/business/discern/
 const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/index.vue')); // 工单详情
 // 定义变量内容
 const ruleFormRef = ref<RefType>(); // 表单ref
-const state = reactive(<any>{
+const proTableRef = ref<RefType>(); // 表格ref
+// 表格配置项
+const columns = ref<any[]>([
+	{ type: 'selection', fixed: 'left', width: 55 },
+	{ prop: 'expiredStatus', label: '超期状态', align: 'center' },
+	{ prop: 'order.no', label: '工单编码', width: 150 },
+	{ prop: 'isProvince', label: '省/市工单', width: 100 },
+	{ prop: 'title', label: '工单标题', width: 300 },
+	{ prop: 'order.sourceChannel', label: '来源方式', width: 100 },
+	{ prop: 'order.acceptType', label: '受理类型', width: 150 },
+	{ prop: 'order.acceptorName', label: '受理人', width: 120 },
+	{ prop: 'order.orgLevelOneName', label: '一级部门', width: 150 },
+	{ prop: 'order.actualHandleOrgName', label: '接办部门', width: 150 },
+	{
+		prop: 'order.actualHandleTime',
+		label: '接办时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.order?.actualHandleTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{
+		prop: 'order.startTime',
+		label: '受理时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.order?.startTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{
+		prop: 'visit.visitTime',
+		label: '回访时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.visit?.visitTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{
+		prop: 'creationTime',
+		label: '甄别申请时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.creationTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{ prop: 'creatorName', label: '甄别申请人', width: 120 },
+	{ prop: 'creatorOrgName', label: '甄别申请部门', width: 150 },
+	{ prop: 'typeDicName', label: '甄别申请类型', width: 120 },
+	{ prop: 'content', label: '甄别申请原因', width: 200 },
+	{ prop: 'operation', label: '操作', fixed: 'right', width: 160, align: 'center' },
+]);
+const state = reactive({
 	queryParams: {
 		// 查询条件
 		PageIndex: 1,
@@ -186,7 +145,7 @@ const state = reactive(<any>{
 		CreationTimeEnd: null, // 创建时间 结束
 		exTime: [], // 办理期限
 		Status: '0',
-    source:'1', // 甄别待办 1 甄别已办 1
+		source: '1', // 甄别待办 1 甄别已办 1
 	},
 	tableData: [], //表单
 	loading: false, // 加载
@@ -215,11 +174,29 @@ const getBaseData = async () => {
 };
 /** 获取列表 */
 const queryList = throttle(() => {
+	const index = columns.value.findIndex((item) => item.prop === 'title');
 	let request = other.deepClone(state.queryParams);
 	Reflect.deleteProperty(request, 'exTime'); // 删除无用的参数
 	state.loading = true;
 	screenList(request)
 		.then((response: any) => {
+			if (state.queryParams.Status === '4') {
+				if (!columns.value.find((item) => item.prop === 'statusText')) {
+					columns.value.splice(
+						index,
+						0,
+						{ prop: 'statusText', label: '甄别状态', width: 120 },
+						{ prop: 'currentStepName', label: '当前节点', width: 150 },
+						{ prop: 'actualHandlerName', label: '当前审批人', width: 150 }
+					);
+				}
+			} else {
+				if (columns.value.find((item) => item.prop === 'statusText')) {
+					columns.value = columns.value.filter(
+						(item) => item.prop !== 'statusText' && item.prop !== 'currentStepName' && item.prop !== 'actualHandlerName'
+					);
+				}
+			}
 			state.tableData = response?.result.items ?? [];
 			state.total = response?.result.total;
 			state.loading = false;
@@ -236,12 +213,6 @@ const resetQuery = throttle((formEl: FormInstance | undefined) => {
 	state.queryParams.CreationTimeEnd = null;
 	queryList();
 }, 500);
-// 表格多选
-const multipleTableRef = ref<RefType>();
-const multipleSelection = ref<any>([]);
-const handleSelectionChange = (val: any[]) => {
-	multipleSelection.value = val;
-};
 // 导出
 const onExport = () => {
 	console.log('导出');
@@ -250,17 +221,18 @@ const onExport = () => {
 const discernDetailRef = ref<RefType>(); // 甄别详情ref
 const discernEditRef = ref<RefType>(); // 甄别修改ref
 const onDetail = async (row: any) => {
-  try {
-    const {result} = await screenDetail(row.id);
-    console.log(result)
-    if(result.handle) { // 退回到了开始 需要重新打开编辑页面在发起流程
-      discernEditRef.value.openDialog(row);
-    } else {
-      discernDetailRef.value.openDialog(row);
-    }
-  } catch (e) {
-    console.log(e);
-  }
+	try {
+		const { result } = await screenDetail(row.id);
+		console.log(result);
+		if (result.handle) {
+			// 退回到了开始 需要重新打开编辑页面在发起流程
+			discernEditRef.value.openDialog(row);
+		} else {
+			discernDetailRef.value.openDialog(row);
+		}
+	} catch (e) {
+		console.log(e);
+	}
 };
 onMounted(async () => {
 	await getBaseData();

src/views/todo/order/index.vue

@@ -15,6 +15,12 @@
 						<el-option label="否" value="false" />
 					</el-select>
 				</el-form-item>
+        <el-form-item label="是否会签" prop="IsCountersign">
+          <el-select v-model="state.queryParams.IsCountersign" placeholder="请选择是否会签">
+            <el-option label="是" value="true" />
+            <el-option label="否" value="false" />
+          </el-select>
+        </el-form-item>
 				<el-form-item>
 					<el-button type="primary" @click="queryList" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
 					<el-button @click="resetQuery(ruleFormRef)" v-waves class="default-button" :loading="state.loading">
@@ -23,143 +29,52 @@
 				</el-form-item>
 			</el-form>
 			<!-- 表格 -->
-			<el-table :data="state.tableData" v-loading="state.loading" row-key="id" ref="multipleTableRef" @selection-change="handleSelectionChange">
-				<el-table-column type="selection" width="40" />
-				<el-table-column label="超期状态" width="80" align="center">
-					<template #default="{ row }">
-						<span :class="'overdue-status-' + row.expiredStatus" :title="row.expiredStatusText"></span>
-					</template>
-				</el-table-column>
-				<template v-if="state.queryParams.IsHandled === 'false'">
-					<el-table-column prop="no" label="工单编码" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column width="100" label="省/市工单" prop="isProvince">
-						<template #default="{ row }">
-							<span>{{ row.isProvince ? '省工单' : '市工单' }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="currentStepName" label="办理节点" show-overflow-tooltip width="150"></el-table-column>
-					<template v-if="state.queryParams.Status === 'false'">
-						<el-table-column prop="creationTime" label="节点签收时间" show-overflow-tooltip width="170">
-							<template #default="{ row }">
-								<span>{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-							</template>
-						</el-table-column>
-					</template>
-					<el-table-column label="工单状态" show-overflow-tooltip width="100" prop="statusText"></el-table-column>
-					<el-table-column label="标题" show-overflow-tooltip width="300">
-						<template #default="{ row }">
-							<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
-						</template>
-					</el-table-column>
-					<el-table-column label="生成时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="受理时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="工单期满时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="acceptType" label="受理类型" show-overflow-tooltip width="120"></el-table-column>
-					<el-table-column label="紧急程度" show-overflow-tooltip prop="emergencyLevelText" width="100"></el-table-column>
-					<el-table-column prop="sourceChannel" label="来源方式" show-overflow-tooltip></el-table-column>
-					<el-table-column prop="hotspotName" label="热点分类" show-overflow-tooltip width="100"></el-table-column>
-					<el-table-column prop="employeeName" label="受理人" show-overflow-tooltip width="150">
-						<template #default="{ row }">
-							<span
-								>{{ row.acceptorName }} <span v-if="row.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
-							</span>
-						</template>
-					</el-table-column>
+			<ProTable
+				ref="proTableRef"
+				:columns="columns"
+				:data="state.tableData"
+				@updateTable="queryList"
+				:loading="state.loading"
+				:total="state.total"
+				v-model:page-index="state.queryParams.PageIndex"
+				v-model:page-size="state.queryParams.PageSize"
+				:key="Math.random()"
+			>
+				<template #expiredStatus="{ row }">
+					<span :class="'overdue-status-' + row.expiredStatus" :title="row.expiredStatusText"></span>
 				</template>
-				<template v-if="state.queryParams.IsHandled === 'true'">
-					<el-table-column prop="no" label="工单编码" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column width="100" label="省/市工单" prop="isProvince">
-						<template #default="{ row }">
-							<span>{{ row.isProvince ? '省工单' : '市工单' }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="currentStepName" label="办理节点" show-overflow-tooltip width="150"></el-table-column>
-					<template v-if="state.queryParams.Status === '0'">
-						<el-table-column prop="creationTime" label="节点签收时间" show-overflow-tooltip width="170">
-							<template #default="{ row }">
-								<span>{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-							</template>
-						</el-table-column>
-					</template>
-					<el-table-column label="工单状态" show-overflow-tooltip width="100" prop="statusText"></el-table-column>
-					<el-table-column label="标题" show-overflow-tooltip width="300">
-						<template #default="{ row }">
-              <order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
-						</template>
-					</el-table-column>
-					<el-table-column label="生成时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="受理时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="工单期满时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="orgLevelOneName" label="一级部门" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column prop="actualHandleOrgName" label="接办部门" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column prop="acceptType" label="受理类型" show-overflow-tooltip width="120"></el-table-column>
-					<el-table-column label="紧急程度" show-overflow-tooltip prop="emergencyLevelText" width="100"></el-table-column>
-					<el-table-column prop="sourceChannel" label="来源方式" show-overflow-tooltip></el-table-column>
-					<el-table-column prop="hotspotName" label="热点分类" show-overflow-tooltip width="100"></el-table-column>
-					<el-table-column prop="employeeName" label="受理人" show-overflow-tooltip width="150">
-						<template #default="{ row }">
-							<span
-								>{{ row.acceptorName }} <span v-if="row.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
-							</span>
-						</template>
-					</el-table-column>
+				<template #isProvince="{ row }">
+					<span>{{ row.isProvince ? '省工单' : '市工单' }}</span>
 				</template>
-				<el-table-column label="操作" width="140" fixed="right" align="center">
-					<template #default="{ row }">
-						<el-button
-							link
-							type="primary"
-							@click="onReturn(row)"
-							title="退回工单"
-							v-auth="'todo:order:return'"
-							v-if="row.source > 1 && row.status <= 1"
-						>
-							退回</el-button
-						>
-						<order-detail :order="row" @updateList="queryList" />
-					</template>
-				</el-table-column>
-				<template #empty>
-					<Empty />
+				<template #title="{ row }">
+					<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
 				</template>
-			</el-table>
-			<!-- 分页 -->
-			<pagination
-				:total="state.total"
-				v-model:page="state.queryParams.PageIndex"
-				v-model:limit="state.queryParams.PageSize"
-				@pagination="queryList"
-			/>
+				<template #employeeName="{ row }">
+					<span
+						>{{ row.acceptorName }} <span v-if="row.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
+					</span>
+				</template>
+				<!-- 表格操作 -->
+				<template #operation="{ row }">
+					<el-button
+						link
+						type="primary"
+						@click="onReturn(row)"
+						title="退回工单"
+						v-auth="'todo:order:return'"
+						v-if="row.source > 1 && row.status <= 1"
+					>
+						退回</el-button
+					>
+					<order-detail :order="row" @updateList="queryList" />
+				</template>
+			</ProTable>
 		</el-card>
 		<!-- 工单省退回 -->
 		<order-return ref="orderReturnRef" @updateList="queryList" />
 	</div>
 </template>
-<script setup lang="ts" name="todoOrder">
+<script setup lang="tsx" name="todoOrder">
 import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { ElButton, FormInstance } from 'element-plus';
 import { throttle } from '@/utils/tools';
@@ -170,7 +85,7 @@ import { orderListTodo } from '@/api/todo/order';
 const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/index.vue')); // 工单详情
 const OrderReturn = defineAsyncComponent(() => import('@/views/business/return/components/Apply.vue')); // 工单退回
 // 定义变量内容
-const state = reactive(<any>{
+const state = reactive({
 	queryParams: {
 		// 查询条件
 		PageIndex: 1, // 当前页
@@ -178,6 +93,7 @@ const state = reactive(<any>{
 		IsHandled: 'false', // 工单状态
 		Keyword: null, // 关键字
 		IsProvince: null, // 是否省工单
+    IsCountersign: null, // 是否会签
 	},
 	tableData: [], //表单
 	loading: false, // 加载
@@ -185,11 +101,67 @@ const state = reactive(<any>{
 });
 const ruleFormRef = ref<RefType>(); // 表单ref
 const router = useRouter(); // 路由
+const proTableRef = ref<RefType>(); // 表格ref
+// 表格配置项
+const columns = ref<any[]>([
+	{ type: 'selection', fixed: 'left', width: 55 },
+	{ prop: 'expiredStatus', label: '超期状态', align: 'center' },
+	{ prop: 'no', label: '工单编码', width: 150 },
+	{ prop: 'isProvince', label: '省/市工单', width: 100 },
+	{ prop: 'currentStepName', label: '办理节点', width: 150 },
+	{ prop: 'statusText', label: '工单状态', width: 100 },
+	{ prop: 'title', label: '工单标题', width: 300 },
+	{
+		prop: 'creationTime',
+		label: '生成时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.creationTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{
+		prop: 'startTime',
+		label: '受理时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.startTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{
+		prop: 'expiredTime',
+		label: '工单期满时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.expiredTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{ prop: 'acceptType', label: '受理类型', width: 150 },
+	{ prop: 'emergencyLevelText', label: '紧急程度', width: 150 },
+	{ prop: 'sourceChannel', label: '来源方式', width: 100 },
+	{ prop: 'hotspotName', label: '热点分类', width: 200 },
+	{ prop: 'employeeName', label: '受理人', width: 120 },
+	{ prop: 'operation', label: '操作', fixed: 'right', width: 140, align: 'center' },
+]);
 // 获取查询条件基础信息
 /** 获取列表 */
 const queryList = throttle(async () => {
 	try {
 		state.loading = true;
+		const index = columns.value.findIndex((item) => item.prop === 'acceptType');
+		if (state.queryParams.IsHandled === 'true') {
+			if (!columns.value.find((item) => item.prop === 'orgLevelOneName')) {
+				columns.value.splice(
+					index,
+					0,
+					{ prop: 'orgLevelOneName', label: '一级部门', width: 150 },
+					{ prop: 'actualHandleOrgName', label: '接办部门', width: 150 }
+				);
+			}
+		} else {
+			if (columns.value.find((item) => item.prop === 'orgLevelOneName')) {
+				columns.value = columns.value.filter((item) => item.prop !== 'orgLevelOneName' && item.prop !== 'actualHandleOrgName');
+			}
+		}
 		const res: any = await orderListTodo(state.queryParams);
 		state.tableData = res.result?.items ?? [];
 		state.total = res.result?.total ?? 0;
@@ -204,16 +176,6 @@ const resetQuery = throttle((formEl: FormInstance | undefined) => {
 	formEl.resetFields();
 	queryList();
 }, 300);
-// 表格多选
-const multipleTableRef = ref<RefType>();
-const multipleSelection = ref<any>([]);
-const handleSelectionChange = (val: any[]) => {
-	multipleSelection.value = val;
-};
-// 导出
-const onExport = () => {
-	console.log('导出');
-};
 // 工单退回
 const orderReturnRef = ref<RefType>(); // 工单退回ref
 const onReturn = (row: any) => {

src/views/todo/publish/index.vue

@@ -2,9 +2,9 @@
 	<div class="todo-publish-container layout-pd">
 		<!-- 搜索  -->
 		<el-card shadow="never">
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent  inline>
+			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
 				<el-form-item label="关键词" prop="Keyword">
-					<el-input v-model="state.queryParams.Keyword" placeholder="工单编码/标题" clearable @keyup.enter="queryList" class="keyword-input"/>
+					<el-input v-model="state.queryParams.Keyword" placeholder="工单编码/标题" clearable @keyup.enter="queryList" class="keyword-input" />
 				</el-form-item>
 				<el-form-item label="归档类型" prop="FiledType">
 					<el-select v-model="state.queryParams.FiledType" placeholder="请选择归档类型">
@@ -27,100 +27,106 @@
 			</el-form>
 		</el-card>
 		<el-card shadow="never">
-			<!-- 功能按钮 -->
-			<div class="mb20">
-				<el-button type="primary" @click="publishMultiple" v-auth="'todo:publish:multiple'" :disabled="!multipleSelection.length">
-					<SvgIcon name="iconfont icon-tianjiawenjian" class="mr5" />批量发布
-				</el-button>
-			</div>
-			<!-- 表格 -->
-			<el-table :data="state.tableData" v-loading="state.loading" row-key="id" ref="multipleTableRef" @selection-change="handleSelectionChange">
-				<el-table-column type="selection" width="55" :selectable="selectable" />
-				<el-table-column prop="no" label="工单编码" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column width="100" label="省/市工单" prop="isProvince">
-					<template #default="{ row }">
-						<span>{{ row.isProvince ? '省工单' : '市工单' }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="statusText" label="发布状态" show-overflow-tooltip></el-table-column>
-				<el-table-column label="工单标题" show-overflow-tooltip width="300">
-					<template #default="{ row }">
-            <order-detail :order="row" @updateList="queryList">{{row.title}}</order-detail>
-					</template>
-				</el-table-column>
-				<el-table-column prop="sourceChannel" label="来源方式" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="acceptType" label="受理类型" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column prop="counterSignTypeText" label="中心会签" show-overflow-tooltip width="100"></el-table-column>
-				<el-table-column prop="actualHandleOrgName" label="接办部门" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column prop="expiredTime" label="受理人" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span
-							>{{ row.acceptorName }} <span v-if="row.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
-						</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="actualHandleTime" label="接办时间" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.actualHandleTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column label="受理时间" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column label="办结时间" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.filedTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column label="操作" width="140" fixed="right" align="center">
-					<template #default="{ row }">
-						<el-button link type="primary" @click="publish(row)" title="发布工单" v-auth="'todo:publish:publish'"> 发布 </el-button>
-						<order-detail :order="row" @updateList="queryList" />
-					</template>
-				</el-table-column>
-				<template #empty>
-					<Empty />
-				</template>
-			</el-table>
-			<!-- 分页 -->
-			<pagination
+			<ProTable
+				ref="proTableRef"
+				:columns="columns"
+				:data="state.tableData"
+				@updateTable="queryList"
+				:loading="state.loading"
 				:total="state.total"
-				v-model:page="state.queryParams.PageIndex"
-				v-model:limit="state.queryParams.PageSize"
-				@pagination="queryList"
-			/>
+				v-model:page-index="state.queryParams.PageIndex"
+				v-model:page-size="state.queryParams.PageSize"
+			>
+				<template #tableHeader="scope">
+					<el-button type="primary" @click="publishMultiple" v-auth="'todo:publish:multiple'" :disabled="!scope.isSelected">
+						<SvgIcon name="iconfont icon-tianjiawenjian" class="mr5" />批量发布
+					</el-button>
+				</template>
+				<template #isProvince="{ row }">
+					<span>{{ row.isProvince ? '省工单' : '市工单' }}</span>
+				</template>
+				<template #title="{ row }">
+					<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
+				</template>
+				<template #employeeName="{ row }">
+					<span
+						>{{ row.acceptorName }} <span v-if="row.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
+					</span>
+				</template>
+				<!-- 表格操作 -->
+				<template #operation="{ row }">
+          <el-button link type="primary" @click="publish(row)" title="发布工单" v-auth="'todo:publish:publish'"> 发布 </el-button>
+          <order-detail :order="row" @updateList="queryList" />
+				</template>
+			</ProTable>
 		</el-card>
 		<!-- 工单发布详情 -->
 		<order-publish ref="orderPublishRef" @updateList="queryList" />
 	</div>
 </template>
-<script setup lang="ts" name="todoPublish">
+<script setup lang="tsx" name="todoPublish">
 import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { ElButton, ElMessage, ElMessageBox, FormInstance } from 'element-plus';
 import { throttle } from '@/utils/tools';
 import { formatDate } from '@/utils/formatTime';
 import { batchPublishOrder, publishList } from '@/api/todo/publish';
-import { deleteCommon } from '@/api/auxiliary/advice';
 // 引入组件
 const OrderPublish = defineAsyncComponent(() => import('@/views/business/publish/component/Order-publish.vue'));
 const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/index.vue')); // 工单详情
 // 定义变量内容
 const ruleFormRef = ref<RefType>(); // 表单ref
-const state = reactive(<any>{
+const state = reactive({
 	queryParams: {
 		// 查询条件
 		PageIndex: 1,
 		PageSize: 10,
 		Keyword: null, // 关键词
-    FiledType: null, // 归档类型
-    IsCountersign: null, // 是否会签
+		FiledType: null, // 归档类型
+		IsCountersign: null, // 是否会签
 	},
 	tableData: [], //表单
 	loading: false, // 加载
 	total: 0, // 总数
 });
+const proTableRef = ref<RefType>(); // 表格ref
+// 表格配置项
+const columns = ref<any[]>([
+  { type: 'selection', fixed: 'left', width: 55 },
+  { prop: 'no', label: '工单编码', width: 150 },
+  { prop: 'isProvince', label: '省/市工单', width: 100 },
+  { prop: 'statusText', label: '发布状态', width: 100 },
+  { prop: 'title', label: '工单标题', width: 300 },
+  { prop: 'sourceChannel', label: '来源方式', width: 100 },
+  { prop: 'acceptType', label: '受理类型', width: 150 },
+  { prop: 'counterSignTypeText', label: '中心会签', width: 100 },
+  { prop: 'actualHandleOrgName', label: '接办部门', width: 150 },
+  { prop: 'employeeName', label: '受理人', width: 120 },
+  {
+    prop: 'actualHandleTime',
+    label: '接办时间',
+    width: 170,
+    render: (scope) => {
+      return <span>{formatDate(scope.row.actualHandleTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+    },
+  },
+  {
+    prop: 'startTime',
+    label: '受理时间',
+    width: 170,
+    render: (scope) => {
+      return <span>{formatDate(scope.row.startTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+    },
+  },
+  {
+    prop: 'filedTime',
+    label: '办结时间',
+    width: 170,
+    render: (scope) => {
+      return <span>{formatDate(scope.row.filedTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+    },
+  },
+  { prop: 'operation', label: '操作', fixed: 'right', width: 140, align: 'center' },
+]);
 /** 获取列表 */
 const queryList = throttle(() => {
 	state.loading = true;
@@ -152,8 +158,8 @@ const handleSelectionChange = (val: any[]) => {
 };
 // 批量发布
 const publishMultiple = () => {
-	const ids = multipleSelection.value.map((item: any) => item.id);
-	const names = multipleSelection.value.map((item: any) => item.title);
+	const ids = proTableRef.value.selectedList.map((item: any) => item.id);
+	const names = proTableRef.value.selectedList.map((item: any) => item.title);
 	ElMessageBox.confirm(`您确定要发布：【${names}】的工单吗，是否继续?`, '提示', {
 		confirmButtonText: '确认',
 		cancelButtonText: '取消',
@@ -178,4 +184,4 @@ const publish = (row: any) => {
 onMounted(() => {
 	queryList();
 });
-</script>
+</script>

src/views/todo/return/index.vue

@@ -15,68 +15,46 @@
 			</el-form>
 		</el-card>
 		<el-card shadow="never">
-			<!-- 功能按钮 -->
 			<el-tabs v-model="state.queryParams.status" class="demo-tabs" @tab-change="handleClick">
 				<el-tab-pane :name="item.value" v-for="item in state.tabPaneList" :key="item.value" :label="item.label"></el-tab-pane>
 			</el-tabs>
 			<!-- 表格 -->
-			<el-table :data="state.tableData" v-loading="state.loading" row-key="id" ref="multipleTableRef" @selection-change="handleSelectionChange">
-				<el-table-column type="selection" width="55" />
-				<el-table-column prop="no" label="工单编码" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="acceptTypeText" label="省/市工单" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="acceptTypeText" label="退回状态" show-overflow-tooltip></el-table-column>
-				<el-table-column label="工单标题" show-overflow-tooltip width="300">
-					<template #default="{ row }">
-						<el-button link type="primary">{{ row.title }}</el-button>
-					</template>
-				</el-table-column>
-				<el-table-column label="受理时间" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="employeeName" label="受理人" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ row.employeeName + '[' + row.employeeStaffNo + ']' }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="acceptTypeText" label="受理类型" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="hotspotName" label="热点分类" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="acceptTypeText" label="一级部门" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="expiredTime" label="交办时间" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="expiredTime" label="退回申请时间" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="acceptTypeText" label="退回申请部门" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="acceptTypeText" label="退回申请人" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="acceptTypeText" label="退回申请理由" show-overflow-tooltip></el-table-column>
-				<el-table-column label="操作" width="100" fixed="right" align="center">
-					<template #default="{ row }">
-						<el-button link type="primary" @click="approve(row)" title="退回审批" v-auth="'todo:return:audit'"> 退回审批 </el-button>
-						<order-detail :order="row" @updateList="queryList" />
-					</template>
-				</el-table-column>
-				<template #empty>
-					<Empty />
-				</template>
-			</el-table>
-			<!-- 分页 -->
-			<pagination
-				:total="state.total"
-				v-model:page="state.queryParams.PageIndex"
-				v-model:limit="state.queryParams.PageSize"
-				@pagination="queryList"
-			/>
+      <ProTable
+        ref="proTableRef"
+        :columns="columns"
+        :data="state.tableData"
+        @updateTable="queryList"
+        :loading="state.loading"
+        :total="state.total"
+        v-model:page-index="state.queryParams.PageIndex"
+        v-model:page-size="state.queryParams.PageSize"
+      >
+        <template #tableHeader="scope">
+          <el-button type="primary" @click="publishMultiple" v-auth="'todo:publish:multiple'" :disabled="!scope.isSelected">
+            <SvgIcon name="iconfont icon-tianjiawenjian" class="mr5" />批量发布
+          </el-button>
+        </template>
+        <template #isProvince="{ row }">
+          <span>{{ row.isProvince ? '省工单' : '市工单' }}</span>
+        </template>
+        <template #title="{ row }">
+          <order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
+        </template>
+        <template #employeeName="{ row }">
+					<span
+          >{{ row.acceptorName }} <span v-if="row.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
+					</span>
+        </template>
+        <!-- 表格操作 -->
+        <template #operation="{ row }">
+          <el-button link type="primary" @click="approve(row)" title="退回审批" v-auth="'todo:return:audit'"> 退回审批 </el-button>
+          <order-detail :order="row" @updateList="queryList" />
+        </template>
+      </ProTable>
 		</el-card>
 	</div>
 </template>
-<script setup lang="ts" name="orderReturnBacklog">
+<script setup lang="tsx" name="orderReturnBacklog">
 import { onMounted, reactive, ref, defineAsyncComponent } from 'vue';
 import { ElButton, FormInstance } from 'element-plus';
 import { throttle } from '@/utils/tools';
@@ -88,7 +66,46 @@ const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/
 // 定义变量内容
 const ruleFormRef = ref<RefType>(); // 表单ref
 const router = useRouter(); // 路由
-const state = reactive(<any>{
+const proTableRef = ref<RefType>(); // 表格ref
+// 表格配置项
+const columns = ref<any[]>([
+  { type: 'selection', fixed: 'left', width: 55 },
+  { prop: 'no', label: '工单编码', width: 150 },
+  { prop: 'isProvince', label: '省/市工单', width: 100 },
+  { prop: 'statusText', label: '发布状态', width: 100 },
+  { prop: 'title', label: '工单标题', width: 300 },
+  { prop: 'sourceChannel', label: '来源方式', width: 100 },
+  { prop: 'acceptType', label: '受理类型', width: 150 },
+  { prop: 'counterSignTypeText', label: '中心会签', width: 100 },
+  { prop: 'actualHandleOrgName', label: '接办部门', width: 150 },
+  { prop: 'employeeName', label: '受理人', width: 120 },
+  {
+    prop: 'actualHandleTime',
+    label: '接办时间',
+    width: 170,
+    render: (scope) => {
+      return <span>{formatDate(scope.row.actualHandleTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+    },
+  },
+  {
+    prop: 'startTime',
+    label: '受理时间',
+    width: 170,
+    render: (scope) => {
+      return <span>{formatDate(scope.row.startTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+    },
+  },
+  {
+    prop: 'filedTime',
+    label: '办结时间',
+    width: 170,
+    render: (scope) => {
+      return <span>{formatDate(scope.row.filedTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+    },
+  },
+  { prop: 'operation', label: '操作', fixed: 'right', width: 140, align: 'center' },
+]);
+const state = reactive({
 	queryParams: {
 		// 查询条件
 		PageIndex: 1,
@@ -121,12 +138,6 @@ const resetQuery = throttle((formEl: FormInstance | undefined) => {
 	formEl.resetFields();
 	queryList();
 }, 300);
-// 表格多选
-const multipleTableRef = ref<RefType>();
-const multipleSelection = ref<any>([]);
-const handleSelectionChange = (val: any[]) => {
-	multipleSelection.value = val;
-};
 // 导出
 const onExport = () => {
 	console.log('导出');

src/views/todo/seats/index.vue

@@ -5,9 +5,9 @@
 				<el-tab-pane name="false" label="工单待办"></el-tab-pane>
 				<el-tab-pane name="true" label="工单已办"></el-tab-pane>
 			</el-tabs>
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent  inline>
+			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
 				<el-form-item label="关键字" prop="Keyword">
-					<el-input v-model="state.queryParams.Keyword" placeholder="工单编码/标题" clearable @keyup.enter="queryList" class="keyword-input"/>
+					<el-input v-model="state.queryParams.Keyword" placeholder="工单编码/标题" clearable @keyup.enter="queryList" class="keyword-input" />
 				</el-form-item>
 				<el-form-item label="是否省工单" prop="IsProvince">
 					<el-select v-model="state.queryParams.IsProvince" placeholder="请选择是否省工单">
@@ -15,6 +15,12 @@
 						<el-option label="否" value="false" />
 					</el-select>
 				</el-form-item>
+				<el-form-item label="是否会签" prop="IsCountersign">
+					<el-select v-model="state.queryParams.IsCountersign" placeholder="请选择是否会签">
+						<el-option label="是" value="true" />
+						<el-option label="否" value="false" />
+					</el-select>
+				</el-form-item>
 				<el-form-item>
 					<el-button type="primary" @click="queryList" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
 					<el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
@@ -22,138 +28,47 @@
 					</el-button>
 				</el-form-item>
 			</el-form>
-			<!-- 功能按钮 -->
-			<div class="mb20">
-				<el-button type="primary" @click="onAddOrder" v-auth="'todo:seats:add'"> <SvgIcon name="ele-Plus" class="mr5" />新建工单 </el-button>
-			</div>
 			<!-- 表格 -->
-			<el-table :data="state.tableData" v-loading="state.loading" row-key="id" ref="multipleTableRef" @selection-change="handleSelectionChange">
-				<el-table-column type="selection" width="40" />
-        <el-table-column label="超期状态" width="80" align="center">
-          <template #default="{ row }">
-            <span :class="'overdue-status-'+row.expiredStatus" :title="row.expiredStatusText"></span>
-          </template>
-        </el-table-column>
-				<template v-if="state.queryParams.IsHandled === 'false'">
-					<el-table-column prop="no" label="工单编码" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column width="100" label="省/市工单" prop="isProvince">
-						<template #default="{ row }">
-							<span>{{ row.isProvince ? '省工单' : '市工单' }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="currentStepName" label="办理节点" show-overflow-tooltip width="150"></el-table-column>
-					<template v-if="state.queryParams.Status === 'false'">
-						<el-table-column prop="creationTime" label="节点签收时间" show-overflow-tooltip width="170">
-							<template #default="{ row }">
-								<span>{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-							</template>
-						</el-table-column>
-					</template>
-					<el-table-column label="工单状态" show-overflow-tooltip width="100" prop="statusText"></el-table-column>
-					<el-table-column label="标题" show-overflow-tooltip width="300">
-						<template #default="{ row }">
-              <order-detail :order="row" @updateList="queryList">{{row.title}}</order-detail>
-						</template>
-					</el-table-column>
-					<el-table-column label="生成时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="受理时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="工单期满时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="acceptType" label="受理类型" show-overflow-tooltip width="120"></el-table-column>
-					<el-table-column label="紧急程度" show-overflow-tooltip prop="emergencyLevelText"></el-table-column>
-					<el-table-column prop="sourceChannel" label="来源方式" show-overflow-tooltip width="120"></el-table-column>
-					<el-table-column prop="hotspotName" label="热点分类" show-overflow-tooltip width="100"></el-table-column>
-					<el-table-column prop="employeeName" label="受理人" show-overflow-tooltip width="150">
-						<template #default="{ row }">
-							<span
-								>{{ row.acceptorName }} <span v-if="row.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
-							</span>
-						</template>
-					</el-table-column>
+			<ProTable
+				ref="proTableRef"
+				:columns="columns"
+				:data="state.tableData"
+				@updateTable="queryList"
+				:loading="state.loading"
+				:total="state.total"
+				v-model:page-index="state.queryParams.PageIndex"
+				v-model:page-size="state.queryParams.PageSize"
+				:key="Math.random()"
+			>
+				<!-- 表格 header 按钮 -->
+				<template #tableHeader="scope">
+					<el-button type="primary" @click="onAddOrder" v-auth="'todo:seats:add'"> <SvgIcon name="ele-Plus" class="mr5" />新建工单 </el-button>
 				</template>
-				<template v-if="state.queryParams.IsHandled === 'true'">
-					<el-table-column prop="no" label="工单编码" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column width="100" label="省/市工单" prop="isProvince">
-						<template #default="{ row }">
-							<span>{{ row.isProvince ? '省工单' : '市工单' }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="currentStepName" label="办理节点" show-overflow-tooltip width="150"></el-table-column>
-					<template v-if="state.queryParams.Status === '0'">
-						<el-table-column prop="creationTime" label="节点签收时间" show-overflow-tooltip width="170">
-							<template #default="{ row }">
-								<span>{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-							</template>
-						</el-table-column>
-					</template>
-					<el-table-column label="工单状态" show-overflow-tooltip width="100" prop="statusText"></el-table-column>
-					<el-table-column label="标题" show-overflow-tooltip width="300">
-						<template #default="{ row }">
-              <order-detail :order="row" @updateList="queryList">{{row.title}}</order-detail>
-						</template>
-					</el-table-column>
-					<el-table-column label="生成时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="受理时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="工单期满时间" show-overflow-tooltip width="170">
-						<template #default="{ row }">
-							<span>{{ formatDate(row.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="orgLevelOneName" label="一级部门" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column prop="actualHandleOrgName" label="接办部门" show-overflow-tooltip width="150"></el-table-column>
-					<el-table-column prop="acceptType" label="受理类型" show-overflow-tooltip width="120"></el-table-column>
-					<el-table-column label="紧急程度" show-overflow-tooltip prop="emergencyLevelText" width="100"></el-table-column>
-					<el-table-column prop="sourceChannel" label="来源方式" show-overflow-tooltip></el-table-column>
-					<el-table-column prop="hotspotName" label="热点分类" show-overflow-tooltip width="100"></el-table-column>
-					<el-table-column prop="employeeName" label="受理人" show-overflow-tooltip width="150">
-						<template #default="{ row }">
-							<span
-								>{{ row.acceptorName }} <span v-if="row.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
-							</span>
-						</template>
-					</el-table-column>
+				<template #expiredStatus="{ row }">
+					<span :class="'overdue-status-' + row.expiredStatus" :title="row.expiredStatusText"></span>
 				</template>
-				<el-table-column label="操作" width="140" fixed="right" align="center">
-					<template #default="{ row }">
-						<el-button link type="success" @click="onOrderEdit(row)" title="编辑工单" v-if="row.canEdit" v-auth="'todo:seats:edit'"> 修改 </el-button>
-						<el-button link type="primary" @click="onSign(row)" title="签收工单" v-if="row.canSign" v-auth="'todo:seats:sign'"> 签收 </el-button>
-						<order-detail :order="row" @updateList="queryList"/>
-					</template>
-				</el-table-column>
-				<template #empty>
-					<Empty />
+				<template #isProvince="{ row }">
+					<span>{{ row.isProvince ? '省工单' : '市工单' }}</span>
 				</template>
-			</el-table>
-			<!-- 分页 -->
-			<pagination
-				:total="state.total"
-				v-model:page="state.queryParams.PageIndex"
-				v-model:limit="state.queryParams.PageSize"
-				@pagination="queryList"
-			/>
+				<template #title="{ row }">
+					<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
+				</template>
+				<template #employeeName="{ row }">
+					<span
+						>{{ row.acceptorName }} <span v-if="row.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
+					</span>
+				</template>
+				<!-- 表格操作 -->
+				<template #operation="{ row }">
+					<el-button link type="success" @click="onOrderEdit(row)" title="编辑工单" v-if="row.canEdit" v-auth="'todo:seats:edit'"> 修改 </el-button>
+					<el-button link type="primary" @click="onSign(row)" title="签收工单" v-if="row.canSign" v-auth="'todo:seats:sign'"> 签收 </el-button>
+					<order-detail :order="row" @updateList="queryList" />
+				</template>
+			</ProTable>
 		</el-card>
 	</div>
 </template>
-<script setup lang="ts" name="todoOrder">
+<script setup lang="tsx" name="todoOrder">
 import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { ElButton, ElMessage, ElMessageBox, FormInstance } from 'element-plus';
 import { throttle } from '@/utils/tools';
@@ -163,7 +78,7 @@ import { seatsListTodo, orderSign } from '@/api/todo/order';
 // 引入组件
 const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/index.vue')); // 工单详情
 // 定义变量内容
-const state = reactive(<any>{
+const state = reactive({
 	queryParams: {
 		// 查询条件
 		PageIndex: 1, // 当前页
@@ -171,6 +86,7 @@ const state = reactive(<any>{
 		IsHandled: 'false', // 工单状态
 		Keyword: null, // 关键字
 		IsProvince: null, // 是否省工单
+		IsCountersign: null, // 是否会签
 	},
 	tableData: [], //表单
 	loading: false, // 加载
@@ -178,11 +94,67 @@ const state = reactive(<any>{
 });
 const ruleFormRef = ref<RefType>(); // 表单ref
 const router = useRouter(); // 路由
+const proTableRef = ref<RefType>(); // 表格ref
+// 表格配置项
+const columns = ref<any[]>([
+	{ type: 'selection', fixed: 'left', width: 55 },
+	{ prop: 'expiredStatus', label: '超期状态', align: 'center' },
+	{ prop: 'no', label: '工单编码', width: 150 },
+	{ prop: 'isProvince', label: '省/市工单', width: 100 },
+	{ prop: 'currentStepName', label: '办理节点', width: 150 },
+	{ prop: 'statusText', label: '工单状态', width: 100 },
+	{ prop: 'title', label: '工单标题', width: 300 },
+	{
+		prop: 'creationTime',
+		label: '生成时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.creationTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{
+		prop: 'startTime',
+		label: '受理时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.startTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{
+		prop: 'expiredTime',
+		label: '工单期满时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.expiredTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{ prop: 'acceptType', label: '受理类型', width: 150 },
+	{ prop: 'emergencyLevelText', label: '紧急程度', width: 150 },
+	{ prop: 'sourceChannel', label: '来源方式', width: 100 },
+	{ prop: 'hotspotName', label: '热点分类', width: 200 },
+	{ prop: 'employeeName', label: '受理人', width: 120 },
+	{ prop: 'operation', label: '操作', fixed: 'right', width: 140, align: 'center' },
+]);
 // 获取查询条件基础信息
 /** 获取列表 */
 const queryList = throttle(async () => {
 	try {
 		state.loading = true;
+    const index = columns.value.findIndex((item) => item.prop === 'acceptType');
+    if (state.queryParams.IsHandled === 'true') {
+      if (!columns.value.find((item) => item.prop === 'orgLevelOneName')) {
+        columns.value.splice(
+          index,
+          0,
+          { prop: 'orgLevelOneName', label: '一级部门', width: 150 },
+          { prop: 'actualHandleOrgName', label: '接办部门', width: 150 }
+        );
+      }
+    } else {
+      if (columns.value.find((item) => item.prop === 'orgLevelOneName')) {
+        columns.value = columns.value.filter((item) => item.prop !== 'orgLevelOneName' && item.prop !== 'actualHandleOrgName');
+      }
+    }
 		const res: any = await seatsListTodo(state.queryParams);
 		state.tableData = res.result?.items ?? [];
 		state.total = res.result?.total ?? 0;

src/views/todo/supervise/index.vue

@@ -15,84 +15,42 @@
 			</el-form>
 		</el-card>
 		<el-card shadow="never">
-			<!-- 表格 -->
-			<el-table :data="state.tableData" v-loading="state.loading" row-key="id" ref="multipleTableRef" @selection-change="handleSelectionChange">
-				<el-table-column type="selection" width="55" />
-        <el-table-column label="超期状态" width="80" align="center">
-          <template #default="{ row }">
-            <span :class="'overdue-status-'+row.order?.expiredStatus" :title="row.order?.expiredStatusText"></span>
-          </template>
-        </el-table-column>
-				<el-table-column prop="order.no" label="工单编码" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column label="工单标题" show-overflow-tooltip width="300">
-					<template #default="{ row }">
-            <order-detail :order="row.order" @updateList="queryList">{{row.order?.title}}</order-detail>
-					</template>
-				</el-table-column>
-				<el-table-column prop="order.sourceChannel" label="来源方式" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="order.statusText" label="工单状态" show-overflow-tooltip width="120"></el-table-column>
-				<el-table-column width="100" label="省/市工单" prop="isProvince">
-					<template #default="{ row }">
-						<span>{{ row.order?.isProvince ? '省工单' : '市工单' }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="order.acceptType" label="受理类型" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="order.hotspotName" label="热点分类" show-overflow-tooltip width="120"></el-table-column>
-				<el-table-column prop="acceptorName" label="受理人" show-overflow-tooltip width="120">
-					<template #default="{ row }">
-						<span
-							>{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
-						</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="order.actualHandleOrgName" label="接办部门" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column label="受理时间" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.order.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="order.expiredTime" label="工单期满时间" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.order.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="creationTime" label="督办时间" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="replyLimitTime" label="督办回复时限" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.replyLimitTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="creatorOrgName" label="督办部门" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column prop="crUser" label="督办人" show-overflow-tooltip width="120"></el-table-column>
-				<el-table-column prop="orgName" label="被督办部门" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column prop="applyContent" label="督办意见" show-overflow-tooltip width="200"></el-table-column>
-				<el-table-column label="操作" width="140" fixed="right" align="center">
-					<template #default="{ row }">
-						<el-button link type="primary" @click="onReply(row)" title="回复督办" v-auth="'todo:supervise:reply'"> 回复 </el-button>
-						<order-detail :order="row.order" @updateList="queryList" />
-					</template>
-				</el-table-column>
-				<template #empty>
-					<Empty />
-				</template>
-			</el-table>
-			<!-- 分页 -->
-			<pagination
-				:total="state.total"
-				v-model:page="state.queryParams.PageIndex"
-				v-model:limit="state.queryParams.PageSize"
-				@pagination="queryList"
-			/>
+      <ProTable
+        ref="proTableRef"
+        :columns="columns"
+        :data="state.tableData"
+        @updateTable="queryList"
+        :loading="state.loading"
+        :total="state.total"
+        v-model:page-index="state.queryParams.PageIndex"
+        v-model:page-size="state.queryParams.PageSize"
+      >
+        <template #expiredStatus="{ row }">
+          <span :class="'overdue-status-' + row.order?.expiredStatus" :title="row.order?.expiredStatusText"></span>
+        </template>
+        <template #isProvince="{ row }">
+          <span>{{ row.order?.isProvince ? '省工单' : '市工单' }}</span>
+        </template>
+        <template #title="{ row }">
+          <order-detail :order="row.order" @updateList="queryList">{{ row.order?.title }}</order-detail>
+        </template>
+        <template #employeeName="{ row }">
+					<span
+          >{{ row.acceptorName }} <span v-if="row.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
+					</span>
+        </template>
+        <!-- 表格操作 -->
+        <template #operation="{ row }">
+          <el-button link type="primary" @click="onReply(row)" title="回复督办" v-auth="'todo:supervise:reply'"> 回复 </el-button>
+          <order-detail :order="row.order" @updateList="queryList" />
+        </template>
+      </ProTable>
 		</el-card>
 		<!-- 督办回复 -->
 		<order-supervise-reply ref="orderSuperviseReplyRef" @updateList="queryList" />
 	</div>
 </template>
-<script setup lang="ts" name="todoSupervise">
+<script setup lang="tsx" name="todoSupervise">
 import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { ElButton, FormInstance } from 'element-plus';
 import { throttle } from '@/utils/tools';
@@ -103,7 +61,61 @@ const OrderSuperviseReply = defineAsyncComponent(() => import('@/views/business/
 const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/index.vue')); // 工单详情
 // 定义变量内容
 const ruleFormRef = ref<RefType>(); // 表单ref
-const state = reactive(<any>{
+const proTableRef = ref<RefType>(); // 表格ref
+// 表格配置项
+const columns = ref<any[]>([
+  { type: 'selection', fixed: 'left', width: 55 },
+  { prop: 'expiredStatus', label: '超期状态', align: 'center' },
+  { prop: 'order.no', label: '工单编码', width: 150 },
+  { prop: 'title', label: '工单标题', width: 300 },
+  { prop: 'order.sourceChannel', label: '来源方式', width: 100 },
+  { prop: 'isProvince', label: '省/市工单', width: 100 },
+  { prop: 'order.statusText', label: '工单状态', width: 100 },
+  { prop: 'order.acceptType', label: '受理类型', width: 150 },
+  { prop: 'employeeName', label: '受理人', width: 120 },
+  { prop: 'order.hotspotName', label: '热点分类', width: 200 },
+  { prop: 'order.actualHandleOrgName', label: '接办部门', width: 150 },
+  {
+    prop: 'startTime',
+    label: '受理时间',
+    width: 170,
+    render: (scope) => {
+      return <span>{formatDate(scope.row.order?.startTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+    },
+  },
+  {
+    prop: 'expiredTime',
+    label: '工单期满时间',
+    width: 170,
+    render: (scope) => {
+      return <span>{formatDate(scope.row.order?.expiredTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+    },
+  },
+  {
+    prop: 'creationTime',
+    label: '督办时间',
+    width: 170,
+    render: (scope) => {
+      return <span>{formatDate(scope.row.creationTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+    },
+  },
+  {
+    prop: 'replyLimitTime',
+    label: '督办回复时限',
+    width: 170,
+    render: (scope) => {
+      return <span>{formatDate(scope.row.replyLimitTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+    },
+  },
+  { prop: 'creatorOrgName', label: '督办部门', width: 150 },
+  { prop: 'crUser', label: '督办人', width: 120 },
+  { prop: 'orgName', label: '被督办部门', width: 150 },
+  { prop: 'applyContent', label: '督办意见', width: 200 },
+  { prop: 'operation', label: '操作', fixed: 'right', width: 140, align: 'center' },
+
+
+]);
+const state = reactive({
 	queryParams: {
 		// 查询条件
 		PageIndex: 1,
@@ -133,12 +145,6 @@ const resetQuery = throttle((formEl: FormInstance | undefined) => {
 	formEl.resetFields();
 	queryList();
 }, 300);
-// 表格多选
-const multipleTableRef = ref<RefType>();
-const multipleSelection = ref<any>([]);
-const handleSelectionChange = (val: any[]) => {
-	multipleSelection.value = val;
-};
 // 导出
 const onExport = () => {
 	console.log('导出');

src/views/todo/urge/index.vue

@@ -2,9 +2,9 @@
 	<div class="todo-urge-container layout-pd">
 		<!-- 搜索  -->
 		<el-card shadow="never">
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent  inline>
+			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
 				<el-form-item label="工单标题" prop="Keyword">
-					<el-input v-model="state.queryParams.Keyword" placeholder="工单编码/标题" clearable @keyup.enter="queryList" class="keyword-input"/>
+					<el-input v-model="state.queryParams.Keyword" placeholder="工单编码/标题" clearable @keyup.enter="queryList" class="keyword-input" />
 				</el-form-item>
 				<el-form-item>
 					<el-button type="primary" @click="queryList" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
@@ -15,72 +15,37 @@
 			</el-form>
 		</el-card>
 		<el-card shadow="never">
-			<!-- 表格 -->
-			<el-table :data="state.tableData" v-loading="state.loading" row-key="id" ref="multipleTableRef" @selection-change="handleSelectionChange">
-				<el-table-column type="selection" width="55" />
-        <el-table-column label="超期状态" width="80" align="center">
-          <template #default="{ row }">
-            <span :class="'overdue-status-'+row.order?.expiredStatus" :title="row.order?.expiredStatusText"></span>
-          </template>
-        </el-table-column>
-				<el-table-column prop="order.no" label="工单编码" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column label="工单标题" show-overflow-tooltip width="300">
-					<template #default="{ row }">
-            <order-detail :order="row.order" @updateList="queryList">{{row.order?.title}}</order-detail>
-					</template>
-				</el-table-column>
-				<el-table-column prop="order.sourceChannel" label="来源方式" show-overflow-tooltip></el-table-column>
-				<el-table-column width="100" label="省/市工单" prop="isProvince">
-					<template #default="{ row }">
-						<span>{{ row.order?.isProvince ? '省工单' : '市工单' }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="order.statusText" label="工单状态" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="order.acceptType" label="受理类型" show-overflow-tooltip width="100"></el-table-column>
-				<el-table-column prop="order.hotspotName" label="热点分类" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column prop="order.actualHandleOrgName" label="接办部门" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column label="受理时间" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.order?.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column label="工单期满时间" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.order?.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="creatorOrgName" label="催办部门" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column prop="crUser" label="催办人" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="creationTime" label="催办时间" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="orgName" label="被催办部门" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column prop="applyContent" label="催办内容" show-overflow-tooltip width="200"></el-table-column>
-				<el-table-column label="操作" width="160" fixed="right" align="center">
-					<template #default="{ row }">
-						<el-button link type="primary" @click="onDetail(row)" title="查看工单详情"> 催办详情 </el-button>
-						<order-detail :order="row.order" @updateList="queryList" />
-					</template>
-				</el-table-column>
-				<template #empty>
-					<Empty />
-				</template>
-			</el-table>
-			<!-- 分页 -->
-			<pagination
+			<ProTable
+				ref="proTableRef"
+				:columns="columns"
+				:data="state.tableData"
+				@updateTable="queryList"
+				:loading="state.loading"
 				:total="state.total"
-				v-model:page="state.queryParams.PageIndex"
-				v-model:limit="state.queryParams.PageSize"
-				@pagination="queryList"
-			/>
+				v-model:page-index="state.queryParams.PageIndex"
+				v-model:page-size="state.queryParams.PageSize"
+			>
+				<template #expiredStatus="{ row }">
+					<span :class="'overdue-status-' + row.order?.expiredStatus" :title="row.order?.expiredStatusText"></span>
+				</template>
+				<template #isProvince="{ row }">
+					<span>{{ row.order?.isProvince ? '省工单' : '市工单' }}</span>
+				</template>
+				<template #title="{ row }">
+					<order-detail :order="row.order" @updateList="queryList">{{ row.order?.title }}</order-detail>
+				</template>
+				<!-- 表格操作 -->
+				<template #operation="{ row }">
+					<el-button link type="primary" @click="onDetail(row)" title="查看工单详情"> 催办详情 </el-button>
+					<order-detail :order="row.order" @updateList="queryList" />
+				</template>
+			</ProTable>
 		</el-card>
 		<!-- 催办详情 -->
 		<order-urge-detail ref="orderUrgeDetailRef" @updateList="queryList" />
 	</div>
 </template>
-<script setup lang="ts" name="todoUrge">
+<script setup lang="tsx" name="todoUrge">
 import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { ElButton, FormInstance } from 'element-plus';
 import { throttle } from '@/utils/tools';
@@ -92,7 +57,50 @@ const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/
 
 // 定义变量内容
 const ruleFormRef = ref<RefType>(); // 表单ref
-const state = reactive(<any>{
+const proTableRef = ref<RefType>(); // 表格ref
+// 表格配置项
+const columns = ref<any[]>([
+	{ type: 'selection', fixed: 'left', width: 55 },
+	{ prop: 'expiredStatus', label: '超期状态', align: 'center' },
+	{ prop: 'order.no', label: '工单编码', width: 150 },
+	{ prop: 'title', label: '工单标题', width: 300 },
+	{ prop: 'order.sourceChannel', label: '来源方式', width: 100 },
+	{ prop: 'isProvince', label: '省/市工单', width: 100 },
+	{ prop: 'order.statusText', label: '工单状态', width: 100 },
+	{ prop: 'order.acceptType', label: '受理类型', width: 150 },
+	{ prop: 'order.hotspotName', label: '热点分类', width: 200 },
+	{ prop: 'order.actualHandleOrgName', label: '接办部门', width: 150 },
+	{
+		prop: 'startTime',
+		label: '受理时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.order?.startTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{
+		prop: 'expiredTime',
+		label: '工单期满时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.order?.expiredTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{ prop: 'creatorOrgName', label: '催办部门', width: 150 },
+	{ prop: 'crUser', label: '催办人', width: 120 },
+	{
+		prop: 'creationTime',
+		label: '催办时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.creationTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{ prop: 'orgName', label: '被催办部门', width: 150 },
+	{ prop: 'applyContent', label: '催办内容', width: 200 },
+	{ prop: 'operation', label: '操作', fixed: 'right', width: 140, align: 'center' },
+]);
+const state = reactive({
 	queryParams: {
 		// 查询条件
 		PageIndex: 1,
@@ -124,12 +132,6 @@ const resetQuery = throttle((formEl: FormInstance | undefined) => {
 	formEl.resetFields();
 	queryList();
 }, 300);
-// 表格多选
-const multipleTableRef = ref<RefType>();
-const multipleSelection = ref<any>([]);
-const handleSelectionChange = (val: any[]) => {
-	multipleSelection.value = val;
-};
 // 导出
 const onExport = () => {
 	console.log('导出');

src/views/todo/visit/index.vue

@@ -6,18 +6,18 @@
 				<el-form-item label="关键字" prop="Keyword">
 					<el-input v-model="state.queryParams.Keyword" placeholder="工单编码/标题" clearable @keyup.enter="queryList" class="keyword-input" />
 				</el-form-item>
-        <el-form-item label="归档类型" prop="FiledType">
-          <el-select v-model="state.queryParams.FiledType" placeholder="请选择归档类型">
-            <el-option label="中心归档" value="10" />
-            <el-option label="部门归档" value="20" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="是否会签" prop="IsCountersign">
-          <el-select v-model="state.queryParams.IsCountersign" placeholder="请选择是否会签">
-            <el-option label="是" value="true" />
-            <el-option label="否" value="false" />
-          </el-select>
-        </el-form-item>
+				<el-form-item label="归档类型" prop="FiledType">
+					<el-select v-model="state.queryParams.FiledType" placeholder="请选择归档类型">
+						<el-option label="中心归档" value="10" />
+						<el-option label="部门归档" value="20" />
+					</el-select>
+				</el-form-item>
+				<el-form-item label="是否会签" prop="IsCountersign">
+					<el-select v-model="state.queryParams.IsCountersign" placeholder="请选择是否会签">
+						<el-option label="是" value="true" />
+						<el-option label="否" value="false" />
+					</el-select>
+				</el-form-item>
 				<el-form-item>
 					<el-button type="primary" @click="queryList" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
 					<el-button @click="resetQuery(ruleFormRef)" v-waves class="default-button" :loading="state.loading">
@@ -27,89 +27,44 @@
 			</el-form>
 		</el-card>
 		<el-card shadow="never">
-			<!-- 功能按钮 -->
-			<div class="mb20">
-<!--				<el-button type="primary" @click="onTextMessageFollowUp" :disabled="!multipleSelection.length" v-auth="'todo:visit:textMessage'">
-					<SvgIcon name="ele-Message" class="mr5" />短信回访</el-button
-				>-->
-				<el-button type="primary" @click="multiplePeople" :disabled="!multipleSelection.length" v-auth="'todo:visit:multiplePeople'">
-					<SvgIcon name="ele-User" class="mr5" />分配回访人</el-button
-				>
-<!--				<el-button type="primary" @click="smartFollowUp" :disabled="!multipleSelection.length" v-auth="'todo:visit:smart'">
-					<SvgIcon name="iconfont icon-diannao1" class="mr5" />智能回访</el-button
-				>-->
-			</div>
-			<!-- 表格 -->
-			<el-table :data="state.tableData" v-loading="state.loading" row-key="id" ref="multipleTableRef" @selection-change="handleSelectionChange">
-				<el-table-column type="selection" width="55" />
-				<el-table-column prop="order.no" label="工单编码" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column label="工单标题" show-overflow-tooltip width="300">
-					<template #default="{ row }">
-            <order-detail :order="row.order" @updateList="queryList">{{row.order?.title}}</order-detail>
-					</template>
-				</el-table-column>
-				<el-table-column prop="order.sourceChannel" label="来源方式" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="visitStateText" label="回访状态" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="visitTypeText" label="回访方式" show-overflow-tooltip width="100"></el-table-column>
-				<el-table-column prop="order.acceptType" label="受理类型" show-overflow-tooltip width="120"></el-table-column>
-				<el-table-column prop="order.hotspotName" label="热点分类" show-overflow-tooltip width="200"></el-table-column>
-				<el-table-column prop="expiredTime" label="受理人" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span
-							>{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
-						</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="order.orgLevelOneName" label="一级部门" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column prop="order.actualHandleOrgName" label="接办部门" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column label="受理时间" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.order?.startTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column label="办结时间" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.order?.filedTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column label="发布时间" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.publishTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column label="办结短信发送时间" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.publishTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column label="回访任务创建时间" show-overflow-tooltip width="170">
-					<template #default="{ row }">
-						<span>{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="employeeName" label="回访人" show-overflow-tooltip width="150"></el-table-column>
-				<el-table-column label="是否接通" show-overflow-tooltip width="150">
-					<template #default="{ row }">
-						<span v-if="row.isPutThrough">{{ row.isPutThrough ? '未接通' : '已接通' }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column label="操作" width="140" fixed="right" align="center">
-					<template #default="{ row }">
-						<el-button link type="primary" @click="onManpower(row)" title="工单回访" v-auth="'todo:visit:manpower'"> 回访 </el-button>
-						<order-detail :order="row.order" @updateList="queryList" />
-					</template>
-				</el-table-column>
-				<template #empty>
-					<Empty />
-				</template>
-			</el-table>
-			<!-- 分页 -->
-			<pagination
+			<ProTable
+				ref="proTableRef"
+				:columns="columns"
+				:data="state.tableData"
+				@updateTable="queryList"
+				:loading="state.loading"
 				:total="state.total"
-				v-model:page="state.queryParams.PageIndex"
-				v-model:limit="state.queryParams.PageSize"
-				@pagination="queryList"
-			/>
+				v-model:page-index="state.queryParams.PageIndex"
+				v-model:page-size="state.queryParams.PageSize"
+			>
+				<template #tableHeader="scope">
+					<!--				<el-button type="primary" @click="onTextMessageFollowUp" :disabled="!multipleSelection.length" v-auth="'todo:visit:textMessage'">
+           <SvgIcon name="ele-Message" class="mr5" />短信回访</el-button
+         >-->
+					<el-button type="primary" @click="multiplePeople" :disabled="!scope.isSelected" v-auth="'todo:visit:multiplePeople'">
+						<SvgIcon name="ele-User" class="mr5" />分配回访人</el-button
+					>
+					<!--				<el-button type="primary" @click="smartFollowUp" :disabled="!multipleSelection.length" v-auth="'todo:visit:smart'">
+                    <SvgIcon name="iconfont icon-diannao1" class="mr5" />智能回访</el-button
+                  >-->
+				</template>
+				<template #title="{ row }">
+					<order-detail :order="row.order" @updateList="queryList">{{ row.order?.title }}</order-detail>
+				</template>
+				<template #acceptorName="{ row }">
+					<span
+						>{{ row.order?.acceptorName }} <span v-if="row.order?.acceptorStaffNo">[{{ row.order?.acceptorStaffNo }}]</span>
+					</span>
+				</template>
+				<template #isPutThrough="{ row }">
+					<span v-if="row.isPutThrough">{{ row.isPutThrough ? '未接通' : '已接通' }}</span>
+				</template>
+				<!-- 表格操作 -->
+				<template #operation="{ row }">
+					<el-button link type="primary" @click="onManpower(row)" title="工单回访" v-auth="'todo:visit:manpower'"> 回访 </el-button>
+					<order-detail :order="row.order" @updateList="queryList" />
+				</template>
+			</ProTable>
 		</el-card>
 		<!-- 回访 -->
 		<visit-detail ref="visitDetailRef" @updateList="queryList" />
@@ -118,7 +73,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="todoVisit">
+<script setup lang="tsx" name="todoVisit">
 import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { ElButton, ElMessageBox, FormInstance } from 'element-plus';
 import { throttle } from '@/utils/tools';
@@ -133,14 +88,77 @@ const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/
 // 定义变量内容
 const ruleFormRef = ref<RefType>(); // 表单ref
 const router = useRouter(); // 路由
-const state = reactive(<any>{
+const proTableRef = ref<RefType>(); // 表格ref
+// 表格配置项
+const columns = ref<any[]>([
+	{ type: 'selection', fixed: 'left', width: 55 },
+	{ prop: 'order.no', label: '工单编码', width: 150 },
+	{ prop: 'order.title', label: '工单标题', width: 300 },
+	{ prop: 'order.sourceChannel', label: '来源方式', width: 100 },
+	{ prop: 'visitStateText', label: '回访状态', width: 100 },
+	{ prop: 'visitTypeText', label: '回访方式', width: 100 },
+	{ prop: 'order.acceptType', label: '受理类型', width: 150 },
+	{ prop: 'order.hotspotName', label: '热点分类', width: 200 },
+	{ prop: 'acceptorName', label: '受理人', width: 120 },
+	{ prop: 'order.orgLevelOneName', label: '一级部门', width: 150 },
+	{ prop: 'order.actualHandleOrgName', label: '接办部门', width: 150 },
+	{ prop: 'order.actualHandleOrgName', label: '接办部门', width: 150 },
+	{
+		prop: 'order.startTime',
+		label: '受理时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.order?.startTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{
+		prop: 'order.filedTime',
+		label: '办结时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.order?.filedTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{
+		prop: 'publishTime',
+		label: '发布时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.publishTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{
+		prop: 'publishTime',
+		label: '办结短信发送时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.publishTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{
+		prop: 'creationTime',
+		label: '回访任务创建时间',
+		width: 170,
+		render: (scope) => {
+			return <span>{formatDate(scope.row.creationTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+		},
+	},
+	{ prop: 'employeeName', label: '回访人', width: 150 },
+	{
+		prop: 'isPutThrough',
+		label: '是否接通',
+		width: 150,
+	},
+	{ prop: 'operation', label: '操作', fixed: 'right', width: 140, align: 'center' },
+]);
+const state = reactive({
 	queryParams: {
 		// 查询条件
 		PageIndex: 1,
 		PageSize: 10,
 		Keyword: null, // 关键字
-    FiledType: null, // 归档类型
-    IsCountersign: null, // 是否会签
+		FiledType: null, // 归档类型
+		IsCountersign: null, // 是否会签
 		VisitState: '2', // 回访状态 待回访
 	},
 	tableData: [], //表单
@@ -184,19 +202,13 @@ const onTextMessageFollowUp = () => {
 // 批量分配
 const assignReturnVisitorsRef = ref<RefType>();
 const multiplePeople = () => {
-	const ids = multipleSelection.value.map((item: any) => item.id);
+	const ids = proTableRef.value.selectedList.map((item: any) => item.id);
 	assignReturnVisitorsRef.value.openDialog(ids);
 };
 // 智能回访
 const smartFollowUp = () => {
 	console.log('智能回访');
 };
-// 表格多选
-const multipleTableRef = ref<RefType>();
-const multipleSelection = ref<any>([]);
-const handleSelectionChange = (val: any[]) => {
-	multipleSelection.value = val;
-};
 // 导出
 const onExport = () => {
 	console.log('导出');