diff --git a/src/views/manage/mkConfig/index.vue b/src/views/manage/mkConfig/index.vue index ca4ecef..0861ada 100644 --- a/src/views/manage/mkConfig/index.vue +++ b/src/views/manage/mkConfig/index.vue @@ -116,7 +116,7 @@ + + :disabled="dialog.type == 'preview'" clearable @visible-change="getProductAllList"> @@ -223,9 +223,9 @@ import { listProductCategory } from '@/api/manage/productCategory'; import { listVendor } from '@/api/manage/vendor'; onMounted(() => { getList(); + getProductAllList(true); //商品列表 getlistVendor(); //供应商列表 getProductCategoryList(); //商品类别列表 - getProductAllList(); //商品列表 下拉选择 不分页 }); const { proxy } = getCurrentInstance() as ComponentInternalInstance; const mkConfigList = ref([]); @@ -505,13 +505,17 @@ const getlistVendor = async () => { listVendorList.value = res.rows; } /** - * 商品列表 下拉选择 + * 商品列表 下拉选择 //商品列表 下拉选择 不分页 */ const productAllList=ref([]); -const getProductAllList=()=>{ - productAll({status:1}).then(res=>{ - Object.assign(productAllList.value,res.data) - }) +const getProductAllList=(e:any)=>{ + console.log(e); + + if (e) { + productAll({status:1}).then(res=>{ + Object.assign(productAllList.value,res.data) + }) + } } /** * 格式化商品类别名称 diff --git a/src/views/manage/mkPostcard/index.vue b/src/views/manage/mkPostcard/index.vue index 6ea5605..3abcef9 100644 --- a/src/views/manage/mkPostcard/index.vue +++ b/src/views/manage/mkPostcard/index.vue @@ -14,8 +14,9 @@ - + + @@ -58,7 +59,8 @@ @@ -67,7 +69,7 @@