reactor:25 市州通用-工单坐席待办：新增选项卡；

src/api/todo/order.ts

@@ -15,6 +15,17 @@ export const orderListTodo = (params: any) => {
         params
     });
 };
+/**
+ * @description 工单坐席待办列表查询总数
+ * @param {any} params
+ */
+export const orderListTodoCount = (params: any) => {
+    return request({
+        url: `/api/v1/Order/waited/sign/count`,
+        method: 'get',
+        params
+    });
+};
 /**
  * @description 坐席待办列表
  * @param {any} params

src/views/business/discern/apply.vue

@@ -1,6 +1,10 @@
 <template>
 	<div class="business-discern-apply-container layout-padding">
 		<div class="layout-padding-auto layout-padding-view pd20">
+			<el-tabs v-model="state.queryParams.TabStatus" @tab-change="handleQuery">
+				<el-tab-pane :name="0" label=""></el-tab-pane>
+				<el-tab-pane :name="4" label="甄别已审批"></el-tab-pane>
+			</el-tabs>
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"

src/views/business/order/index.vue

@@ -798,7 +798,7 @@ const onObserve = () => {
 		.then(() => {
 			addObserve({ orderIds: ids }).then(() => {
 				ElMessage.success('已添加关注');
-				queryList();
+				queryList(true);
 			});
 		})
 		.catch(() => {});
@@ -820,7 +820,7 @@ const onEnd = () => {
 		.then(() => {
 			addEnd({ orderIds: ids }).then(() => {
 				ElMessage.success('操作成功');
-				queryList();
+				queryList(true);
 			});
 		})
 		.catch(() => {});

src/views/tels/callLog/ybCallLog.vue

@@ -583,11 +583,6 @@ const state = reactive<any>({
 	endByOptions: [],
 });
 const ruleFormRef = ref<FormInstance>(); // 表单ref
-const searchCol = ref(true); // 展开/收起
-// 展开/收起
-const closeSearch = () => {
-	searchCol.value = !searchCol.value;
-};
 // 全部表头
 const allColumns = ref<any[]>([
 	{ prop: 'cpn', label: '主叫号码', minWidth: 120 },

src/views/todo/order/index.vue

@@ -146,7 +146,6 @@
 import { defineAsyncComponent, onMounted, reactive, ref, onActivated, onBeforeUnmount } from 'vue';
 import { ElMessage, ElMessageBox, FormInstance } from 'element-plus';
 import { formatDate } from '@/utils/formatTime';
-import { useRoute } from 'vue-router';
 import { orderListTodo } from '@/api/todo/order';
 import { exportJbOrder } from '@/api/business/order';
 import { downloadZip } from '@/utils/tools';
@@ -342,8 +341,6 @@ const onJbExport = () => {
 		})
 		.catch(() => {});
 };
-const route = useRoute();
-const routeQueryParams = route.query;
 // 获取查询条件基础信息
 const getBaseData = async () => {
 	try {
@@ -354,32 +351,10 @@ const getBaseData = async () => {
 	}
 };
 onMounted(() => {
-	if(routeQueryParams.type){
-		ruleFormRef.value.resetFields();
-		switch (routeQueryParams.type) {
-			case 'expired': // 已超期
-				state.queryParams = { ...state.queryParams, ExpiredOrAlmostOverdue: 'true' };
-				break;
-			case 'sign':// 会签待办
-				state.queryParams = { ...state.queryParams, IsCounterSign: 'true' };
-				break;
-		}
-	}
 	getBaseData();
 	queryList();
 });
 onActivated(() => {
-	if(routeQueryParams.type){
-		ruleFormRef.value.resetFields();
-		switch (routeQueryParams.type) {
-			case 'expired': // 已超期
-				state.queryParams = { ...state.queryParams, ExpiredOrAlmostOverdue: 'true' };
-				break;
-			case 'sign':// 会签待办
-				state.queryParams = { ...state.queryParams, IsCounterSign: 'true' };
-				break;
-		}
-	}
 	mittBus.on('clearCachePage', () => {
 		//清除缓存
 		queryList();

src/views/todo/seats/index.vue

@@ -1,9 +1,10 @@
 <template>
-	<div class="todo-order-container layout-padding">
+	<div class="todo-seats-container layout-padding">
 		<div class="layout-padding-auto layout-padding-view pd20">
-			<el-tabs v-model="state.queryParams.IsHandled" @tab-change="handleQuery">
-				<el-tab-pane name="false" label="工单待办"></el-tab-pane>
-				<el-tab-pane name="true" label="工单已办"></el-tab-pane>
+			<el-tabs v-model="state.queryParams.type" @tab-change="changeTab">
+				<el-tab-pane name="0" label="工单待办"></el-tab-pane>
+				<el-tab-pane name="1" label="交办件"></el-tab-pane>
+				<el-tab-pane name="2" label="直办件"></el-tab-pane>
 			</el-tabs>
 			<ProTable
 				ref="proTableRef"
@@ -14,7 +15,7 @@
 				:total="state.total"
 				v-model:page-index="state.queryParams.PageIndex"
 				v-model:page-size="state.queryParams.PageSize"
-				v-if="state.queryParams.IsHandled === 'false'"
+				:pagination="false"
 			>
 				<template #table-search>
 					<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
@@ -44,57 +45,23 @@
 					<span :class="'overdue-status-' + row.expiredStatus" :title="row.expiredStatusText"></span>
 				</template>
 				<template #title="{ row }">
-					<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
-				</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>
-				</template>
-			</ProTable>
-			<ProTable
-				ref="proTableRef"
-				:columns="columnsDone"
-				: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"
-				v-else
-			>
-				<template #table-search>
-					<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="handleQuery" class="keyword-input" />
-						</el-form-item>
-						<el-form-item label="工单编码" prop="No">
-							<el-input v-model="state.queryParams.No" placeholder="工单编码" clearable @keyup.enter="handleQuery" class="keyword-input" />
-						</el-form-item>
-						<el-form-item label="">
-							<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" 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 #tableHeader="scope">
-					<el-button type="primary" @click="onAddOrder" v-auth="'todo:seats:add'" :loading="state.loading">
-						<SvgIcon name="ele-Plus" class="mr5" />新建工单
-					</el-button>
-					<el-button type="primary" @click="onJbExport" :disabled="!scope.isSelected" :loading="state.loading" v-auth="'todo:order:jbdExport'"
-						><SvgIcon name="iconfont icon-daochu" class="mr5" />交办单导出
-					</el-button>
-				</template>
-				<template #expiredStatusText="{ row }">
-					<span :class="'overdue-status-' + row.expiredStatus" :title="row.expiredStatusText"></span>
-				</template>
-				<template #title="{ row }">
-					<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
+					<order-detail :order="row" @updateList="handleQuery">{{ row.title }}</order-detail>
 				</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>
 				</template>
 			</ProTable>
+			<div class="flex-end mt20" style="align-items: center">
+				<span v-loading="totalLoading" class="mr10">共 {{ totalCount }} 条</span>
+				<el-pagination
+					layout="prev, pager, next"
+					:total="state.total"
+					@current-change="handleCurrentChange"
+					:page-size="state.queryParams.PageSize"
+					:current-page="state.queryParams.PageIndex"
+				/>
+			</div>
 		</div>
 		<!--	更多查询	-->
 		<el-drawer v-model="drawer" title="更多查询" size="500px">
@@ -162,9 +129,9 @@ import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { ElMessage, ElMessageBox, FormInstance } from 'element-plus';
 import { formatDate } from '@/utils/formatTime';
 import { useRouter } from 'vue-router';
-import { seatsListTodo, orderSign } from '@/api/todo/order';
-import { downloadZip } from '@/utils/tools';
-import { exportJbOrder } from '@/api/business/order';
+import { seatsListTodo, orderSign, orderListTodoCount } from '@/api/todo/order';
+import { downloadZip, getNeedArr } from '@/utils/tools';
+import { exportJbOrder, orderListCount, orderListFixed } from '@/api/business/order';
 import { defaultTimeStartEnd, shortcuts } from '@/utils/constants';
 import Other from '@/utils/other';
 import { treeArea } from '@/api/auxiliary/area';
@@ -178,6 +145,7 @@ const state = reactive<any>({
 		PageIndex: 1, // 当前页
 		PageSize: 20, // 每页条数
 		IsHandled: 'false', // 工单状态
+		type:'0',
 		Keyword: null, // 关键字
 		IsProvince: null, // 是否省工单
 		IsCounterSign: null, // 是否会签
@@ -187,6 +155,7 @@ const state = reactive<any>({
 		IsUrgent: null,
 		AreaCode: null,
 		Status: null,
+		TypeCode:null,
 	},
 	tableData: [], //表单
 	loading: false, // 加载
@@ -293,28 +262,85 @@ const columnsDone = ref<any[]>([
 	},
 	{ prop: 'operation', label: '操作', fixed: 'right', width: 80, align: 'center' },
 ]);
+// 修改查询参数
+const changeTab = (val:string)=>{
+	switch (val) {
+		case '0':
+			state.queryParams.IsHandled = 'false';
+			state.queryParams.TypeCode  = null;
+			break;
+		case '1': // 交办
+			state.queryParams.TypeCode  = 1;
+			state.queryParams.IsHandled = null;
+			break;
+		case '2': //直办
+			state.queryParams.TypeCode = 2;
+			state.queryParams.IsHandled = null;
+			break;
+	}
+	handleQuery();
+}
 // 手动查询，将页码设置为1
 const handleQuery = () => {
 	state.queryParams.PageIndex = 1;
-	queryList();
+	queryIndex.value = 0;
+	queryList(true);
+};
+// 改变页码
+const queryIndex = ref(0); // 数据批次
+const totalTable = ref([]); // 数据总数
+const handleCurrentChange = (val: number) => {
+	state.queryParams.PageIndex = val;
+	// 判断当前页是否是数据的最后一页
+	if (val === Math.ceil(state.total / state.queryParams.PageSize)) {
+		queryList();
+	} else {
+		state.tableData = getNeedArr(totalTable.value, state.queryParams.PageSize)[state.queryParams.PageIndex - 1]; //当前页的表格数据
+	}
 };
 /** 获取列表 */
 const requestParams = ref<EmptyObjectType>({});
-const queryList = async () => {
-	try {
-		state.loading = true;
-		requestParams.value = Other.deepClone(state.queryParams);
-		requestParams.value.StartTime = state.queryParams.scTime === null ? null : state.queryParams.scTime[0];
-		requestParams.value.EndTime = state.queryParams.scTime === null ? null : state.queryParams.scTime[1];
-		Reflect.deleteProperty(requestParams.value, 'scTime');
-		const res: any = await seatsListTodo(requestParams.value);
-		state.tableData = res.result?.items ?? [];
-		state.total = res.result?.total ?? 0;
-		state.loading = false;
-	} catch (e) {
-		console.log(e);
-		state.loading = false;
-	}
+const totalCount = ref(0);
+const totalLoading = ref(false);
+const queryList = async (isQuery: boolean = false) => {
+	state.loading = true;
+	totalLoading.value = true;
+	requestParams.value = Other.deepClone(state.queryParams);
+	requestParams.value.StartTime = state.queryParams.scTime === null ? null : state.queryParams.scTime[0];
+	requestParams.value.EndTime = state.queryParams.scTime === null ? null : state.queryParams.scTime[1];
+	requestParams.value.QueryIndex = queryIndex.value; // 数据批次
+	seatsListTodo(requestParams.value)
+		.then((response: any) => {
+			if (isQuery) {
+				// 如果是查询
+				totalTable.value = []; // 先清空
+				totalTable.value = response?.result;
+				state.total = totalTable.value.length;
+				state.tableData = getNeedArr(totalTable.value, state.queryParams.PageSize)[state.queryParams.PageIndex - 1]; //当前页的表格数据
+				queryIndex.value = 1; // 请求完成之后，页码加一避免重复
+			} else {
+				if (response?.result.length) queryIndex.value++;
+				totalTable.value = totalTable.value.concat(response?.result);
+				state.total = totalTable.value.length;
+				state.tableData = getNeedArr(totalTable.value, state.queryParams.PageSize)[state.queryParams.PageIndex - 1]; //当前页的表格数据
+			}
+			state.loading = false;
+		})
+		.then(() => {
+			// 查询总数
+			orderListTodoCount(requestParams.value)
+				.then((count) => {
+					totalCount.value = count.result;
+					totalLoading.value = false;
+				})
+				.catch(() => {
+					totalLoading.value = false;
+				});
+		})
+		.catch(() => {
+			state.loading = false;
+			totalLoading.value = false;
+		});
 };
 /** 重置按钮操作 */
 const drawerRuleFormRef = ref();
@@ -324,7 +350,8 @@ const resetQuery = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.resetFields();
 	ruleFormRef.value?.resetFields();
-	queryList();
+	queryIndex.value = 0;
+	queryList(true);
 };
 // 新增工单
 const onAddOrder = () => {
@@ -358,7 +385,7 @@ const onSign = (row: any) => {
 		.then(() => {
 			orderSign(row.id).then(() => {
 				ElMessage.success('签收成功');
-				queryList();
+				queryList(true);
 			});
 		})
 		.catch(() => {});
@@ -409,3 +436,10 @@ onMounted(() => {
 	queryList();
 });
 </script>
+<style scoped lang="scss">
+.todo-seats-container {
+	:deep(.pro-table-main) {
+		height: calc(100% - 95px);
+	}
+}
+</style>