reactor:知识库驳回操作;

src/layout/navBars/breadcrumb/telControl.vue

@@ -990,6 +990,8 @@ const onMessage = (event: any) => {
 						startTime();
 						// 设置电话状态 通话中
 						useTelStatusStore.setPhoneControlState(TelStates.onCall);
+
+            onCallArr.value.push(data.call_accept); // 呼出通话中
 						console.log('呼出通话中');
 					}
 				}
@@ -1031,6 +1033,8 @@ const onMessage = (event: any) => {
 					startTime();
 					// 设置电话状态 通话中
 					useTelStatusStore.setPhoneControlState(TelStates.onCall);
+
+          onCallArr.value.push(data); // 呼入通话中
 					console.log('呼入通话中');
 				}
 			}
@@ -1038,9 +1042,14 @@ const onMessage = (event: any) => {
 			//挂机后系统可以返回两种状态:acw 话后整理状态 ready 示闲状态，如果不需要acw，可以联系我们后台修改配置，如果需要保留，如果需要再次
 			//拨打电话的话，需要手动点击示闲按钮
 
+      // 设置分机号和坐席组
+      useTelStatusStore.setCallInfo({ telsNo: data.agent_extn});
+      // 设置话机状态 结束休息改为签入状态
+      useTelStatusStore.setPhoneControlState(TelStates.dutyOn);
+
 			// 结束计时
 			removeTimer();
-			console.log('已挂机');
+			console.log('已挂机',onCallArr.value,data);
 		}
 	} else if (data.event_type == 'agent_caller_state') {
 		//通话状态
@@ -1352,14 +1361,7 @@ const onConference = () => {
 	state.threeWayDialogVisible = true;
 };
 // 三方会议确定
-const onCallArr = ref<EmptyArrayType>([
-	{
-		number: '2121',
-	},
-	{
-		number: '1001',
-	},
-]); // 三方会议选中的分机
+const onCallArr = ref<EmptyArrayType>([]); // 三方会议选中的分机
 const threeWayVisible = ref(false); // 三方会议弹窗
 const threeWayFormRef = ref<RefType>(); // 三方会议表单
 const clickOnThreeWay = (formEl: FormInstance | undefined) => {

src/views/knowledge/index/index.vue

@@ -121,9 +121,15 @@
 							</el-table-column>
 							<el-table-column prop="knowledgeTypeName" label="知识分类" show-overflow-tooltip width="120"></el-table-column>
 							<el-table-column prop="statusName" label="知识状态" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="workflow.moduleName" label="审批类型" show-overflow-tooltip width="120" v-if="[1].includes(state.queryParams.Status)"></el-table-column>
-              <el-table-column prop="attribution" label="知识归属" show-overflow-tooltip width="120"></el-table-column>
-              <el-table-column prop="sourceOrganize.name" label="来源部门" show-overflow-tooltip width="120"></el-table-column>
+							<el-table-column
+								prop="workflow.moduleName"
+								label="审批类型"
+								show-overflow-tooltip
+								width="120"
+								v-if="[1].includes(state.queryParams.Status)"
+							></el-table-column>
+							<el-table-column prop="attribution" label="知识归属" show-overflow-tooltip width="120"></el-table-column>
+							<el-table-column prop="sourceOrganize.name" label="来源部门" show-overflow-tooltip width="120"></el-table-column>
 							<el-table-column prop="hotspotName" label="热点" show-overflow-tooltip width="120"></el-table-column>
 							<el-table-column prop="hotspotName" label="是否公开" show-overflow-tooltip>
 								<template #default="{ row }">
@@ -155,7 +161,14 @@
 							</el-table-column>
 							<el-table-column label="操作" width="200" fixed="right" align="center">
 								<template #default="{ row }">
-									<el-button link type="primary" @click="onEdit(row)" title="编辑" v-if="[0, 4].includes(row.status)" v-auth="'knowledge:index:edit'">
+									<el-button
+										link
+										type="primary"
+										@click="onEdit(row)"
+										title="编辑"
+										v-if="[0, 4, 5].includes(row.status)"
+										v-auth="'knowledge:index:edit'"
+									>
 										编辑
 									</el-button>
 									<el-button
@@ -163,7 +176,7 @@
 										type="danger"
 										@click="onRowDel(row)"
 										title="删除"
-										v-if="[0, 2, 4].includes(row.status)"
+										v-if="[0, 2, 4, 5].includes(row.status)"
 										v-auth="'knowledge:index:delete'"
 									>
 										删除
@@ -188,7 +201,7 @@
 									>
 										上架
 									</el-button>
-<!--									<el-button
+									<!--									<el-button
 										link
 										type="primary"
 										@click="onAudit(row)"
@@ -203,7 +216,7 @@
 										type="primary"
 										@click="onPreview(row)"
 										title="查看"
-										v-if="[1, 2, 3, 4].includes(row.status)"
+										v-if="[1, 2, 3, 4, 5].includes(row.status)"
 										v-auth="'knowledge:index:preview'"
 									>
 										查看
@@ -240,7 +253,7 @@ import { formatDate } from '/@/utils/formatTime';
 import { throttle } from '/@/utils/tools';
 import { commonEnum } from '/@/utils/constants';
 import { auth } from '/@/utils/authFunction';
-import {KnowledgePaged, KnowledgeOffShelf, KnowledgeOnTheShelf, baseData, KnowledgeDel} from '/@/api/knowledge';
+import { KnowledgePaged, KnowledgeOffShelf, KnowledgeOnTheShelf, baseData, KnowledgeDel } from '/@/api/knowledge';
 import { getOrgList } from '/@/api/system/organize';
 import { treeList } from '/@/api/knowledge/type';
 import { hotSpotType } from '/@/api/business/order';
@@ -387,16 +400,16 @@ const resetQuery = throttle((formEl: FormInstance | undefined) => {
 }, 500);
 // 重置选中的节点
 const resetNode = () => {
-  state.queryParams.CreateOrgId = null;
-  state.queryParams.KnowledgeTypeId = null;
-  state.queryParams.HotspotId = null;
-  filterOrg.value = '';
-  filterType.value = '';
-  filterHot.value = '';
-  typeRef.value?.setCurrentKey(null);
-  orgRef.value?.setCurrentKey(null);
-  hotRef.value?.setCurrentKey(null);
-  handleQuery();
+	state.queryParams.CreateOrgId = null;
+	state.queryParams.KnowledgeTypeId = null;
+	state.queryParams.HotspotId = null;
+	filterOrg.value = '';
+	filterType.value = '';
+	filterHot.value = '';
+	typeRef.value?.setCurrentKey(null);
+	orgRef.value?.setCurrentKey(null);
+	hotRef.value?.setCurrentKey(null);
+	handleQuery();
 };
 // 新增知识
 const onOpenAddUser = () => {
@@ -478,34 +491,36 @@ const groundingFn = (row: any) => {
 };
 // 删除知识
 const onRowDel = (row: any) => {
-  if(row.workflowId){ // 如果有流程id，说明是审批中的知识
-    const params = {
-      id: row.workflowId,
-      processType: '删除知识',
-      extra: {
-        dialogTitle: '删除知识',
-        inputPlaceholder: '办理意见',
-        annexName: '知识附件',
-      },
-      orderDetail: row,
-    };
-    processAuditRef.value.openDialog(params);
-  }else{ // 否则直接删除
-    ElMessageBox.confirm(`是否确定要删除【${row.title}】？`, '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-      draggable: true,
-      cancelButtonClass: 'default-button',
-    })
-        .then(() => {
-          KnowledgeDel({data:row}).then(() => {
-            ElMessage.success('操作成功');
-            handleQuery();
-          });
-        })
-        .catch(() => {});
-  }
+	if (row.workflowId) {
+		// 如果有流程id，说明是审批中的知识
+		const params = {
+			id: row.workflowId,
+			processType: '删除知识',
+			extra: {
+				dialogTitle: '删除知识',
+				inputPlaceholder: '办理意见',
+				annexName: '知识附件',
+			},
+			orderDetail: row,
+		};
+		processAuditRef.value.openDialog(params);
+	} else {
+		// 否则直接删除
+		ElMessageBox.confirm(`是否确定要删除【${row.title}】？`, '提示', {
+			confirmButtonText: '确认',
+			cancelButtonText: '取消',
+			type: 'warning',
+			draggable: true,
+			cancelButtonClass: 'default-button',
+		})
+			.then(() => {
+				KnowledgeDel({ data: row }).then(() => {
+					ElMessage.success('操作成功');
+					handleQuery();
+				});
+			})
+			.catch(() => {});
+	}
 };
 onMounted(() => {
 	queryList();