Merge remote-tracking branch 'yx/250427-bugfix-shl'

This commit is contained in:
joshen
2025-05-13 15:44:20 +08:00
2 changed files with 17 additions and 5 deletions

View File

@@ -300,7 +300,7 @@
showSearch showSearch
:filter-option="false" :filter-option="false"
:options="filterOrgListSearch2" :options="filterOrgListSearch2"
@search="handleOrgSearch" @search="handleOrgSearch2"
@change="changeOrg"> @change="changeOrg">
</a-select> </a-select>
<!-- <OrgClass v-model:value="formParam.sourceBelongId" v-model:name="formParam.sourceBelongFullName"></OrgClass> --> <!-- <OrgClass v-model:value="formParam.sourceBelongId" v-model:name="formParam.sourceBelongFullName"></OrgClass> -->
@@ -1531,7 +1531,11 @@ export default {
state.filterOrgListSearch = temp.filter(item => item.label.includes(value)) state.filterOrgListSearch = temp.filter(item => item.label.includes(value))
} }
const handleOrgSearch2 = (value) => {
let temp = JSON.parse(JSON.stringify(state.orgListSearch.filter(item => item.value !== '')));
//选择数据
state.filterOrgListSearch2 = temp.filter(item => item.label.includes(value))
}
return { return {
...toRefs(state), ...toRefs(state),
@@ -1593,7 +1597,8 @@ export default {
scoreChange, scoreChange,
locale, locale,
checkMenu, checkMenu,
handleOrgSearch handleOrgSearch,
handleOrgSearch2
} }
}, },
}; };

View File

@@ -319,7 +319,7 @@
showSearch showSearch
:filter-option="false" :filter-option="false"
:options="filterOrgListSearch2" :options="filterOrgListSearch2"
@search="handleOrgSearch" @search="handleOrgSearch2"
@change="changeOrg"> @change="changeOrg">
</a-select> </a-select>
</a-form-item> </a-form-item>
@@ -1660,7 +1660,13 @@ export default {
let temp = JSON.parse(JSON.stringify(state.orgListSearch)); let temp = JSON.parse(JSON.stringify(state.orgListSearch));
//选择数据 //选择数据
state.filterOrgListSearch = temp.filter(item => item.label.includes(value)) state.filterOrgListSearch = temp.filter(item => item.label.includes(value))
}
const handleOrgSearch2 = (value) => {
//克隆数据
let temp = JSON.parse(JSON.stringify(state.orgListSearch.filter(item => item.value !== '')));
//选择数据
state.filterOrgListSearch2 = temp.filter(item => item.label.includes(value))
} }
const handleOrgChange = (value) => { const handleOrgChange = (value) => {
@@ -2000,6 +2006,7 @@ export default {
getListData, getListData,
changetlevel, changetlevel,
handleOrgSearch, handleOrgSearch,
handleOrgSearch2,
handleOrgChange, handleOrgChange,
canceleditTeacherDialog, canceleditTeacherDialog,
allFee, allFee,