duy 2 سال پیش
والد
کامیت
c03622a7ba
2فایلهای تغییر یافته به همراه55 افزوده شده و 8 حذف شده
  1. 41 6
      src/views/data-fill/components/ListItem.vue
  2. 14 2
      src/views/data-fill/wbs.vue

+ 41 - 6
src/views/data-fill/components/ListItem.vue

@@ -218,6 +218,10 @@ const props = defineProps({
         type: [String,Number],
         default: ''
     },
+    drawType:{
+        type:Boolean,
+        default:false
+    }
 })
 const {isString, getObjNullValue, getArrValue} = isType()
 const {setPosInsert, setPosRange} = utilsText()
@@ -229,7 +233,7 @@ const contractId = ref(props.contractId)
 const projectInfo = ref(props.projectInfo)
 const useAppState = useAppStore()
 const authBtnTabKey = ref(props.authBtnTabKey)
-
+const drawType = ref(props.drawType)
 //全局变量
 const projectId = ref(useAppState.getProjectId);
 
@@ -293,7 +297,13 @@ const ActiveKey = ref([])
 const formKeyIds = ref('')
 const CollapseChange = async (name) => {
     ActiveKey.value = name
-    const names = name[0] ? name[0].split('-') : []
+    console.log(name,'name');
+    let names=[]
+    if(name.length>0){
+         names = name[0] ? name[name.length-1].split('-') : name[0]
+    }
+   
+    console.log(names,'names');
     if (names.length > 0) {
         getOffsetTop(name);
         const index = names[1]
@@ -829,12 +839,37 @@ const emit = defineEmits(['renew','offsetTop'])
 //被点击
 const getOffsetTop = (key = '') => {
     if (key) {
+         console.log(drawType,'drawType');
         const dom = document.getElementById(key[key.length-1])
         console.log(dom.offsetTop,'dom.offsetTop');
-        if(dom.offsetTop>=583&&ActiveKey.value.length>1){
-            emit('offsetTop', dom.offsetTop-583)
-        }else{
-             emit('offsetTop', dom.offsetTop)
+        if(!drawType.value){
+             if(dom.offsetTop>=583&&ActiveKey.value.length>1){
+                if(drawType.value){
+                    console.log(1111111111);
+                    emit('offsetTop', dom.offsetTop-424)
+                }else{
+                    console.log(22222222);
+                    emit('offsetTop', dom.offsetTop-583)
+                }
+                
+            }else{
+                console.log(3333333);
+                emit('offsetTop', dom.offsetTop)
+            }
+        }else {
+            if(dom.offsetTop>=424&&ActiveKey.value.length>1){
+                if(drawType.value){
+                    console.log(1111111111);
+                    emit('offsetTop', dom.offsetTop-424)
+                }else{
+                    console.log(22222222);
+                    emit('offsetTop', dom.offsetTop-583)
+                }
+                
+            }else{
+                console.log(3333333);
+                emit('offsetTop', dom.offsetTop)
+            }
         }
        
     } else {

+ 14 - 2
src/views/data-fill/wbs.vue

@@ -39,7 +39,17 @@
             <HcDrawer :show="isDrawer" actionUi="text-center" to-id="wbs-node-tree-card-target" @close="drawerClose">
                 <!--清表列表-->
                 <el-scrollbar ref="ListItemScrollRef" v-if="ListItemDatas.length > 0">
-                    <ListItem ref="ListItemsRef" :datas="ListItemDatas" :status="NodeStatus" :classify="authBtnTabKey" @offsetTop="ListItemOffsetTop" :projectInfo="projectInfo" :primaryKeyId="primaryKeyId" :contractId="contractId" @renew="getTableDataAll"/>
+                    <ListItem ref="ListItemsRef"
+                     :datas="ListItemDatas" 
+                     :status="NodeStatus" 
+                     :classify="authBtnTabKey"
+                     @offsetTop="ListItemOffsetTop" 
+                     :projectInfo="projectInfo" 
+                     :primaryKeyId="primaryKeyId" 
+                     :contractId="contractId" 
+                     @renew="getTableDataAll"
+                      :drawType="isDrawType"
+                    />
                 </el-scrollbar>
                 <HcStatus text="暂无表单" v-else/>
                 <!--底部按钮区域-->
@@ -151,6 +161,7 @@
                         :primaryKeyId="primaryKeyId" 
                         :contractId="contractId" 
                         @renew="getTableDataAll"
+                         :drawType="!isDrawType"
 
                         />
                     </el-scrollbar>
@@ -362,7 +373,8 @@ const isCollapse = ref(useAppState.getCollapse)
 //路由参数
 const routerQuery = useRoutes?.query;
 const typeName = routerQuery?.type || 'map'
-
+//是否是抽屉
+const isDrawType = ref(true)
 //自动展开缓存
 const TreeAutoExpandKeys = ref(getStoreData('wbsTreeExpandKeys') || [])