reactor:332 【坐席月接通率->通话时段明细】增加一列“振铃结束时间”和查询条件;324 甄别审批弹窗增加“历史工单”选项卡

src/views/business/discern/components/Discern-audit.vue

@@ -1,125 +1,142 @@
 <template>
 	<el-dialog v-model="state.dialogVisible" draggable title="甄别审批" ref="dialogRef" width="50%" append-to-body destroy-on-close @close="close">
-		<el-form label-width="110px" :model="state.infoForm" class="show-info-form" v-loading="state.loading">
-			<p class="border-title">申请信息</p>
-			<el-row :gutter="10">
-				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="工单编号"> {{ state.infoForm?.no }} </el-form-item>
-				</el-col>
-				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="工单标题"> {{ state.infoForm?.visit?.order?.title }} </el-form-item>
-				</el-col>
-				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="申请人">{{ state.infoForm?.creatorName }} </el-form-item>
-				</el-col>
-				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="申请部门">{{ state.infoForm?.creatorOrgName }} </el-form-item>
-				</el-col>
-				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="申请时间">{{ formatDate(state.infoForm?.creationTime, 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
-				</el-col>
-				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="申请类型"> {{ state.infoForm?.typeDicName }} </el-form-item>
-				</el-col>
-				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="发起甄别耗时"> {{ state.infoForm?.timeConsuminText }} </el-form-item>
-				</el-col>
-				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="是否省甄别">{{ state.infoForm?.isProvince ? '是' : '否' }} </el-form-item>
-				</el-col>
-				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-					<el-form-item label="申请理由" class="formatted-text">{{ state.infoForm?.content }} </el-form-item>
-				</el-col>
-				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-					<el-form-item label="附件"
-						><annex-list name="甄别申请附件" v-model="state.infoForm.files" readonly classify="甄别申请附件" />
-					</el-form-item>
-				</el-col>
-			</el-row>
-		</el-form>
-		<p class="border-title mt10 mb10">甄别审核明细</p>
-		<vxe-table :expand-config="{ trigger: 'row', padding: true }" border :data="tableData" :loading="state.loading" max-height="500px">
-			<vxe-column type="seq" width="70"></vxe-column>
-			<vxe-column type="expand" width="60">
-				<template #content="{ row }">
-					<div class="mb5  formatted-text">审核意见：{{ row.opinion }}</div>
-					<annex-list name="附件" readonly businessId="" classify="查看附件" v-model="row.files" />
-				</template>
-			</vxe-column>
-			<vxe-column field="name" title="节点"></vxe-column>
-			<vxe-column field="handlerName" title="审批人"></vxe-column>
-			<vxe-column field="handleTime" title="审批时间" width="160">
-				<template #default="{ row }">{{ formatDate(row.handleTime, 'YYYY-mm-dd HH:MM:SS') }}</template>
-			</vxe-column>
-			<vxe-column field="handleModeText" title="状态"></vxe-column>
-		</vxe-table>
-		<p class="border-title mt20 mb10">审核意见</p>
-		<el-form :model="state.ruleForm" label-width="110px" ref="ruleFormRef" v-loading="state.loading">
-			<el-row :gutter="10">
-				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="审批结果" prop="isPass" :rules="[{ required: true, message: '请选择审批结果', trigger: 'change' }]">
-						<el-radio-group v-model="state.ruleForm.isPass">
-							<el-radio :value="true">同意</el-radio>
-							<el-radio :value="false">不同意</el-radio>
-						</el-radio-group>
-					</el-form-item>
-				</el-col>
-				<template v-if="state.ruleForm.isPass">
+		<template #header>
+			<el-tabs v-model="state.activeName" @tab-change="handleClick">
+				<el-tab-pane
+					:name="item.value"
+					v-for="item in state.tabPaneList"
+					:key="item.value"
+					:label="item.label"
+					:disabled="state.loading"
+				></el-tab-pane>
+			</el-tabs>
+		</template>
+		<div v-show="state.activeName === '0'">
+			<el-form label-width="110px" :model="state.infoForm" class="show-info-form" v-loading="state.loading">
+				<p class="border-title">申请信息</p>
+				<el-row :gutter="10">
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+						<el-form-item label="工单编号"> {{ state.infoForm?.no }} </el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+						<el-form-item label="工单标题"> {{ state.infoForm?.visit?.order?.title }} </el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+						<el-form-item label="申请人">{{ state.infoForm?.creatorName }} </el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+						<el-form-item label="申请部门">{{ state.infoForm?.creatorOrgName }} </el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+						<el-form-item label="申请时间">{{ formatDate(state.infoForm?.creationTime, 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+						<el-form-item label="申请类型"> {{ state.infoForm?.typeDicName }} </el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+						<el-form-item label="发起甄别耗时"> {{ state.infoForm?.timeConsuminText }} </el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+						<el-form-item label="是否省甄别">{{ state.infoForm?.isProvince ? '是' : '否' }} </el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+						<el-form-item label="申请理由" class="formatted-text">{{ state.infoForm?.content }} </el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+						<el-form-item label="附件"
+							><annex-list name="甄别申请附件" v-model="state.infoForm.files" readonly classify="甄别申请附件" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<p class="border-title mt10 mb10">甄别审核明细</p>
+			<vxe-table :expand-config="{ trigger: 'row', padding: true }" border :data="tableData" :loading="state.loading" max-height="500px">
+				<vxe-column type="seq" width="70"></vxe-column>
+				<vxe-column type="expand" width="60">
+					<template #content="{ row }">
+						<div class="mb5 formatted-text">审核意见：{{ row.opinion }}</div>
+						<annex-list name="附件" readonly businessId="" classify="查看附件" v-model="row.files" />
+					</template>
+				</vxe-column>
+				<vxe-column field="name" title="节点"></vxe-column>
+				<vxe-column field="handlerName" title="审批人"></vxe-column>
+				<vxe-column field="handleTime" title="审批时间" width="160">
+					<template #default="{ row }">{{ formatDate(row.handleTime, 'YYYY-mm-dd HH:MM:SS') }}</template>
+				</vxe-column>
+				<vxe-column field="handleModeText" title="状态"></vxe-column>
+			</vxe-table>
+			<p class="border-title mt20 mb10">审核意见</p>
+			<el-form :model="state.ruleForm" label-width="110px" ref="ruleFormRef" v-loading="state.loading">
+				<el-row :gutter="10">
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+						<el-form-item label="审批结果" prop="isPass" :rules="[{ required: true, message: '请选择审批结果', trigger: 'change' }]">
+							<el-radio-group v-model="state.ruleForm.isPass">
+								<el-radio :value="true">同意</el-radio>
+								<el-radio :value="false">不同意</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+					<template v-if="state.ruleForm.isPass">
+						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+							<el-form-item label="下一环节" prop="nextStepCode" :rules="[{ required: true, message: '请选择下一环节', trigger: 'change' }]">
+								<el-select v-model="state.ruleForm.nextStepCode" placeholder="请选择下一环节" class="w100" @change="selectNextStep">
+									<el-option v-for="item in state.nextStepOptions" :key="item.key" :label="item.value" :value="item.key" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="showHandlers">
+							<el-form-item
+								label="办理对象"
+								prop="nextHandlers"
+								:rules="[{ required: nextHandlersRequired, message: '请选择办理对象', trigger: 'change' }]"
+							>
+								<el-select-v2
+									v-model="state.ruleForm.nextHandlers"
+									:options="state.handlerOptions"
+									placeholder="请选择办理对象"
+									class="w100"
+									multiple
+									clearable
+									collapse-tags
+									collapse-tags-tooltip
+									filterable
+									value-key="key"
+									@change="selectHandlers"
+									:multiple-limit="multipleLimit"
+								/>
+							</el-form-item>
+						</el-col>
+					</template>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="下一环节" prop="nextStepCode" :rules="[{ required: true, message: '请选择下一环节', trigger: 'change' }]">
-							<el-select v-model="state.ruleForm.nextStepCode" placeholder="请选择下一环节" class="w100" @change="selectNextStep">
-								<el-option v-for="item in state.nextStepOptions" :key="item.key" :label="item.value" :value="item.key" />
-							</el-select>
+						<el-form-item label="" prop="isSms">
+							<el-checkbox v-model="state.ruleForm.isSms" label="短信通知" />
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="showHandlers">
-						<el-form-item
-							label="办理对象"
-							prop="nextHandlers"
-							:rules="[{ required: nextHandlersRequired, message: '请选择办理对象', trigger: 'change' }]"
-						>
-							<el-select-v2
-								v-model="state.ruleForm.nextHandlers"
-								:options="state.handlerOptions"
-								placeholder="请选择办理对象"
-								class="w100"
-								multiple
-								clearable
-								collapse-tags
-								collapse-tags-tooltip
-								filterable
-								value-key="key"
-								@change="selectHandlers"
-								:multiple-limit="multipleLimit"
+					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+						<el-form-item label="审批意见" prop="opinion" :rules="[{ required: true, message: '请填写审批意见', trigger: 'blur' }]">
+							<common-advice
+								@chooseAdvice="chooseAdvice"
+								v-model="state.ruleForm.opinion"
+								placeholder="请填写审批意见"
+								:loading="state.loading"
+								:commonEnum="commonEnum.Discriminate"
+								:maxlength="AppConfigInfo.handleOpinionWordLimit"
 							/>
 						</el-form-item>
 					</el-col>
-				</template>
-				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="" prop="isSms">
-						<el-checkbox v-model="state.ruleForm.isSms" label="短信通知" />
-					</el-form-item>
-				</el-col>
-				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-					<el-form-item label="审批意见" prop="opinion" :rules="[{ required: true, message: '请填写审批意见', trigger: 'blur' }]">
-						<common-advice
-							@chooseAdvice="chooseAdvice"
-							v-model="state.ruleForm.opinion"
-							placeholder="请填写审批意见"
-							:loading="state.loading"
-							:commonEnum="commonEnum.Discriminate"
-							:maxlength="AppConfigInfo.handleOpinionWordLimit"
-						/>
-					</el-form-item>
-				</el-col>
-				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-					<el-form-item label="附件" :rules="[{ required: false, message: '请上传附件', trigger: 'change' }]">
-						<annex-list name="甄别附件" classify="甄别上传" v-model:format="handleFiles" />
-					</el-form-item>
-				</el-col>
-			</el-row>
-		</el-form>
-		<template #footer>
+					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+						<el-form-item label="附件" :rules="[{ required: false, message: '请上传附件', trigger: 'change' }]">
+							<annex-list name="甄别附件" classify="甄别上传" v-model:format="handleFiles" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+		</div>
+		<!-- 历史工单 -->
+		<div v-show="state.activeName === '1'">
+			<history-order :ruleForm="state.order" :orderId="orderId" ref="historyOrderRef" />
+		</div>
+		<template #footer v-if="state.activeName === '0'">
 			<span class="dialog-footer">
 				<el-button @click="closeDialog" class="default-button">取 消</el-button>
 				<el-button type="primary" @click="onSubmit(ruleFormRef)" :loading="state.loading">确定</el-button>
@@ -138,12 +155,16 @@ import { commonEnum } from '@/utils/constants';
 import { useAppConfig } from '@/stores/appConfig';
 import { storeToRefs } from 'pinia';
 import other from '@/utils/other';
+import { useThemeConfig } from '@/stores/themeConfig';
 
 const AnnexList = defineAsyncComponent(() => import('@/components/AnnexList/index.vue')); // 附件列表
 const CommonAdvice = defineAsyncComponent(() => import('@/components/CommonAdvice/index.vue')); // 常用意见
+const HistoryOrder = defineAsyncComponent(() => import('@/components/OrderDetail/History.vue')); // 历史工单
 
 const appConfigStore = useAppConfig();
 const { AppConfigInfo } = storeToRefs(appConfigStore); // 系统配置信息
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
 const emit = defineEmits(['updateList']); // 定义事件
 // 定义变量内容
 const state = reactive<any>({
@@ -163,13 +184,38 @@ const state = reactive<any>({
 	},
 	handlerOptions: [],
 	nextStepOptions: [],
+	activeName: '0', // tab切换
+	tabPaneList: [
+		// tab列表
+		{
+			label: '甄别审批',
+			value: '0',
+		},
+		{
+			label: '历史工单',
+			value: '1',
+		},
+	],
+	order: {},
+});
+// 泸州和自贡不展示历史工单选项
+// 根据地区动态过滤 tabPaneList
+const filteredTabPaneList = computed(() => {
+	if (['LuZhou', 'ZiGong'].includes(themeConfig.value.appScope)) {
+		return state.tabPaneList.filter((item: any) => item.value !== '1');
+	}
+	return state.tabPaneList;
 });
 
+// 更新 state.tabPaneList
+state.tabPaneList = filteredTabPaneList.value;
+
 const tableData = ref<EmptyArrayType>([]);
 /*
  * @params row 工单详情
  * @description 打开弹窗
  * */
+const orderId = ref('');
 const openDialog = async (row: any) => {
 	state.dialogVisible = true;
 	state.loading = true;
@@ -178,6 +224,8 @@ const openDialog = async (row: any) => {
 		state.infoForm = result ?? {};
 		state.infoForm.files = transformFile(state.infoForm.files);
 		state.ruleForm.workflowId = row.workflowId;
+		state.order = result.order ?? {};
+		orderId.value = result.orderId;
 		await getWorkflow(result.workflowId);
 		await selectNextStepOptions(result.workflowId);
 		state.loading = false;
@@ -186,6 +234,30 @@ const openDialog = async (row: any) => {
 		state.loading = false;
 	}
 };
+// 切换tab 查询列表
+const handleClick = (val: string) => {
+	switch (val) {
+		case '0': // 甄别审批
+			break;
+		case '1': // 历史工单
+			getHistoryList();
+			break;
+		default:
+			break;
+	}
+};
+// 查询历史工单
+const historyOrderRef = ref<RefType>(); // 历史工单
+const getHistoryList = async () => {
+	state.loading = true;
+	try {
+		historyOrderRef.value.searchHistory();
+		state.loading = false;
+	} catch (error: any) {
+		console.log(error);
+		state.loading = false;
+	}
+};
 const formatTraces = (val: any) => {
 	if (!val || !val.length) return [];
 	val.forEach((item: any) => {
@@ -287,6 +359,7 @@ const closeDialog = () => {
 const close = () => {
 	ruleFormRef.value?.resetFields();
 	ruleFormRef.value?.resetFields();
+	state.activeName = '0';
 };
 // 提交
 const afterSubmit = (emitType?: 'updateList', showMessage?: boolean, message?: string) => {

src/views/statistics/call/detailSeatsMoth.vue

@@ -2,7 +2,7 @@
 	<div class="statistics-call-seats-moth-detail-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="zlTime">
+				<el-form-item label="振铃开始时间" prop="zlTime">
 					<el-date-picker
 						v-model="state.queryParams.zlTime"
 						type="datetimerange"
@@ -16,6 +16,20 @@
 						:default-time="defaultTimeStartEnd"
 					/>
 				</el-form-item>
+				<el-form-item label="振铃结束时间" prop="jsTime">
+					<el-date-picker
+						v-model="state.queryParams.jsTime"
+						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-item label="坐席" prop="EmpId">
 					<el-select-v2
 						v-model="state.queryParams.EmpId"
@@ -73,6 +87,11 @@
 							{{ formatDate(scope.row.ringTimeBegin, 'YYYY-mm-dd HH:MM:SS') }}
 						</template>
 					</vxe-column>
+					<vxe-column field="ringTimeEnd" title="振铃结束时间">
+						<template #default="scope">
+							{{ formatDate(scope.row.ringTimeEnd, 'YYYY-mm-dd HH:MM:SS') }}
+						</template>
+					</vxe-column>
 					<vxe-column field="answeredTime" title="接通时间">
 						<template #default="scope">
 							{{ formatDate(scope.row.answeredTime, 'YYYY-mm-dd HH:MM:SS') }}
@@ -151,10 +170,13 @@ const state = reactive<any>({
 		zlTime: [],
 		RingStartTime: null,
 		RingEndTime: null,
+		jsTime: [], // 振铃结束时间
+		EndRingStartTime: null,
+		EndRingEndTime: null,
 		// 查询参数
 		PageIndex: 1,
 		PageSize: 20,
-    QueryType:null,
+		QueryType: null,
 	},
 	tableData: [], //表单
 	loading: false, // 加载
@@ -176,9 +198,12 @@ const queryList = () => {
 	requestParams.value.AnsweredStartTime = state.queryParams.jtTime === null ? null : state.queryParams.jtTime[0]; // 接通时间
 	requestParams.value.AnsweredEndTime = state.queryParams.jtTime === null ? null : state.queryParams.jtTime[1];
 	Reflect.deleteProperty(requestParams.value, 'jtTime');
-	requestParams.value.RingStartTime = state.queryParams.zlTime === null ? null : state.queryParams.zlTime[0]; // 振铃时间
+	requestParams.value.RingStartTime = state.queryParams.zlTime === null ? null : state.queryParams.zlTime[0]; // 振铃开始时间
 	requestParams.value.RingEndTime = state.queryParams.zlTime === null ? null : state.queryParams.zlTime[1];
 	Reflect.deleteProperty(requestParams.value, 'zlTime');
+	requestParams.value.EndRingStartTime = state.queryParams.jsTime === null ? null : state.queryParams.jsTime[0]; // 振铃结束时间
+	requestParams.value.EndRingEndTime = state.queryParams.jsTime === null ? null : state.queryParams.jsTime[1];
+	Reflect.deleteProperty(requestParams.value, 'jsTime');
 	callAgentMonthDetail(requestParams.value)
 		.then((res: any) => {
 			state.tableData = res.result.items ?? [];
@@ -213,7 +238,7 @@ const seatUser = ref<EmptyArrayType>([]);
 const getBaseData = async () => {
 	try {
 		const { result } = await callAgentMonthBase();
-		seatUser.value = result.seatUser ?? []
+		seatUser.value = result.seatUser ?? [];
 	} catch (e) {
 		console.log(e);
 	}
@@ -224,7 +249,7 @@ onMounted(() => {
 	if (routeQueryParams.StartTime && routeQueryParams.EndTime && routeQueryParams.EmpId) {
 		state.queryParams.zlTime = [routeQueryParams.StartTime, routeQueryParams.EndTime];
 		state.queryParams.EmpId = routeQueryParams.EmpId;
-    state.queryParams.QueryType = routeQueryParams.QueryType;
+		state.queryParams.QueryType = routeQueryParams.QueryType;
 	}
 	queryList();
 	if (tableRef.value && toolbarRef.value) {