Browse Source

reactor:地图信息展示;新建工单默认传经纬度

zhangchong 1 month ago
parent
commit
c4243c4ac0

+ 56 - 0
src/api/statistics/department.ts

@@ -571,3 +571,59 @@ export const departmentUnSignExport = (data: object) => {
 		}
 	);
 };
+/**
+ * @description 部门受理类型统计
+ * @param {object} params
+ */
+export const departmentAcceptType = (params: object) => {
+	return request({
+		url: `/api/v1/BiOrder/department_acceptance_type_statistics_v1`,
+		method: 'get',
+		params,
+	});
+}
+/**
+ * @description 部门受理类型统计导出
+ * @param {object} data
+ */
+export const departmentAcceptTypeExport = (data: object) => {
+	return request(
+		{
+			url: `/api/v1/BiOrder/department_acceptance_type_statistics_export_v1`,
+			method: 'post',
+			data,
+			responseType: 'blob',
+		},
+		{
+			reduce_data_format: false,
+		}
+	);
+}
+/**
+ * @description 部门受理类型统计详情
+ * @param {object} params
+ */
+export const departmentAcceptTypeDetailV1 = (params: object) => {
+	return request({
+		url: `/api/v1/BiOrder/department_acceptance_type_order_list_v1`,
+		method: 'get',
+		params,
+	});
+}
+/**
+ * @description 部门受理类型统计详情导出
+ * @param {object} data
+ */
+export const departmentAcceptTypeDetailV1Export = (data: object) => {
+	return request(
+		{
+			url: `/api/v1/BiOrder/department_acceptance_type_order_list_export_v1`,
+			method: 'post',
+			data,
+			responseType: 'blob',
+		},
+		{
+			reduce_data_format: false,
+		}
+	);
+}

+ 18 - 0
src/router/route.ts

@@ -230,6 +230,24 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 			isKeepAlive: true,
 		},
 	},
+	{
+		path: '/statistics/department/detailDpAccept',
+		name: 'statisticsDepartmentDetailDpAccept',
+		component: () => import('@/views/statistics/department/detailDpAccept.vue'),
+		meta: {
+			title: '部门受理类型统计子部门',
+			isKeepAlive: true,
+		},
+	},
+	{
+		path: '/statistics/department/detailDpAcceptList',
+		name: 'statisticsDepartmentDetailAcceptList',
+		component: () => import('@/views/statistics/department/detailDpAcceptList.vue'),
+		meta: {
+			title: '部门受理类型统计明细',
+			isKeepAlive: true,
+		},
+	},
 	{
 		path: '/statistics/order/detailDispatch',
 		name: 'statisticsOrderDetailDispatch',

+ 267 - 0
src/views/statistics/department/detailDpAccept.vue

@@ -0,0 +1,267 @@
+<template>
+	<div class="statistics-department-detail-dp-accept-container layout-padding">
+		<div class="layout-padding-auto layout-padding-view pd20">
+			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+				<el-form-item prop="crTime">
+					<statistical-time v-model="state.queryParams.crTime" @change="handleQuery" ref="statisticalTimeRef" :disabled="state.loading" />
+				</el-form-item>
+				<el-form-item label="部门类别" prop="OrgType">
+					<el-select v-model="state.queryParams.OrgType" placeholder="请选择部门类别" @change="handleQuery">
+						<el-option :value="0" label="全部" />
+						<el-option :value="1" label="市直部门" />
+						<el-option :value="2" label="区县部门" />
+					</el-select>
+				</el-form-item>
+				<el-form-item label="部门名称" prop="OrgName">
+					<el-input v-model="state.queryParams.OrgName" placeholder="部门名称" clearable @keyup.enter="handleQuery" class="keyword-input" />
+				</el-form-item>
+				<el-form-item>
+					<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
+					<el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
+						<SvgIcon name="ele-Refresh" class="mr5" />重置
+					</el-button>
+					<el-popover :width="500" trigger="click">
+						<template #reference>
+							<el-button type="primary" title="字段说明"><SvgIcon name="ele-QuestionFilled" class="mr5" />字段说明</el-button>
+						</template>
+						<el-descriptions title="" :column="1" border style="max-height: 400px; overflow: auto">
+							<el-descriptions-item label="部门名称">办理工单的部门名称</el-descriptions-item>
+							<el-descriptions-item label="部门类别">办理工单的部门类别</el-descriptions-item>
+							<el-descriptions-item label="受理类型">工单受理类型</el-descriptions-item>
+						</el-descriptions>
+					</el-popover>
+					<el-button type="primary" @click="onDetailList" :loading="state.loading"> <SvgIcon name="ele-List" class="mr5" /> 列表明细 </el-button>
+				</el-form-item>
+			</el-form>
+			<vxe-toolbar
+				ref="toolbarRef"
+				:loading="state.loading"
+				custom
+				:refresh="{
+					queryMethod: handleQuery,
+				}"
+				:tools="[{ toolRender: { name: 'exportAll' } }]"
+			>
+			</vxe-toolbar>
+			<div style="overflow: hidden; width: 100%; height: 100%; flex: 1">
+				<vxe-table
+					border
+					:loading="state.loading"
+					:data="state.tableData"
+					:column-config="{ resizable: true }"
+					:row-config="{ isCurrent: true, isHover: true, height: 30, useKey: true }"
+					ref="tableRef"
+					height="auto"
+					auto-resize
+					show-overflow
+					:scrollY="{ enabled: true, gt: 100 }"
+					id="statisticsDepartmentDetailDpAccept"
+					:custom-config="{
+						storage: true,
+					}"
+					showHeaderOverflow
+					:params="{ exportMethod: departmentAcceptTypeExport, exportParams: requestParams }"
+					show-footer
+					:footer-method="footerMethod"
+				>
+					<vxe-column field="orgName" title="部门名称" min-width="200" fixed="left">
+						<template #default="scope">
+							{{ scope.row.orgName }}
+						</template>
+					</vxe-column>
+					<vxe-column field="orgTypeText" title="部门类别" min-width="100" fixed="left"> </vxe-column>
+					<vxe-column title="咨询" field="zxAllCount" min-width="100">
+						<template #default="scope">
+							<el-button type="primary" link @click="linkDetail(scope, scope.row.zxAcceptanceTypeCode)"  v-if="!['市直合计', '区县合计'].includes(scope.row.orgName)">
+								{{ scope.row.zxAllCount }}
+							</el-button>
+							<span v-else>{{scope.row.zxAllCount}}</span>
+						</template>
+					</vxe-column>
+					<vxe-column title="举报" field="jbAllCount" min-width="100">
+						<template #default="scope">
+							<el-button type="primary" link @click="linkDetail(scope, scope.row.jbAcceptanceTypeCode)" v-if="!['市直合计', '区县合计'].includes(scope.row.orgName)">
+								{{ scope.row.jbAllCount }}
+							</el-button>
+							<span v-else>{{scope.row.jbAllCount}}</span>
+						</template>
+					</vxe-column>
+					<vxe-column title="投诉" field="tsAllCount" min-width="100">
+						<template #default="scope">
+							<el-button type="primary" link @click="linkDetail(scope, scope.row.tsAcceptanceTypeCode)" v-if="!['市直合计', '区县合计'].includes(scope.row.orgName)">
+								{{ scope.row.tsAllCount }}
+							</el-button>
+							<span v-else>{{scope.row.tsAllCount}}</span>
+						</template>
+					</vxe-column>
+					<vxe-column title="求助" field="qzAllCount" min-width="100">
+						<template #default="scope">
+							<el-button type="primary" link @click="linkDetail(scope, scope.row.qzAcceptanceTypeCode)" v-if="!['市直合计', '区县合计'].includes(scope.row.orgName)">
+								{{ scope.row.qzAllCount }}
+							</el-button>
+							<span v-else>{{scope.row.qzAllCount}}</span>
+						</template>
+					</vxe-column>
+					<vxe-column title="建议" field="jyAllCount" min-width="100">
+						<template #default="scope">
+							<el-button type="primary" link @click="linkDetail(scope, scope.row.jbAcceptanceTypeCode)" v-if="!['市直合计', '区县合计'].includes(scope.row.orgName)">
+								{{ scope.row.jyAllCount }}
+							</el-button>
+							<span v-else>{{scope.row.jyAllCount}}</span>
+						</template>
+					</vxe-column>
+					<vxe-column title="意见" field="yjAllCount" min-width="100">
+						<template #default="scope">
+							<el-button type="primary" link @click="linkDetail(scope, scope.row.jyAcceptanceTypeCode)" v-if="!['市直合计', '区县合计'].includes(scope.row.orgName)">
+								{{ scope.row.yjAllCount }}
+							</el-button>
+							<span v-else>{{scope.row.yjAllCount}}</span>
+						</template>
+					</vxe-column>
+					<vxe-column title="惠民帮助" field="hmAllCount" min-width="100">
+						<template #default="scope">
+							<el-button type="primary" link @click="linkDetail(scope, scope.row.hmAcceptanceTypeCode)" v-if="!['市直合计', '区县合计'].includes(scope.row.orgName)">
+								{{ scope.row.hmAllCount }}
+							</el-button>
+							<span v-else>{{scope.row.hmAllCount}}</span>
+						</template>
+					</vxe-column>
+					<vxe-column title="大气污染举报" field="dqAllCount" min-width="100">
+						<template #default="scope">
+							<el-button type="primary" link @click="linkDetail(scope, scope.row.dqAcceptanceTypeCode)" v-if="!['市直合计', '区县合计'].includes(scope.row.orgName)">
+								{{ scope.row.dqAllCount }}
+							</el-button>
+							<span v-else>{{scope.row.dqAllCount}}</span>
+						</template>
+					</vxe-column>
+					<vxe-column title="表扬" field="byAllCount" min-width="100">
+						<template #default="scope">
+							<el-button type="primary" link @click="linkDetail(scope, scope.row.byAcceptanceTypeCode)" v-if="!['市直合计', '区县合计'].includes(scope.row.orgName)">
+								{{ scope.row.byAllCount }}
+							</el-button>
+							<span v-else>{{scope.row.byAllCount}}</span>
+						</template>
+					</vxe-column>
+					<vxe-column title="其他" field="qtAllCount" min-width="100">
+						<template #default="scope">
+							<el-button type="primary" link @click="linkDetail(scope, scope.row.qtAcceptanceTypeCode)" v-if="!['市直合计', '区县合计'].includes(scope.row.orgName)">
+								{{ scope.row.qtAllCount }}
+							</el-button>
+							<span v-else>{{scope.row.qtAllCount}}</span>
+						</template>
+					</vxe-column>
+					<vxe-column title="小计" field="allCount" min-width="100"> </vxe-column>
+				</vxe-table>
+			</div>
+		</div>
+	</div>
+</template>
+<script setup lang="tsx" name="statisticsDepartmentDetailDpAccept">
+import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
+import { FormInstance } from 'element-plus';
+import { departmentAcceptType, departmentAcceptTypeExport } from '@/api/statistics/department';
+import { defaultDate } from '@/utils/constants';
+import { useRoute, useRouter } from 'vue-router';
+import Other from '@/utils/other';
+import XEUtils from 'xe-utils';
+
+const StatisticalTime = defineAsyncComponent(() => import('@/components/StatisticalTime/index.vue')); // 日期类型选择组件
+// 定义变量内容
+const ruleFormRef = ref<RefType>(); // 表单ref
+const state = reactive<any>({
+	queryParams: {
+		// 查询条件
+		crTime: defaultDate, // 时间默认今天开始到今天
+		OrgType: 0, // 部门类别结束
+		TypeId: 0, // 来电主体  0:全部 ,1:市民,2:企业
+		OrgName: null, // 部门名称
+	},
+	tableData: [], //表单
+	loading: false, // 加载
+	totalCount: 0, // 总计
+	IdentityType: 0,
+});
+/** 搜索按钮操作 */
+const handleQuery = () => {
+	// state.queryParams.PageIndex = 1;
+	queryList();
+};
+/** 获取列表 */
+const requestParams = ref<EmptyObjectType>({});
+const route = useRoute();
+const routeQueryParams = route.query;
+const queryList = () => {
+	state.loading = true;
+	state.queryParams.OrgCode = routeQueryParams.OrgCode;
+	requestParams.value = Other.deepClone(state.queryParams);
+	requestParams.value.StartTime = state.queryParams.crTime === null ? null : state.queryParams.crTime[0];
+	requestParams.value.EndTime = state.queryParams.crTime === null ? null : state.queryParams.crTime[1];
+	Reflect.deleteProperty(requestParams.value, 'crTime');
+	departmentAcceptType(requestParams.value)
+		.then((res: any) => {
+			state.tableData = res.result?.dataList ?? [];
+			if (res.result.dataList.length) {
+				state.tableData.push(res.result.citySumModel);
+				state.tableData.push(res.result.countySumModel);
+			}
+			state.totalCount = res.result?.sumModel;
+			state.loading = false;
+		})
+		.catch(() => {
+			state.loading = false;
+		});
+};
+/** 重置按钮操作 */
+const statisticalTimeRef = ref<RefType>();
+const resetQuery = (formEl: FormInstance | undefined) => {
+	if (!formEl) return;
+	formEl.resetFields();
+	statisticalTimeRef.value.reset();
+	queryList();
+};
+// 计算合计
+const footerMethod = ({ columns, data }) => {
+	return [
+		columns.map((column: any, columnIndex: number) => {
+			if (columnIndex === 0) {
+				return '合计';
+			}
+			// 后端返回了数据集合 state.totalCount 所以不需要计算 直接进行赋值
+			return XEUtils.get(state.totalCount, column.property);
+		}),
+	];
+};
+// 查看详情
+const router = useRouter();
+const linkDetail = (scope:any, key?: string) => {
+	let StartTime = state.queryParams.crTime === null ? null : state.queryParams.crTime[0];
+	let EndTime = state.queryParams.crTime === null ? null : state.queryParams.crTime[1];
+	// 点击数字
+	router.push({
+		path: '/statistics/department/detailDpAcceptList',
+		query: {
+			StartTime,
+			EndTime,
+			OrgCode: scope.row.orgCode,
+			AcceptTypeCode: key,
+			TypeCode: state.queryParams.TypeCode,
+			TypeId: state.queryParams.TypeId,
+			OrgType: state.queryParams.OrgType,
+		},
+	});
+};
+// 跳转列表明细
+const onDetailList = () => {
+	router.push({
+		path: '/statistics/department/detailDpAcceptList',
+	});
+};
+const toolbarRef = ref<RefType>();
+const tableRef = ref<RefType>();
+onMounted(() => {
+	queryList();
+	if (tableRef.value && toolbarRef.value) {
+		tableRef.value.connect(toolbarRef.value);
+	}
+});
+</script>

+ 223 - 0
src/views/statistics/department/detailDpAcceptList.vue

@@ -0,0 +1,223 @@
+<template>
+	<div class="statistics-detail-department-dp-accept-list-container layout-padding">
+		<div class="layout-padding-auto layout-padding-view pd20">
+			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+				<el-form-item label="时间段" prop="crTime">
+					<el-date-picker
+						v-model="state.queryParams.crTime"
+						type="datetimerange"
+						unlink-panels
+						range-separator="至"
+						start-placeholder="开始时间"
+						end-placeholder="结束时间"
+						:shortcuts="shortcuts"
+						@change="handleQuery"
+						value-format="YYYY-MM-DD[T]HH:mm:ss"
+						:default-time="defaultTimeStartEnd"
+						:clearable="false"
+					/>
+				</el-form-item>
+				<el-form-item label="部门名称" prop="OrgName">
+					<el-input v-model="state.queryParams.OrgName" placeholder="部门名称" clearable @keyup.enter="handleQuery" class="keyword-input" />
+				</el-form-item>
+				<el-form-item>
+					<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
+					<el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
+						<SvgIcon name="ele-Refresh" class="mr5" />重置
+					</el-button>
+				</el-form-item>
+			</el-form>
+			<vxe-toolbar
+				ref="toolbarRef"
+				:loading="state.loading"
+				custom
+				:refresh="{
+					queryMethod: handleQuery,
+				}"
+				:tools="[{ toolRender: { name: 'exportCurrent' } }, { toolRender: { name: 'exportAll' } }]"
+			>
+				<template #buttons>
+					<el-button type="primary" @click="onJbExport" :loading="state.loading" :disabled="isChecked"
+						><SvgIcon name="iconfont icon-daochu" class="mr5" />交办单导出
+					</el-button>
+				</template>
+			</vxe-toolbar>
+			<div style="overflow: hidden; width: 100%; height: 100%; flex: 1">
+				<vxe-table
+					border
+					:loading="state.loading"
+					:data="state.tableData"
+					:column-config="{ resizable: true }"
+					:row-config="{ isCurrent: true, isHover: true, height: 30, useKey: true }"
+					ref="tableRef"
+					@checkbox-all="selectAllChangeEvent"
+					@checkbox-change="selectChangeEvent"
+					height="auto"
+					auto-resize
+					show-overflow
+					:scrollY="{ enabled: true, gt: 100 }"
+					id="statisticsDepartmentDetailAcceptList"
+					:custom-config="{ storage: true }"
+					:params="{ exportMethod: departmentAcceptTypeDetailV1Export, exportParams: requestParams }"
+				>
+					<vxe-column type="checkbox" width="60" align="center"></vxe-column>
+					<vxe-column field="expiredStatusText" title="状态" width="60" align="center">
+						<template #default="{ row }">
+							<span :class="'overdue-status-' + row.expiredStatus" :title="row.expiredStatusText"></span>
+						</template>
+					</vxe-column>
+					<vxe-column field="no" title="工单编码" width="140"></vxe-column>
+					<vxe-column field="isProvinceText" title="省/市工单" width="100"></vxe-column>
+					<vxe-column field="currentStepName" title="当前节点" width="120"></vxe-column>
+					<vxe-column field="statusText" title="工单状态" width="100">
+						<template #default="{ row }">
+							<el-text type="danger" tag="b" v-if="[1, 2, 3, 9, 101, 102, 103, 104, 105, 200].includes(row.status)">{{ row.statusText }}</el-text>
+							<span v-else>{{ row.statusText }}</span>
+						</template>
+					</vxe-column>
+					<vxe-column field="title" title="工单标题" min-width="200">
+						<template #default="{ row }">
+							<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
+						</template>
+					</vxe-column>
+					<vxe-column field="creationTime" title="受理时间" width="160">
+						<template #default="{ row }">
+							{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}
+						</template>
+					</vxe-column>
+					<vxe-column field="expiredTime" title="期满时间" width="160">
+						<template #default="{ row }">
+							{{ formatDate(row.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}
+						</template>
+					</vxe-column>
+					<vxe-column field="filedTime" title="办结时间" width="160">
+						<template #default="{ row }">
+							{{ formatDate(row.filedTime, 'YYYY-mm-dd HH:MM:SS') }}
+						</template>
+					</vxe-column>
+					<vxe-column field="orgLevelOneName" title="一级部门" width="140"></vxe-column>
+					<vxe-column field="actualHandleOrgName" title="接办部门" width="140"></vxe-column>
+					<vxe-column field="acceptType" title="受理类型" width="100"></vxe-column>
+					<vxe-column field="counterSignTypeText" title="是否会签" width="100"></vxe-column>
+					<vxe-column field="sourceChannel" title="来源渠道" width="110"></vxe-column>
+					<vxe-column field="hotspotName" title="热点分类" width="150"></vxe-column>
+					<vxe-column field="acceptorName" title="受理人" width="120"></vxe-column>
+				</vxe-table>
+			</div>
+			<pagination
+				@pagination="queryList"
+				:total="state.total"
+				v-model:current-page="state.queryParams.PageIndex"
+				v-model:page-size="state.queryParams.PageSize"
+				:disabled="state.loading"
+			/>
+		</div>
+	</div>
+</template>
+<script setup lang="tsx" name="statisticsDepartmentDetailAcceptList">
+import { computed, defineAsyncComponent, onMounted, reactive, ref } from 'vue';
+import type { FormInstance } from 'element-plus';
+import other from '@/utils/other';
+import { useRoute } from 'vue-router';
+import { formatDate } from '@/utils/formatTime';
+import { exportAssignment } from '@/utils/tools';
+import { defaultTimeStartEnd, shortcuts } from '@/utils/constants';
+import { departmentAcceptTypeDetailV1, departmentAcceptTypeDetailV1Export } from '@/api/statistics/department';
+
+// 引入组件
+const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/index.vue')); // 工单详情
+const pagination = defineAsyncComponent(() => import('@/components/ProTable/components/Pagination.vue')); // 分页
+
+// 定义变量内容
+const state = reactive<any>({
+	queryParams: {
+		PageIndex: 1, // 当前页
+		PageSize: 20, // 每页条数
+		TypeId: 0,
+		crTime: [],
+		StartTime: null,
+		EndTime: null,
+		OrgName: null, // 部门名称
+		TimeType: 2, // 1:受理时间 2:办结时间 默认:2
+		TypeCode: 0, // 交办类型
+		OrgCode: null, // 部门编码
+	},
+	tableData: [], //表单
+	loading: false, // 加载
+	total: 0, // 总数
+});
+const ruleFormRef = ref<RefType>(); // 表单ref
+const route = useRoute(); // 路由
+// 手动查询,将页码设置为1
+const handleQuery = () => {
+	state.queryParams.PageIndex = 1;
+	queryList();
+};
+const routeQueryParams = route.query;
+const requestParams = ref<EmptyObjectType>({});
+/** 获取列表 */
+const queryList = () => {
+	requestParams.value = other.deepClone(state.queryParams);
+	requestParams.value = {
+		...requestParams.value,
+		StartTime: routeQueryParams.StartTime,
+		EndTime: routeQueryParams.EndTime,
+		OrgCode: routeQueryParams.OrgCode,
+		AcceptTypeCode: routeQueryParams.AcceptTypeCode,
+		TypeCode: routeQueryParams.TypeCode,
+		OrgType: routeQueryParams.OrgType,
+	};
+	state.loading = true;
+	departmentAcceptTypeDetailV1(requestParams.value)
+		.then((response: any) => {
+			state.tableData = response?.result.items ?? [];
+
+			state.total = response?.result.total;
+			state.loading = false;
+		})
+		.catch(() => {
+			state.loading = false;
+		});
+};
+/** 重置按钮操作 */
+const resetQuery = (formEl: FormInstance | undefined) => {
+	if (!formEl) return;
+	formEl.resetFields();
+	queryList();
+};
+// 交办单导出
+const onJbExport = () => {
+	const ids = checkTable.value.map((item: any) => item.id);
+	exportAssignment(ids);
+};
+const checkTable = ref<EmptyArrayType>([]);
+const selectAllChangeEvent = ({ checked }) => {
+	if (tableRef.value) {
+		const records = tableRef.value.getCheckboxRecords();
+		checkTable.value = records;
+		console.log(checked ? '所有勾选事件' : '所有取消事件', records);
+	}
+};
+
+const selectChangeEvent = ({ checked }) => {
+	if (tableRef.value) {
+		const records = tableRef.value.getCheckboxRecords();
+		checkTable.value = records;
+		console.log(checked ? '勾选事件' : '取消事件', records);
+	}
+};
+const isChecked = computed(() => {
+	return !Boolean(checkTable.value.length);
+});
+const toolbarRef = ref<RefType>();
+const tableRef = ref<RefType>();
+onMounted(() => {
+	queryList();
+	if (tableRef.value && toolbarRef.value) {
+		tableRef.value.connect(toolbarRef.value);
+	}
+	if (routeQueryParams.StartTime && routeQueryParams.EndTime) {
+		state.queryParams.crTime = [routeQueryParams.StartTime, routeQueryParams.EndTime];
+	}
+});
+</script>

+ 279 - 0
src/views/statistics/department/dpAccept.vue

@@ -0,0 +1,279 @@
+<template>
+	<div class="statistics-department-dp-accept-container layout-padding">
+		<div class="layout-padding-auto layout-padding-view pd20">
+			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+				<el-form-item prop="crTime">
+					<statistical-time v-model="state.queryParams.crTime" @change="handleQuery" ref="statisticalTimeRef" :disabled="state.loading" />
+				</el-form-item>
+				<el-form-item label="部门类别" prop="OrgType">
+					<el-select v-model="state.queryParams.OrgType" placeholder="请选择部门类别" @change="handleQuery">
+						<el-option :value="0" label="全部" />
+						<el-option :value="1" label="市直部门" />
+						<el-option :value="2" label="区县部门" />
+					</el-select>
+				</el-form-item>
+				<el-form-item label="部门名称" prop="OrgName">
+					<el-input v-model="state.queryParams.OrgName" placeholder="部门名称" clearable @keyup.enter="handleQuery" class="keyword-input" />
+				</el-form-item>
+				<el-form-item>
+					<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
+					<el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
+						<SvgIcon name="ele-Refresh" class="mr5" />重置
+					</el-button>
+					<el-popover :width="500" trigger="click">
+						<template #reference>
+							<el-button type="primary" title="字段说明"><SvgIcon name="ele-QuestionFilled" class="mr5" />字段说明</el-button>
+						</template>
+						<el-descriptions title="" :column="1" border style="max-height: 400px; overflow: auto">
+							<el-descriptions-item label="部门名称">办理工单的部门名称</el-descriptions-item>
+							<el-descriptions-item label="部门类别">办理工单的部门类别</el-descriptions-item>
+							<el-descriptions-item label="受理类型">工单受理类型</el-descriptions-item>
+						</el-descriptions>
+					</el-popover>
+					<el-button type="primary" @click="onDetailList" :loading="state.loading"> <SvgIcon name="ele-List" class="mr5" /> 列表明细 </el-button>
+				</el-form-item>
+			</el-form>
+			<vxe-toolbar
+				ref="toolbarRef"
+				:loading="state.loading"
+				custom
+				:refresh="{
+					queryMethod: handleQuery,
+				}"
+				:tools="[{ toolRender: { name: 'exportAll' } }]"
+			>
+			</vxe-toolbar>
+			<div style="overflow: hidden; width: 100%; height: 100%; flex: 1">
+				<vxe-table
+					border
+					:loading="state.loading"
+					:data="state.tableData"
+					:column-config="{ resizable: true }"
+					:row-config="{ isCurrent: true, isHover: true, height: 30, useKey: true }"
+					ref="tableRef"
+					height="auto"
+					auto-resize
+					show-overflow
+					:scrollY="{ enabled: true, gt: 100 }"
+					id="statisticsDepartmentDpAccept"
+					:custom-config="{
+						storage: true,
+					}"
+					showHeaderOverflow
+					:params="{ exportMethod: departmentAcceptTypeExport, exportParams: requestParams }"
+					show-footer
+					:footer-method="footerMethod"
+				>
+					<vxe-column field="orgName" title="部门名称" min-width="200" fixed="left">
+						<template #default="scope">
+							<el-button type="primary" link @click="linkDetail(scope)"  v-if="!['市直合计', '区县合计'].includes(scope.row.orgName)">
+								{{ scope.row.orgName }}
+							</el-button>
+							<span v-else>{{ scope.row.orgName }}</span>
+						</template>
+					</vxe-column>
+					<vxe-column field="orgTypeText" title="部门类别" min-width="100" fixed="left"> </vxe-column>
+					<vxe-column title="咨询" field="zxAllCount" min-width="100">
+						<template #default="scope">
+							<el-button type="primary" link @click="linkDetail(scope, scope.row.zxAcceptanceTypeCode)"  v-if="!['市直合计', '区县合计'].includes(scope.row.orgName)">
+								{{ scope.row.zxAllCount }}
+							</el-button>
+							<span v-else>{{scope.row.zxAllCount}}</span>
+						</template>
+					</vxe-column>
+					<vxe-column title="举报" field="jbAllCount" min-width="100">
+						<template #default="scope">
+							<el-button type="primary" link @click="linkDetail(scope, scope.row.jbAcceptanceTypeCode)" v-if="!['市直合计', '区县合计'].includes(scope.row.orgName)">
+								{{ scope.row.jbAllCount }}
+							</el-button>
+							<span v-else>{{scope.row.jbAllCount}}</span>
+						</template>
+					</vxe-column>
+					<vxe-column title="投诉" field="tsAllCount" min-width="100">
+						<template #default="scope">
+							<el-button type="primary" link @click="linkDetail(scope, scope.row.tsAcceptanceTypeCode)" v-if="!['市直合计', '区县合计'].includes(scope.row.orgName)">
+								{{ scope.row.tsAllCount }}
+							</el-button>
+							<span v-else>{{scope.row.tsAllCount}}</span>
+						</template>
+					</vxe-column>
+					<vxe-column title="求助" field="qzAllCount" min-width="100">
+						<template #default="scope">
+							<el-button type="primary" link @click="linkDetail(scope, scope.row.qzAcceptanceTypeCode)" v-if="!['市直合计', '区县合计'].includes(scope.row.orgName)">
+								{{ scope.row.qzAllCount }}
+							</el-button>
+							<span v-else>{{scope.row.qzAllCount}}</span>
+						</template>
+					</vxe-column>
+					<vxe-column title="建议" field="jyAllCount" min-width="100">
+						<template #default="scope">
+							<el-button type="primary" link @click="linkDetail(scope, scope.row.jbAcceptanceTypeCode)" v-if="!['市直合计', '区县合计'].includes(scope.row.orgName)">
+								{{ scope.row.jyAllCount }}
+							</el-button>
+							<span v-else>{{scope.row.jyAllCount}}</span>
+						</template>
+					</vxe-column>
+					<vxe-column title="意见" field="yjAllCount" min-width="100">
+						<template #default="scope">
+							<el-button type="primary" link @click="linkDetail(scope, scope.row.jyAcceptanceTypeCode)" v-if="!['市直合计', '区县合计'].includes(scope.row.orgName)">
+								{{ scope.row.yjAllCount }}
+							</el-button>
+							<span v-else>{{scope.row.yjAllCount}}</span>
+						</template>
+					</vxe-column>
+					<vxe-column title="惠民帮助" field="hmAllCount" min-width="100">
+						<template #default="scope">
+							<el-button type="primary" link @click="linkDetail(scope, scope.row.hmAcceptanceTypeCode)" v-if="!['市直合计', '区县合计'].includes(scope.row.orgName)">
+								{{ scope.row.hmAllCount }}
+							</el-button>
+							<span v-else>{{scope.row.hmAllCount}}</span>
+						</template>
+					</vxe-column>
+					<vxe-column title="大气污染举报" field="dqAllCount" min-width="100">
+						<template #default="scope">
+							<el-button type="primary" link @click="linkDetail(scope, scope.row.dqAcceptanceTypeCode)" v-if="!['市直合计', '区县合计'].includes(scope.row.orgName)">
+								{{ scope.row.dqAllCount }}
+							</el-button>
+							<span v-else>{{scope.row.dqAllCount}}</span>
+						</template>
+					</vxe-column>
+					<vxe-column title="表扬" field="byAllCount" min-width="100">
+						<template #default="scope">
+							<el-button type="primary" link @click="linkDetail(scope, scope.row.byAcceptanceTypeCode)" v-if="!['市直合计', '区县合计'].includes(scope.row.orgName)">
+								{{ scope.row.byAllCount }}
+							</el-button>
+							<span v-else>{{scope.row.byAllCount}}</span>
+						</template>
+					</vxe-column>
+					<vxe-column title="其他" field="qtAllCount" min-width="100">
+						<template #default="scope">
+							<el-button type="primary" link @click="linkDetail(scope, scope.row.qtAcceptanceTypeCode)" v-if="!['市直合计', '区县合计'].includes(scope.row.orgName)">
+								{{ scope.row.qtAllCount }}
+							</el-button>
+							<span v-else>{{scope.row.qtAllCount}}</span>
+						</template>
+					</vxe-column>
+					<vxe-column title="小计" field="allCount" min-width="100"> </vxe-column>
+				</vxe-table>
+			</div>
+		</div>
+	</div>
+</template>
+<script setup lang="tsx" name="statisticsDepartmentDpAccept">
+import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
+import { FormInstance } from 'element-plus';
+import { departmentAcceptType, departmentAcceptTypeExport } from '@/api/statistics/department';
+import { defaultDate } from '@/utils/constants';
+import { useRouter } from 'vue-router';
+import Other from '@/utils/other';
+import XEUtils from 'xe-utils';
+
+const StatisticalTime = defineAsyncComponent(() => import('@/components/StatisticalTime/index.vue')); // 日期类型选择组件
+// 定义变量内容
+const ruleFormRef = ref<RefType>(); // 表单ref
+const state = reactive<any>({
+	queryParams: {
+		// 查询条件
+		crTime: defaultDate, // 时间默认今天开始到今天
+		OrgType:0, // 部门类别结束
+		TypeId: 0, // 来电主体  0:全部 ,1:市民,2:企业
+		OrgName:null, // 部门名称
+	},
+	tableData: [], //表单
+	loading: false, // 加载
+	totalCount: 0, // 总计
+	IdentityType: 0,
+});
+/** 搜索按钮操作 */
+const handleQuery = () => {
+	// state.queryParams.PageIndex = 1;
+	queryList();
+};
+/** 获取列表 */
+const requestParams = ref<EmptyObjectType>({});
+const queryList = () => {
+	state.loading = true;
+	requestParams.value = Other.deepClone(state.queryParams);
+	requestParams.value.StartTime = state.queryParams.crTime === null ? null : state.queryParams.crTime[0];
+	requestParams.value.EndTime = state.queryParams.crTime === null ? null : state.queryParams.crTime[1];
+	Reflect.deleteProperty(requestParams.value, 'crTime');
+	departmentAcceptType(requestParams.value)
+		.then((res: any) => {
+			state.tableData = res.result?.dataList ?? [];
+			if (res.result.dataList.length) {
+				state.tableData.push(res.result.citySumModel);
+				state.tableData.push(res.result.countySumModel);
+			}
+			state.totalCount = res.result?.sumModel;
+			state.loading = false;
+		})
+		.catch(() => {
+			state.loading = false;
+		});
+};
+/** 重置按钮操作 */
+const statisticalTimeRef = ref<RefType>();
+const resetQuery = (formEl: FormInstance | undefined) => {
+	if (!formEl) return;
+	formEl.resetFields();
+	statisticalTimeRef.value.reset();
+	queryList();
+};
+// 计算合计
+const footerMethod = ({ columns, data }) => {
+	return [
+		columns.map((column: any, columnIndex: number) => {
+			if (columnIndex === 0) {
+				return '合计';
+			}
+			// 后端返回了数据集合 state.totalCount 所以不需要计算 直接进行赋值
+			return XEUtils.get(state.totalCount, column.property);
+		}),
+	];
+};
+// 查看详情
+const router = useRouter();
+const linkDetail = (scope:any, key?: string) => {
+	let StartTime = state.queryParams.crTime === null ? null : state.queryParams.crTime[0];
+	let EndTime = state.queryParams.crTime === null ? null : state.queryParams.crTime[1];
+	if (key) {
+		// 点击数字
+		router.push({
+			path: '/statistics/department/detailDpAcceptList',
+			query: {
+				StartTime,
+				EndTime,
+				OrgCode: scope.row.orgCode,
+				AcceptTypeCode: key,
+				TypeCode: state.queryParams.TypeCode,
+				TypeId: state.queryParams.TypeId,
+				OrgType: state.queryParams.OrgType,
+			},
+		});
+	} else {
+		// 点击部门
+		router.push({
+			path: '/statistics/department/detailDpAccept',
+			query: {
+				StartTime,
+				EndTime,
+				OrgCode: scope.row.orgCode,
+			},
+		});
+	}
+};
+// 跳转列表明细
+const onDetailList = () => {
+	router.push({
+		path: '/statistics/department/detailDpAcceptList',
+	});
+};
+const toolbarRef = ref<RefType>();
+const tableRef = ref<RefType>();
+onMounted(() => {
+	queryList();
+	if (tableRef.value && toolbarRef.value) {
+		tableRef.value.connect(toolbarRef.value);
+	}
+});
+</script>

+ 4 - 0
src/views/tels/callLog/zgCallLog.vue

@@ -158,6 +158,9 @@
 					<el-form-item prop="UserName" v-show="['1'].includes(state.queryParams.type)" label="话务员名称">
 						<el-input v-model="state.queryParams.UserName" placeholder="话务员名称" clearable @keyup.enter="handleQuery" />
 					</el-form-item>
+					<el-form-item prop="StaffNo" label="工号">
+						<el-input v-model="state.queryParams.StaffNo" placeholder="工号" clearable @keyup.enter="handleQuery" />
+					</el-form-item>
 					<el-form-item prop="OrderNo" v-show="['0', '1'].includes(state.queryParams.type)" label="工单编码">
 						<el-input v-model="state.queryParams.OrderNo" placeholder="工单编码" clearable @keyup.enter="handleQuery" />
 					</el-form-item>
@@ -228,6 +231,7 @@ const state = reactive<any>({
 		IsMissOrder: null,
 		SortField: null,
 		SortRule: null,
+		StaffNo:null, // 工号
 	},
 	tableData: [], // 列表数据
 	loading: false, // 加载

+ 1 - 1
src/views/todo/seats/accept/zgAccept.vue

@@ -808,7 +808,7 @@ const citizenPortraitRef = ref<RefType>(); // 市民画像组件
 const searchHistory = () => {
 	historyOrderRef.value.searchHistory();
 	citizenPortraitRef.value.getCitizen();
-	rightActive.value = 'draw';
+	// rightActive.value = 'draw';
 };
 // 填写来电人姓名时根据填写内容自动选择性别
 const inputName = (val: string) => {