diff --git a/src/api/supermarket/supermarketUnit.ts b/src/api/supermarket/supermarketUnit.ts new file mode 100644 index 0000000..88f56d1 --- /dev/null +++ b/src/api/supermarket/supermarketUnit.ts @@ -0,0 +1,40 @@ +import request from '/@/utils/request'; + +export function fetchList(query?: Object) { + return request({ + url: '/supermarket/supermarketUnit/page', + method: 'get', + params: query, + }); +} + +export function addObj(obj?: Object) { + return request({ + url: '/supermarket/supermarketUnit', + method: 'post', + data: obj, + }); +} + +export function getObj(id?: string) { + return request({ + url: '/supermarket/supermarketUnit/' + id, + method: 'get', + }); +} + +export function delObjs(ids?: Object) { + return request({ + url: '/supermarket/supermarketUnit', + method: 'delete', + data: ids, + }); +} + +export function putObj(obj?: Object) { + return request({ + url: '/supermarket/supermarketUnit', + method: 'put', + data: obj, + }); +} diff --git a/src/views/admin/system/menu/form.vue b/src/views/admin/system/menu/form.vue index db8f59c..d694fe1 100644 --- a/src/views/admin/system/menu/form.vue +++ b/src/views/admin/system/menu/form.vue @@ -40,7 +40,7 @@ {{ t('sysmenu.permission') }} - + diff --git a/src/views/gen/design/form.vue b/src/views/gen/design/form.vue index 3b1652c..1b3f48a 100644 --- a/src/views/gen/design/form.vue +++ b/src/views/gen/design/form.vue @@ -13,7 +13,7 @@ - +supermarket_supermarketAuxiliaryCode_ supermarket_supermarketAuxiliaryCode_export \ No newline at end of file + diff --git a/src/views/supermarket/supermarketAuxiliaryCode/index.vue b/src/views/supermarket/supermarketAuxiliaryCode/index.vue index 18c03ef..487128c 100644 --- a/src/views/supermarket/supermarketAuxiliaryCode/index.vue +++ b/src/views/supermarket/supermarketAuxiliaryCode/index.vue @@ -1,132 +1,149 @@ \ No newline at end of file + diff --git a/src/views/supermarket/supermarketSpu/form.vue b/src/views/supermarket/supermarketSpu/form.vue index d4a8d02..4657bdd 100644 --- a/src/views/supermarket/supermarketSpu/form.vue +++ b/src/views/supermarket/supermarketSpu/form.vue @@ -158,7 +158,7 @@ - + @@ -183,8 +183,25 @@ - Config - Role + aaaa + + + + + + + + @@ -204,6 +221,8 @@ import { useDict } from '/@/hooks/dict'; import { useMessage } from '/@/hooks/message'; import { getObj, addObj, putObj, getSupermarketCategory, getSupermarketBrand } from '/@/api/supermarket/supermarketSpu'; import { rule } from '/@/utils/validate'; +import { BasicTableProps, useTable } from '/@/hooks/table'; +import { fetchList } from '/@/api/supermarket/supermarketAuxiliaryCode'; const emit = defineEmits(['refresh']); const tabPaneEnum = ['基础信息', '包装单位', '辅助条码']; @@ -267,6 +286,24 @@ const { supermarket_nature, status } = useDict('supermarket_nature', 'status'); const categoryOptions = ref([]); // 商品分类的下拉选项 const brandOptions = ref([]); // 超市品牌的下拉选项 +// 辅助条码state +const auxiliaryCodeState: BasicTableProps = reactive({ + queryForm: {}, + pageList: fetchList, +}); +const auxiliaryCodeTableRef = ref(); +// 辅助条码多选变量 +const auxiliaryCodeSelectObjs = ref([]) as any; +const { getDataList: getAuxiliaryCodeList, tableStyle } = useTable(auxiliaryCodeState); +// 辅助条码多选事件 +const auxiliaryCodeSelectionChangHandle = (objs: { id: string }[]) => { + auxiliaryCodeSelectObjs.value = objs; +}; +// 表格行点击事件 +const HandleAuxiliaryCodeRowClick = (row: any) => { + auxiliaryCodeTableRef.value.toggleRowSelection(row); +}; + // 初始化表单数据 const getsupermarketSpuData = (id: string) => { // 获取数据 @@ -296,6 +333,7 @@ const openDialog = async (id: string) => { getsupermarketSpuData(id); } + // 获取分类选项 if (categoryOptions.value.length <= 0) { try { const res = await getSupermarketCategory(); @@ -305,6 +343,7 @@ const openDialog = async (id: string) => { } } + // 获取品牌选项 if (brandOptions.value.length <= 0) { try { const res = await getSupermarketBrand(); @@ -313,6 +352,9 @@ const openDialog = async (id: string) => { brandOptions.value = []; } } + + // 获取辅助条码列表 + getAuxiliaryCodeList(); }; // 提交 diff --git a/src/views/supermarket/supermarketUnit/form.vue b/src/views/supermarket/supermarketUnit/form.vue new file mode 100644 index 0000000..0e25370 --- /dev/null +++ b/src/views/supermarket/supermarketUnit/form.vue @@ -0,0 +1,138 @@ + + + diff --git a/src/views/supermarket/supermarketUnit/index.vue b/src/views/supermarket/supermarketUnit/index.vue new file mode 100644 index 0000000..2c74c03 --- /dev/null +++ b/src/views/supermarket/supermarketUnit/index.vue @@ -0,0 +1,149 @@ + + +