Merge branch 'release' into dev

# Conflicts:
#	src/layout/navBars/breadcrumb/zgTel.vue

src/layout/navBars/breadcrumb/zgTel.vue

@@ -1482,7 +1482,7 @@ const blindFormClose = () => {
 	blindFormRef.value?.resetFields();
 	blindFormRef.value?.clearValidate();
 };
-const onTransferMz = (strCallNumber: string) => {
+const onTransferMz = (strCallNumber: string|number|null) => {
 	const objMsg = {
 		Action: 'ReqBlindTransfer',
 		Param: {
@@ -1743,16 +1743,16 @@ const evtCallAlerting = (data: any) => {
 				// 振铃呼出弹屏
 				console.log(
 					'呼出是否弹屏[' +
-						m_bIsOpen.value +
-						'];弹屏方式[' +
-						m_strOpenFlag.value +
-						'];记录ID[' +
-						callId.value +
-						'];主叫号码[' +
-						strTelNumber +
-						'];被叫号码[' +
-						strCalledNum +
-						']'
+					m_bIsOpen.value +
+					'];弹屏方式[' +
+					m_strOpenFlag.value +
+					'];记录ID[' +
+					callId.value +
+					'];主叫号码[' +
+					strTelNumber +
+					'];被叫号码[' +
+					strCalledNum +
+					']'
 				);
 				m_bIsOpen.value = true;
 				// 呼出不再弹单
@@ -1873,16 +1873,16 @@ const evtEvtCallAnswer = (data: any) => {
 				if (!m_bIsOpen.value && m_strOpenFlag.value === '1') {
 					console.log(
 						'呼出是否弹屏[' +
-							m_bIsOpen.value +
-							'];弹屏方式[' +
-							m_strOpenFlag.value +
-							'];记录ID[' +
-							callId.value +
-							'];主叫号码[' +
-							strTelNumber +
-							'];被叫号码[' +
-							strCalledNum +
-							']'
+						m_bIsOpen.value +
+						'];弹屏方式[' +
+						m_strOpenFlag.value +
+						'];记录ID[' +
+						callId.value +
+						'];主叫号码[' +
+						strTelNumber +
+						'];被叫号码[' +
+						strCalledNum +
+						']'
 					);
 					m_bIsOpen.value = true;
 					// 呼出不再弹单
@@ -1914,16 +1914,16 @@ const evtEvtCallAnswer = (data: any) => {
 		callId.value = data.Param.Callid;
 		console.log(
 			'是否弹屏[' +
-				m_bIsOpen.value +
-				'];弹屏方式[' +
-				m_strOpenFlag.value +
-				'];记录ID[' +
-				callId.value +
-				'];主叫号码[' +
-				strTelNumber +
-				'];被叫号码[' +
-				strCalledNum +
-				']'
+			m_bIsOpen.value +
+			'];弹屏方式[' +
+			m_strOpenFlag.value +
+			'];记录ID[' +
+			callId.value +
+			'];主叫号码[' +
+			strTelNumber +
+			'];被叫号码[' +
+			strCalledNum +
+			']'
 		);
 		if (strTelNumber.length == strCalledNum.length && strTelNumber.length == 4) {
 			// 如果主叫号码、被叫号码都是分机号码，则不弹屏
@@ -1935,18 +1935,18 @@ const evtEvtCallAnswer = (data: any) => {
 			const strDigit = data.Param.Digit;
 			console.log(
 				'用户按键' +
-					strDigit +
-					'是否弹屏[' +
-					m_bIsOpen.value +
-					'];弹屏方式[' +
-					m_strOpenFlag.value +
-					'];记录ID[' +
-					callId.value +
-					'];主叫号码[' +
-					strTelNumber +
-					'];被叫号码[' +
-					strCalledNum +
-					']'
+				strDigit +
+				'是否弹屏[' +
+				m_bIsOpen.value +
+				'];弹屏方式[' +
+				m_strOpenFlag.value +
+				'];记录ID[' +
+				callId.value +
+				'];主叫号码[' +
+				strTelNumber +
+				'];被叫号码[' +
+				strCalledNum +
+				']'
 			);
 			router.push({
 				name: 'orderAccept',
@@ -1994,16 +1994,16 @@ const evtEvtCalling = (data: any) => {
 			m_bIsOpen.value = true;
 			console.log(
 				'呼出是否弹屏[' +
-					m_bIsOpen.value +
-					'];弹屏方式[' +
-					m_strOpenFlag.value +
-					'];记录ID[' +
-					callId.value +
-					'];主叫号码[' +
-					strTelNumber +
-					'];被叫号码[' +
-					strCalledNum +
-					']'
+				m_bIsOpen.value +
+				'];弹屏方式[' +
+				m_strOpenFlag.value +
+				'];记录ID[' +
+				callId.value +
+				'];主叫号码[' +
+				strTelNumber +
+				'];被叫号码[' +
+				strCalledNum +
+				']'
 			);
 			router.push({
 				name: 'orderAccept',