zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

货商类型接口调整

Browse Source
This commit is contained in:
weiwei committed 2025-03-03 15:21:53 +08:00
1 parent bc02237465
commit 939f39889d
3 files changed
+104 -105
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/api/supermarketerp/smErpSupplier.ts
+16 -23
View File
@@ -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',
});
})
}
src/api/supermarketerp/smErpSupplierType.ts
+30 -24
View File
@@ -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",
})
}
src/views/supermarketerp/supermarketSpu/form.vue
+58 -58
View File
@@ -14,11 +14,11 @@
<el-input v-model.trim="form.productCode" placeholder="请输入货号" />
</el-form-item>
</el-col>
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="自编码/条码" prop="barcode">-->
<!-- <el-input v-model.trim="form.barcode" placeholder="请输入自编码/条码" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="自编码/条码" prop="barcode">-->
<!-- <el-input v-model.trim="form.barcode" placeholder="请输入自编码/条码" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12" class="mb20">
<el-form-item label="商品名称" prop="productName">
<el-input v-model.trim="form.productName" placeholder="请输入商品名称" />
@@ -27,7 +27,7 @@
<el-col :span="12" class="mb20">
<el-form-item label="货商" prop="supplierId">
<el-select v-model="form.supplierId" placeholder="请选择货商">
<el-option v-for="item in supplierOptions" :key="item?.id" :label="item?.typeName" :value="item?.id" />
<el-option v-for="item in supplierTypeOptions" :key="item?.id" :label="item?.typeName" :value="item?.id" />
</el-select>
</el-form-item>
</el-col>
@@ -58,43 +58,43 @@
</el-form-item>
</el-col>
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="单位" prop="unit">-->
<!-- &lt;!&ndash; <el-alert type="warning" show-icon>&ndash;&gt;-->
<!-- &lt;!&ndash; <p>最小售卖的基本单位</p>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-alert>&ndash;&gt;-->
<!-- <el-input placeholder="请输入单位" v-model.trim="form.unit" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="14" class="mb20">-->
<!-- <el-form-item label="内装数" prop="packageNum">-->
<!-- &lt;!&ndash; <el-alert type="warning" show-icon >&ndash;&gt;-->
<!-- &lt;!&ndash; <p>注：内装数据必须为该商品的基本单位的内装数,否则无法完成库存数量转换。&ndash;&gt;-->
<!-- &lt;!&ndash; 例如：零售一瓶矿泉水内装数为1，按一箱售卖矿泉水内装填'24'</p>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-alert>&ndash;&gt;-->
<!-- <el-input-number v-model="form.packageNum" :min="0" :precision="0" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="零售价" prop="retailPrice">-->
<!-- <el-input-number v-model="form.retailPrice" :min="0" :precision="2" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="进价" prop="purchasePrice">-->
<!-- <el-input-number v-model="form.purchasePrice" :min="0" :precision="2" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="促销价" prop="promotionPrice">-->
<!-- <el-input-number v-model="form.promotionPrice" :min="0" :precision="2" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="成本价" prop="costPrice">-->
<!-- <el-input-number v-model="form.costPrice" :min="0" :precision="2" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="单位" prop="unit">-->
<!-- &lt;!&ndash; <el-alert type="warning" show-icon>&ndash;&gt;-->
<!-- &lt;!&ndash; <p>最小售卖的基本单位</p>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-alert>&ndash;&gt;-->
<!-- <el-input placeholder="请输入单位" v-model.trim="form.unit" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="14" class="mb20">-->
<!-- <el-form-item label="内装数" prop="packageNum">-->
<!-- &lt;!&ndash; <el-alert type="warning" show-icon >&ndash;&gt;-->
<!-- &lt;!&ndash; <p>注：内装数据必须为该商品的基本单位的内装数,否则无法完成库存数量转换。&ndash;&gt;-->
<!-- &lt;!&ndash; 例如：零售一瓶矿泉水内装数为1，按一箱售卖矿泉水内装填'24'</p>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-alert>&ndash;&gt;-->
<!-- <el-input-number v-model="form.packageNum" :min="0" :precision="0" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="零售价" prop="retailPrice">-->
<!-- <el-input-number v-model="form.retailPrice" :min="0" :precision="2" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="进价" prop="purchasePrice">-->
<!-- <el-input-number v-model="form.purchasePrice" :min="0" :precision="2" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="促销价" prop="promotionPrice">-->
<!-- <el-input-number v-model="form.promotionPrice" :min="0" :precision="2" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="成本价" prop="costPrice">-->
<!-- <el-input-number v-model="form.costPrice" :min="0" :precision="2" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="24" class="mb20">
<el-form-item label="商品状态" prop="status">
<el-radio-group v-model="form.status">
@@ -102,11 +102,11 @@
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="规格" prop="spec">-->
<!-- <el-input placeholder="请输入规格" v-model.trim="form.spec" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="规格" prop="spec">-->
<!-- <el-input placeholder="请输入规格" v-model.trim="form.spec" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12" class="mb20">
<el-form-item label="产地" prop="origin">
<el-input v-model.trim="form.origin" placeholder="请输入产地" />
@@ -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<any>([]) // 商品分类的下拉选项
const brandOptions = ref<any>([]) // 超市品牌的下拉选项
const supplierOptions = ref<any>([]) // 货商的下拉选项
const supplierTypeOptions = ref<any>([]) // 货商的下拉选项
// 打开弹窗
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()