diff --git a/snowy-admin-web/src/components/Selector/orgSelectorPlus.vue b/snowy-admin-web/src/components/Selector/orgSelectorPlus.vue index 20ce6076..3452f4d4 100644 --- a/snowy-admin-web/src/components/Selector/orgSelectorPlus.vue +++ b/snowy-admin-web/src/components/Selector/orgSelectorPlus.vue @@ -27,12 +27,12 @@ - + - 查询 - 重置 + 查询 + 重置 @@ -134,7 +134,7 @@ // 选中表格的ref 名称 const selectedTable = ref() const tableRecordNum = ref() - let searchFormState = reactive({}) + const searchFormState = ref({}) const searchFormRef = ref() const cardLoading = ref(true) // 替换treeNode 中 title,key,children @@ -184,14 +184,11 @@ } // 查询主表格数据 const loadData = () => { - orgSelectorPlusApi.orgSelector(props.pageUrl, searchFormState).then((res) => { + orgSelectorPlusApi.orgSelector(props.pageUrl, searchFormState.value).then((res) => { // 总共多少条 tableRecordNum.value = res.length tableData.value = res - // 如果无查询条件,查询到已加载的 - if (JSON.stringify(searchFormState) === '{}') { - loadCheckedKey() - } + loadCheckedKey() }) } // 加载已选中的 @@ -254,9 +251,9 @@ // 点击树查询 const treeSelect = (selectedKeys) => { if (selectedKeys.length > 0) { - searchFormState.orgId = selectedKeys.toString() + searchFormState.value.orgId = selectedKeys.toString() } else { - delete searchFormState.orgId + delete searchFormState.value.orgId } loadData() } @@ -279,8 +276,15 @@ } handleClose() } + // 重置 + const reset = () => { + delete searchFormState.value.searchKey + loadData() + } const handleClose = () => { - searchFormState = reactive({}) + searchFormState.value = {} + tableRecordNum.value = 0 + tableData.value = [] visible = false } diff --git a/snowy-admin-web/src/components/Selector/posSelectorPlus.vue b/snowy-admin-web/src/components/Selector/posSelectorPlus.vue index 3b089483..0efc0cf9 100644 --- a/snowy-admin-web/src/components/Selector/posSelectorPlus.vue +++ b/snowy-admin-web/src/components/Selector/posSelectorPlus.vue @@ -27,12 +27,12 @@ - + - 查询 - 重置 + 查询 + 重置 @@ -134,7 +134,7 @@ // 选中表格的ref 名称 const selectedTable = ref() const tableRecordNum = ref() - let searchFormState = reactive({}) + const searchFormState = ref({}) const searchFormRef = ref() const cardLoading = ref(true) // 替换treeNode 中 title,key,children @@ -184,14 +184,11 @@ } // 查询主表格数据 const loadData = () => { - posSelectorPlusApi.posSelector(props.pageUrl, searchFormState).then((res) => { + posSelectorPlusApi.posSelector(props.pageUrl, searchFormState.value).then((res) => { // 总共多少条 tableRecordNum.value = res.length tableData.value = res - // 如果无查询条件,查询到已加载的 - if (JSON.stringify(searchFormState) === '{}') { - loadCheckedKey() - } + loadCheckedKey() }) } // 加载已选中的 @@ -254,9 +251,9 @@ // 点击树查询 const treeSelect = (selectedKeys) => { if (selectedKeys.length > 0) { - searchFormState.orgId = selectedKeys.toString() + searchFormState.value.orgId = selectedKeys.toString() } else { - delete searchFormState.orgId + delete searchFormState.value.orgId } loadData() } @@ -279,8 +276,15 @@ } handleClose() } + // 重置 + const reset = () => { + delete searchFormState.value.searchKey + loadData() + } const handleClose = () => { - searchFormState = reactive({}) + searchFormState.value = {} + tableRecordNum.value = 0 + tableData.value = [] visible = false } diff --git a/snowy-admin-web/src/components/Selector/roleSelectorPlus.vue b/snowy-admin-web/src/components/Selector/roleSelectorPlus.vue index 349fc925..32aea870 100644 --- a/snowy-admin-web/src/components/Selector/roleSelectorPlus.vue +++ b/snowy-admin-web/src/components/Selector/roleSelectorPlus.vue @@ -27,12 +27,12 @@ - + - 查询 - 重置 + 查询 + 重置 @@ -134,7 +134,7 @@ // 选中表格的ref 名称 const selectedTable = ref() const tableRecordNum = ref() - let searchFormState = reactive({}) + const searchFormState = ref({}) const searchFormRef = ref() const cardLoading = ref(true) // 替换treeNode 中 title,key,children @@ -229,16 +229,13 @@ const loadData = () => { // 如果不是用全局的,我们每次查询加上这个条件 if (!roleGlobal) { - searchFormState.category = 'ORG' + searchFormState.value.category = 'ORG' } - roleSelectorPlusApi.roleSelector(props.pageUrl, searchFormState).then((res) => { + roleSelectorPlusApi.roleSelector(props.pageUrl, searchFormState.value).then((res) => { // 总共多少条 tableRecordNum.value = res.length tableData.value = res - // 如果无查询条件,查询到已加载的 - if (JSON.stringify(searchFormState) === '{}') { - loadCheckedKey() - } + loadCheckedKey() }) } // 加载已选中的 @@ -302,15 +299,15 @@ const treeSelect = (selectedKeys) => { if (selectedKeys.length > 0) { if (selectedKeys[0] === 'GLOBAL') { - searchFormState.category = selectedKeys[0] - delete searchFormState.orgId + searchFormState.value.category = selectedKeys[0] + delete searchFormState.value.orgId } else { - searchFormState.orgId = selectedKeys.toString() - delete searchFormState.category + searchFormState.value.orgId = selectedKeys.toString() + delete searchFormState.value.category } } else { - delete searchFormState.category - delete searchFormState.orgId + delete searchFormState.value.category + delete searchFormState.value.orgId } loadData() } @@ -332,8 +329,15 @@ } handleClose() } + // 重置 + const reset = () => { + delete searchFormState.value.searchKey + loadData() + } const handleClose = () => { - searchFormState = reactive({}) + searchFormState.value = {} + tableRecordNum.value = 0 + tableData.value = [] visible = false } diff --git a/snowy-admin-web/src/components/Selector/userSelectorPlus.vue b/snowy-admin-web/src/components/Selector/userSelectorPlus.vue index f62936f2..df15e566 100644 --- a/snowy-admin-web/src/components/Selector/userSelectorPlus.vue +++ b/snowy-admin-web/src/components/Selector/userSelectorPlus.vue @@ -27,12 +27,12 @@ - + - 查询 - 重置 + 查询 + 重置 @@ -134,7 +134,7 @@ // 选中表格的ref 名称 const selectedTable = ref() const tableRecordNum = ref() - let searchFormState = reactive({}) + const searchFormState = ref({}) const searchFormRef = ref() const cardLoading = ref(true) // 替换treeNode 中 title,key,children @@ -184,14 +184,11 @@ } // 查询主表格数据 const loadData = () => { - userSelectorPlusApi.userSelector(props.pageUrl, searchFormState).then((res) => { + userSelectorPlusApi.userSelector(props.pageUrl, searchFormState.value).then((res) => { // 总共多少条 tableRecordNum.value = res.length tableData.value = res - // 如果无查询条件,查询到已加载的 - if (JSON.stringify(searchFormState) === '{}') { - loadCheckedKey() - } + loadCheckedKey() }) } // 加载已选中的 @@ -254,9 +251,9 @@ // 点击树查询 const treeSelect = (selectedKeys) => { if (selectedKeys.length > 0) { - searchFormState.orgId = selectedKeys.toString() + searchFormState.value.orgId = selectedKeys.toString() } else { - delete searchFormState.orgId + delete searchFormState.value.orgId } loadData() } @@ -279,8 +276,15 @@ } handleClose() } + // 重置 + const reset = () => { + delete searchFormState.value.searchKey + loadData() + } const handleClose = () => { - searchFormState = reactive({}) + searchFormState.value = {} + tableRecordNum.value = 0 + tableData.value = [] visible = false }