Browse Source

资料填报树形控件数量问题

duy 2 years ago
parent
commit
e38c18838d

+ 8 - 5
src/views/data-fill/components/HcTreeData.vue

@@ -4,11 +4,14 @@
         <template #default="{ node, data }">
             <div class="data-custom-tree-node" :id="`${idPrefix}${data['primaryKeyId']}`">
                 <!--树组件,节点名称-->
-                <div class="label" :class="node.level === 1?'level-name':''">
-                    <span :class="data?.colorStatus === 2?'text-blue':data?.colorStatus === 3?'text-orange':data?.colorStatus === 4?'text-green':''" v-if="isColor">{{ node.label }}</span>
-                    <span v-else>{{ node.label }}</span>
+                <div class="label" :class="node.level === 1?'level-name':''"  style="display: flex;justify-content: space-between;">
+                   <div>
+                        <span :class="data?.colorStatus === 2?'text-blue':data?.colorStatus === 3?'text-orange':data?.colorStatus === 4?'text-green':''" v-if="isColor">{{ node.label }}</span>
+                        <span v-else>{{ node.label }}</span>
+                   </div>
+                     <div class="text-blue submit-counts" v-if="true">【{{ data.submitCounts ?? 0 }}】</div>
                 </div>
-                <div class="text-blue submit-counts" v-if="isSubmitCounts">【{{ data.submitCounts ?? 0 }}】</div>
+                <!-- <div class="text-blue submit-counts" v-if="isSubmitCounts">【{{ data.submitCounts ?? 0 }}】</div> -->
                 <!--树组件,操作菜单-->
                 <div class="menu-icon1" :class="node.showTreeMenu?'show':''" v-if="node.level !== 1 && menusData.length > 0" @click.stop>
                     <div class="cu-tree-node-popover-menu-icon" @click.prevent.stop="ElTreeLabelContextMenu($event,data,node)">
@@ -282,7 +285,7 @@ defineExpose({
             pointer-events: none;
             transition: opacity 0.2s;
             opacity: 0;
-            // right: 0;
+            right: 0;
             background: rgba(255, 255, 255, 0.25);
             border-radius: 2px;
         .cu-tree-node-popover-menu-icon {

+ 11 - 5
src/views/data-fill/components/WbsTree.vue

@@ -4,11 +4,17 @@
         <template #default="{ node, data }">
             <div class="data-custom-tree-node" :id="`${idPrefix}${data['primaryKeyId']}`">
                 <!--树组件,节点名称-->
-                <div class="label" :class="node.level === 1?'level-name':''">
-                    <span :class="data?.colorStatus === 2?'text-blue':data?.colorStatus === 3?'text-orange':data?.colorStatus === 4?'text-green':''" v-if="isColor">{{ node.label }}</span>
-                    <span v-else>{{ node.label }}</span>
+                <div class="label" :class="node.level === 1?'level-name':''" 
+                style="display: flex;
+                justify-content: space-between;">
+                    <div>
+                            <span :class="data?.colorStatus === 2?'text-blue':data?.colorStatus === 3?'text-orange':data?.colorStatus === 4?'text-green':''" v-if="isColor">{{ node.label }}</span>
+                            <span v-else>{{ node.label }}</span>
+                    </div>  
+                   
+                      <div class="text-blue submit-counts" v-if="true">【{{ data.submitCounts ?? 0 }}】</div>
                 </div>
-                <div class="text-blue submit-counts" v-if="isSubmitCounts">【{{ data.submitCounts ?? 0 }}】</div>
+                <!-- <div class="text-blue submit-counts" v-if="true">【{{ data.submitCounts ?? 0 }}】</div> -->
                 <!--树组件,操作菜单-->
                 <div class="menu-icon1" :class="node.showTreeMenu?'show':''" v-if="node.level !== 1 && menusData.length > 0">
                     <div class="cu-tree-node-popover-menu-icon" @click.prevent.stop="ElTreeLabelContextMenu($event,data,node)">
@@ -287,7 +293,7 @@ defineExpose({
             pointer-events: none;
             transition: opacity 0.2s;
             opacity: 0;
-            // right: 0;
+            right: 0;
             background: rgba(255, 255, 255, 0.25);
             border-radius: 2px;
         .cu-tree-node-popover-menu-icon {

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

@@ -108,10 +108,10 @@
                         <el-scrollbar>
                             <KeepAlive>
                                 <template v-if="isSearchTree">
-                                    <HcTreeData :datas="searchTreeData" :menus="ElTreeMenu" :isMark="TreeMark" :autoExpandKeys="TreeAutoExpandKeys" :searchTreeVal="searchTreeVal" isColor @nodeTap="wbsElTreeClick" @menuTap="ElTreeMenuClick"  @changeSearch="changeisSearch"/>
+                                    <HcTreeData :datas="searchTreeData" :menus="ElTreeMenu" :isMark="TreeMark" :autoExpandKeys="TreeAutoExpandKeys" :searchTreeVal="searchTreeVal" isColor @nodeTap="wbsElTreeClick" @menuTap="ElTreeMenuClick"  @changeSearch="changeisSearch" submitCounts/>
                                 </template>
                                 <template v-else>
-                                    <WbsTree :menus="ElTreeMenu" :isMark="TreeMark" :autoExpandKeys="TreeAutoExpandKeys" :projectId="projectId" :contractId="contractId" isColor @nodeTap="wbsElTreeClick" @menuTap="ElTreeMenuClick" @nodeLoading="ElTreeNodeLoading"/>
+                                    <WbsTree :menus="ElTreeMenu" :isMark="TreeMark" :autoExpandKeys="TreeAutoExpandKeys" :projectId="projectId" :contractId="contractId" isColor @nodeTap="wbsElTreeClick" @menuTap="ElTreeMenuClick" @nodeLoading="ElTreeNodeLoading" submitCounts/>
                                 </template>
                             </KeepAlive>
                         </el-scrollbar>