From 939f39889d6859ab3b22836d3713009fe748bad5 Mon Sep 17 00:00:00 2001 From: weiwei Date: Mon, 3 Mar 2025 15:21:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A7=E5=95=86=E7=B1=BB=E5=9E=8B=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/supermarketerp/smErpSupplier.ts | 39 +++--- src/api/supermarketerp/smErpSupplierType.ts | 54 ++++---- .../supermarketerp/supermarketSpu/form.vue | 116 +++++++++--------- 3 files changed, 104 insertions(+), 105 deletions(-) diff --git a/src/api/supermarketerp/smErpSupplier.ts b/src/api/supermarketerp/smErpSupplier.ts index a00b904..2ac41a3 100644 --- a/src/api/supermarketerp/smErpSupplier.ts +++ b/src/api/supermarketerp/smErpSupplier.ts @@ -1,47 +1,40 @@ -import request from '/@/utils/request'; +import request from "/@/utils/request" export function fetchList(query?: Object) { return request({ - url: '/supermarket/smErpSupplier/page', - method: 'get', + url: "/supermarket/smErpSupplier/page", + method: "get", params: query, - }); + }) } export function addObj(obj?: Object) { return request({ - url: '/supermarket/smErpSupplier', - method: 'post', + url: "/supermarket/smErpSupplier", + method: "post", data: obj, - }); + }) } export function getObj(id?: string) { return request({ - url: '/supermarket/smErpSupplier/' + id, - method: 'get', - }); + url: "/supermarket/smErpSupplier/" + id, + method: "get", + }) } export function delObjs(ids?: Object) { return request({ - url: '/supermarket/smErpSupplier', - method: 'delete', + url: "/supermarket/smErpSupplier", + method: "delete", data: ids, - }); + }) } export function putObj(obj?: Object) { return request({ - url: '/supermarket/smErpSupplier', - method: 'put', + url: "/supermarket/smErpSupplier", + method: "put", data: obj, - }); -} - -export function getSupplierTypeOptions(): any { - return request({ - url: '/supermarket/smErpSupplierType/simpleAll', - method: 'get', - }); + }) } diff --git a/src/api/supermarketerp/smErpSupplierType.ts b/src/api/supermarketerp/smErpSupplierType.ts index 3d33a2b..bbfc59b 100644 --- a/src/api/supermarketerp/smErpSupplierType.ts +++ b/src/api/supermarketerp/smErpSupplierType.ts @@ -1,41 +1,47 @@ import request from "/@/utils/request" export function fetchList(query?: Object) { - return request({ - url: '/supermarket/smErpSupplierType/page', - method: 'get', - params: query - }) + return request({ + url: "/supermarket/smErpSupplierType/page", + method: "get", + params: query, + }) } export function addObj(obj?: Object) { - return request({ - url: '/supermarket/smErpSupplierType', - method: 'post', - data: obj - }) + return request({ + url: "/supermarket/smErpSupplierType", + method: "post", + data: obj, + }) } export function getObj(id?: string) { - return request({ - url: '/supermarket/smErpSupplierType/' + id, - method: 'get' - }) + return request({ + url: "/supermarket/smErpSupplierType/" + id, + method: "get", + }) } export function delObjs(ids?: Object) { - return request({ - url: '/supermarket/smErpSupplierType', - method: 'delete', - data: ids - }) + return request({ + url: "/supermarket/smErpSupplierType", + method: "delete", + data: ids, + }) } export function putObj(obj?: Object) { - return request({ - url: '/supermarket/smErpSupplierType', - method: 'put', - data: obj - }) + return request({ + url: "/supermarket/smErpSupplierType", + method: "put", + data: obj, + }) } +export function getSupplierTypeSimpleAll(): any { + return request({ + url: "/supermarket/smErpSupplierType/simpleAll", + method: "get", + }) +} diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue index 7a913e5..c6d0ffa 100644 --- a/src/views/supermarketerp/supermarketSpu/form.vue +++ b/src/views/supermarketerp/supermarketSpu/form.vue @@ -14,11 +14,11 @@ - - - - - + + + + + @@ -27,7 +27,7 @@ - + @@ -58,43 +58,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -102,11 +102,11 @@ - - - - - + + + + + @@ -158,7 +158,7 @@ import { useDict } from "/@/hooks/dict" import { useMessage } from "/@/hooks/message" import { getObj, addObj, putObj, getSupermarketCategory, getSupermarketBrand } from "/@/api/supermarketerp/supermarketSpu" -import { getSupplierTypeOptions } from "/@/api/supermarketerp/smErpSupplier" +import { getSupplierTypeSimpleAll } from "/@/api/supermarketerp/smErpSupplierType" import { rule } from "/@/utils/validate" import SupermarketUnit from "./components/supermarketUnit.vue" import supermarketInventory from "./components/supermarketInventory.vue" @@ -231,7 +231,7 @@ const dataRules = { const { supermarket_nature, status } = useDict("supermarket_nature", "status") const categoryOptions = ref([]) // 商品分类的下拉选项 const brandOptions = ref([]) // 超市品牌的下拉选项 -const supplierOptions = ref([]) // 货商的下拉选项 +const supplierTypeOptions = ref([]) // 货商的下拉选项 // 打开弹窗 const openDialog = async (id: string) => { @@ -251,16 +251,16 @@ const openDialog = async (id: string) => { supermarketUnitEntityListRef.value.setRadioRow(form.smErpUnitEntityList.findIndex((item: any) => item.isBase)) } - // 获取分类下拉选项 & 获取品牌下拉选项 & 获取货商下拉选项 - const [categoryDict, brandDict, supplierDict] = await Promise.allSettled([ + // 获取分类下拉选项 & 获取品牌下拉选项 & 获取货商类型下拉选项 + const [categoryDict, brandDict, supplierTypeDict] = await Promise.allSettled([ getSupermarketCategory(), getSupermarketBrand(), - getSupplierTypeOptions(), + getSupplierTypeSimpleAll(), ]).then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null))) - categoryOptions && categoryDict.code === 0 && (categoryOptions.value = categoryDict.data) - brandOptions && brandDict.code === 0 && (brandOptions.value = brandDict.data) - supplierOptions && supplierDict.code === 0 && (supplierOptions.value = supplierDict.data) + categoryDict && categoryDict.code === 0 && (categoryOptions.value = categoryDict.data) + brandDict && brandDict.code === 0 && (brandOptions.value = brandDict.data) + supplierTypeDict && supplierTypeDict.code === 0 && (supplierTypeOptions.value = supplierTypeDict.data) } // 初始化表单数据 @@ -349,8 +349,8 @@ const onSubmit = async () => { if (!(await supermarketUnitEntityListRef.value.editableTableValidate())) return useMessage().warning("包装单位必填项未填写完整") if (!supermarketUnitEntityListRef.value.getRadioEvent()) return useMessage().warning("请选择基础包装单位") if (!(await supermarketInventoryRef.value.stockValidate())) return useMessage().warning("库存必填项未填写完整") - if (!form.smErpAuxiliaryCodeEntityList || form.smErpAuxiliaryCodeEntityList.length <= 0) return useMessage().warning("请添加辅助条码") - if (!(await supermarketAuxiliaryCodeEntityList.value.editableTableValidate())) return useMessage().warning("辅助条码必填项未填写完整") + // if (!form.smErpAuxiliaryCodeEntityList || form.smErpAuxiliaryCodeEntityList.length <= 0) return useMessage().warning("请添加辅助条码") + // if (!(await supermarketAuxiliaryCodeEntityList.value.editableTableValidate())) return useMessage().warning("辅助条码必填项未填写完整") const handleUnit = useHandleUnit() const handleAuxiliaryCode = useHandleAuxiliaryCode()