Эх сурвалжийг харах

reactor:442 交办单导出提示语调整

zhangchong 1 сар өмнө
parent
commit
6d2ac9d16f

+ 1 - 1
.env.development

@@ -3,7 +3,7 @@ VITE_MODE_NAME=development
 # 防止部署多套系统到同一域名不同目录时,变量共用的问题 设置不同的前缀
 VITE_STORAGE_NAME=dev
 # 业务系统基础请求地址
-VITE_API_URL=http://110.188.24.28:50300
+VITE_API_URL=http://110.188.24.28:50100
 # 业务系统socket请求地址
 VITE_API_SOCKET_URL=http://110.188.24.28:50100/hubs/hotline
 # 业务系统文件上传上传请求地址

+ 5 - 5
src/views/business/discern/YBApply.vue

@@ -73,6 +73,11 @@
 					:params="{ exportMethod: screenApplyListExport, exportParams: requestParams }"
 				>
 					<vxe-column type="checkbox" width="50" align="center"></vxe-column>
+					<vxe-column field="orderVisit.visitTime" title="回访时间" sortable width="160">
+						<template #default="{ row }">
+							{{ formatDate(row.orderVisit?.visitTime, 'YYYY-mm-dd HH:MM:SS') }}
+						</template>
+					</vxe-column>
 					<vxe-column field="order.expiredStatusText" title="状态" width="60" align="center">
 						<template #default="{ row }">
 							<span :class="'overdue-status-' + row.order?.expiredStatus" :title="row.order?.expiredStatusText"></span>
@@ -112,11 +117,6 @@
 							{{ formatDate(row.order?.filedTime, 'YYYY-mm-dd HH:MM:SS') }}
 						</template>
 					</vxe-column>
-					<vxe-column field="orderVisit.visitTime" title="回访时间" sortable width="160">
-						<template #default="{ row }">
-							{{ formatDate(row.orderVisit?.visitTime, 'YYYY-mm-dd HH:MM:SS') }}
-						</template>
-					</vxe-column>
 					<vxe-column title="操作" fixed="right" width="240" align="center">
 						<template #default="{ row }">
 							<el-button

+ 19 - 1
src/views/business/discern/index.vue

@@ -212,6 +212,20 @@
 						class="keyword-input"
 					/>
 				</el-form-item>
+				<el-form-item label="甄别通过时间" prop="zbtgTime" v-if="['YiBin'].includes(themeConfig.appScope)">
+					<el-date-picker
+						v-model="state.queryParams.zbtgTime"
+						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"
+					/>
+				</el-form-item>
 			</el-form>
 			<template #footer>
 				<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
@@ -266,6 +280,7 @@ const state = reactive<any>({
 		FromPhone: null, // 来电电话
 		QueryScreenType: -1, // 甄别类型
 		OrgLevelOneName: null, // 一级部门
+		zbtgTime: [], // 甄别通过时间
 	},
 	tableData: [], //表单
 	loading: false, // 加载
@@ -301,9 +316,12 @@ const requestParams = ref<EmptyObjectType>({});
 const queryList = () => {
 	return new Promise((resolve, reject) => {
 		requestParams.value = Other.deepClone(state.queryParams);
-		requestParams.value.CreationTimeStart = state.queryParams.crTime === null ? null : state.queryParams.crTime[0]; // 受理时间
+		requestParams.value.CreationTimeStart = state.queryParams.crTime === null ? null : state.queryParams.crTime[0]; // 申请时间
 		requestParams.value.CreationTimeEnd = state.queryParams.crTime === null ? null : state.queryParams.crTime[1];
 		Reflect.deleteProperty(requestParams.value, 'crTime'); // 删除无用的参数
+		/*		requestParams.value.CreationTimeStart = state.queryParams.zbtgTime === null ? null : state.queryParams.zbtgTime[0]; // 甄别通过时间
+		requestParams.value.CreationTimeEnd = state.queryParams.zbtgTime === null ? null : state.queryParams.zbtgTime[1];
+		Reflect.deleteProperty(requestParams.value, 'zbtgTime'); // 删除无用的参数*/
 		state.loading = true;
 		screenList(requestParams.value)
 			.then((response: any) => {

+ 151 - 96
src/views/business/special/audit.vue

@@ -1,88 +1,63 @@
 <template>
 	<div class="business-special-audit-container layout-padding">
 		<div class="layout-padding-auto layout-padding-view pd20">
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline :disabled="state.loading">
-				<el-form-item label="关键词" prop="Keyword">
-					<el-input v-model.trim="state.queryParams.Keyword" 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)" v-waves class="default-button" :loading="state.loading">
-						<SvgIcon name="ele-Refresh" class="mr5" />重置
+			<vxe-grid v-bind="gridOptions" v-on="gridEvents" ref="gridRef" @checkbox-all="selectAllChangeEvent" @checkbox-change="selectChangeEvent">
+				<template #form>
+					<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline :disabled="gridOptions.loading">
+						<el-form-item label="关键词" prop="Keyword">
+							<el-input
+								v-model.trim="state.queryParams.Keyword"
+								placeholder="工单编码/标题"
+								clearable
+								@keyup.enter="handleQuery"
+								class="keyword-input"
+							/>
+						</el-form-item>
+						<el-form-item>
+							<el-button type="primary" @click="handleQuery" :loading="gridOptions.loading">
+								<SvgIcon name="ele-Search" class="mr5" />查询
+							</el-button>
+							<el-button @click="resetQuery(ruleFormRef)" v-waves class="default-button" :loading="gridOptions.loading">
+								<SvgIcon name="ele-Refresh" class="mr5" />重置
+							</el-button>
+						</el-form-item>
+					</el-form>
+				</template>
+				<template #toolbar_buttons>
+					<el-button
+						type="primary"
+						@click="onAuditMultiple"
+						:disabled="isChecked"
+						:loading="gridOptions.loading"
+						v-auth="'business:special:audit:multiple'"
+						>批量审批<span v-if="checkTable.length">({{ checkTable.length }})</span>
 					</el-button>
-				</el-form-item>
-			</el-form>
-			<vxe-toolbar
-				ref="toolbarRef"
-				:loading="state.loading"
-				custom
-				:refresh="{
-					queryMethod: handleQuery,
-				}"
-			>
-				<template #buttons>
-					<el-button type="primary" @click="onAuditMultiple" :disabled="isChecked" :loading="state.loading" v-auth="'business:special:audit:multiple'"
-						>批量审批<span v-if="checkTable.length">({{checkTable.length}})</span>
+				</template>
+				<template #statusText="{ row }">
+					<el-text type="danger" tag="b" v-if="[1, 2, 3, 9, 101, 102, 103, 104, 105, 200].includes(row.order?.status)">{{
+						row.order?.statusText
+					}}</el-text>
+					<span v-else>{{ row.order?.statusText }}</span>
+				</template>
+				<template #order_detail="{ row }">
+					<order-detail :order="row.order" @updateList="refreshList">{{ row.order?.title }}</order-detail>
+				</template>
+				<template #action="{ row }">
+					<el-button link type="primary" @click="onAudit(row)" title="审批特提" v-auth="'business:special:audit'" v-show="[0].includes(row.state)">
+						审批
 					</el-button>
+					<el-button link type="primary" @click="onAuditDetail(row)" title="查看审批明细" v-if="[1, 2].includes(row.state)"> 审批明细 </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"
-					height="auto"
-					auto-resize
-					show-overflow
-					:scrollY="{ enabled: true,  gt: 100  }"
-					id="orderSpecialAudit"
-					:custom-config="{ storage: true }"
-					showHeaderOverflow
-					@checkbox-all="selectAllChangeEvent"
-					@checkbox-change="selectChangeEvent"
-				>
-					<vxe-column type="checkbox" width="50" align="center"></vxe-column>
-					<vxe-column field="order.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.order.status)">{{ row.order.statusText }}</el-text>
-							<span v-else>{{ row.order.statusText }}</span>
-						</template>
-					</vxe-column>
-					<vxe-column field="order.no" title="工单编码" width="140"></vxe-column>
-					<vxe-column field="order.title" title="工单标题" width="200">
-						<template #default="{ row }">
-							<order-detail :order="row.order" @updateList="refreshList">{{ row.order?.title }}</order-detail>
-						</template>
-					</vxe-column>
-					<vxe-column field="order.sourceChannel" title="来源渠道" width="110"></vxe-column>
-					<vxe-column field="order.hotspotName" title="热点分类" width="150"></vxe-column>
-					<vxe-column field="order.acceptorName" title="受理人" width="120"></vxe-column>
-					<vxe-column field="order.orgLevelOneName" title="一级部门" width="140"></vxe-column>
-					<vxe-column field="stateText" title="特提审批状态" width="140"></vxe-column>
-					<vxe-column field="cause" title="特提原因" width="150"></vxe-column>
-					<vxe-column field="creatorName" title="申请人" width="140"></vxe-column>
-					<vxe-column field="creatorOrgName" title="申请部门" width="140"></vxe-column>
-					<vxe-column field="reason" title="申请理由" min-width="150"></vxe-column>
-					<vxe-column title="操作" fixed="right" width="100" 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>
-						</template>
-					</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"
-			/>
+				<template #pager>
+					<pagination
+						@pagination="queryList"
+						:total="state.total"
+						v-model:current-page="state.queryParams.PageIndex"
+						v-model:page-size="state.queryParams.PageSize"
+						:disabled="gridOptions.loading"
+					/>
+				</template>
+			</vxe-grid>
 		</div>
 		<!-- 特提审批 -->
 		<special-audit ref="specialAuditRef" @updateList="refreshList" />
@@ -111,11 +86,95 @@ const state = reactive({
 		PageSize: 20,
 		Keyword: null, // 关键字
 		State: 0, // 审核结果 0 待审核 1 审核通过 2 审核不通过
+		SortField: null, // 排序字段
+		SortRule: null, // 排序规则 0 升序 1 降序
 	},
 	tableData: [], //表单
 	loading: false, // 加载
 	total: 0, // 总数
 });
+const gridOptions = reactive<any>({
+	loading: false,
+	border: true,
+	showOverflow: true,
+	columnConfig: {
+		resizable: true,
+	},
+	scrollY: {
+		enabled: true,
+		gt: 100,
+	},
+	toolbarConfig: {
+		zoom: true,
+		custom: true,
+		refresh: {
+			queryMethod: () => {
+				handleQuery();
+			},
+		},
+		slots: {
+			buttons: 'toolbar_buttons',
+		},
+	},
+	customConfig: {
+		storage: true,
+	},
+	id: 'orderSpecialAudit',
+	rowConfig: { isHover: true, height: 30, isCurrent: true, useKey: true },
+	height: 'auto',
+	columns: [
+		{ type: 'checkbox', width: 50, align: 'center' },
+		{
+			field: 'order.expiredStatusText',
+			title: '状态',
+			width: 60,
+			align: 'center',
+			slots: {
+				default: ({ row }) => {
+					return <span class={'overdue-status-' + row.order?.expiredStatus} title={row.order.expiredStatusText}></span>;
+				},
+			},
+		},
+		{
+			field: 'order.statusText',
+			title: '工单状态',
+			width: 100,
+			slots: {
+				default: 'statusText',
+			},
+		},
+		{ field: 'order.no', title: '工单编码', width: 140 },
+		{ field: 'order.title', title: '工单标题', minWidth: 200, slots: { default: 'order_detail' } },
+		{ field: 'order.sourceChannel', title: '来源渠道', width: 110 },
+		{ field: 'order.hotspotName', title: '热点分类', width: 150 },
+		{ field: 'order.acceptorName', title: '受理人', width: 120 },
+		{ field: 'order.orgLevelOneName', title: '一级部门', width: 140 },
+		{ field: 'stateText', title: '特提审批状态', width: 140 },
+		{ field: 'cause', title: '特提原因', width: 150 },
+		{ field: 'creatorName', title: '申请人', width: 140 },
+		{ field: 'creatorOrgName', title: '申请部门', width: 140 },
+		{ field: 'reason', title: '申请理由', minWidth: 150 },
+		{
+			title: '操作',
+			fixed: 'right',
+			width: 100,
+			align: 'center',
+			slots: { default: 'action' },
+		},
+	],
+	data: [],
+	sortConfig: {
+		remote: true,
+	},
+});
+const gridEvents = {
+	sortChange(val: any) {
+		state.queryParams.SortField = val.order ? val.field : null;
+		// 0 升序 1 降序
+		state.queryParams.SortRule = val.order ? (val.order == 'desc' ? 1 : 0) : null;
+		handleQuery();
+	},
+};
 // 手动查询,将页码设置为1
 const handleQuery = () => {
 	state.queryParams.PageIndex = 1;
@@ -123,23 +182,23 @@ const handleQuery = () => {
 };
 // 刷新列表
 const refreshList = () => {
-  queryList();
+	queryList();
 };
 /** 获取列表 */
 const queryList = () => {
-	state.loading = true;
+	gridOptions.loading = true;
 	specialList(state.queryParams)
 		.then((res) => {
-			state.tableData = res.result?.items ?? [];
+			gridOptions.data = res.result?.items ?? [];
 			state.total = res.result?.total ?? 0;
-			state.loading = false;
-			tableRef.value.clearCheckboxRow();
+			gridOptions.loading = false;
+			gridRef.value.clearCheckboxRow();
 			checkTable.value = [];
 		})
 		.catch((err) => {
 			console.log(err);
-			state.loading = false;
-			tableRef.value.clearCheckboxRow();
+			gridOptions.loading = false;
+			gridRef.value.clearCheckboxRow();
 			checkTable.value = [];
 		});
 };
@@ -166,31 +225,27 @@ const onAuditMultiple = () => {
 	const ids = checkTable.value.map((item: any) => item.id);
 	specialAuditMultipleRef.value.openDialog(ids);
 };
-const tableRef = ref<RefType>();
 const checkTable = ref<EmptyArrayType>([]);
+const gridRef = ref<RefType>();
 const selectAllChangeEvent = ({ checked }) => {
-	if (tableRef.value) {
-		const records = tableRef.value.getCheckboxRecords();
+	if (gridRef.value) {
+		const records = gridRef.value.getCheckboxRecords();
 		checkTable.value = records;
 		console.log(checked ? '所有勾选事件' : '所有取消事件', records);
 	}
 };
 
 const selectChangeEvent = ({ checked }) => {
-	if (tableRef.value) {
-		const records = tableRef.value.getCheckboxRecords();
+	if (gridRef.value) {
+		const records = gridRef.value.getCheckboxRecords();
 		checkTable.value = records;
 		console.log(checked ? '勾选事件' : '取消事件', records);
 	}
 };
 const isChecked = computed(() => {
-	return !Boolean(checkTable.value.length);
+	return !checkTable.value.length;
 });
-const toolbarRef = ref<RefType>();
 onMounted(() => {
 	queryList();
-	if (tableRef.value && toolbarRef.value) {
-		tableRef.value.connect(toolbarRef.value);
-	}
 });
 </script>

+ 1 - 1
src/views/business/special/components/Special-audit-multiple.vue

@@ -80,7 +80,7 @@ const onAudit = (formEl: FormInstance | undefined) => {
 				state.loading = false;
 				closeDialog();
 				emit('updateList');
-				ElMessage.success('操作成功');
+				ElMessage.success('审批完成');
 			})
 			.catch(() => {
 				state.loading = false;

+ 1 - 1
src/views/business/special/components/Special-audit.vue

@@ -186,7 +186,7 @@ const onAudit = (formEl: FormInstance | undefined) => {
 				state.loading = false;
 				closeDialog();
 				emit('updateList');
-				ElMessage.success('操作成功');
+				ElMessage.success('审批完成');
 			})
 			.catch(() => {
 				state.loading = false;

+ 158 - 94
src/views/business/special/index.vue

@@ -1,15 +1,52 @@
 <template>
 	<div class="business-special-container layout-padding">
 		<div class="layout-padding-auto layout-padding-view pd20">
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline :disabled="state.loading">
-				<el-form-item label="工单编码" prop="No">
-					<el-input v-model.trim="state.queryParams.No" placeholder="工单编码" clearable @keyup.enter="handleQuery" class="keyword-input" />
-				</el-form-item>
-				<el-form-item label="审核状态" prop="State">
-					<el-select v-model="state.queryParams.State" placeholder="请选择审核状态" @change="handleQuery">
-						<el-option v-for="item in stateOptions" :value="item.value" :key="item.value" :label="item.label" />
-					</el-select>
-				</el-form-item>
+			<vxe-grid v-bind="gridOptions">
+				<template #form>
+					<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline :disabled="gridOptions.loading">
+						<el-form-item label="工单编码" prop="No">
+							<el-input v-model.trim="state.queryParams.No" placeholder="工单编码" clearable @keyup.enter="handleQuery" class="keyword-input" />
+						</el-form-item>
+						<el-form-item label="审核状态" prop="State">
+							<el-select v-model="state.queryParams.State" placeholder="请选择审核状态" @change="handleQuery">
+								<el-option v-for="item in stateOptions" :value="item.value" :key="item.value" :label="item.label" />
+							</el-select>
+						</el-form-item>
+						<el-form-item>
+							<el-button type="primary" @click="handleQuery" :loading="gridOptions.loading">
+								<SvgIcon name="ele-Search" class="mr5" />查询
+							</el-button>
+<!--							<el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="gridOptions.loading">
+								<SvgIcon name="ele-Refresh" class="mr5" />重置
+							</el-button>-->
+							<el-button @click="drawer = true" class="default-button"> <SvgIcon name="ele-Search" class="mr5" />更多查询</el-button>
+						</el-form-item>
+					</el-form>
+				</template>
+				<template #statusText="{ 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>
+				<template #order_detail="{ row }">
+					<order-detail :order="{ id: row.orderId }" @updateList="refreshList">{{ row.title }}</order-detail>
+				</template>
+				<template #pager>
+					<pagination
+						@pagination="queryList"
+						:total="state.total"
+						v-model:current-page="state.queryParams.PageIndex"
+						v-model:page-size="state.queryParams.PageSize"
+						:disabled="gridOptions.loading"
+					/>
+				</template>
+			</vxe-grid>
+		</div>
+		<!--	更多查询	-->
+		<el-drawer v-model="drawer" title="更多查询" size="500px">
+			<el-form :model="state.queryParams" ref="drawerRuleFormRef" @submit.native.prevent label-width="100px" :disabled="gridOptions.loading">
+<!--				<el-form-item label="申请人" prop="AcceptorName">
+					<el-input v-model.trim="state.queryParams.AcceptorName" placeholder="申请人" clearable @keyup.enter="handleQuery" />
+				</el-form-item>-->
 				<el-form-item label="申请时间" prop="crTime">
 					<el-date-picker
 						v-model="state.queryParams.crTime"
@@ -24,81 +61,12 @@
 						:default-time="defaultTimeStartEnd"
 					/>
 				</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)" v-waves 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,
-				}"
-			>
-			</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="orderSpecialAudit"
-					:custom-config="{ storage: true }"
-					showHeaderOverflow
-				>
-					<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="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.id ? row : { ...row, id: row.orderId }" @updateList="refreshList">{{ row.title }}</order-detail>
-						</template>
-					</vxe-column>
-					<vxe-column field="state" title="审批状态" width="150">
-						<template #default="{ row }">
-							<span>{{ stateOptions.find((item) => item.value === row.state).label }}</span>
-						</template>
-					</vxe-column>
-					<vxe-column field="stepName" title="申请节点" width="110"></vxe-column>
-					<vxe-column field="nextStepName" title="特提节点" width="110"></vxe-column>
-					<vxe-column field="creatorName" title="申请人" width="140"></vxe-column>
-					<vxe-column field="creatorOrgName" title="申请部门" width="140"></vxe-column>
-					<vxe-column field="acceptType" title="受理类型" width="110"></vxe-column>
-					<vxe-column field="hotspotName" title="热点分类" width="150"></vxe-column>
-					<vxe-column title="操作" fixed="right" width="100" align="center">
-						<template #default="{ row }">
-							<el-button link type="primary" @click="onprogressDetail(row)" title="查看审批明细"> 审批明细 </el-button>
-						</template>
-					</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>
+			<template #footer>
+				<el-button type="primary" @click="handleQuery" :loading="gridOptions.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
+				<el-button @click="resetQuery(drawerRuleFormRef)" class="default-button"> <SvgIcon name="ele-Refresh" class="mr5" />重置 </el-button>
+			</template>
+		</el-drawer>
 		<!-- 审批详情 -->
 		<special-audit-detail ref="specialAuditDetailRef" />
 	</div>
@@ -113,7 +81,6 @@ const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/
 const SpecialAuditDetail = defineAsyncComponent(() => import('@/views/business/special/components/Special-audit-detail.vue')); // 审批详情
 const pagination = defineAsyncComponent(() => import('@/components/ProTable/components/Pagination.vue')); // 分页
 // 定义变量内容
-const ruleFormRef = ref<RefType>(); // 表单ref
 const state = reactive({
 	queryParams: {
 		// 查询条件
@@ -122,23 +89,115 @@ const state = reactive({
 		No: null, // 工单编号
 		State: null, // 审核状态
 		crTime: [], // 申请时间
+		AcceptorName:null, // 申请人
 	},
 	tableData: [], //表单
 	loading: false, // 加载
 	total: 0, // 总数
 });
-// 受理时间
-const timeStartChangeCr = (val: string[]) => {
-	state.queryParams['StartTime'] = val[0];
-	state.queryParams['EndTime'] = val[1];
-	handleQuery();
-};
 const stateOptions = [
 	// 审核状态
 	{ value: 0, label: '待审核' },
 	{ value: 1, label: '审核通过' },
 	{ value: 2, label: '审核不通过' },
 ];
+const gridOptions = reactive<any>({
+	loading: false,
+	border: true,
+	showOverflow: true,
+	columnConfig: {
+		resizable: true,
+	},
+	scrollY: {
+		enabled: true,
+		gt: 100,
+	},
+	toolbarConfig: {
+		zoom: true,
+		custom: true,
+		refresh: {
+			queryMethod: () => {
+				handleQuery();
+			},
+		},
+	},
+	customConfig: {
+		storage: true,
+	},
+	id: 'businessSpecialIndex',
+	rowConfig: { isHover: true, height: 30, isCurrent: true, useKey: true },
+	height: 'auto',
+	columns: [
+		{
+			field: 'expiredStatusText',
+			title: '状态',
+			width: 60,
+			align: 'center',
+			slots: {
+				default: ({ row }) => {
+					return <span class={'overdue-status-' + row.expiredStatus} title={row.expiredStatusText}></span>;
+				},
+			},
+		},
+		{ field: 'no', title: '工单编码', width: 140 },
+		{
+			field: 'statusText',
+			title: '工单状态',
+			width: 100,
+			slots: {
+				default: 'statusText',
+			},
+		},
+		{
+			field: 'title',
+			title: '工单标题',
+			minWidth: 200,
+			slots: { default: 'order_detail' },
+		},
+		{
+			field: 'state',
+			title: '审批状态',
+			width: 150,
+			slots: {
+				default: ({ row }) => {
+					return <span>{stateOptions.find((item) => item.value === row.state).label}</span>;
+				},
+			},
+		},
+		{ field: 'stepName', title: '申请节点', width: 110 },
+		{ field: 'nextStepName', title: '特提节点', width: 110 },
+		{ field: 'creatorName', title: '申请人', width: 140 },
+		{ field: 'creatorOrgName', title: '申请部门', width: 140 },
+		{ field: 'acceptType', title: '受理类型', width: 110 },
+		{ field: 'hotspotName', title: '热点分类', width: 150 },
+		{
+			title: '操作',
+			fixed: 'right',
+			width: 100,
+			align: 'center',
+			slots: {
+				default: ({ row }) => {
+					return (
+						<el-button link type="primary" onClick={() => onprogressDetail(row)}>
+							{' '}
+							审批明细{' '}
+						</el-button>
+					);
+				},
+			},
+		},
+	],
+	data: [],
+	sortConfig: {
+		remote: true,
+	},
+});
+// 受理时间
+const timeStartChangeCr = (val: string[]) => {
+	state.queryParams['StartTime'] = val[0];
+	state.queryParams['EndTime'] = val[1];
+	handleQuery();
+};
 // 手动查询,将页码设置为1
 const handleQuery = () => {
 	state.queryParams.PageIndex = 1;
@@ -146,28 +205,33 @@ const handleQuery = () => {
 };
 // 刷新列表
 const refreshList = () => {
-  queryList();
+	queryList();
 };
 /** 获取列表 */
 const queryList = () => {
-	state.loading = true;
+	gridOptions.loading = true;
 	specialListAll(state.queryParams)
 		.then((res) => {
 			state.tableData = res.result?.items ?? [];
+			gridOptions.data = res.result?.items ?? [];
 			state.total = res.result?.total ?? 0;
-			state.loading = false;
+			gridOptions.loading = false;
 		})
 		.catch((err) => {
 			console.log(err);
-			state.loading = false;
+			gridOptions.loading = false;
 		});
 };
 
 /** 重置按钮操作 */
+const drawerRuleFormRef = ref();
+const ruleFormRef = ref<RefType>(); // 表单ref
+const drawer = ref(false);
 const resetQuery = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	state.queryParams['StartTime'] = null;
 	state.queryParams['EndTime'] = null;
+	ruleFormRef.value?.resetFields();
 	formEl.resetFields();
 	queryList();
 };

+ 7 - 7
src/views/tels/callLog/zgCallLog.vue

@@ -55,9 +55,9 @@
 								case '1': //呼入列表
 									return !['directionText', 'waitDuration'].includes(column.field);
 								case '2': //呼出列表
-									return !['mobileAreaName', 'userName', 'directionText', 'waitDuration'].includes(column.field);
+									return !['mobileAreaName', 'directionText', 'waitDuration'].includes(column.field);
 								case '3': //未接列表
-									return !['orderNo', 'title', 'mobileAreaName', 'userName', 'duration', 'answeredTime', 'endByText'].includes(column.field);
+									return !['orderNo', 'title', 'mobileAreaName', 'duration', 'answeredTime', 'endByText'].includes(column.field);
 							}
 						},
 					}"
@@ -74,7 +74,7 @@
 					<vxe-column field="telNo" title="响应分机" width="100"></vxe-column>
 					<vxe-column field="staffNo" title="工号" width="100"></vxe-column>
 					<vxe-column field="mobileAreaName" title="号码归属地" min-width="120" :visible="['1'].includes(state.queryParams.type)"></vxe-column>
-					<vxe-column field="userName" title="话务员" width="120" :visible="['1'].includes(state.queryParams.type)"></vxe-column>
+					<vxe-column field="userName" title="话务员" width="120"></vxe-column>
 					<vxe-column field="groupId" title="功能组号码" width="100"></vxe-column>
 					<vxe-column field="duration" title="通话时间(秒)" width="110" :visible="['1', '2'].includes(state.queryParams.type)"></vxe-column>
 					<vxe-column field="endByText" title="挂断状态" width="100" :visible="['1', '2'].includes(state.queryParams.type)"></vxe-column>
@@ -155,8 +155,8 @@
 							<el-option v-for="item in state.endByOptions" :value="item.key" :key="item.key" :label="item.value" />
 						</el-select>
 					</el-form-item>
-					<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 prop="UserName" 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" />
@@ -219,7 +219,7 @@ const state = reactive<any>({
 		IsConnected: null, // 接通状态
 		FromNo: null, // 主叫
 		ToNo: null, // 被叫
-		UserName: null, // 话务员名称
+		UserName: null, // 话务员
 		TelNo: null, // 分机号
 		EndBy: null, //挂断
 		Direction: null, // 通话方向
@@ -231,7 +231,7 @@ const state = reactive<any>({
 		IsMissOrder: null,
 		SortField: null,
 		SortRule: null,
-		StaffNo:null, // 工号
+		StaffNo: null, // 工号
 	},
 	tableData: [], // 列表数据
 	loading: false, // 加载