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:
zjf committed 2025-03-21 17:50:16 +08:00
1 parent 6ac9382e8d
commit 9dd493e6c7
8 files changed
+646 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/api/integrated/feedback.ts
+41
View File
@@ -0,0 +1,41 @@
import request from "/@/utils/request"
export function fetchList(query?: Object) {
return request({
url: '/integrated/feedback/page',
method: 'get',
params: query
})
}
export function addObj(obj?: Object) {
return request({
url: '/integrated/feedback',
method: 'post',
data: obj
})
}
export function getObj(id?: string) {
return request({
url: '/integrated/feedback/' + id,
method: 'get'
})
}
export function delObjs(ids?: Object) {
return request({
url: '/integrated/feedback',
method: 'delete',
data: ids
})
}
export function putObj(obj?: Object) {
return request({
url: '/integrated/feedback',
method: 'put',
data: obj
})
}
src/api/integrated/feedbackLog.ts
+41
View File
@@ -0,0 +1,41 @@
import request from "/@/utils/request"
export function fetchList(query?: Object) {
return request({
url: '/integrated/feedbackLog/page',
method: 'get',
params: query
})
}
export function addObj(obj?: Object) {
return request({
url: '/integrated/feedbackLog',
method: 'post',
data: obj
})
}
export function getObj(id?: string) {
return request({
url: '/integrated/feedbackLog/' + id,
method: 'get'
})
}
export function delObjs(ids?: Object) {
return request({
url: '/integrated/feedbackLog',
method: 'delete',
data: ids
})
}
export function putObj(obj?: Object) {
return request({
url: '/integrated/feedbackLog',
method: 'put',
data: obj
})
}
src/views/canteen/canteenSpu/form.vue
+5 -5
View File
@@ -49,11 +49,11 @@
</el-form-item>
</el-col>
<el-col :span="14" class="mb20">
<el-form-item label="库存" prop="stock">
<el-input-number v-model="form.stock" :min="0" :precision="0" />
</el-form-item>
</el-col>
<!-- <el-col :span="14" class="mb20">-->
<!-- <el-form-item label="库存" prop="stock">-->
<!-- <el-input-number v-model="form.stock" :min="0" :precision="0" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8" class="mb20">-->
<!-- <el-form-item label="赠送积分" prop="giveIntegral">-->
src/views/canteen/canteenSpu/index.vue
+3 -3
View File
@@ -79,10 +79,10 @@
{{ displayPrice(scope.row.marketPrice) }}
</template>
</el-table-column>
<el-table-column prop="costPrice" label="成本价" show-overflow-tooltip />
<el-table-column prop="stock" label="库存" show-overflow-tooltip />
<!-- <el-table-column prop="costPrice" 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="createTime" label="创建时间" show-overflow-tooltip min-width="160" />
<el-table-column label="操作" width="150" fixed="right">
src/views/integrated/feedback/form.vue
+147
View File
@@ -0,0 +1,147 @@
<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="title">
<el-input v-model="form.title" 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="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="12" 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">
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" placeholder="请选择状态）">
<el-option :value="item.value" :label="item.label" v-for="(item, index) in maintenance_status" :key="index"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="上报人" prop="userId">
<el-input v-model="form.userId" placeholder="请输入上报人"/>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="反馈类型" prop="type">
<el-select v-model="form.type" placeholder="请选择反馈类型">
<el-option :value="item.value" :label="item.label" v-for="(item, index) in feedback_type" :key="index"></el-option>
</el-select>
</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>
</template>
<script setup lang="ts" name="FeedbackDialog">
import { useDict } from '/@/hooks/dict';
import { useMessage } from "/@/hooks/message";
import { getObj, addObj, putObj } from '/@/api/integrated/feedback'
import { rule } from '/@/utils/validate';
const emit = defineEmits(['refresh']);
// 定义变量内容
const dataFormRef = ref();
const visible = ref(false)
const loading = ref(false)
// 定义字典
const { maintenance_status,feedback_type } = useDict('maintenance_status','feedback_type')
// 提交表单数据
const form = reactive({
id:'',
title: '',
picUrl: '',
sort: 0,
description: '',
status: '',
userId: '',
type: '',
});
// 定义校验规则
const dataRules = ref({
title: [{required: true, message: '标题不能为空', trigger: 'blur'}],
sort: [{ validator: rule.number, trigger: 'blur' }],
type: [{required: true, message: '反馈类型不能为空', trigger: 'blur'}],
})
// 打开弹窗
const openDialog = (id: string) => {
visible.value = true
form.id = ''
// 重置表单数据
nextTick(() => {
dataFormRef.value?.resetFields();
});
// 获取feedback信息
if (id) {
form.id = id
getfeedbackData(id)
}
};
// 提交
const onSubmit = async () => {
const valid = await dataFormRef.value.validate().catch(() => {});
if (!valid) return false;
try {
loading.value = true;
form.id ? await putObj(form) : await addObj(form);
useMessage().success(form.id ? '修改成功' : '添加成功');
visible.value = false;
emit('refresh');
} catch (err: any) {
useMessage().error(err.msg);
} finally {
loading.value = false;
}
};
// 初始化表单数据
const getfeedbackData = (id: string) => {
// 获取数据
loading.value = true
getObj(id).then((res: any) => {
Object.assign(form, res.data)
}).finally(() => {
loading.value = false
})
};
// 暴露变量
defineExpose({
openDialog
});
</script>
src/views/integrated/feedback/index.vue
+150
View File
@@ -0,0 +1,150 @@
<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="title" >
<el-input placeholder="请输入标题" v-model="state.queryForm.title" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="state.queryForm.status" placeholder="请选择状态">
<el-option :label="item.label" :value="item.value" v-for="(item, index) in maintenance_status" :key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="反馈类型" prop="type">
<el-select v-model="state.queryForm.type" placeholder="请选择反馈类型">
<el-option :label="item.label" :value="item.value" v-for="(item, index) in feedback_type" :key="index"></el-option>
</el-select>
</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="'integrated_feedback_add'">
新 增
</el-button>
<el-button plain :disabled="multiple" icon="Delete" type="primary"
v-auth="'integrated_feedback_del'" @click="handleDelete(selectObjs)">
删除
</el-button>
<right-toolbar v-model:showSearch="showSearch" :export="'integrated_feedback_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="title" 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="status" label="状态（0未处理，1已处理）" show-overflow-tooltip>
<template #default="scope">
<dict-tag :options="maintenance_status" :value="scope.row.status"></dict-tag>
</template>
</el-table-column>
<el-table-column prop="userId" label="上报人" show-overflow-tooltip/>
<el-table-column prop="type" label="反馈类型" show-overflow-tooltip>
<template #default="scope">
<dict-tag :options="feedback_type" :value="scope.row.type"></dict-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="150">
<template #default="scope">
<el-button icon="edit-pen" text type="primary" v-auth="'integrated_feedback_edit'"
@click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
<el-button icon="delete" text type="primary" v-auth="'integrated_feedback_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>
</template>
<script setup lang="ts" name="systemFeedback">
import { BasicTableProps, useTable } from "/@/hooks/table";
import { fetchList, delObjs } from "/@/api/integrated/feedback";
import { useMessage, useMessageBox } from "/@/hooks/message";
import { useDict } from '/@/hooks/dict';
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
// 定义查询字典
const { maintenance_status,feedback_type } = useDict('maintenance_status','feedback_type')
// 定义变量内容
const formDialogRef = ref()
// 搜索变量
const queryRef = ref()
const showSearch = ref(true)
// 多选变量
const selectObjs = ref([]) as any
const multiple = ref(true)
const state: BasicTableProps = reactive<BasicTableProps>({
queryForm: {},
pageList: fetchList
})
// table hook
const {
getDataList,
currentChangeHandle,
sizeChangeHandle,
sortChangeHandle,
downBlobFile,
tableStyle
} = useTable(state)
// 清空搜索条件
const resetQuery = () => {
// 清空搜索条件
queryRef.value?.resetFields()
// 清空多选
selectObjs.value = []
getDataList()
}
// 导出excel
const exportExcel = () => {
downBlobFile('/integrated/feedback/export', Object.assign(state.queryForm, { ids: selectObjs }), 'feedback.xlsx')
}
// 多选事件
const selectionChangHandle = (objs: { id: string }[]) => {
selectObjs.value = objs.map(({ id }) => id);
multiple.value = !objs.length;
};
// 删除操作
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);
}
};
</script>
src/views/integrated/feedbackLog/form.vue
+120
View File
@@ -0,0 +1,120 @@
<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="description">
<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="状态（0未处理，1已处理）" prop="status">
<el-input v-model="form.status" placeholder="请输入状态（0未处理，1已处理）"/>
</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="feedbackId">
<el-input v-model="form.feedbackId" 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>
</template>
<script setup lang="ts" name="FeedbackLogDialog">
import { useDict } from '/@/hooks/dict';
import { useMessage } from "/@/hooks/message";
import { getObj, addObj, putObj } from '/@/api/integrated/feedbackLog'
import { rule } from '/@/utils/validate';
const emit = defineEmits(['refresh']);
// 定义变量内容
const dataFormRef = ref();
const visible = ref(false)
const loading = ref(false)
// 定义字典
const { maintenance_status } = useDict('maintenance_status')
// 提交表单数据
const form = reactive({
id:'',
description: '',
status: '',
deptId: '',
feedbackId: '',
});
// 定义校验规则
const dataRules = ref({
description: [{required: true, message: '处理描述不能为空', trigger: 'blur'}],
})
// 打开弹窗
const openDialog = (id: string) => {
visible.value = true
form.id = ''
// 重置表单数据
nextTick(() => {
dataFormRef.value?.resetFields();
});
// 获取feedbackLog信息
if (id) {
form.id = id
getfeedbackLogData(id)
}
};
// 提交
const onSubmit = async () => {
const valid = await dataFormRef.value.validate().catch(() => {});
if (!valid) return false;
try {
loading.value = true;
form.id ? await putObj(form) : await addObj(form);
useMessage().success(form.id ? '修改成功' : '添加成功');
visible.value = false;
emit('refresh');
} catch (err: any) {
useMessage().error(err.msg);
} finally {
loading.value = false;
}
};
// 初始化表单数据
const getfeedbackLogData = (id: string) => {
// 获取数据
loading.value = true
getObj(id).then((res: any) => {
Object.assign(form, res.data)
}).finally(() => {
loading.value = false
})
};
// 暴露变量
defineExpose({
openDialog
});
</script>
src/views/integrated/feedbackLog/index.vue
+139
View File
@@ -0,0 +1,139 @@
<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="状态（0未处理，1已处理）" prop="status">
<el-select v-model="state.queryForm.status" placeholder="请选择状态（0未处理，1已处理）">
<el-option :label="item.label" :value="item.value" v-for="(item, index) in maintenance_status" :key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="主表id" prop="feedbackId" >
<el-input placeholder="请输入主表id" v-model="state.queryForm.feedbackId" />
</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="'integrated_feedbackLog_add'">
新 增
</el-button>
<el-button plain :disabled="multiple" icon="Delete" type="primary"
v-auth="'integrated_feedbackLog_del'" @click="handleDelete(selectObjs)">
删除
</el-button>
<right-toolbar v-model:showSearch="showSearch" :export="'integrated_feedbackLog_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="description" label="处理描述" show-overflow-tooltip/>
<el-table-column prop="status" label="状态（0未处理，1已处理）" show-overflow-tooltip>
<template #default="scope">
<dict-tag :options="maintenance_status" :value="scope.row.status"></dict-tag>
</template>
</el-table-column>
<el-table-column prop="deptId" label="部门id" show-overflow-tooltip/>
<el-table-column prop="feedbackId" label="主表id" show-overflow-tooltip/>
<el-table-column label="操作" width="150">
<template #default="scope">
<el-button icon="edit-pen" text type="primary" v-auth="'integrated_feedbackLog_edit'"
@click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
<el-button icon="delete" text type="primary" v-auth="'integrated_feedbackLog_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>
</template>
<script setup lang="ts" name="systemFeedbackLog">
import { BasicTableProps, useTable } from "/@/hooks/table";
import { fetchList, delObjs } from "/@/api/integrated/feedbackLog";
import { useMessage, useMessageBox } from "/@/hooks/message";
import { useDict } from '/@/hooks/dict';
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
// 定义查询字典
const { maintenance_status } = useDict('maintenance_status')
// 定义变量内容
const formDialogRef = ref()
// 搜索变量
const queryRef = ref()
const showSearch = ref(true)
// 多选变量
const selectObjs = ref([]) as any
const multiple = ref(true)
const state: BasicTableProps = reactive<BasicTableProps>({
queryForm: {},
pageList: fetchList
})
// table hook
const {
getDataList,
currentChangeHandle,
sizeChangeHandle,
sortChangeHandle,
downBlobFile,
tableStyle
} = useTable(state)
// 清空搜索条件
const resetQuery = () => {
// 清空搜索条件
queryRef.value?.resetFields()
// 清空多选
selectObjs.value = []
getDataList()
}
// 导出excel
const exportExcel = () => {
downBlobFile('/integrated/feedbackLog/export', Object.assign(state.queryForm, { ids: selectObjs }), 'feedbackLog.xlsx')
}
// 多选事件
const selectionChangHandle = (objs: { id: string }[]) => {
selectObjs.value = objs.map(({ id }) => id);
multiple.value = !objs.length;
};
// 删除操作
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);
}
};
</script>