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:
ctw committed 2025-01-08 17:29:53 +08:00
1 parent 1a8f5192cb
commit 9413207905
12 files changed
+349 -319
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/views/canteen/canteenOnlineSpu/form.vue
+1
View File
@@ -163,6 +163,7 @@ const getcanteenOnlineSpuData = (id: string) => {
Object.assign(form, res.data, {
price: Number(displayPrice(res.data.price, '')),
marketPrice: Number(displayPrice(res.data.marketPrice, '')),
status: '' + res.data.status,
});
})
.finally(() => {
src/views/supermarket/supermarketBrand/form.vue
+15 -7
View File
@@ -2,31 +2,37 @@
<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-row :gutter="24">
<el-col :span="12" class="mb20">
<el-col :span="14" class="mb20">
<el-form-item label="商户" prop="merchantId">
<select-mch v-model="form.merchantId" />
</el-form-item>
</el-col>
<el-col :span="14" 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="24" class="mb20">
<el-form-item label="品牌图片" prop="picUrl">
<upload-img v-model="form.picUrl"></upload-img>
<upload-img v-model:imageUrl="form.picUrl" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="14" class="mb20">
<el-form-item label="品牌排序" prop="sort">
<el-input-number :min="1" :max="1000" v-model="form.sort" placeholder="请输入品牌排序"></el-input-number>
<el-input-number :min="1" :max="1000" v-model="form.sort" placeholder="请输入品牌排序" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="14" class="mb20">
<el-form-item label="品牌描述" prop="description">
<el-input v-model="form.description" placeholder="请输入品牌描述" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="24" class="mb20">
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio :label="item.value" v-for="(item, index) in status" border :key="index">{{ item.label }} </el-radio>
@@ -61,6 +67,7 @@ const { status } = useDict('status');
// 提交表单数据
const form = reactive({
id: '',
merchantId: '',
name: '',
picUrl: '',
sort: 0,
@@ -70,6 +77,7 @@ const form = reactive({
// 定义校验规则
const dataRules = ref({
merchantId: [{ required: true, message: '商户不能为空', trigger: 'blur' }],
name: [{ required: true, message: '品牌名称不能为空', trigger: 'blur' }],
sort: [{ validator: rule.number, trigger: 'blur' }],
});
src/views/supermarket/supermarketBrand/index.vue
+3 -6
View File
@@ -50,15 +50,15 @@
<el-table-column type="index" label="#" width="50" />
<el-table-column prop="name" label="品牌名称" show-overflow-tooltip />
<el-table-column prop="picUrl" label="品牌图片" show-overflow-tooltip>
<template #default="scope">
<preview-image style="width: 50px; height: 50px" :src="imageBaseUrl + scope.row.picUrl" />
<template #default="{ row }">
<preview-image :src="row.picUrl" />
</template>
</el-table-column>
<el-table-column prop="sort" label="品牌排序" show-overflow-tooltip />
<el-table-column prop="description" label="品牌描述" show-overflow-tooltip />
<el-table-column prop="status" label="状态" show-overflow-tooltip>
<template #default="scope">
<dict-tag :options="status" :value="scope.row.status"></dict-tag>
<dict-tag :options="status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="操作" width="150">
@@ -92,11 +92,8 @@ import { fetchList, delObjs } from '/@/api/supermarket/supermarketBrand';
import { useMessage, useMessageBox } from '/@/hooks/message';
import { useDict } from '/@/hooks/dict';
// 图片基础路径
const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH;
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
// 定义查询字典
const { status } = useDict('status');
// 定义变量内容
src/views/supermarket/supermarketCategory/form.vue
+79 -80
View File
@@ -1,103 +1,101 @@
<template>
<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-row :gutter="24">
<el-col :span="12" class="mb20">
<el-form-item label="父分类编号" prop="parentId">
<el-input v-model="form.parentId" placeholder="请输入父分类编号"/>
</el-form-item>
</el-col>
<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-row :gutter="24">
<el-col :span="14" class="mb20">
<el-form-item label="商户" prop="merchantId">
<select-mch v-model="form.merchantId" />
</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="14" 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-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-form-item label="分类图" prop="picUrl">
<upload-img v-model:imageUrl="form.picUrl" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="分类排序" prop="sort">
<el-input-number :min="1" :max="1000" v-model="form.sort" placeholder="请输入分类排序"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="14" class="mb20">
<el-form-item label="分类排序" prop="sort">
<el-input-number :min="1" :max="1000" v-model="form.sort" placeholder="请输入分类排序" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="开启状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio :label="item.value" v-for="(item, index) in 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="部门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="status">
<el-radio-group v-model="form.status">
<el-radio :label="item.value" v-for="(item, index) in status" border :key="index">{{ item.label }} </el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="14" 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-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
</span>
</template>
</el-dialog>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
</span>
</template>
</el-dialog>
</template>
<script setup lang="ts" name="SupermarketCategoryDialog">
import { useDict } from '/@/hooks/dict';
import { useMessage } from "/@/hooks/message";
import { getObj, addObj, putObj } from '/@/api/supermarket/supermarketCategory'
import { useMessage } from '/@/hooks/message';
import { getObj, addObj, putObj } from '/@/api/supermarket/supermarketCategory';
import { rule } from '/@/utils/validate';
const emit = defineEmits(['refresh']);
// 定义变量内容
const dataFormRef = ref();
const visible = ref(false)
const loading = ref(false)
const visible = ref(false);
const loading = ref(false);
// 定义字典
const { status } = useDict('status')
const { status } = useDict('status');
// 提交表单数据
const form = reactive({
id:'',
parentId: '',
name: '',
picUrl: '',
sort: 0,
status: '',
deptId: '',
id: '',
merchantId: '',
name: '',
picUrl: '',
sort: 0,
status: '',
});
// 定义校验规则
const dataRules = ref({
name: [{required: true, message: '分类名称不能为空', trigger: 'blur'}],
})
merchantId: [{ required: true, message: '商户不能为空', trigger: 'blur' }],
name: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }],
});
// 打开弹窗
const openDialog = (id: string) => {
visible.value = true
form.id = ''
visible.value = true;
form.id = '';
// 重置表单数据
// 重置表单数据
nextTick(() => {
dataFormRef.value?.resetFields();
});
// 获取supermarketCategory信息
if (id) {
form.id = id
getsupermarketCategoryData(id)
}
// 获取supermarketCategory信息
if (id) {
form.id = id;
getsupermarketCategoryData(id);
}
};
// 提交
@@ -106,7 +104,7 @@ const onSubmit = async () => {
if (!valid) return false;
try {
loading.value = true;
loading.value = true;
form.id ? await putObj(form) : await addObj(form);
useMessage().success(form.id ? '修改成功' : '添加成功');
visible.value = false;
@@ -114,24 +112,25 @@ const onSubmit = async () => {
} catch (err: any) {
useMessage().error(err.msg);
} finally {
loading.value = false;
}
loading.value = false;
}
};
// 初始化表单数据
const getsupermarketCategoryData = (id: string) => {
// 获取数据
loading.value = true
getObj(id).then((res: any) => {
Object.assign(form, res.data)
}).finally(() => {
loading.value = false
})
// 获取数据
loading.value = true;
getObj(id)
.then((res: any) => {
Object.assign(form, res.data);
})
.finally(() => {
loading.value = false;
});
};
// 暴露变量
defineExpose({
openDialog
openDialog,
});
</script>
src/views/supermarket/supermarketCategory/index.vue
+11 -7
View File
@@ -7,7 +7,7 @@
<el-input placeholder="请输入分类名称" v-model="state.queryForm.name" />
</el-form-item>
<el-form-item>
<el-button icon="search" type="primary" @click="getDataList"> 查询 </el-button>
<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
@@ -47,18 +47,22 @@
@sort-change="sortChangeHandle"
>
<el-table-column type="selection" width="40" align="center" />
<el-table-column type="index" label="#" width="40" />
<el-table-column prop="parentId" label="父分类编号" show-overflow-tooltip />
<el-table-column type="index" label="#" width="50" />
<!-- <el-table-column prop="parentId" 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>
<template #default="scope">
<preview-image :src="scope.row.picUrl" />
</template>
</el-table-column>
<el-table-column prop="sort" label="分类排序" show-overflow-tooltip />
<el-table-column prop="status" label="开启状态" show-overflow-tooltip>
<template #default="scope">
<dict-tag :options="status" :value="scope.row.status"></dict-tag>
<dict-tag :options="status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column prop="deptId" label="部门id" show-overflow-tooltip min-width="160" />
<el-table-column label="操作" width="150">
<!-- <el-table-column prop="deptId" label="部门id" show-overflow-tooltip min-width="160" /> -->
<el-table-column label="操作" width="150" fixed="right">
<template #default="scope">
<el-button
icon="edit-pen"
src/views/supermarket/supermarketSpu/components/supermarketAuxiliaryCode/form.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<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-row :gutter="24">
<el-col :span="12" class="mb20 mx-auto">
<el-col :span="24" class="mb20">
<el-form-item label="条码" prop="barCode">
<el-input v-model="form.barCode" placeholder="请输入条码" />
</el-form-item>
src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue
+9 -9
View File
@@ -2,25 +2,25 @@
<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="110px" v-loading="loading">
<el-row :gutter="24">
<el-col :span="12" class="mb20">
<el-col :span="14" class="mb20">
<el-form-item label="条码" prop="barCode">
<el-input placeholder="请输入条码" v-model="form.barCode" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="14" class="mb20">
<el-form-item label="规格" prop="spec">
<el-input placeholder="请输入规格" v-model="form.spec" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="14" class="mb20">
<el-form-item label="单位" prop="unit">
<el-input placeholder="请输入单位" v-model="form.unit" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="14" class="mb20">
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" placeholder="请选择状态">
<el-option label="正常" :value="0"></el-option>
@@ -29,31 +29,31 @@
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="14" class="mb20">
<el-form-item label="内装数量" prop="packageNum">
<el-input-number v-model="form.packageNum" placeholder="请输入内装数量" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="14" class="mb20">
<el-form-item label="进价" prop="purchasePrice">
<el-input-number v-model="form.purchasePrice" placeholder="请输入进价" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="14" 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-col :span="14" 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-col :span="14" class="mb20">
<el-form-item label="成本价" prop="costPrice">
<el-input-number v-model="form.costPrice" placeholder="请输入成本价" />
</el-form-item>
src/views/supermarket/supermarketSpu/form.vue
+40 -42
View File
@@ -3,180 +3,178 @@
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="auto" v-loading="loading">
<el-tabs v-model="tabPaneActiveName" @tab-change="handleTabChange">
<el-tab-pane label="基础信息" name="基础信息" style="overflow-y: auto; height: 60vh">
<el-row style="padding: 10px">
<el-col :span="12" class="mb20 pr-10">
<el-row>
<el-col :span="12" class="mb20">
<el-form-item label="商户" prop="merchantId">
<select-mch v-model="form.merchantId" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="货号" prop="productCode">
<el-input v-model="form.productCode" placeholder="请输入货号" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20 pr-10">
<el-col :span="12" class="mb20">
<el-form-item label="自编码/条码" prop="barcode">
<el-input v-model="form.barcode" placeholder="请输入自编码/条码" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20 pr-10">
<el-col :span="12" class="mb20">
<el-form-item label="商品名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入商品名称" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20 pr-10">
<el-col :span="12" class="mb20">
<el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20 pr-10">
<el-col :span="12" class="mb20">
<el-form-item label="商品分类" prop="categoryId">
<el-select v-model="form.categoryId" placeholder="请选择商品分类">
<el-option v-for="item in categoryOptions" :key="item?.id" :label="item?.name" :value="item?.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20 pr-10">
<el-col :span="12" class="mb20">
<el-form-item label="品牌" prop="brandId">
<el-select v-model="form.brandId" placeholder="请选择品牌">
<el-option v-for="item in brandOptions" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" class="mb20 pr-10">
<el-col :span="24" class="mb20">
<el-form-item label="商品封面图" prop="picUrl">
<upload-img v-model:imageUrl="form.picUrl"></upload-img>
</el-form-item>
</el-col>
<el-col :span="24" class="mb20 pr-10">
<el-col :span="24" class="mb20">
<el-form-item label="商品轮播图" prop="sliderPicUrls">
<upload-imgs v-model:imageUrl="form.sliderPicUrls"></upload-imgs>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20 pr-10">
<el-col :span="12" class="mb20">
<el-form-item label="排序字段" prop="sort">
<el-input-number :min="0" :max="1000" v-model="form.sort" placeholder="请输入排序字段"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20 pr-10">
<el-col :span="24" class="mb20">
<el-form-item label="商品状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio :label="item.value" v-for="(item, index) in status" border :key="index">{{ item.label }} </el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20 pr-10">
<el-col :span="12" class="mb20">
<el-form-item label="成本单价" prop="costPrice">
<el-input-number v-model="form.costPrice" placeholder="请输入成本单价，单位:分"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20 pr-10">
<el-col :span="12" class="mb20">
<el-form-item label="库存" prop="stock">
<el-input-number v-model="form.stock" placeholder="请输入库存"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20 pr-10">
<el-col :span="12" class="mb20">
<el-form-item label="赠送积分" prop="giveIntegral">
<el-input-number v-model="form.giveIntegral" placeholder="请输入赠送积分"></el-input-number>
</el-form-item>
</el-col>
<!-- <el-col :span="12" class="mb20 pr-10">
<el-form-item label="商户编号" prop="merchantId">
<el-select v-model="form.merchantId" placeholder="请选择商户编号">
<el-option label="请选择" :value="1">1???</el-option>
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="12" class="mb20 pr-10">
<el-col :span="12" class="mb20">
<el-form-item label="规格" prop="specification">
<el-input v-model="form.specification" placeholder="请输入规格" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20 pr-10">
<el-col :span="12" class="mb20">
<el-form-item label="产地" prop="origin">
<el-input v-model="form.origin" placeholder="请输入产地" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20 pr-10">
<el-col :span="12" class="mb20">
<el-form-item label="装数" prop="packingQuantity">
<el-input-number :min="0" v-model="form.packingQuantity" placeholder="请输入装数"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20 pr-10">
<el-col :span="12" class="mb20">
<el-form-item label="零售价" prop="retailPrice">
<el-input-number v-model="form.retailPrice" placeholder="请输入零售价"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20 pr-10">
<el-col :span="12" class="mb20">
<el-form-item label="进价" prop="purchasePrice">
<el-input-number v-model="form.purchasePrice" placeholder="请输入进价"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20 pr-10">
<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-select>
</el-form-item>
</el-col>
<!-- <el-col :span="12" class="mb20 pr-10">-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="会员价1" prop="memberPrice1">-->
<!-- <el-input-number v-model="form.memberPrice1" placeholder="请输入会员价1"></el-input-number>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20 pr-10">-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="会员价2" prop="memberPrice2">-->
<!-- <el-input-number v-model="form.memberPrice2" placeholder="请输入会员价2"></el-input-number>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20 pr-10">-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="会员价3" prop="memberPrice3">-->
<!-- <el-input-number v-model="form.memberPrice3" placeholder="请输入会员价3"></el-input-number>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20 pr-10">-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="批发价1" prop="wholesalePrice1">-->
<!-- <el-input-number v-model="form.wholesalePrice1" placeholder="请输入批发价1"></el-input-number>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20 pr-10">-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="批发价2" prop="wholesalePrice2">-->
<!-- <el-input-number v-model="form.wholesalePrice2" placeholder="请输入批发价2"></el-input-number>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20 pr-10">-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="批发价3" prop="wholesalePrice3">-->
<!-- <el-input-number v-model="form.wholesalePrice3" placeholder="请输入批发价3"></el-input-number>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12" class="mb20 pr-10">
<el-col :span="12" class="mb20">
<el-form-item label="促销价" prop="promotionPrice">
<el-input-number v-model="form.promotionPrice" placeholder="请输入促销价"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20 pr-10">
<el-col :span="12" class="mb20">
<el-form-item label="商品性质" prop="productNature">
<el-select v-model="form.productNature" placeholder="请选择商品性质">
<el-option :value="item.value" :label="item.label" v-for="(item, index) in supermarket_nature" :key="index"></el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="24" class="mb20 pr-10">
<!-- <el-col :span="24" class="mb20">
<el-form-item label="商品简介" prop="introduction">
<el-input type="textarea" v-model="form.introduction" rows="4" placeholder="请输入商品简介" maxlength="400" show-word-limit />
</el-form-item>
</el-col> -->
<el-col :span="24" class="mb20 pr-10">
<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-col :span="12" class="mb20 pr-10">
<el-col :span="12" class="mb20">
<el-form-item label="库存上限" prop="inventoryUpperLimit">
<el-input-number v-model="form.inventoryUpperLimit" placeholder="请输入库存上限"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20 pr-10">
<el-col :span="12" class="mb20">
<el-form-item label="库存下限" prop="inventoryLowerLimit">
<el-input-number v-model="form.inventoryLowerLimit" placeholder="请输入库存下限"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20 pr-10">
<el-col :span="12" class="mb20">
<el-form-item label="毛利率" prop="grossMargin">
<el-input-number v-model="form.grossMargin" placeholder="请输入毛利率"></el-input-number>
</el-form-item>
@@ -225,6 +223,7 @@ const tabPaneActiveName = computed(() => tabPaneEnum[currentTabPaneIndex.value])
// 提交表单数据
const form = reactive({
id: '',
merchantId: '',
productCode: '',
barcode: '',
productName: '',
@@ -238,7 +237,6 @@ const form = reactive({
costPrice: 0,
stock: 0,
giveIntegral: 0,
merchantId: '',
specification: '',
origin: '',
packingQuantity: 0,
@@ -263,6 +261,7 @@ const form = reactive({
});
// 定义校验规则
const dataRules = {
merchantId: [{ required: true, message: '商户不能为空', trigger: 'blur' }],
productCode: [{ required: true, message: '货号不能为空', trigger: 'blur' }],
barcode: [{ required: true, message: '自编码/条码不能为空', trigger: 'blur' }],
productName: [{ required: true, message: '商品名称不能为空', trigger: 'blur' }],
@@ -271,7 +270,6 @@ const dataRules = {
brandId: [{ required: true, message: '品牌不能为空', trigger: 'blur' }],
picUrl: [{ required: true, message: '商品封面图不能为空', trigger: 'blur' }],
status: [{ required: true, message: '请选择商品状态', trigger: 'blur' }],
merchantId: [{ required: true, message: '商户编号不能为空', trigger: 'blur' }],
supplierId: [{ required: true, message: '请选择货商', trigger: 'blur' }],
supermarketUnitEntityList: [{ required: true, message: '请添加包装单位', trigger: 'change' }],
supermarketAuxiliaryCodeEntityList: [{ required: true, message: '请添加辅助条码', trigger: 'change' }],
src/views/supermarketerp/smErpSupplier/form.vue
+12 -12
View File
@@ -2,13 +2,13 @@
<el-dialog :title="form.supplierId ? '编辑' : '新增'" 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-row :gutter="24">
<el-col :span="12" class="mb20">
<el-col :span="14" class="mb20">
<el-form-item label="货商名称" prop="supplierName">
<el-input v-model="form.supplierName" placeholder="请输入货商名称" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="14" class="mb20">
<el-form-item label="货商类别" prop="supplierType">
<el-select v-model="form.supplierType" placeholder="请输入货商类别">
<el-option v-for="item in supplierTypeOptions" :key="item.id" :label="item.typeName" :value="item.id" />
@@ -22,55 +22,55 @@
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="14" class="mb20">
<el-form-item label="联系人" prop="linkName">
<el-input v-model="form.linkName" placeholder="请输入联系人" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="14" class="mb20">
<el-form-item label="电话号码" prop="phone">
<el-input v-model="form.phone" placeholder="请输入电话号码" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="14" class="mb20">
<el-form-item label="开户行" prop="openName">
<el-input v-model="form.openName" placeholder="请输入开户行" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="14" class="mb20">
<el-form-item label="开户行账号" prop="openAccount">
<el-input v-model="form.openAccount" placeholder="请输入开户行账号" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="14" class="mb20">
<el-form-item label="税号" prop="tax">
<el-input v-model="form.tax" placeholder="请输入税号" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="14" class="mb20">
<el-form-item label="邮箱地址" prop="email">
<el-input v-model="form.email" placeholder="请输入邮箱地址" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="14" class="mb20">
<el-form-item label="货商地区" prop="supplierArea">
<el-input v-model="form.supplierArea" placeholder="请输入货商地区" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="14" class="mb20">
<el-form-item label="合同号" prop="contractNumber">
<el-input v-model="form.contractNumber" placeholder="请输入合同号" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="24" class="mb20">
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio :label="item.value" v-for="(item, index) in status" border :key="index">{{ item.label }} </el-radio>
@@ -78,7 +78,7 @@
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="14" class="mb20">
<el-form-item label="拼音简码" prop="pinyinCod">
<el-input v-model="form.pinyinCod" placeholder="请输入拼音简码" />
</el-form-item>
src/views/supermarketerp/smErpSupplier/index.vue
+8 -8
View File
@@ -60,9 +60,9 @@
<el-table-column prop="linkName" label="联系人" show-overflow-tooltip />
<el-table-column prop="openAccount" label="开户行账号" show-overflow-tooltip />
<el-table-column prop="supplierType" label="货商类别" show-overflow-tooltip min-width="160">
<template #default="scope">{{
supplierType.length > 0 && supplierType?.find((item: any) => item.id == scope.row.supplierType)?.typeName
}}</template>
<template #default="scope">
{{ supplierType.length > 0 && supplierType?.find((item: any) => item.id == scope.row.supplierType)?.typeName }}
</template>
</el-table-column>
<el-table-column prop="supplierArea" label="货商地区" show-overflow-tooltip />
<el-table-column prop="openName" label="开户行" show-overflow-tooltip />
@@ -82,11 +82,12 @@
type="primary"
v-auth="'supermarketerp_smErpSupplier_edit'"
@click="formDialogRef.openDialog(scope.row.supplierId)"
>编辑</el-button
>
<el-button icon="delete" text type="primary" v-auth="'supermarketerp_smErpSupplier_del'" @click="handleDelete([scope.row.supplierId])"
>删除</el-button
>
编辑
</el-button>
<el-button icon="delete" text type="primary" v-auth="'supermarketerp_smErpSupplier_del'" @click="handleDelete([scope.row.supplierId])">
删除
</el-button>
</template>
</el-table-column>
</el-table>
@@ -106,7 +107,6 @@ import { useDict } from '/@/hooks/dict';
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
// 定义查询字典
const { status } = useDict('status');
// 定义变量内容
src/views/supermarketerp/smErpSupplierType/form.vue
+52 -53
View File
@@ -1,71 +1,69 @@
<template>
<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-row :gutter="24">
<el-col :span="24" class="mb20">
<el-form-item label="类别名称" prop="typeName">
<el-input v-model="form.typeName" placeholder="请输入货商类别名称"/>
</el-form-item>
</el-col>
<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-row :gutter="24">
<el-col :span="24" class="mb20">
<el-form-item label="类别名称" prop="typeName">
<el-input v-model="form.typeName" placeholder="请输入货商类别名称" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="类别图片" prop="typePic">
<upload-img v-model="form.typePic"></upload-img>
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="类别图片" prop="typePic">
<upload-img v-model:imageUrl="form.typePic" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
</span>
</template>
</el-dialog>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
</span>
</template>
</el-dialog>
</template>
<script setup lang="ts" name="SmErpSupplierTypeDialog">
import { useDict } from '/@/hooks/dict';
import { useMessage } from "/@/hooks/message";
import { getObj, addObj, putObj } from '/@/api/supermarketerp/smErpSupplierType'
import { useMessage } from '/@/hooks/message';
import { getObj, addObj, putObj } from '/@/api/supermarketerp/smErpSupplierType';
import { rule } from '/@/utils/validate';
const emit = defineEmits(['refresh']);
// 定义变量内容
const dataFormRef = ref();
const visible = ref(false)
const loading = ref(false)
const visible = ref(false);
const loading = ref(false);
// 定义字典
// 提交表单数据
const form = reactive({
id:'',
typeName: '',
typePic: '',
deptId: '',
id: '',
typeName: '',
typePic: '',
deptId: '',
});
// 定义校验规则
const dataRules = ref({
typeName: [{required: true, message: '货商类别名称不能为空', trigger: 'blur'}],
})
typeName: [{ required: true, message: '货商类别名称不能为空', trigger: 'blur' }],
});
// 打开弹窗
const openDialog = (id: string) => {
visible.value = true
form.id = ''
visible.value = true;
form.id = '';
// 重置表单数据
// 重置表单数据
nextTick(() => {
dataFormRef.value?.resetFields();
});
// 获取smErpSupplierType信息
if (id) {
form.id = id
getsmErpSupplierTypeData(id)
}
// 获取smErpSupplierType信息
if (id) {
form.id = id;
getsmErpSupplierTypeData(id);
}
};
// 提交
@@ -74,7 +72,7 @@ const onSubmit = async () => {
if (!valid) return false;
try {
loading.value = true;
loading.value = true;
form.id ? await putObj(form) : await addObj(form);
useMessage().success(form.id ? '修改成功' : '添加成功');
visible.value = false;
@@ -82,24 +80,25 @@ const onSubmit = async () => {
} catch (err: any) {
useMessage().error(err.msg);
} finally {
loading.value = false;
}
loading.value = false;
}
};
// 初始化表单数据
const getsmErpSupplierTypeData = (id: string) => {
// 获取数据
loading.value = true
getObj(id).then((res: any) => {
Object.assign(form, res.data)
}).finally(() => {
loading.value = false
})
// 获取数据
loading.value = true;
getObj(id)
.then((res: any) => {
Object.assign(form, res.data);
})
.finally(() => {
loading.value = false;
});
};
// 暴露变量
defineExpose({
openDialog
openDialog,
});
</script>
src/views/supermarketerp/smErpSupplierType/index.vue
+118 -94
View File
@@ -1,65 +1,96 @@
<template>
<div class="layout-padding">
<div class="layout-padding-auto layout-padding-view">
<el-row v-show="showSearch">
<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
<el-form-item label="货商类别名称" prop="typeName" >
<el-input placeholder="请输入货商类别名称" v-model="state.queryForm.typeName" />
</el-form-item>
<el-form-item>
<el-button icon="search" type="primary" @click="getDataList">
查询
</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-row>
<el-row>
<div class="mb8" style="width: 100%">
<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
v-auth="'supermarketerp_smErpSupplierType_add'">
新 增
</el-button>
<el-button plain :disabled="multiple" icon="Delete" type="primary"
v-auth="'supermarketerp_smErpSupplierType_del'" @click="handleDelete(selectObjs)">
删除
</el-button>
<right-toolbar v-model:showSearch="showSearch" :export="'supermarketerp_smErpSupplierType_export'"
@exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
@queryTable="getDataList"></right-toolbar>
</div>
</el-row>
<el-table :data="state.dataList" v-loading="state.loading" border
:cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
<div class="layout-padding">
<div class="layout-padding-auto layout-padding-view">
<el-row v-show="showSearch">
<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
<el-form-item label="货商类别名称" prop="typeName">
<el-input placeholder="请输入货商类别名称" v-model="state.queryForm.typeName" />
</el-form-item>
<el-form-item>
<el-button icon="search" type="primary" @click="getDataList"> 查询 </el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-row>
<el-row>
<div class="mb8" style="width: 100%">
<el-button
icon="folder-add"
type="primary"
class="ml10"
@click="formDialogRef.openDialog()"
v-auth="'supermarketerp_smErpSupplierType_add'"
>
新 增
</el-button>
<el-button
plain
:disabled="multiple"
icon="Delete"
type="primary"
v-auth="'supermarketerp_smErpSupplierType_del'"
@click="handleDelete(selectObjs)"
>
删 除
</el-button>
<right-toolbar
v-model:showSearch="showSearch"
:export="'supermarketerp_smErpSupplierType_export'"
@exportExcel="exportExcel"
class="ml10 mr20"
style="float: right"
@queryTable="getDataList"
></right-toolbar>
</div>
</el-row>
<el-table
:data="state.dataList"
v-loading="state.loading"
border
:cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle"
@selection-change="selectionChangHandle"
@sort-change="sortChangeHandle">
<el-table-column type="selection" width="40" align="center" />
<el-table-column type="index" label="#" width="40" />
<el-table-column prop="typeName" label="货商类别名称" show-overflow-tooltip/>
<el-table-column prop="typePic" label="类别图片" show-overflow-tooltip/>
<el-table-column prop="createBy" label="创建人" show-overflow-tooltip/>
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip/>
<el-table-column label="操作" width="150">
<template #default="scope">
<el-button icon="edit-pen" text type="primary" v-auth="'supermarketerp_smErpSupplierType_edit'"
@click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
<el-button icon="delete" text type="primary" v-auth="'supermarketerp_smErpSupplierType_del'" @click="handleDelete([scope.row.id])">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
</div>
@sort-change="sortChangeHandle"
>
<el-table-column type="selection" width="40" align="center" />
<el-table-column type="index" label="#" width="50" />
<el-table-column prop="typeName" label="货商类别名称" show-overflow-tooltip />
<el-table-column prop="typePic" label="类别图片" show-overflow-tooltip>
<template #default="{ row }">
<preview-image :src="row.typePic" />
</template>
</el-table-column>
<el-table-column prop="createBy" label="创建人" show-overflow-tooltip />
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip min-width="160" />
<el-table-column label="操作" width="150" fixed="right">
<template #default="scope">
<el-button
icon="edit-pen"
text
type="primary"
v-auth="'supermarketerp_smErpSupplierType_edit'"
@click="formDialogRef.openDialog(scope.row.id)"
>
编辑
</el-button>
<el-button icon="delete" text type="primary" v-auth="'supermarketerp_smErpSupplierType_del'" @click="handleDelete([scope.row.id])">
删除
</el-button>
</template>
</el-table-column>
</el-table>
<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
</div>
<!-- 编辑、新增 -->
<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
</div>
<!-- 编辑、新增 -->
<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
</div>
</template>
<script setup lang="ts" name="systemSmErpSupplierType">
import { BasicTableProps, useTable } from "/@/hooks/table";
import { fetchList, delObjs } from "/@/api/supermarketerp/smErpSupplierType";
import { useMessage, useMessageBox } from "/@/hooks/message";
import { BasicTableProps, useTable } from '/@/hooks/table';
import { fetchList, delObjs } from '/@/api/supermarketerp/smErpSupplierType';
import { useMessage, useMessageBox } from '/@/hooks/message';
import { useDict } from '/@/hooks/dict';
// 引入组件
@@ -67,63 +98,56 @@ const FormDialog = defineAsyncComponent(() => import('./form.vue'));
// 定义查询字典
// 定义变量内容
const formDialogRef = ref()
const formDialogRef = ref();
// 搜索变量
const queryRef = ref()
const showSearch = ref(true)
const queryRef = ref();
const showSearch = ref(true);
// 多选变量
const selectObjs = ref([]) as any
const multiple = ref(true)
const selectObjs = ref([]) as any;
const multiple = ref(true);
const state: BasicTableProps = reactive<BasicTableProps>({
queryForm: {},
pageList: fetchList
})
queryForm: {},
pageList: fetchList,
});
// table hook
const {
getDataList,
currentChangeHandle,
sizeChangeHandle,
sortChangeHandle,
downBlobFile,
tableStyle
} = useTable(state)
const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state);
// 清空搜索条件
const resetQuery = () => {
// 清空搜索条件
queryRef.value?.resetFields()
// 清空多选
selectObjs.value = []
getDataList()
}
// 清空搜索条件
queryRef.value?.resetFields();
// 清空多选
selectObjs.value = [];
getDataList();
};
// 导出excel
const exportExcel = () => {
downBlobFile('/supermarketerp/smErpSupplierType/export', Object.assign(state.queryForm, { ids: selectObjs }), 'smErpSupplierType.xlsx')
}
downBlobFile('/supermarketerp/smErpSupplierType/export', Object.assign(state.queryForm, { ids: selectObjs }), 'smErpSupplierType.xlsx');
};
// 多选事件
const selectionChangHandle = (objs: { id: string }[]) => {
selectObjs.value = objs.map(({ id }) => id);
multiple.value = !objs.length;
selectObjs.value = objs.map(({ id }) => id);
multiple.value = !objs.length;
};
// 删除操作
const handleDelete = async (ids: string[]) => {
try {
await useMessageBox().confirm('此操作将永久删除');
} catch {
return;
}
try {
await useMessageBox().confirm('此操作将永久删除');
} catch {
return;
}
try {
await delObjs(ids);
getDataList();
useMessage().success('删除成功');
} catch (err: any) {
useMessage().error(err.msg);
}
try {
await delObjs(ids);
getDataList();
useMessage().success('删除成功');
} catch (err: any) {
useMessage().error(err.msg);
}
};
</script>