diff --git a/src/assets/images/avatar_icon.png b/src/assets/images/avatar_icon.png index f9c13f9..edd0b08 100644 Binary files a/src/assets/images/avatar_icon.png and b/src/assets/images/avatar_icon.png differ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index c7a399a..e997956 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -73,7 +73,7 @@ const appStore = useAppStore() const userStore = useUserStore() const settingsStore = useSettingsStore() const { proxy } = getCurrentInstance() - + function toggleSideBar() { appStore.toggleSideBar() } diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 40db6bc..90b263c 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -3,7 +3,7 @@ import { ElMessageBox, } from 'element-plus' import { login, logout, getInfo } from '@/api/login' import { getToken, setToken, removeToken } from '@/utils/auth' import { isHttp, isEmpty } from "@/utils/validate" -import defAva from '@/assets/images/profile.jpg' +import defAva from '@/assets/images/avatar_icon.png' const useUserStore = defineStore( 'user', diff --git a/src/views/supplier/index.vue b/src/views/supplier/index.vue index f5c866a..60b8d0f 100644 --- a/src/views/supplier/index.vue +++ b/src/views/supplier/index.vue @@ -90,14 +90,23 @@ - + + + - + + + - - + + + + @@ -130,7 +139,7 @@ @@ -166,7 +175,7 @@ @mouseenter="scope.row.currentImageSrc = hoverImageSrc" @mouseleave="scope.row.currentImageSrc = defaultImageSrc" /> - + @@ -214,6 +223,7 @@ import optionIcon from '@/assets/images/optionIcon.png' import optionIconHover from '@/assets/images/optionIconHover.png' import { useBackgroundStore } from '@/store/modules/background' import otherbg from '@/assets/images/otherbg.png' +import { sysRegionListByPid } from "@/api/system/administrativeRegion" import supplierForm from "./supplierForm.vue"; import supplierDetail from "./supplierDetail.vue"; @@ -226,6 +236,10 @@ const showForm = ref(false) const supplierFormRef = ref(null) const showDetail = ref(false) const supplierDetailRef = ref(null) +// 查询条件 省、市、县 +const province = ref([]) +const city = ref([]) +const county = ref([]) const defaultImageSrc = ref(optionIcon); const hoverImageSrc = ref(optionIconHover); @@ -270,6 +284,29 @@ const unfoldFlag = ref(false) const handleFlod = () => { unfoldFlag.value = !unfoldFlag.value } +// 获取省/直辖市数据 +const getProvinceList = () => { + sysRegionListByPid({ parentId: '0' }).then(res => { + province.value = res.data + }) +} + +// 获取地级市/区数据 +const getCityList = (value) => { + sysRegionListByPid({ parentId: value }).then(res => { + queryParams.value.cityId = undefined + queryParams.value.countyId = undefined + city.value = res.data + }) +} + +// 获取区/县数据 +const getCountyList = (value) => { + sysRegionListByPid({ parentId: value }).then(res => { + queryParams.value.countyId = undefined + county.value = res.data + }) +} /** 查询岗位列表 */ const getList = () => { @@ -356,6 +393,7 @@ const handleShowList = () => { // 初始化 onMounted(() => { bgStore.setBgImage(otherbg) + getProvinceList() getList() }); diff --git a/src/views/supplier/supplierForm.vue b/src/views/supplier/supplierForm.vue index 1838c30..bd86a61 100644 --- a/src/views/supplier/supplierForm.vue +++ b/src/views/supplier/supplierForm.vue @@ -152,28 +152,28 @@ - - + + - - + + - - + + @@ -424,7 +424,7 @@