Merge remote-tracking branch 'yx/250429-report-wjh' into test20250220

src/views/report/Overvoewnew.vue

@@ -35,27 +35,27 @@
                   placeholder="请选择状态" allowClear :options="statusList">
         </a-select>
       </div>
-      <div class="select" v-if="[3].includes(currentTab) ">
+<!--      <div class="select" v-if="[3].includes(currentTab) ">-->
-        <a-tree-select
+<!--        <a-tree-select-->
-            :getPopupContainer="
+<!--            :getPopupContainer="-->
-                (triggerNode) => triggerNode.parentNode || document.body
+<!--                (triggerNode) => triggerNode.parentNode || document.body-->
-              "
+<!--              "-->
-            v-model:value="categoryTypeId"
+<!--            v-model:value="categoryTypeId"-->
-            show-search
+<!--            show-search-->
-            style="width: 100%"
+<!--            style="width: 100%"-->
-            :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+<!--            :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"-->
-            placeholder="请选择内容分类"
+<!--            placeholder="请选择内容分类"-->
-            allow-clear
+<!--            allow-clear-->
-            tree-default-expand-all
+<!--            tree-default-expand-all-->
-            :fieldNames="{
+<!--            :fieldNames="{-->
-                children: 'children',
+<!--                children: 'children',-->
-                label: 'name',
+<!--                label: 'name',-->
-                value: 'code',
+<!--                value: 'code',-->
-              }"
+<!--              }"-->
-            :tree-data="sysTypeOptions"
+<!--            :tree-data="sysTypeOptions"-->
-        >
+<!--        >-->
-        </a-tree-select>
+<!--        </a-tree-select>-->
-      </div>
+<!--      </div>-->
       <div class="select" v-if="currentTab !== 6">
         <a-input
             style="width: 100%; height: 40px; border-radius: 3px"