瀏覽代碼

reactor:修复来电谈单数据问题;

zhangchong 3 月之前
父節點
當前提交
ec435a3ec1
共有 3 個文件被更改,包括 34 次插入9 次删除
  1. 1 1
      src/layout/navBars/breadcrumb/zgTel.vue
  2. 20 2
      src/layout/routerView/parent.vue
  3. 13 6
      src/views/todo/seats/accept/zgAccept.vue

+ 1 - 1
src/layout/navBars/breadcrumb/zgTel.vue

@@ -743,7 +743,7 @@ const sendSignIn = () => {
 			Role: '',
 			GroupName: m_strGroup.value,
 			OrgId: m_strCompanyId.value,
-			Userdata: userInfos.value.id, // 签入时携带的参数,用于后台记录 用户ID
+			Userdata: userInfos.value.id+':'+userInfos.value.name, // 签入时携带的参数,用于后台记录 用户ID
 		},
 	};
 	// 发送请求

+ 20 - 2
src/layout/routerView/parent.vue

@@ -3,7 +3,7 @@
 		<router-view v-slot="{ Component }">
 			<transition :name="setTransitionName" mode="out-in">
 				<keep-alive :include="getKeepAliveNames">
-					<component :is="Component" :key="state.refreshRouterViewKey" class="w100" v-show="!isIframePage" />
+					<component :is="wrap(route.name, Component)" :key="state.refreshRouterViewKey" class="w100" v-show="!isIframePage" />
 				</keep-alive>
 			</transition>
 		</router-view>
@@ -14,7 +14,7 @@
 </template>
 
 <script setup lang="ts" name="layoutParentView">
-import { defineAsyncComponent, computed, reactive, onBeforeMount, onUnmounted, nextTick, watch, onMounted } from 'vue';
+import { defineAsyncComponent, computed, reactive, onBeforeMount, onUnmounted, nextTick, watch, onMounted, h } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { storeToRefs } from 'pinia';
 import { useKeepALiveNames } from '@/stores/keepAliveNames';
@@ -25,6 +25,24 @@ import mittBus from '@/utils/mitt';
 // 引入组件
 const Iframes = defineAsyncComponent(() => import('@/layout/routerView/iframes.vue'));
 
+const wrapperMap = new Map();
+const wrap = (name: any, component: any) => {
+	let wrapper:any;
+	const wrapperName = name;
+	if (wrapperMap.has(wrapperName)) {
+		wrapper = wrapperMap.get(wrapperName);
+	} else {
+		wrapper = {
+			name: wrapperName,
+			render() {
+				return h('div', { class: 'h100 w100' }, component);
+			},
+		};
+		wrapperMap.set(wrapperName, wrapper);
+	}
+	return h(wrapper);
+};
+
 // 定义变量内容
 const route = useRoute();
 const router = useRouter();

+ 13 - 6
src/views/todo/seats/accept/zgAccept.vue

@@ -413,8 +413,8 @@
 							<el-tab-pane label="知识库" name="knowledge">
 								<Knowledge ref="knowledgeRef" :formData="state.ruleForm" @changeYYType="changeYYType" />
 							</el-tab-pane>
-							<el-tab-pane label="预案库" name="plan" >
-								<plan  ref="planRef" :formData="state.ruleForm"/>
+							<el-tab-pane label="预案库" name="plan">
+								<plan ref="planRef" :formData="state.ruleForm" />
 							</el-tab-pane>
 						</el-tabs>
 					</el-card>
@@ -1170,6 +1170,13 @@ const loadBaseData = async () => {
 		console.log(error);
 	}
 };
+watch(
+	() => route.query,
+	(newValue, oldValue) => {
+		console.log(state.ruleForm);
+	},
+	{ immediate: true }
+);
 // 如果是修改加载表单内容
 const loadForm = async () => {
 	state.formLoading = true;
@@ -1199,9 +1206,9 @@ const loadForm = async () => {
 					state.ruleForm.identityType = 1;
 				}
 			}
-      setTimeout(() => {
-        historyOrderRef.value.searchHistory();
-      }, 300);
+			setTimeout(() => {
+				historyOrderRef.value.searchHistory();
+			}, 300);
 		}
 
 		if (route.query.id) {
@@ -1288,7 +1295,7 @@ const loadForm = async () => {
 			isSaveSuccess.value = true; // 如果是修改进入 可以直接办理
 			setTimeout(() => {
 				watchPauseAbleFn.resume();
-        historyOrderRef.value.searchHistory();
+				historyOrderRef.value.searchHistory();
 			}, 300);
 			state.formLoading = false;
 		} else {