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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zjf committed 2025-01-07 15:21:53 +08:00
2 parents f0c6056e57 8aeed03d5c
commit 3bd0644d3b
4 files changed
+306 -253
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.env.development
+6 -4
View File
@@ -8,12 +8,14 @@ VITE_OPEN = true
ENV = 'development' 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
src/views/canteen/canteenOnlineCategory/form.vue
+105 -83
View File
@@ -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="24" 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-number 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>
src/views/canteen/canteenOnlineSpu/form.vue
+144 -134
View File
@@ -1,154 +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-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-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="merchantId"> <el-form-item label="商品分类" prop="categoryId">
<el-input v-model="form.merchantId" placeholder="请输入商户编号"/> <el-select v-model="form.categoryId" placeholder="请选择商品分类">
</el-form-item> <el-option label="请选择">0</el-option>
</el-col> </el-select>
<el-col :span="12" class="mb20"> </el-form-item>
<el-form-item label="商品名称" prop="name"> </el-col>
<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="categoryId"> <el-form-item label="商品价格" prop="price">
<el-select v-model="form.categoryId" placeholder="请选择商品分类"> <el-input-number v-model="form.price" placeholder="请输入商品价格" />
<el-option label="请选择">0</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> <el-col :span="12" class="mb20">
</el-col> <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="price"> <el-form-item label="商品轮播图" prop="sliderPicUrls">
<el-input-number v-model="form.price" placeholder="请输入商品价格"/> <upload-imgs v-model="form.sliderPicUrls"></upload-imgs>
</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="24" class="mb20"> <el-col :span="12" class="mb20">
<el-form-item label="商品轮播图" prop="sliderPicUrls"> <el-form-item label="排序字段" prop="sort">
<upload-img v-model="form.sliderPicUrls"></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="排序字段" prop="sort"> <el-form-item label="商品状态" prop="status">
<el-input-number v-model="form.sort" placeholder="请输入排序字段"/> <el-radio-group v-model="form.status">
</el-form-item> <el-radio :label="item.value" v-for="(item, index) in spu_status" border :key="index">{{ item.label }} </el-radio>
</el-col> </el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20"> <!-- <el-col :span="12" class="mb20">-->
<el-form-item label="商品状态" prop="status"> <!-- <el-form-item label="部门id" prop="deptId">-->
<el-radio-group v-model="form.status"> <!-- <el-input v-model="form.deptId" placeholder="请输入部门id"/>-->
<el-radio :label="item.value" v-for="(item, index) in spu_status" border :key="index">{{ item.label }} <!-- </el-form-item>-->
</el-radio> <!-- </el-col>-->
</el-radio-group> <el-col :span="24" class="mb20">
</el-form-item> <el-form-item label="商品详情" prop="description">
</el-col> <editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>
</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: '0', 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: [{ required: true,message: '请输入库存数量',trigger: 'blur' }], marketPrice: [{ required: true, message: '市场价', trigger: 'blur' }],
status: [{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);
}
}; };
// 提交 // 提交
@@ -157,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;
@@ -165,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>
src/views/canteen/canteenSpu/form.vue
+51 -32
View File
@@ -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;