diff --git a/src/views/cabinet/smart-cabinet-card/detail.vue b/src/views/cabinet/smart-cabinet-card/detail.vue index d296dd2..0a0c500 100644 --- a/src/views/cabinet/smart-cabinet-card/detail.vue +++ b/src/views/cabinet/smart-cabinet-card/detail.vue @@ -403,7 +403,7 @@ onMounted(() => { - + @@ -411,7 +411,7 @@ onMounted(() => { @refresh="fetchCabinetDetail" /> - + (); const emit = defineEmits(['update:modelValue', 'refresh']); @@ -47,7 +48,8 @@ const loadShops = async () => { loading.value = true; const { data } = await getShopList({ pageSize: pagination.value.pageSize, - pageNum: pagination.value.currentPage + pageNum: pagination.value.currentPage, + belongType: props.belongType }); shopList.value = data.rows; pagination.value.total = data.total; diff --git a/src/views/shop/cabinet-goods/cabinet-goods-config-modal.vue b/src/views/shop/cabinet-goods/cabinet-goods-config-modal.vue index e667953..deb9812 100644 --- a/src/views/shop/cabinet-goods/cabinet-goods-config-modal.vue +++ b/src/views/shop/cabinet-goods/cabinet-goods-config-modal.vue @@ -6,11 +6,16 @@ import { configureGoodsCellsStock } from "@/api/cabinet/cabinet-cell"; import Search from "@iconify-icons/ep/search"; import Refresh from "@iconify-icons/ep/refresh"; import { ElMessage, ElMessageBox } from "element-plus"; +import { useWxStore } from "@/store/modules/wx"; const props = defineProps({ cellId: { type: Number, required: true + }, + belongType: { + type: Number, + required: false } }); @@ -19,10 +24,13 @@ const closeModal = () => { emit('update:modelValue', false); }; +const wxStore = useWxStore(); + const searchFormParams = ref({ + corpid: wxStore.corpid, goodsName: "", status: null, - belongType: null + belongType: props.belongType }); const pagination = ref({ @@ -37,6 +45,8 @@ const dataList = ref([]); const getList = async () => { try { loading.value = true; + searchFormParams.value.corpid = wxStore.corpid; + searchFormParams.value.belongType = props.belongType; const { data } = await getGoodsListApi({ ...searchFormParams.value, pageSize: pagination.value.pageSize, @@ -104,13 +114,13 @@ defineExpose({ getList }); --> - + 搜索