diff --git a/.env.development b/.env.development
index 54dfa3c..577906e 100644
--- a/.env.development
+++ b/.env.development
@@ -10,12 +10,14 @@ ENV = 'development'
# ADMIN 服务地址
# VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/
# VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
-VITE_ADMIN_PROXY_PATH = http://localhost:9999
+# VITE_ADMIN_PROXY_PATH = http://localhost:9999/
+VITE_ADMIN_PROXY_PATH = http://192.168.101.29:9999/ # 邓-本地
# 图片访问基础地址
-# VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api
+# VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089
# VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
- VITE_IMAGE_BASE_PATH = http://localhost:9999
+# VITE_IMAGE_BASE_PATH = http://localhost:9999
+VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地
# 代码生成服务地址
VITE_GEN_PROXY_PATH = http://192.168.110.156:5003
diff --git a/src/api/wallet/mch-manage.ts b/src/api/wallet/mch-manage.ts
index 58a1b4b..cf367c0 100644
--- a/src/api/wallet/mch-manage.ts
+++ b/src/api/wallet/mch-manage.ts
@@ -1,50 +1,50 @@
-import request from "/@/utils/request"
+import request from '/@/utils/request';
export function pageJoin(query?: Object) {
- return request({
- url: '/wallet/mch-manage/page-join',
- method: 'get',
- params: query
- })
+ return request({
+ url: '/wallet/mch-manage/page-join',
+ method: 'get',
+ params: query,
+ });
}
export function fetchList(query?: Object) {
- return request({
- url: '/wallet/mch-manage/page',
- method: 'get',
- params: query
- })
+ return request({
+ url: '/wallet/mch-manage/page',
+ method: 'get',
+ params: query,
+ });
}
export function addObj(obj?: Object) {
- return request({
- url: '/wallet/mch-manage',
- method: 'post',
- data: obj
- })
+ return request({
+ url: '/wallet/mch-manage',
+ method: 'post',
+ data: obj,
+ });
}
export function getObj(id?: string) {
- return request({
- url: '/wallet/mch-manage/' + id,
- method: 'get'
- })
+ return request({
+ url: '/wallet/mch-manage/' + id,
+ method: 'get',
+ });
}
export function delObjs(ids?: Object) {
- return request({
- url: '/wallet/mch-manage',
- method: 'delete',
- data: ids
- })
+ return request({
+ url: '/wallet/mch-manage',
+ method: 'delete',
+ data: ids,
+ });
}
export function putObj(obj?: Object) {
- return request({
- url: '/wallet/mch-manage',
- method: 'put',
- data: obj
- })
+ return request({
+ url: '/wallet/mch-manage',
+ method: 'put',
+ data: obj,
+ });
}
/**
@@ -52,11 +52,11 @@ export function putObj(obj?: Object) {
* @param type
*/
export function selectMerchantList(type?: string) {
- return request({
- url: '/wallet/mch-manage/selectMerchantList',
- method: 'get',
- params: {
- type: type
- }
- })
+ return request({
+ url: '/wallet/mch-manage/selectMerchantList',
+ method: 'get',
+ params: {
+ type: type,
+ },
+ });
}
diff --git a/src/components/Select/SelectCtcgd.vue b/src/components/Select/SelectCtcgd.vue
new file mode 100644
index 0000000..c48a8a5
--- /dev/null
+++ b/src/components/Select/SelectCtcgd.vue
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/components/index.ts b/src/components/index.ts
index d3f3a02..5d54803 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -19,6 +19,7 @@ import SelectWalletType from '/@/components/Select/SelectWalletType.vue';
import SelectMch from '/@/components/Select/SelectMch.vue';
import SelectDept from '/@/components/Select/SelectDept.vue';
import SelectCtcg from '/@/components/Select/SelectCtcg.vue';
+import SelectCtcgd from '/@/components/Select/SelectCtcgd.vue';
// 第三方组件
import ElementPlus from 'element-plus';
@@ -59,6 +60,7 @@ export default {
app.component('SelectMch', SelectMch);
app.component('SelectDept', SelectDept);
app.component('SelectCtcg', SelectCtcg);
+ app.component('SelectCtcgd', SelectCtcgd);
// 导入全部的elmenet-plus的图标
for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
diff --git a/src/views/canteen/boxesInfo/form.vue b/src/views/canteen/boxesInfo/form.vue
index aa5b34f..6a76685 100644
--- a/src/views/canteen/boxesInfo/form.vue
+++ b/src/views/canteen/boxesInfo/form.vue
@@ -2,28 +2,28 @@
-
+
-
+
-
+
-
+
-
+
{{ item.label }}
@@ -129,7 +129,9 @@ const getboxesInfoData = (id: string) => {
loading.value = true;
getObj(id)
.then((res: any) => {
- Object.assign(form, res.data);
+ Object.assign(form, res.data, {
+ status: '' + res.data.status,
+ });
})
.finally(() => {
loading.value = false;
diff --git a/src/views/canteen/boxesInfo/index.vue b/src/views/canteen/boxesInfo/index.vue
index 4990ffd..a59bd3b 100644
--- a/src/views/canteen/boxesInfo/index.vue
+++ b/src/views/canteen/boxesInfo/index.vue
@@ -40,20 +40,24 @@
@sort-change="sortChangeHandle"
>
-
+
-
+
+
+
+
+
-
+
-
+
编辑
diff --git a/src/views/canteen/canteenCategory/form.vue b/src/views/canteen/canteenCategory/form.vue
index b38dc3f..0474317 100644
--- a/src/views/canteen/canteenCategory/form.vue
+++ b/src/views/canteen/canteenCategory/form.vue
@@ -2,12 +2,12 @@
-
+
-
+
@@ -16,11 +16,11 @@
-
+
-
+
diff --git a/src/views/canteen/canteenCategory/index.vue b/src/views/canteen/canteenCategory/index.vue
index f00ea30..8641c10 100644
--- a/src/views/canteen/canteenCategory/index.vue
+++ b/src/views/canteen/canteenCategory/index.vue
@@ -7,7 +7,7 @@
- 查询
+ 查询
重置
@@ -18,7 +18,7 @@
新 增
- 删除
+ 删 除
-
-
+
+
-
-
-
-
-
+
- 编辑
+
+
+
+
+
+
+
+
+
+ 编辑
+
删除
diff --git a/src/views/canteen/canteenDailyMenu/index.vue b/src/views/canteen/canteenDailyMenu/index.vue
index 097fdb9..bdaf4d3 100644
--- a/src/views/canteen/canteenDailyMenu/index.vue
+++ b/src/views/canteen/canteenDailyMenu/index.vue
@@ -29,7 +29,6 @@
![]()
-
| 中餐 |
@@ -44,6 +43,7 @@
|
+
@@ -53,11 +53,10 @@
import { delObjs, selectTimeFoodApi, selectWeekInfo } from '/@/api/canteen/canteenDailyMenu';
import { useMessage, useMessageBox } from '/@/hooks/message';
import { useDict } from '/@/hooks/dict';
-import { selectMerchantList } from '/@/api/canteen/merchantInfo';
+import { pageJoin } from '/@/api/wallet/mch-manage';
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-// 定义查询字典
const { daily_menu } = useDict('daily_menu');
// 定义变量内容
@@ -73,14 +72,14 @@ const weekData = reactive({
const weekParams = reactive({
index: 0,
});
-const foodData1 = ref({});
-const foodData2 = ref({});
-const foodData3 = ref({});
+const foodData1 = ref({});
+const foodData2 = ref({});
+const foodData3 = ref({});
let isActive = ref(-1);
let timedata = '';
const merchantId = ref();
const merchantStatus = ref(true);
-const merchantInfo = ref([]);
+const merchantInfo = ref([]);
let tableWitch = 1000;
const addFood = async (hourType: number) => {
@@ -136,7 +135,7 @@ const selectTimeFood = async () => {
//最大长度
let count = 0;
const result = await selectTimeFoodApi(params);
- result.data.forEach((r) => {
+ result.data.forEach((r: any) => {
if (r.dailyMenuVOS.length > count) {
count = r.dailyMenuVOS.length;
}
@@ -167,45 +166,35 @@ const delteData = async (tid: number) => {
};
// 删除操作
-const handleDelete = async (ids: string[]) => {
- try {
- await useMessageBox().confirm('此操作将永久删除');
- } catch {
- return;
- }
+// const handleDelete = async (ids: string[]) => {
+// try {
+// await useMessageBox().confirm('此操作将永久删除');
+// } catch {
+// return;
+// }
- try {
- await delObjs(ids);
- // getDataList();
- useMessage().success('删除成功');
- } catch (err: any) {
- useMessage().error(err.msg);
- }
-};
-/** 查询列表 */
-// const getList = async () => {
-// loading.value = true
-// try {
-// const data = await fetchList(queryParams)
-// list.value = data.list
-// total.value = data.total
-// } finally {
-// loading.value = false
-// }
-// }
+// try {
+// await delObjs(ids);
+// // getDataList();
+// useMessage().success('删除成功');
+// } catch (err: any) {
+// useMessage().error(err.msg);
+// }
+// };
/** 初始化下拉框 */
const merchantInit = async () => {
- // 获取下拉框
- let res = await selectMerchantList('1');
- merchantInfo.value = res.data;
+ // 获取下拉框选项
+ let res = await pageJoin({ current: 1, size: 9999 });
+ merchantInfo.value = res.data.records;
+
//默认选中第一个
if (merchantInfo.value) {
merchantId.value = merchantInfo.value[0].id;
+
if (merchantInfo.value.length > 1) {
merchantStatus.value = false;
}
- // getList()
fetchData();
}
};
diff --git a/src/views/canteen/canteenOnlineCategory/form.vue b/src/views/canteen/canteenOnlineCategory/form.vue
index 3116164..83be525 100644
--- a/src/views/canteen/canteenOnlineCategory/form.vue
+++ b/src/views/canteen/canteenOnlineCategory/form.vue
@@ -2,22 +2,22 @@
-
+
-
+
-
+
-
+
diff --git a/src/views/canteen/canteenOnlineCategory/index.vue b/src/views/canteen/canteenOnlineCategory/index.vue
index 6f2ba8f..9c04360 100644
--- a/src/views/canteen/canteenOnlineCategory/index.vue
+++ b/src/views/canteen/canteenOnlineCategory/index.vue
@@ -50,8 +50,8 @@
-
-
+
+
@@ -86,10 +86,8 @@ import { BasicTableProps, useTable } from '/@/hooks/table';
import { fetchList, delObjs } from '/@/api/canteen/canteenOnlineCategory';
import { useMessage, useMessageBox } from '/@/hooks/message';
-const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH;
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-// 定义查询字典
// 定义变量内容
const formDialogRef = ref();
diff --git a/src/views/canteen/canteenOnlineSpu/form.vue b/src/views/canteen/canteenOnlineSpu/form.vue
index dfbc140..42eb444 100644
--- a/src/views/canteen/canteenOnlineSpu/form.vue
+++ b/src/views/canteen/canteenOnlineSpu/form.vue
@@ -2,52 +2,52 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
{{ item.label }}
@@ -56,11 +56,12 @@
-
+
+
-
-
+
+
+ {{ displayPrice(scope.row.price) }}
+
+
+
+
+ {{ displayPrice(scope.row.marketPrice) }}
+
+
@@ -93,11 +105,11 @@ import { BasicTableProps, useTable } from '/@/hooks/table';
import { fetchList, delObjs } from '/@/api/canteen/canteenOnlineSpu';
import { useMessage, useMessageBox } from '/@/hooks/message';
import { useDict } from '/@/hooks/dict';
+import { displayPrice } from '/@/utils/formatMoney';
+import { fetchList as getCanteenOnlineCategory } from '/@/api/canteen/canteenOnlineCategory';
-const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH;
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-// 定义查询字典
const { spu_status } = useDict('spu_status');
// 定义变量内容
@@ -108,13 +120,22 @@ const showSearch = ref(true);
// 多选变量
const selectObjs = ref([]) as any;
const multiple = ref(true);
-
+const categoryOptions = ref([]); // 商品分类选项
const state: BasicTableProps = reactive({
queryForm: {},
pageList: fetchList,
});
-// table hook
+onMounted(async () => {
+ try {
+ const res = await getCanteenOnlineCategory();
+ categoryOptions.value = res.data.records;
+ } catch (error) {
+ categoryOptions.value = [];
+ }
+});
+
+// table hook
const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state);
// 清空搜索条件
diff --git a/src/views/canteen/canteenSpu/form.vue b/src/views/canteen/canteenSpu/form.vue
index d5cae4d..2f25823 100644
--- a/src/views/canteen/canteenSpu/form.vue
+++ b/src/views/canteen/canteenSpu/form.vue
@@ -2,28 +2,24 @@
-
+
-
+
-
+
-
-
-
-
-
+
-
+
@@ -38,35 +34,35 @@
-
+
-
+
- {{ item.label }}
+ {{ item.label }}
-
+
-
+
-
+
-
+
-
+
-
+
@@ -104,6 +100,7 @@ import { useMessage } from '/@/hooks/message';
import { getObj, addObj, putObj } from '/@/api/canteen/canteenSpu';
import { getAllSimple } from '/@/api/canteen/canteenCategory';
import { rule } from '/@/utils/validate';
+import { displayPrice, storePrice } from '/@/utils/formatMoney';
const emit = defineEmits(['refresh']);
// 定义变量内容
@@ -125,10 +122,10 @@ const form = reactive({
sliderPicUrls: '',
sort: '',
status: '0',
- price: '',
- marketPrice: '',
+ price: 0,
+ marketPrice: 0,
costPrice: '',
- stock: '',
+ stock: 0,
giveIntegral: '',
salesCount: '',
virtualSalesCount: '',
@@ -138,14 +135,25 @@ const form = reactive({
// 定义校验规则
const dataRules = ref({
+ categoryId: [{ required: true, message: '商品分类不能为空', trigger: 'blur' }],
merchantId: [{ required: true, message: '商户不能为空', trigger: 'blur' }],
name: [{ required: true, message: '商品名称不能为空', trigger: 'blur' }],
picUrl: [{ required: true, message: '商品封面图不能为空', trigger: 'blur' }],
+ status: [{ required: true, message: '商品状态不能为空', trigger: 'blur' }],
sort: [{ validator: rule.number, trigger: 'blur' }],
- price: [{ validator: rule.number, trigger: 'blur' }],
- marketPrice: [{ validator: rule.number, trigger: 'blur' }],
+ price: [
+ { validator: rule.number, trigger: 'blur' },
+ { required: true, message: '商品状态不能为空', trigger: 'blur' },
+ ],
+ marketPrice: [
+ { validator: rule.number, trigger: 'blur' },
+ { required: true, message: '商品状态不能为空', trigger: 'blur' },
+ ],
costPrice: [{ validator: rule.number, trigger: 'blur' }],
- stock: [{ validator: rule.number, trigger: 'blur' }],
+ stock: [
+ { validator: rule.number, trigger: 'blur' },
+ { required: true, message: '商品状态不能为空', trigger: 'blur' },
+ ],
giveIntegral: [{ validator: rule.number, trigger: 'blur' }],
salesCount: [{ validator: rule.number, trigger: 'blur' }],
virtualSalesCount: [{ validator: rule.number, trigger: 'blur' }],
@@ -168,14 +176,13 @@ const openDialog = async (id: string) => {
// 提交
const onSubmit = async () => {
- console.log(form);
-
const valid = await dataFormRef?.value.validate().catch(() => {});
if (!valid) return false;
try {
loading.value = true;
- form.id ? await putObj(form) : await addObj(form);
+ const _pa = { ...form, price: storePrice(form.price), marketPrice: storePrice(form.marketPrice) };
+ form.id ? await putObj(_pa) : await addObj(_pa);
useMessage().success(form.id ? '修改成功' : '添加成功');
visible.value = false;
emit('refresh');
@@ -192,7 +199,11 @@ const getcanteenSpuData = (id: string) => {
loading.value = true;
getObj(id)
.then((res: any) => {
- Object.assign(form, res.data);
+ Object.assign(form, res.data, {
+ price: Number(displayPrice(res.data.price, '')),
+ marketPrice: Number(displayPrice(res.data.marketPrice, '')),
+ status: '' + res.data.status,
+ });
})
.finally(() => {
loading.value = false;
diff --git a/src/views/canteen/canteenSpu/index.vue b/src/views/canteen/canteenSpu/index.vue
index 70a955c..a90d2b7 100644
--- a/src/views/canteen/canteenSpu/index.vue
+++ b/src/views/canteen/canteenSpu/index.vue
@@ -6,11 +6,8 @@
-
-
-
-
-
+
+
查询
@@ -46,29 +43,41 @@
@sort-change="sortChangeHandle"
>
-
+
-
+
+
+ {{ categoryOptions?.find((item: any) => item?.id === row?.categoryId)?.name }}
+
+
-
+
-
+
+
+
+
+
+ {{ displayPrice(scope.row.price) }}
+
+
+
+
+ {{ displayPrice(scope.row.marketPrice) }}
-
-
-
+
@@ -91,10 +100,11 @@ import { BasicTableProps, useTable } from '/@/hooks/table';
import { fetchList, delObjs } from '/@/api/canteen/canteenSpu';
import { useMessage, useMessageBox } from '/@/hooks/message';
import { useDict } from '/@/hooks/dict';
+import { displayPrice } from '/@/utils/formatMoney';
+import { fetchList as getCanteenCategory } from '/@/api/canteen/canteenCategory';
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-// 定义查询字典
const { spu_status } = useDict('spu_status');
// 定义变量内容
@@ -105,14 +115,23 @@ const showSearch = ref(true);
// 多选变量
const selectObjs = ref([]) as any;
const multiple = ref(true);
-const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH;
+const categoryOptions = ref([]); // 商品分类选项
const state: BasicTableProps = reactive({
queryForm: {},
pageList: fetchList,
});
-// table hook
+onMounted(async () => {
+ try {
+ const res = await getCanteenCategory();
+ categoryOptions.value = res.data.records;
+ } catch (error) {
+ categoryOptions.value = [];
+ }
+});
+
+// table hook
const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state);
// 清空搜索条件