asd26269546 1 жил өмнө
parent
commit
9b11e6c0f6

+ 1 - 0
src/components/byTable/ElementsMapping.vue

@@ -32,6 +32,7 @@ export default defineComponent({
   },
   setup (props) {
     const { proxy } = getCurrentInstance()
+    
     proxy.$.components = props.parent.$options.components
     proxy.$.directives = props.parent.$options.directives
     const elementsMapping = ref({

+ 3 - 2
src/components/byTable/index.vue

@@ -362,7 +362,6 @@ export default defineComponent({
 		let isMore = ref(true)
 		const changeStatData = () => {
 			statWarpHeight.value = document.getElementById('statWarp').offsetHeight
-			console.log(statWarpHeight.value)
 		}
 		let statWarpHeight = ref(0)
 		watch(proxy.statConfig,(newValue,oldValue)=>{
@@ -373,7 +372,6 @@ export default defineComponent({
 		},{immediate:true})
 		let statSelectVal = ref(0)
 		const retrievalModal = ref(false)
-		console.log(selectConfigCopy)
 		const getAttrsValue = (item) => {
 			const { attrs } = item
 			const result = {
@@ -390,6 +388,9 @@ export default defineComponent({
 			renderComponent: {
 				target: 'components-mapping',
 			},
+			renderMoreBtn: {
+				target: 'more-btn',
+			},
 		})
 		const getParent = computed(() => {
 			return proxy.$parent

+ 5 - 3
src/views/process/processApproval/index.vue

@@ -427,13 +427,15 @@ const handleSubmit = async (_type) => {
 };
 // 页面跳转
 const skipPage = () => {
-  if (route.query.processType === 10) {
+  const useTagsStore = useTagsViewStore();
+  useTagsStore.delVisitedView(router.currentRoute.value);
+  if (route.query.processType) {
     router.replace({
       path: "/oa/1/dealWith",
     });
+    
+    
   } else {
-    const useTagsStore = useTagsViewStore();
-    useTagsStore.delVisitedView(router.currentRoute.value);
     ElMessage({
       message: "操作成功!",
       type: "success",