Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud
This commit is contained in:
commit
d547d8eef8
10 files changed
+387
-373
No files matched your search
+4
-2
@@ -9,11 +9,13 @@ ENV = 'development'
|
|||||||
|
|
||||||
# ADMIN 服务地址
|
# ADMIN 服务地址
|
||||||
# VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/
|
# VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/
|
||||||
VITE_ADMIN_PROXY_PATH = http://localhost:9999
|
VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
|
||||||
|
# VITE_ADMIN_PROXY_PATH = http://localhost:9999
|
||||||
|
|
||||||
# 图片访问基础地址
|
# 图片访问基础地址
|
||||||
# VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api
|
# VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api
|
||||||
VITE_IMAGE_BASE_PATH = http://localhost:9999
|
VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
|
||||||
|
# VITE_IMAGE_BASE_PATH = http://localhost:9999
|
||||||
|
|
||||||
# 代码生成服务地址
|
# 代码生成服务地址
|
||||||
VITE_GEN_PROXY_PATH = http://192.168.110.156:5003
|
VITE_GEN_PROXY_PATH = http://192.168.110.156:5003
|
||||||
@@ -1,102 +1,123 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
|
<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
|
||||||
:close-on-click-modal="false" draggable>
|
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
|
||||||
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
|
<el-row :gutter="24">
|
||||||
<el-row :gutter="24">
|
<!-- <el-col :span="12" class="mb20">-->
|
||||||
<el-col :span="12" class="mb20">
|
<!-- <el-form-item label="父分类编号" prop="parentId">-->
|
||||||
<el-form-item label="父分类编号" prop="parentId">
|
<!-- <el-input v-model="form.parentId" placeholder="请输入父分类编号"/>-->
|
||||||
<el-input v-model="form.parentId" placeholder="请输入父分类编号"/>
|
<!-- </el-form-item>-->
|
||||||
</el-form-item>
|
<!-- </el-col>-->
|
||||||
</el-col>
|
|
||||||
|
|
||||||
<el-col :span="12" class="mb20">
|
<el-col :span="24" class="mb20">
|
||||||
<el-form-item label="分类名称" prop="name">
|
<el-form-item label="商户" prop="merchantId">
|
||||||
<el-input v-model="form.name" placeholder="请输入分类名称"/>
|
<el-select v-model="form.merchantId" placeholder="请选择商户" style="width: 240px">
|
||||||
</el-form-item>
|
<el-option v-for="item in merchantInfo" :key="item.id" :label="item.name" :value="item.id" />
|
||||||
</el-col>
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
|
||||||
<el-col :span="12" class="mb20">
|
<el-col :span="12" class="mb20">
|
||||||
<el-form-item label="分类图" prop="picUrl">
|
<el-form-item label="分类名称" prop="name">
|
||||||
<upload-img v-model="form.picUrl"></upload-img>
|
<el-input v-model="form.name" placeholder="请输入分类名称" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
||||||
<el-col :span="12" class="mb20">
|
<el-col :span="24" class="mb20">
|
||||||
<el-form-item label="分类排序" prop="sort">
|
<el-form-item label="分类图" prop="picUrl">
|
||||||
<el-input v-model="form.sort" placeholder="请输入分类排序"/>
|
<upload-img v-model="form.picUrl"></upload-img>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
||||||
<el-col :span="12" class="mb20">
|
<el-col :span="12" class="mb20">
|
||||||
<el-form-item label="开启状态" prop="status">
|
<el-form-item label="分类排序" prop="sort">
|
||||||
<el-radio-group v-model="form.status">
|
<el-input-number v-model="form.sort" placeholder="请输入分类排序" />
|
||||||
<el-radio label="开启状态" border>开启状态</el-radio>
|
</el-form-item>
|
||||||
</el-radio-group>
|
</el-col>
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
|
|
||||||
<el-col :span="12" class="mb20">
|
<!-- <el-col :span="12" class="mb20">-->
|
||||||
<el-form-item label="部门id" prop="deptId">
|
<!-- <el-form-item label="开启状态" prop="status">-->
|
||||||
<el-input v-model="form.deptId" placeholder="请输入部门id"/>
|
<!-- <el-radio-group v-model="form.status">-->
|
||||||
</el-form-item>
|
<!-- <el-radio label="开启状态" border>开启状态</el-radio>-->
|
||||||
</el-col>
|
<!-- </el-radio-group>-->
|
||||||
|
<!-- </el-form-item>-->
|
||||||
|
<!-- </el-col>-->
|
||||||
|
|
||||||
|
<!-- <el-col :span="12" class="mb20">-->
|
||||||
|
<!-- <el-form-item label="部门id" prop="deptId">-->
|
||||||
|
<!-- <el-input v-model="form.deptId" placeholder="请输入部门id"/>-->
|
||||||
|
<!-- </el-form-item>-->
|
||||||
|
<!-- </el-col>-->
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<span class="dialog-footer">
|
<span class="dialog-footer">
|
||||||
<el-button @click="visible = false">取消</el-button>
|
<el-button @click="visible = false">取消</el-button>
|
||||||
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
|
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts" name="CanteenOnlineCategoryDialog">
|
<script setup lang="ts" name="CanteenOnlineCategoryDialog">
|
||||||
import { useDict } from '/@/hooks/dict';
|
import { useDict } from '/@/hooks/dict';
|
||||||
import { useMessage } from "/@/hooks/message";
|
import { useMessage } from '/@/hooks/message';
|
||||||
import { getObj, addObj, putObj } from '/@/api/canteen/canteenOnlineCategory'
|
import { getObj, addObj, putObj } from '/@/api/canteen/canteenOnlineCategory';
|
||||||
|
import { selectMerchantList } from '/@/api/canteen/merchantInfo';
|
||||||
import { rule } from '/@/utils/validate';
|
import { rule } from '/@/utils/validate';
|
||||||
const emit = defineEmits(['refresh']);
|
const emit = defineEmits(['refresh']);
|
||||||
|
|
||||||
// 定义变量内容
|
// 定义变量内容
|
||||||
const dataFormRef = ref();
|
const dataFormRef = ref();
|
||||||
const visible = ref(false)
|
const visible = ref(false);
|
||||||
const loading = ref(false)
|
const loading = ref(false);
|
||||||
// 定义字典
|
const merchantInfo = ref<any>([]); // 商户信息
|
||||||
|
|
||||||
// 提交表单数据
|
// 提交表单数据
|
||||||
const form = reactive({
|
const form = reactive({
|
||||||
id:'',
|
id: '',
|
||||||
parentId: '',
|
merchantId: '',
|
||||||
name: '',
|
parentId: '',
|
||||||
picUrl: '',
|
name: '',
|
||||||
sort: '',
|
picUrl: '',
|
||||||
status: '',
|
sort: '',
|
||||||
deptId: '',
|
status: '',
|
||||||
|
deptId: '',
|
||||||
});
|
});
|
||||||
|
|
||||||
// 定义校验规则
|
// 定义校验规则
|
||||||
const dataRules = ref({
|
const dataRules = ref({
|
||||||
name: [{required: true, message: '分类名称不能为空', trigger: 'blur'}],
|
merchantId: [{ required: true, message: '商户不能为空', trigger: 'blur' }],
|
||||||
sort: [{required: true, message: '分类排序不能为空', trigger: 'blur'}, { validator: rule.number, trigger: 'blur' }],
|
name: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }],
|
||||||
})
|
sort: [
|
||||||
|
{ required: true, message: '分类排序不能为空', trigger: 'blur' },
|
||||||
|
{ validator: rule.number, trigger: 'blur' },
|
||||||
|
],
|
||||||
|
});
|
||||||
|
|
||||||
// 打开弹窗
|
// 打开弹窗
|
||||||
const openDialog = (id: string) => {
|
const openDialog = async (id: string) => {
|
||||||
visible.value = true
|
visible.value = true;
|
||||||
form.id = ''
|
form.id = '';
|
||||||
|
|
||||||
// 重置表单数据
|
// 重置表单数据
|
||||||
nextTick(() => {
|
dataFormRef.value?.resetFields();
|
||||||
dataFormRef.value?.resetFields();
|
|
||||||
});
|
|
||||||
|
|
||||||
// 获取canteenOnlineCategory信息
|
if (merchantInfo.value.length <= 0) {
|
||||||
if (id) {
|
try {
|
||||||
form.id = id
|
// 获取商户下拉框选项
|
||||||
getcanteenOnlineCategoryData(id)
|
const res = await selectMerchantList('1');
|
||||||
}
|
merchantInfo.value = res.data;
|
||||||
|
} catch (error) {
|
||||||
|
merchantInfo.value = [];
|
||||||
|
loading.value = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取canteenOnlineCategory信息
|
||||||
|
if (id) {
|
||||||
|
form.id = id;
|
||||||
|
getcanteenOnlineCategoryData(id);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// 提交
|
// 提交
|
||||||
@@ -105,7 +126,7 @@ const onSubmit = async () => {
|
|||||||
if (!valid) return false;
|
if (!valid) return false;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
form.id ? await putObj(form) : await addObj(form);
|
form.id ? await putObj(form) : await addObj(form);
|
||||||
useMessage().success(form.id ? '修改成功' : '添加成功');
|
useMessage().success(form.id ? '修改成功' : '添加成功');
|
||||||
visible.value = false;
|
visible.value = false;
|
||||||
@@ -113,24 +134,25 @@ const onSubmit = async () => {
|
|||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
useMessage().error(err.msg);
|
useMessage().error(err.msg);
|
||||||
} finally {
|
} finally {
|
||||||
loading.value = false;
|
loading.value = false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// 初始化表单数据
|
// 初始化表单数据
|
||||||
const getcanteenOnlineCategoryData = (id: string) => {
|
const getcanteenOnlineCategoryData = (id: string) => {
|
||||||
// 获取数据
|
// 获取数据
|
||||||
loading.value = true
|
loading.value = true;
|
||||||
getObj(id).then((res: any) => {
|
getObj(id)
|
||||||
Object.assign(form, res.data)
|
.then((res: any) => {
|
||||||
}).finally(() => {
|
Object.assign(form, res.data);
|
||||||
loading.value = false
|
})
|
||||||
})
|
.finally(() => {
|
||||||
|
loading.value = false;
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
// 暴露变量
|
// 暴露变量
|
||||||
defineExpose({
|
defineExpose({
|
||||||
openDialog
|
openDialog,
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
@@ -35,12 +35,11 @@
|
|||||||
@sort-change="sortChangeHandle">
|
@sort-change="sortChangeHandle">
|
||||||
<el-table-column type="selection" width="40" align="center" />
|
<el-table-column type="selection" width="40" align="center" />
|
||||||
<el-table-column type="index" label="#" width="40" />
|
<el-table-column type="index" label="#" width="40" />
|
||||||
<el-table-column prop="parentId" label="父分类编号" show-overflow-tooltip/>
|
|
||||||
<el-table-column prop="name" label="分类名称" show-overflow-tooltip/>
|
<el-table-column prop="name" label="分类名称" show-overflow-tooltip/>
|
||||||
<el-table-column prop="picUrl" label="分类图" show-overflow-tooltip/>
|
<el-table-column prop="picUrl" label="分类图" show-overflow-tooltip/>
|
||||||
<el-table-column prop="sort" label="分类排序" show-overflow-tooltip/>
|
<el-table-column prop="sort" label="分类排序" show-overflow-tooltip/>
|
||||||
<el-table-column prop="status" label="开启状态" show-overflow-tooltip/>
|
<!-- <el-table-column prop="status" label="开启状态" show-overflow-tooltip/>-->
|
||||||
<el-table-column prop="deptId" label="部门id" show-overflow-tooltip/>
|
<!-- <el-table-column prop="deptId" label="部门id" show-overflow-tooltip/>-->
|
||||||
<el-table-column label="操作" width="150">
|
<el-table-column label="操作" width="150">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-button icon="edit-pen" text type="primary" v-auth="'canteen_canteenOnlineCategory_edit'"
|
<el-button icon="edit-pen" text type="primary" v-auth="'canteen_canteenOnlineCategory_edit'"
|
||||||
|
|||||||
@@ -1,188 +1,163 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
|
<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
|
||||||
:close-on-click-modal="false" draggable>
|
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
|
||||||
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
|
<el-row :gutter="24">
|
||||||
<el-row :gutter="24">
|
<el-col :span="12" class="mb20">
|
||||||
<el-col :span="12" class="mb20">
|
<el-form-item label="商户" prop="merchantId">
|
||||||
<el-form-item label="商品名称" prop="name">
|
<el-select v-model="form.merchantId" placeholder="请选择商户" style="width: 240px">
|
||||||
<el-input v-model="form.name" placeholder="请输入商品名称"/>
|
<el-option v-for="item in merchantInfo" :key="item.id" :label="item.name" :value="item.id" />
|
||||||
</el-form-item>
|
</el-select>
|
||||||
</el-col>
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12" class="mb20">
|
||||||
|
<el-form-item label="商品名称" prop="name">
|
||||||
|
<el-input v-model="form.name" placeholder="请输入商品名称" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
|
||||||
<el-col :span="12" class="mb20">
|
<el-col :span="12" class="mb20">
|
||||||
<el-form-item label="商品简介" prop="introduction">
|
<el-form-item label="商品分类" prop="categoryId">
|
||||||
<el-input type="textarea" v-model="form.introduction" placeholder="请输入商品简介"/>
|
<el-select v-model="form.categoryId" placeholder="请选择商品分类">
|
||||||
</el-form-item>
|
<el-option label="请选择">0</el-option>
|
||||||
</el-col>
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
|
||||||
<el-col :span="12" class="mb20">
|
<el-col :span="12" class="mb20">
|
||||||
<el-form-item label="商品详情" prop="description">
|
<el-form-item label="商品价格" prop="price">
|
||||||
<editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>
|
<el-input-number v-model="form.price" placeholder="请输入商品价格" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
<el-col :span="12" class="mb20">
|
||||||
|
<el-form-item label="市场价" prop="marketPrice">
|
||||||
|
<el-input-number v-model="form.marketPrice" placeholder="请输入市场价" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12" class="mb20">
|
||||||
|
<el-form-item label="库存" prop="stock">
|
||||||
|
<el-input-number v-model="form.stock" placeholder="请输入库存" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="24" class="mb20">
|
||||||
|
<el-form-item label="商品封面图" prop="picUrl">
|
||||||
|
<upload-img v-model="form.picUrl"></upload-img>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
|
||||||
<el-col :span="12" class="mb20">
|
<el-col :span="24" class="mb20">
|
||||||
<el-form-item label="商品分类编号" prop="categoryId">
|
<el-form-item label="商品轮播图" prop="sliderPicUrls">
|
||||||
<el-select v-model="form.categoryId" placeholder="请选择商品分类编号">
|
<upload-imgs v-model="form.sliderPicUrls"></upload-imgs>
|
||||||
<el-option label="请选择">0</el-option>
|
</el-form-item>
|
||||||
</el-select>
|
</el-col>
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
|
|
||||||
<el-col :span="12" class="mb20">
|
<el-col :span="12" class="mb20">
|
||||||
<el-form-item label="商品封面图" prop="picUrl">
|
<el-form-item label="排序字段" prop="sort">
|
||||||
<upload-img v-model="form.picUrl"></upload-img>
|
<el-input-number v-model="form.sort" placeholder="请输入排序字段" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
||||||
<el-col :span="12" class="mb20">
|
<el-col :span="12" class="mb20">
|
||||||
<el-form-item label="商品轮播图地址
|
<el-form-item label="商品状态" prop="status">
|
||||||
数组,以逗号分隔
|
<el-radio-group v-model="form.status">
|
||||||
最多上传15张" prop="sliderPicUrls">
|
<el-radio :label="item.value" v-for="(item, index) in spu_status" border :key="index">{{ item.label }} </el-radio>
|
||||||
<upload-img v-model="form.sliderPicUrls"></upload-img>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
||||||
<el-col :span="12" class="mb20">
|
|
||||||
<el-form-item label="排序字段" prop="sort">
|
|
||||||
<el-input v-model="form.sort" placeholder="请输入排序字段"/>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
|
|
||||||
<el-col :span="12" class="mb20">
|
|
||||||
<el-form-item label="商品状态: 1 上架(开启) 0 下架(禁用) -1 回收" prop="status">
|
|
||||||
<el-radio-group v-model="form.status">
|
|
||||||
<el-radio :label="item.value" v-for="(item, index) in spu_status" border :key="index">{{ item.label }}
|
|
||||||
</el-radio>
|
|
||||||
</el-radio-group>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
|
|
||||||
<el-col :span="12" class="mb20">
|
|
||||||
<el-form-item label="商品价格,单位使用:分" prop="price">
|
|
||||||
<el-input v-model="form.price" placeholder="请输入商品价格,单位使用:分"/>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
|
|
||||||
<el-col :span="12" class="mb20">
|
|
||||||
<el-form-item label="市场价,单位使用:分" prop="marketPrice">
|
|
||||||
<el-input v-model="form.marketPrice" placeholder="请输入市场价,单位使用:分"/>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
|
|
||||||
<el-col :span="12" class="mb20">
|
|
||||||
<el-form-item label="库存" prop="stock">
|
|
||||||
<el-input v-model="form.stock" placeholder="请输入库存"/>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
|
|
||||||
<el-col :span="12" class="mb20">
|
|
||||||
<el-form-item label="赠送积分" prop="giveIntegral">
|
|
||||||
<el-input v-model="form.giveIntegral" placeholder="请输入赠送积分"/>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
|
|
||||||
<el-col :span="12" class="mb20">
|
|
||||||
<el-form-item label="商品销量" prop="salesCount">
|
|
||||||
<el-input v-model="form.salesCount" placeholder="请输入商品销量"/>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
|
|
||||||
<el-col :span="12" class="mb20">
|
|
||||||
<el-form-item label="虚拟销量" prop="virtualSalesCount">
|
|
||||||
<el-input v-model="form.virtualSalesCount" placeholder="请输入虚拟销量"/>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
|
|
||||||
<el-col :span="12" class="mb20">
|
|
||||||
<el-form-item label="商品点击量" prop="browseCount">
|
|
||||||
<el-input v-model="form.browseCount" placeholder="请输入商品点击量"/>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
|
|
||||||
<el-col :span="12" class="mb20">
|
|
||||||
<el-form-item label="商户编号" prop="merchantId">
|
|
||||||
<el-input v-model="form.merchantId" placeholder="请输入商户编号"/>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
|
|
||||||
<el-col :span="12" class="mb20">
|
|
||||||
<el-form-item label="部门id" prop="deptId">
|
|
||||||
<el-input v-model="form.deptId" placeholder="请输入部门id"/>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
|
|
||||||
|
<!-- <el-col :span="12" class="mb20">-->
|
||||||
|
<!-- <el-form-item label="部门id" prop="deptId">-->
|
||||||
|
<!-- <el-input v-model="form.deptId" placeholder="请输入部门id"/>-->
|
||||||
|
<!-- </el-form-item>-->
|
||||||
|
<!-- </el-col>-->
|
||||||
|
<el-col :span="24" class="mb20">
|
||||||
|
<el-form-item label="商品详情" prop="description">
|
||||||
|
<editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<span class="dialog-footer">
|
<span class="dialog-footer">
|
||||||
<el-button @click="visible = false">取消</el-button>
|
<el-button @click="visible = false">取消</el-button>
|
||||||
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
|
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts" name="CanteenOnlineSpuDialog">
|
<script setup lang="ts" name="CanteenOnlineSpuDialog">
|
||||||
import { useDict } from '/@/hooks/dict';
|
import { useDict } from '/@/hooks/dict';
|
||||||
import { useMessage } from "/@/hooks/message";
|
import { useMessage } from '/@/hooks/message';
|
||||||
import { getObj, addObj, putObj } from '/@/api/canteen/canteenOnlineSpu'
|
import { getObj, addObj, putObj } from '/@/api/canteen/canteenOnlineSpu';
|
||||||
|
import { selectMerchantList } from '/@/api/canteen/merchantInfo';
|
||||||
import { rule } from '/@/utils/validate';
|
import { rule } from '/@/utils/validate';
|
||||||
const emit = defineEmits(['refresh']);
|
const emit = defineEmits(['refresh']);
|
||||||
|
|
||||||
// 定义变量内容
|
// 定义变量内容
|
||||||
const dataFormRef = ref();
|
const dataFormRef = ref();
|
||||||
const visible = ref(false)
|
const visible = ref(false);
|
||||||
const loading = ref(false)
|
const loading = ref(false);
|
||||||
// 定义字典
|
// 定义字典
|
||||||
const { spu_status } = useDict('spu_status')
|
const { spu_status } = useDict('spu_status');
|
||||||
|
const merchantInfo = ref<any>([]); // 商户信息
|
||||||
|
|
||||||
// 提交表单数据
|
// 提交表单数据
|
||||||
const form = reactive({
|
const form = reactive({
|
||||||
id:'',
|
id: '',
|
||||||
name: '',
|
merchantId: '',
|
||||||
introduction: '',
|
name: '',
|
||||||
description: '',
|
introduction: '',
|
||||||
categoryId: '',
|
description: '',
|
||||||
picUrl: '',
|
categoryId: '',
|
||||||
sliderPicUrls: '',
|
picUrl: '',
|
||||||
sort: '',
|
sliderPicUrls: '',
|
||||||
status: '',
|
sort: '',
|
||||||
price: '',
|
status: '0',
|
||||||
marketPrice: '',
|
price: '',
|
||||||
stock: '',
|
marketPrice: '',
|
||||||
giveIntegral: '',
|
stock: '',
|
||||||
salesCount: '',
|
giveIntegral: '',
|
||||||
virtualSalesCount: '',
|
salesCount: '',
|
||||||
browseCount: '',
|
virtualSalesCount: '',
|
||||||
merchantId: '',
|
browseCount: '',
|
||||||
deptId: '',
|
deptId: '',
|
||||||
});
|
});
|
||||||
|
|
||||||
// 定义校验规则
|
// 定义校验规则
|
||||||
const dataRules = ref({
|
const dataRules = ref({
|
||||||
name: [{required: true, message: '商品名称不能为空', trigger: 'blur'}],
|
merchantId: [{ required: true, message: '商户不能为空', trigger: 'blur' }],
|
||||||
picUrl: [{required: true, message: '商品封面图不能为空', trigger: 'blur'}],
|
name: [{ required: true, message: '商品名称不能为空', trigger: 'blur' }],
|
||||||
price: [{required: true, message: '商品价格,单位使用:分不能为空', trigger: 'blur'}],
|
picUrl: [{ required: true, message: '商品封面图不能为空', trigger: 'blur' }],
|
||||||
marketPrice: [{required: true, message: '市场价,单位使用:分不能为空', trigger: 'blur'}],
|
price: [{ required: true, message: '商品价格', trigger: 'blur' }],
|
||||||
stock: [{ validator: rule.number, trigger: 'blur' }],
|
marketPrice: [{ required: true, message: '市场价', trigger: 'blur' }],
|
||||||
})
|
stock: [{ required: true, message: '请输入库存数量', trigger: 'blur' }],
|
||||||
|
status: [{ required: true, message: '请勾选上下架', trigger: 'blur' }],
|
||||||
|
});
|
||||||
|
|
||||||
// 打开弹窗
|
// 打开弹窗
|
||||||
const openDialog = (id: string) => {
|
const openDialog = async (id: string) => {
|
||||||
visible.value = true
|
visible.value = true;
|
||||||
form.id = ''
|
form.id = '';
|
||||||
|
|
||||||
// 重置表单数据
|
// 重置表单数据
|
||||||
nextTick(() => {
|
dataFormRef.value?.resetFields();
|
||||||
dataFormRef.value?.resetFields();
|
|
||||||
});
|
|
||||||
|
|
||||||
// 获取canteenOnlineSpu信息
|
if (merchantInfo.value.length <= 0) {
|
||||||
if (id) {
|
try {
|
||||||
form.id = id
|
// 获取商户下拉框选项
|
||||||
getcanteenOnlineSpuData(id)
|
const res = await selectMerchantList('1');
|
||||||
}
|
merchantInfo.value = res.data;
|
||||||
|
} catch (error) {
|
||||||
|
merchantInfo.value = [];
|
||||||
|
loading.value = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取canteenOnlineSpu信息
|
||||||
|
if (id) {
|
||||||
|
form.id = id;
|
||||||
|
getcanteenOnlineSpuData(id);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// 提交
|
// 提交
|
||||||
@@ -191,7 +166,7 @@ const onSubmit = async () => {
|
|||||||
if (!valid) return false;
|
if (!valid) return false;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
form.id ? await putObj(form) : await addObj(form);
|
form.id ? await putObj(form) : await addObj(form);
|
||||||
useMessage().success(form.id ? '修改成功' : '添加成功');
|
useMessage().success(form.id ? '修改成功' : '添加成功');
|
||||||
visible.value = false;
|
visible.value = false;
|
||||||
@@ -199,24 +174,25 @@ const onSubmit = async () => {
|
|||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
useMessage().error(err.msg);
|
useMessage().error(err.msg);
|
||||||
} finally {
|
} finally {
|
||||||
loading.value = false;
|
loading.value = false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// 初始化表单数据
|
// 初始化表单数据
|
||||||
const getcanteenOnlineSpuData = (id: string) => {
|
const getcanteenOnlineSpuData = (id: string) => {
|
||||||
// 获取数据
|
// 获取数据
|
||||||
loading.value = true
|
loading.value = true;
|
||||||
getObj(id).then((res: any) => {
|
getObj(id)
|
||||||
Object.assign(form, res.data)
|
.then((res: any) => {
|
||||||
}).finally(() => {
|
Object.assign(form, res.data);
|
||||||
loading.value = false
|
})
|
||||||
})
|
.finally(() => {
|
||||||
|
loading.value = false;
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
// 暴露变量
|
// 暴露变量
|
||||||
defineExpose({
|
defineExpose({
|
||||||
openDialog
|
openDialog,
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
@@ -41,28 +41,18 @@
|
|||||||
<el-table-column type="selection" width="40" align="center" />
|
<el-table-column type="selection" width="40" align="center" />
|
||||||
<el-table-column type="index" label="#" width="40" />
|
<el-table-column type="index" label="#" width="40" />
|
||||||
<el-table-column prop="name" label="商品名称" show-overflow-tooltip/>
|
<el-table-column prop="name" label="商品名称" show-overflow-tooltip/>
|
||||||
<el-table-column prop="introduction" label="商品简介" show-overflow-tooltip/>
|
<el-table-column prop="categoryId" label="商品分类" show-overflow-tooltip/>
|
||||||
<el-table-column prop="description" label="商品详情" show-overflow-tooltip/>
|
|
||||||
<el-table-column prop="categoryId" label="商品分类编号" show-overflow-tooltip/>
|
|
||||||
<el-table-column prop="picUrl" label="商品封面图" show-overflow-tooltip/>
|
<el-table-column prop="picUrl" label="商品封面图" show-overflow-tooltip/>
|
||||||
<el-table-column prop="sliderPicUrls" label="商品轮播图地址
|
|
||||||
数组,以逗号分隔
|
|
||||||
最多上传15张" show-overflow-tooltip/>
|
|
||||||
<el-table-column prop="sort" label="排序字段" show-overflow-tooltip/>
|
<el-table-column prop="sort" label="排序字段" show-overflow-tooltip/>
|
||||||
<el-table-column prop="status" label="商品状态: 1 上架(开启) 0 下架(禁用) -1 回收" show-overflow-tooltip>
|
<el-table-column prop="status" label="商品上下架" show-overflow-tooltip>
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<dict-tag :options="spu_status" :value="scope.row.status"></dict-tag>
|
<dict-tag :options="spu_status" :value="scope.row.status"></dict-tag>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="price" label="商品价格,单位使用:分" show-overflow-tooltip/>
|
<el-table-column prop="price" label="商品价格" show-overflow-tooltip/>
|
||||||
<el-table-column prop="marketPrice" label="市场价,单位使用:分" show-overflow-tooltip/>
|
<el-table-column prop="marketPrice" label="市场价" show-overflow-tooltip/>
|
||||||
<el-table-column prop="stock" label="库存" show-overflow-tooltip/>
|
<el-table-column prop="stock" label="库存" show-overflow-tooltip/>
|
||||||
<el-table-column prop="giveIntegral" label="赠送积分" show-overflow-tooltip/>
|
|
||||||
<el-table-column prop="salesCount" label="商品销量" show-overflow-tooltip/>
|
<el-table-column prop="salesCount" label="商品销量" show-overflow-tooltip/>
|
||||||
<el-table-column prop="virtualSalesCount" label="虚拟销量" show-overflow-tooltip/>
|
|
||||||
<el-table-column prop="browseCount" label="商品点击量" show-overflow-tooltip/>
|
|
||||||
<el-table-column prop="merchantId" label="商户编号" show-overflow-tooltip/>
|
|
||||||
<el-table-column prop="deptId" label="部门id" show-overflow-tooltip/>
|
|
||||||
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip/>
|
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip/>
|
||||||
<el-table-column label="操作" width="150">
|
<el-table-column label="操作" width="150">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
|
|||||||
@@ -2,12 +2,19 @@
|
|||||||
<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
|
<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
|
||||||
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
|
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
|
||||||
<el-row :gutter="24">
|
<el-row :gutter="24">
|
||||||
|
<el-col :span="24" class="mb20">
|
||||||
|
<el-form-item label="商户" prop="merchantId">
|
||||||
|
<el-select v-model="form.merchantId" placeholder="请选择商户" style="width: 240px">
|
||||||
|
<el-option v-for="item in merchantInfo" :key="item.id" :label="item.name" :value="item.id" />
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
<el-col :span="12" class="mb20">
|
<el-col :span="12" class="mb20">
|
||||||
<el-form-item label="商品名称" prop="name">
|
<el-form-item label="商品名称" prop="name">
|
||||||
<el-input v-model="form.name" placeholder="请输入商品名称" />
|
<el-input v-model="form.name" placeholder="请输入商品名称" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8" class="mb20">
|
<el-col :span="12" class="mb20">
|
||||||
<el-form-item label="商品分类" prop="categoryId">
|
<el-form-item label="商品分类" prop="categoryId">
|
||||||
<el-select v-model="form.categoryId" placeholder="请选择商品分类">
|
<el-select v-model="form.categoryId" placeholder="请选择商品分类">
|
||||||
<el-option placeholder="请选择商品分类" v-for="item in categoryList" :key="item.id" :label="item.name" :value="item.id"> </el-option>
|
<el-option placeholder="请选择商品分类" v-for="item in categoryList" :key="item.id" :label="item.name" :value="item.id"> </el-option>
|
||||||
@@ -21,17 +28,17 @@
|
|||||||
<upload-img v-model:imageUrl="form.picUrl"></upload-img>
|
<upload-img v-model:imageUrl="form.picUrl"></upload-img>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<!-- <el-col :span="12" class="mb20">-->
|
<!-- <el-col :span="12" class="mb20">-->
|
||||||
<!-- <el-form-item label="商品简介" prop="introduction">-->
|
<!-- <el-form-item label="商品简介" prop="introduction">-->
|
||||||
<!-- <el-input type="textarea" v-model="form.introduction" placeholder="请输入商品简介" />-->
|
<!-- <el-input type="textarea" v-model="form.introduction" placeholder="请输入商品简介" />-->
|
||||||
<!-- </el-form-item>-->
|
<!-- </el-form-item>-->
|
||||||
<!-- </el-col>-->
|
<!-- </el-col>-->
|
||||||
|
|
||||||
<!-- <el-col :span="24" class="mb20">-->
|
<!-- <el-col :span="24" class="mb20">-->
|
||||||
<!-- <el-form-item label="商品轮播图" prop="sliderPicUrls">-->
|
<!-- <el-form-item label="商品轮播图" prop="sliderPicUrls">-->
|
||||||
<!-- <upload-imgs v-model:imageUrls="form.sliderPicUrls"></upload-imgs>-->
|
<!-- <upload-imgs v-model:imageUrls="form.sliderPicUrls"></upload-imgs>-->
|
||||||
<!-- </el-form-item>-->
|
<!-- </el-form-item>-->
|
||||||
<!-- </el-col>-->
|
<!-- </el-col>-->
|
||||||
|
|
||||||
<el-col :span="8" class="mb20">
|
<el-col :span="8" class="mb20">
|
||||||
<el-form-item label="排序" prop="sort">
|
<el-form-item label="排序" prop="sort">
|
||||||
@@ -65,23 +72,23 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
||||||
<!-- <el-col :span="8" class="mb20">-->
|
<!-- <el-col :span="8" class="mb20">-->
|
||||||
<!-- <el-form-item label="赠送积分" prop="giveIntegral">-->
|
<!-- <el-form-item label="赠送积分" prop="giveIntegral">-->
|
||||||
<!-- <el-input v-model="form.giveIntegral" placeholder="请输入赠送积分" />-->
|
<!-- <el-input v-model="form.giveIntegral" placeholder="请输入赠送积分" />-->
|
||||||
<!-- </el-form-item>-->
|
<!-- </el-form-item>-->
|
||||||
<!-- </el-col>-->
|
<!-- </el-col>-->
|
||||||
|
|
||||||
<!-- <el-col :span="8" class="mb20">-->
|
<!-- <el-col :span="8" class="mb20">-->
|
||||||
<!-- <el-form-item label="虚拟销量" prop="virtualSalesCount">-->
|
<!-- <el-form-item label="虚拟销量" prop="virtualSalesCount">-->
|
||||||
<!-- <el-input v-model="form.virtualSalesCount" placeholder="请输入虚拟销量" />-->
|
<!-- <el-input v-model="form.virtualSalesCount" placeholder="请输入虚拟销量" />-->
|
||||||
<!-- </el-form-item>-->
|
<!-- </el-form-item>-->
|
||||||
<!-- </el-col>-->
|
<!-- </el-col>-->
|
||||||
|
|
||||||
<!-- <el-col :span="24" class="mb20">-->
|
<!-- <el-col :span="24" class="mb20">-->
|
||||||
<!-- <el-form-item label="商品详情" prop="description">-->
|
<!-- <el-form-item label="商品详情" prop="description">-->
|
||||||
<!-- <editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>-->
|
<!-- <editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>-->
|
||||||
<!-- </el-form-item>-->
|
<!-- </el-form-item>-->
|
||||||
<!-- </el-col>-->
|
<!-- </el-col>-->
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
@@ -99,6 +106,7 @@ import { useMessage } from '/@/hooks/message';
|
|||||||
import { getObj, addObj, putObj } from '/@/api/canteen/canteenSpu';
|
import { getObj, addObj, putObj } from '/@/api/canteen/canteenSpu';
|
||||||
import { getAllSimple } from '/@/api/canteen/canteenCategory';
|
import { getAllSimple } from '/@/api/canteen/canteenCategory';
|
||||||
import { rule } from '/@/utils/validate';
|
import { rule } from '/@/utils/validate';
|
||||||
|
import { selectMerchantList } from '/@/api/canteen/merchantInfo';
|
||||||
const emit = defineEmits(['refresh']);
|
const emit = defineEmits(['refresh']);
|
||||||
|
|
||||||
// 定义变量内容
|
// 定义变量内容
|
||||||
@@ -107,10 +115,12 @@ const visible = ref(false);
|
|||||||
const loading = ref(false);
|
const loading = ref(false);
|
||||||
// 定义字典
|
// 定义字典
|
||||||
const { spu_status } = useDict('spu_status');
|
const { spu_status } = useDict('spu_status');
|
||||||
|
const merchantInfo = ref<any>([]); // 商户信息
|
||||||
|
|
||||||
// 提交表单数据
|
// 提交表单数据
|
||||||
const form = reactive({
|
const form = reactive({
|
||||||
id: '',
|
id: '',
|
||||||
|
merchantId: '',
|
||||||
name: '',
|
name: '',
|
||||||
introduction: '',
|
introduction: '',
|
||||||
description: '',
|
description: '',
|
||||||
@@ -127,12 +137,12 @@ const form = reactive({
|
|||||||
salesCount: '',
|
salesCount: '',
|
||||||
virtualSalesCount: '',
|
virtualSalesCount: '',
|
||||||
browseCount: '',
|
browseCount: '',
|
||||||
merchantId: '',
|
|
||||||
deptId: '',
|
deptId: '',
|
||||||
});
|
});
|
||||||
|
|
||||||
// 定义校验规则
|
// 定义校验规则
|
||||||
const dataRules = ref({
|
const dataRules = ref({
|
||||||
|
merchantId: [{ required: true, message: '商户不能为空', trigger: 'blur' }],
|
||||||
name: [{ required: true, message: '商品名称不能为空', trigger: 'blur' }],
|
name: [{ required: true, message: '商品名称不能为空', trigger: 'blur' }],
|
||||||
picUrl: [{ required: true, message: '商品封面图不能为空', trigger: 'blur' }],
|
picUrl: [{ required: true, message: '商品封面图不能为空', trigger: 'blur' }],
|
||||||
sort: [{ validator: rule.number, trigger: 'blur' }],
|
sort: [{ validator: rule.number, trigger: 'blur' }],
|
||||||
@@ -146,14 +156,23 @@ const dataRules = ref({
|
|||||||
});
|
});
|
||||||
|
|
||||||
// 打开弹窗
|
// 打开弹窗
|
||||||
const openDialog = (id: string) => {
|
const openDialog = async (id: string) => {
|
||||||
visible.value = true;
|
visible.value = true;
|
||||||
form.id = '';
|
form.id = '';
|
||||||
|
|
||||||
// 重置表单数据
|
// 重置表单数据
|
||||||
nextTick(() => {
|
dataFormRef.value?.resetFields();
|
||||||
dataFormRef.value?.resetFields();
|
|
||||||
});
|
if (merchantInfo.value.length <= 0) {
|
||||||
|
try {
|
||||||
|
// 获取商户下拉框选项
|
||||||
|
const res = await selectMerchantList('1');
|
||||||
|
merchantInfo.value = res.data;
|
||||||
|
} catch (error) {
|
||||||
|
merchantInfo.value = [];
|
||||||
|
loading.value = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 获取canteenSpu信息
|
// 获取canteenSpu信息
|
||||||
if (id) {
|
if (id) {
|
||||||
@@ -194,7 +213,7 @@ const getcanteenSpuData = (id: string) => {
|
|||||||
loading.value = false;
|
loading.value = false;
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
const categoryList = ref([]); // 商品分类树
|
const categoryList = ref<any>([]); // 商品分类树
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
const data = await getAllSimple();
|
const data = await getAllSimple();
|
||||||
categoryList.value = data.data;
|
categoryList.value = data.data;
|
||||||
|
|||||||
@@ -35,11 +35,29 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
||||||
<!-- <el-col :span="12" class="mb20">
|
<el-col :span="12" class="mb20">
|
||||||
<el-form-item label="spuId" prop="spuId">
|
<el-form-item label="进价" prop="purchasePrice">
|
||||||
<el-input placeholder="请输入spuId" v-model="form.spuId" />
|
<el-input-number v-model="form.purchasePrice" placeholder="请输入进价" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col> -->
|
</el-col>
|
||||||
|
|
||||||
|
<el-col :span="12" class="mb20">
|
||||||
|
<el-form-item label="零售价" prop="retailPrice">
|
||||||
|
<el-input-number v-model="form.retailPrice" placeholder="请输入零售价" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
|
||||||
|
<el-col :span="12" class="mb20">
|
||||||
|
<el-form-item label="促销价" prop="promotionPrice">
|
||||||
|
<el-input-number v-model="form.promotionPrice" placeholder="请输入促销价" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
|
||||||
|
<el-col :span="12" class="mb20">
|
||||||
|
<el-form-item label="成本价" prop="costPrice">
|
||||||
|
<el-input-number v-model="form.costPrice" placeholder="请输入成本价" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
@@ -71,6 +89,10 @@ const form = reactive({
|
|||||||
unit: '',
|
unit: '',
|
||||||
status: '',
|
status: '',
|
||||||
packageNum: 0,
|
packageNum: 0,
|
||||||
|
purchasePrice: '',
|
||||||
|
retailPrice: '',
|
||||||
|
promotionPrice: '',
|
||||||
|
costPrice: '',
|
||||||
});
|
});
|
||||||
|
|
||||||
// 定义校验规则
|
// 定义校验规则
|
||||||
@@ -80,7 +102,8 @@ const dataRules = ref({
|
|||||||
unit: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
|
unit: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
|
||||||
status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
|
status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
|
||||||
packageNum: [{ required: true, message: '内装数量不能为空', trigger: 'blur' }],
|
packageNum: [{ required: true, message: '内装数量不能为空', trigger: 'blur' }],
|
||||||
spuId: [{ required: true, message: 'spuId不能为空', trigger: 'blur' }],
|
purchasePrice: [{ required: true, message: '进价不能为空', trigger: 'blur' }],
|
||||||
|
retailPrice: [{ required: true, message: '零售价不能为空', trigger: 'blur' }],
|
||||||
});
|
});
|
||||||
|
|
||||||
// 打开弹窗
|
// 打开弹窗
|
||||||
|
|||||||
@@ -67,8 +67,8 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="packageNum" label="内装数量" show-overflow-tooltip />
|
<el-table-column prop="packageNum" label="内装数量" show-overflow-tooltip />
|
||||||
<el-table-column prop="purchasePrice" label="进价/单位分" show-overflow-tooltip />
|
<el-table-column prop="purchasePrice" label="进价" show-overflow-tooltip />
|
||||||
<el-table-column prop="retailPrice" label="零售价/单位分" show-overflow-tooltip />
|
<el-table-column prop="retailPrice" label="零售价" show-overflow-tooltip />
|
||||||
<!-- <el-table-column prop="spuId" label="spuId" show-overflow-tooltip /> -->
|
<!-- <el-table-column prop="spuId" label="spuId" show-overflow-tooltip /> -->
|
||||||
<el-table-column prop="promotionPrice" label="促销价" show-overflow-tooltip />
|
<el-table-column prop="promotionPrice" label="促销价" show-overflow-tooltip />
|
||||||
<el-table-column prop="costPrice" label="成本价" show-overflow-tooltip />
|
<el-table-column prop="costPrice" label="成本价" show-overflow-tooltip />
|
||||||
|
|||||||
@@ -110,40 +110,40 @@
|
|||||||
<el-col :span="12" class="mb20 pr-10">
|
<el-col :span="12" class="mb20 pr-10">
|
||||||
<el-form-item label="货商" prop="supplierId">
|
<el-form-item label="货商" prop="supplierId">
|
||||||
<el-select v-model="form.supplierId" placeholder="请选择货商">
|
<el-select v-model="form.supplierId" placeholder="请选择货商">
|
||||||
<el-option v-for="item in supplierOptions" :key="item.supplierId" :label="item.supplierName" :value="item.supplierId" />
|
<el-option v-for="item in supplierOptions" :key="item?.id" :label="item?.typeName" :value="item?.id" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12" class="mb20 pr-10">
|
<!-- <el-col :span="12" class="mb20 pr-10">-->
|
||||||
<el-form-item label="会员价1" prop="memberPrice1">
|
<!-- <el-form-item label="会员价1" prop="memberPrice1">-->
|
||||||
<el-input-number v-model="form.memberPrice1" placeholder="请输入会员价1"></el-input-number>
|
<!-- <el-input-number v-model="form.memberPrice1" placeholder="请输入会员价1"></el-input-number>-->
|
||||||
</el-form-item>
|
<!-- </el-form-item>-->
|
||||||
</el-col>
|
<!-- </el-col>-->
|
||||||
<el-col :span="12" class="mb20 pr-10">
|
<!-- <el-col :span="12" class="mb20 pr-10">-->
|
||||||
<el-form-item label="会员价2" prop="memberPrice2">
|
<!-- <el-form-item label="会员价2" prop="memberPrice2">-->
|
||||||
<el-input-number v-model="form.memberPrice2" placeholder="请输入会员价2"></el-input-number>
|
<!-- <el-input-number v-model="form.memberPrice2" placeholder="请输入会员价2"></el-input-number>-->
|
||||||
</el-form-item>
|
<!-- </el-form-item>-->
|
||||||
</el-col>
|
<!-- </el-col>-->
|
||||||
<el-col :span="12" class="mb20 pr-10">
|
<!-- <el-col :span="12" class="mb20 pr-10">-->
|
||||||
<el-form-item label="会员价3" prop="memberPrice3">
|
<!-- <el-form-item label="会员价3" prop="memberPrice3">-->
|
||||||
<el-input-number v-model="form.memberPrice3" placeholder="请输入会员价3"></el-input-number>
|
<!-- <el-input-number v-model="form.memberPrice3" placeholder="请输入会员价3"></el-input-number>-->
|
||||||
</el-form-item>
|
<!-- </el-form-item>-->
|
||||||
</el-col>
|
<!-- </el-col>-->
|
||||||
<el-col :span="12" class="mb20 pr-10">
|
<!-- <el-col :span="12" class="mb20 pr-10">-->
|
||||||
<el-form-item label="批发价1" prop="wholesalePrice1">
|
<!-- <el-form-item label="批发价1" prop="wholesalePrice1">-->
|
||||||
<el-input-number v-model="form.wholesalePrice1" placeholder="请输入批发价1"></el-input-number>
|
<!-- <el-input-number v-model="form.wholesalePrice1" placeholder="请输入批发价1"></el-input-number>-->
|
||||||
</el-form-item>
|
<!-- </el-form-item>-->
|
||||||
</el-col>
|
<!-- </el-col>-->
|
||||||
<el-col :span="12" class="mb20 pr-10">
|
<!-- <el-col :span="12" class="mb20 pr-10">-->
|
||||||
<el-form-item label="批发价2" prop="wholesalePrice2">
|
<!-- <el-form-item label="批发价2" prop="wholesalePrice2">-->
|
||||||
<el-input-number v-model="form.wholesalePrice2" placeholder="请输入批发价2"></el-input-number>
|
<!-- <el-input-number v-model="form.wholesalePrice2" placeholder="请输入批发价2"></el-input-number>-->
|
||||||
</el-form-item>
|
<!-- </el-form-item>-->
|
||||||
</el-col>
|
<!-- </el-col>-->
|
||||||
<el-col :span="12" class="mb20 pr-10">
|
<!-- <el-col :span="12" class="mb20 pr-10">-->
|
||||||
<el-form-item label="批发价3" prop="wholesalePrice3">
|
<!-- <el-form-item label="批发价3" prop="wholesalePrice3">-->
|
||||||
<el-input-number v-model="form.wholesalePrice3" placeholder="请输入批发价3"></el-input-number>
|
<!-- <el-input-number v-model="form.wholesalePrice3" placeholder="请输入批发价3"></el-input-number>-->
|
||||||
</el-form-item>
|
<!-- </el-form-item>-->
|
||||||
</el-col>
|
<!-- </el-col>-->
|
||||||
<el-col :span="12" class="mb20 pr-10">
|
<el-col :span="12" class="mb20 pr-10">
|
||||||
<el-form-item label="促销价" prop="promotionPrice">
|
<el-form-item label="促销价" prop="promotionPrice">
|
||||||
<el-input-number v-model="form.promotionPrice" placeholder="请输入促销价"></el-input-number>
|
<el-input-number v-model="form.promotionPrice" placeholder="请输入促销价"></el-input-number>
|
||||||
@@ -156,11 +156,11 @@
|
|||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24" class="mb20 pr-10">
|
<!-- <el-col :span="24" class="mb20 pr-10">-->
|
||||||
<el-form-item label="商品简介" prop="introduction">
|
<!-- <el-form-item label="商品简介" prop="introduction">-->
|
||||||
<el-input type="textarea" v-model="form.introduction" rows="4" placeholder="请输入商品简介" maxlength="400" show-word-limit />
|
<!-- <el-input type="textarea" v-model="form.introduction" rows="4" placeholder="请输入商品简介" maxlength="400" show-word-limit />-->
|
||||||
</el-form-item>
|
<!-- </el-form-item>-->
|
||||||
</el-col>
|
<!-- </el-col>-->
|
||||||
<el-col :span="24" class="mb20 pr-10">
|
<el-col :span="24" class="mb20 pr-10">
|
||||||
<el-form-item label="商品详情" prop="description">
|
<el-form-item label="商品详情" prop="description">
|
||||||
<editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>
|
<editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>
|
||||||
@@ -207,9 +207,7 @@
|
|||||||
import { useDict } from '/@/hooks/dict';
|
import { useDict } from '/@/hooks/dict';
|
||||||
import { useMessage } from '/@/hooks/message';
|
import { useMessage } from '/@/hooks/message';
|
||||||
import { getObj, addObj, putObj, getSupermarketCategory, getSupermarketBrand } from '/@/api/supermarket/supermarketSpu';
|
import { getObj, addObj, putObj, getSupermarketCategory, getSupermarketBrand } from '/@/api/supermarket/supermarketSpu';
|
||||||
import { getObj as getSupermarketUnit } from '/@/api/supermarket/supermarketUnit';
|
import { getSupplierTypeOptions } from '/@/api/supermarketerp/smErpSupplier';
|
||||||
import { getObj as getSupermarketAuxiliaryCode } from '/@/api/supermarket/supermarketAuxiliaryCode';
|
|
||||||
import { fetchList } from '/@/api/supermarketerp/smErpSupplier';
|
|
||||||
import { rule } from '/@/utils/validate';
|
import { rule } from '/@/utils/validate';
|
||||||
import supermarketAuxiliaryCode from './components/supermarketAuxiliaryCode/index.vue';
|
import supermarketAuxiliaryCode from './components/supermarketAuxiliaryCode/index.vue';
|
||||||
import supermarketUnit from './components/supermarketUnit/index.vue';
|
import supermarketUnit from './components/supermarketUnit/index.vue';
|
||||||
@@ -294,20 +292,6 @@ const getsupermarketSpuData = (id: string) => {
|
|||||||
.finally(() => {
|
.finally(() => {
|
||||||
loading.value = false;
|
loading.value = false;
|
||||||
});
|
});
|
||||||
getSupermarketUnit(id)
|
|
||||||
.then((res: any) => {
|
|
||||||
form.supermarketUnitEntityList = res.data;
|
|
||||||
})
|
|
||||||
.finally(() => {
|
|
||||||
loading.value = false;
|
|
||||||
});
|
|
||||||
getSupermarketAuxiliaryCode(id)
|
|
||||||
.then((res: any) => {
|
|
||||||
form.supermarketAuxiliaryCodeEntityList = res.data;
|
|
||||||
})
|
|
||||||
.finally(() => {
|
|
||||||
loading.value = false;
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// 打开弹窗
|
// 打开弹窗
|
||||||
@@ -315,8 +299,6 @@ const openDialog = async (id: string) => {
|
|||||||
visible.value = true;
|
visible.value = true;
|
||||||
currentTabPaneIndex.value = 0;
|
currentTabPaneIndex.value = 0;
|
||||||
form.id = '';
|
form.id = '';
|
||||||
form.supermarketUnitEntityList = [];
|
|
||||||
form.supermarketAuxiliaryCodeEntityList = [];
|
|
||||||
|
|
||||||
// 重置表单数据
|
// 重置表单数据
|
||||||
dataFormRef.value?.resetFields();
|
dataFormRef.value?.resetFields();
|
||||||
@@ -350,8 +332,8 @@ const openDialog = async (id: string) => {
|
|||||||
// 获取货商选项
|
// 获取货商选项
|
||||||
if (supplierOptions.value.length <= 0) {
|
if (supplierOptions.value.length <= 0) {
|
||||||
try {
|
try {
|
||||||
const res = await fetchList();
|
const res = await getSupplierTypeOptions();
|
||||||
supplierOptions.value = res.data.records;
|
supplierOptions.value = res.data;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
supplierOptions.value = [];
|
supplierOptions.value = [];
|
||||||
}
|
}
|
||||||
@@ -368,6 +350,7 @@ const onSubmit = async () => {
|
|||||||
console.log(form);
|
console.log(form);
|
||||||
|
|
||||||
const valid = await dataFormRef.value.validate().catch(() => {});
|
const valid = await dataFormRef.value.validate().catch(() => {});
|
||||||
|
if (!valid) useMessage().warning('基础信息必填项未填写完整');
|
||||||
if (!form.supermarketUnitEntityList || form.supermarketUnitEntityList.length <= 0) useMessage().warning('请添加包装单位');
|
if (!form.supermarketUnitEntityList || form.supermarketUnitEntityList.length <= 0) useMessage().warning('请添加包装单位');
|
||||||
if (!form.supermarketAuxiliaryCodeEntityList || form.supermarketAuxiliaryCodeEntityList.length <= 0) useMessage().warning('请添加辅助条码');
|
if (!form.supermarketAuxiliaryCodeEntityList || form.supermarketAuxiliaryCodeEntityList.length <= 0) useMessage().warning('请添加辅助条码');
|
||||||
if (!valid) return false;
|
if (!valid) return false;
|
||||||
|
|||||||
+7
-7
@@ -9,8 +9,8 @@ import viteCompression from 'vite-plugin-compression';
|
|||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
import { svgBuilder } from '/@/components/IconSelector/index';
|
import { svgBuilder } from '/@/components/IconSelector/index';
|
||||||
|
|
||||||
import dns from 'node:dns'
|
import dns from 'node:dns';
|
||||||
dns.setDefaultResultOrder('verbatim')
|
dns.setDefaultResultOrder('verbatim');
|
||||||
|
|
||||||
const pathResolve = (dir: string) => {
|
const pathResolve = (dir: string) => {
|
||||||
return resolve(__dirname, '.', dir);
|
return resolve(__dirname, '.', dir);
|
||||||
@@ -24,7 +24,7 @@ const alias: Record<string, string> = {
|
|||||||
const viteConfig = defineConfig((mode: ConfigEnv) => {
|
const viteConfig = defineConfig((mode: ConfigEnv) => {
|
||||||
const env = loadEnv(mode.mode, process.cwd());
|
const env = loadEnv(mode.mode, process.cwd());
|
||||||
// 判断是否开发环境
|
// 判断是否开发环境
|
||||||
const isDev = env.ENV === 'development'
|
const isDev = env.ENV === 'development';
|
||||||
return {
|
return {
|
||||||
plugins: [
|
plugins: [
|
||||||
vue(), // Vue 插件
|
vue(), // Vue 插件
|
||||||
@@ -77,18 +77,18 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
build: {
|
build: {
|
||||||
outDir: 'dist', // 打包输出目录
|
outDir: 'dist', // 打包输出目录//
|
||||||
chunkSizeWarningLimit: 1500, // 代码分包阈值
|
chunkSizeWarningLimit: 1500, // 代码分包阈值
|
||||||
// 开发使用 esbuild 更快,生产环境打包使用 terser 可以删除更多注释
|
// 开发使用 esbuild 更快,生产环境打包使用 terser 可以删除更多注释
|
||||||
minify: isDev ? 'esbuild' : 'terser',
|
minify: isDev ? 'esbuild' : 'terser',
|
||||||
terserOptions: {
|
terserOptions: {
|
||||||
compress: {
|
compress: {
|
||||||
drop_console: true, // 删除 console
|
drop_console: true, // 删除 console
|
||||||
drop_debugger: true, // 删除 debugger
|
drop_debugger: true, // 删除 debugger
|
||||||
},
|
},
|
||||||
format: {
|
format: {
|
||||||
comments: false // 删除所有注释
|
comments: false, // 删除所有注释
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
rollupOptions: {
|
rollupOptions: {
|
||||||
output: {
|
output: {
|
||||||
|
|||||||
Reference in new issue
Block a user