Browse Source

流程调整

zhangchong 2 years ago
parent
commit
e54c9501b0

+ 3 - 2
src/views/device/ivrList/index.vue

@@ -627,7 +627,7 @@ const state = reactive<IvrListState>({
 });
 
 /** 获取ivr列表 */
-const queryList = () => {
+const queryList = async () => {
 	if (
 		!authAll([
 			'device:ivrList:query',
@@ -642,7 +642,7 @@ const queryList = () => {
 	else {
 		state.loading = true;
 		try {
-			const res: any = Promise.all([getIvrList(), voicequerylist(), getIvrCategories(), getTelsList(), getTelsGroupList(), baseInfo()]);
+			const res: any = await Promise.all([getIvrList(), voicequerylist(), getIvrCategories(), getTelsList(), getTelsGroupList(), baseInfo()]);
 			// 列表
 			state.tableData = res[0].result ?? [];
 			// 语音文件
@@ -662,6 +662,7 @@ const queryList = () => {
 			state.ivrTypes = res[5].result?.ivrTypes ?? [];
 			state.ivrAnswerTypes = res[5].result?.ivrAnswerTypes ?? [];
 			state.ivrStrategeTypes = res[5].result?.ivrStrategeTypes ?? [];
+			state.loading = false;
 		} catch (error) {
 			state.loading = false;
 		}

+ 13 - 9
src/views/device/line/component/lineEdit.vue

@@ -184,15 +184,19 @@ const openDialog = async (row: any) => {
 	// 获取详情
 	if (!authAll(['device:line:detail', 'device:line:baseData'])) ElMessage.warning('抱歉,您没有权限获取线路详情!');
 	else {
-		const res: any = await Promise.all([getTrunkDetail(row.id), baseInfo()]);
-		state.ruleForm = res[0].result;
-		const { workDay, restCategory, workCategorys, workToGroup, restToGroup } = res[1].result;
-		state.workDayList = workDay;
-		state.workCategoryList = workCategorys;
-		state.restCategoryList = restCategory;
-		state.workToGroupList = workToGroup;
-		state.restToGroupList = restToGroup;
-		state.isShowDialog = true;
+		try {
+			const res: any = await Promise.all([getTrunkDetail(row.id), baseInfo()]);
+			state.ruleForm = res[0].result;
+			const { workDay, restCategory, workCategorys, workToGroup, restToGroup } = res[1].result;
+			state.workDayList = workDay;
+			state.workCategoryList = workCategorys;
+			state.restCategoryList = restCategory;
+			state.workToGroupList = workToGroup;
+			state.restToGroupList = restToGroup;
+			state.isShowDialog = true;
+		} catch (error) {
+			console.log(error);
+		}
 	}
 };
 // 关闭弹窗

+ 0 - 1
src/views/device/phoneGroup/index.vue

@@ -168,7 +168,6 @@ const state = reactive<TelsGroupState>({
 });
 /** 获取分机组列表 语音文件 基础信息 分机列表 */
 const queryList = async () => {
-	console.log(!authAll(['device:phoneGroup:query', 'public:voice:query', 'device:phoneGroup:baseData', 'device:phone:query']));
 	if (!authAll(['device:phoneGroup:query', 'public:voice:query', 'device:phoneGroup:baseData', 'device:phone:query']))
 		ElMessage.error('抱歉,您没有权限获取分机组列表!');
 	else {

+ 1 - 1
src/views/system/organize/index.vue

@@ -263,7 +263,7 @@ const getOrgListApi = async () => {
 				});
 			});
 			state.expandedRowKeys.push(state.orgTableData[0].id); //默认展开一级部门
-			state.orgType = res[1].orgType;
+			state.orgType = res[1].result.orgType;
 			state.loading = false;
 		} catch (error) {
 			state.loading = false;

+ 0 - 1
tsconfig.json

@@ -1,7 +1,6 @@
 {
 	"compilerOptions": {
 		/* Visit https://aka.ms/tsconfig.json to read more about this file */
-
 		/* Basic Options */
 		// "incremental": true,                   /* Enable incremental compilation */
 		"target": "esnext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,