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

This commit is contained in:
joshen
2025-05-09 18:07:38 +08:00

View File

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