Kaynağa Gözat

reactor:测试iframe通信;

zhangchong 4 gün önce
ebeveyn
işleme
1e761fdd87

+ 31 - 22
src/views/knowledge/index/edit.vue

@@ -489,7 +489,15 @@ import { Local } from '@/utils/storage';
 import other from '@/utils/other';
 import { throttle, transformFile } from '@/utils/tools';
 import { treeList } from '@/api/knowledge/type';
-import { knowledgeContent, knowledgeDraft, knowledgeDraftAudit, knowledgeDraftEdit, KnowledgeInfo, knowledgeKeyword,knowledgeDraftEditAudit } from '@/api/knowledge';
+import {
+	knowledgeContent,
+	knowledgeDraft,
+	knowledgeDraftAudit,
+	knowledgeDraftEdit,
+	KnowledgeInfo,
+	knowledgeKeyword,
+	knowledgeDraftEditAudit,
+} from '@/api/knowledge';
 import { templateList } from '@/views/knowledge/index/template';
 import { disabledDate } from '@/utils/constants';
 import { removeDuplicate } from '@/utils/arrayOperation';
@@ -670,36 +678,37 @@ const onSubmitReview = async (formEl: FormInstance | undefined) => {
 		const submitObj = other.deepClone(state.ruleForm);
 		Reflect.deleteProperty(submitObj, 'creationTime');
 		state.loading = true;
-		if(['LuZhou'].includes(themeConfig.value.appScope)){ // 泸州
-			// 更新提交审核
-			knowledgeDraftEditAudit({
-				...submitObj,
-				opinion: state.ruleForm.opinion,
-			})
-				.then(() => {
-					ElMessage.success('更新审核提交成功');
-					knowledgeProcessSuccess();
-					state.loading = false;
+		//如果已经有ID 说明是已经提交过的数据 提交更新流程
+		if (route.params.id) {
+			if (['LuZhou'].includes(themeConfig.value.appScope)) {
+				// 泸州
+				// 更新提交审核
+				knowledgeDraftEditAudit({
+					...submitObj,
+					opinion: state.ruleForm.opinion,
 				})
-				.catch(() => {
-					state.loading = false;
-				});
-		}else{
-			//如果已经有ID 说明是已经提交过的数据 提交更新流程
-			if (route.params.id) {
-				editSubmitAuditRef.value.openDialog(submitObj, 'update');
-				state.loading = false;
-			} else {
-				knowledgeDraftAudit(submitObj)
 					.then(() => {
-						ElMessage.success('新增知识审核提交成功');
+						ElMessage.success('更新审核提交成功');
 						knowledgeProcessSuccess();
+						state.loading = false;
 					})
 					.catch(() => {
 						state.loading = false;
 					});
+			} else {
+				editSubmitAuditRef.value.openDialog(submitObj, 'update');
 				state.loading = false;
 			}
+		} else {
+			knowledgeDraftAudit(submitObj)
+				.then(() => {
+					ElMessage.success('新增知识审核提交成功');
+					knowledgeProcessSuccess();
+				})
+				.catch(() => {
+					state.loading = false;
+				});
+			state.loading = false;
 		}
 	});
 };

+ 1 - 1
src/views/statistics/order/detailDispatch.vue

@@ -107,7 +107,7 @@ const queryList = () => {
 		StartTime: routeQueryParams.startTime,
 		EndTime: routeQueryParams.endTime,
 		TitleCode: routeQueryParams.TitleCode,
-		RoldName: routeQueryParams.RoldName,
+		RoleName: routeQueryParams.RoleName,
 	};
 	requestParams.value = other.deepClone(request);
 	departmentDispatchDetail(requestParams.value)

+ 1 - 1
src/views/statistics/order/dispatch.vue

@@ -154,7 +154,7 @@ const linkDetail = (scope: any) => {
 			startTime: state.queryParams.crTime[0],
 			endTime: state.queryParams.crTime[1],
 			TitleCode: scope.column.property,
-			RoldName: scope.row.roldName,
+			RoleName: scope.row.roleName,
 		},
 	});
 };

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

@@ -76,7 +76,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="callNo" title="通话ID" min-width="200"></vxe-column>
+					<vxe-column field="callNo" title="通话ID" min-width="200" v-if="['ZiGong'].includes(themeConfig.appScope)"></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>