Skip to content

P
park-ui
提交 fe770abf authored 作者: 350505825@qq.com's avatar 350505825@qq.com
浏览文件
操作

提交代码

上级 c56ef38c
隐藏空白字符变更
内嵌 并排
正在显示 包含 281 行增加 和 229 行删除
src/api/analysis/eattingAnalysis/enttingAnalysis.js
浏览文件 @ fe770abf
import request from '@/utils/request' import request from '@/utils/request'
// 查询所有就餐统计列表 // 查询所有就餐统计列表
export function allList(query) { export function allList(query) {
return request({
url: '/eattingAnalysis/allList',
method: 'get',
params: query
})
}
// 查询所有部门
export function alldept() {
return request({
url: '/department/allList',
method: 'get',
})
}
// 导出所有个人统计列表
export function exportEatting(query) {
return request({ return request({
url: '/eattingAnalysis/allList', url: '/eattingAnalysis/exportAll',
method: 'get', method: 'get',
params: query params: query
}) })
} }
src/api/analysis/personalAnalysis/personalAnalysis.js
浏览文件 @ fe770abf
...@@ -11,7 +11,7 @@ export function listApply(query) { ...@@ -11,7 +11,7 @@ export function listApply(query) {
// 导出所有个人统计列表 // 导出所有个人统计列表
export function exportApply(query) { export function exportPerson(query) {
return request({ return request({
url: '/personalAnalysis/exportAll', url: '/personalAnalysis/exportAll',
method: 'get', method: 'get',
......
src/api/analysis/pullRecipe/pullRecipe.js 0 → 100644
浏览文件 @ fe770abf
import request from '@/utils/request'
// 查询所有挂餐列表
export function getPullRecipeList(query) {
return request({
url: '/pullRecipeDetail/getDepAllowanceList',
method: 'get',
params: query
})
}
src/api/analysis/pullRecipe/pullRecipeAnalyze.js 0 → 100644
浏览文件 @ fe770abf
import request from '@/utils/request'
// 查询所有挂餐列表
export function getPullRecipeList(query) {
return request({
url: '/pullRecipeDetail/pullRecipeAnalyzeList',
method: 'get',
params: query
})
}
// 导出所有挂餐列表
export function exportPullRecipeList(query) {
return request({
url: '/pullRecipeDetail/exportPullRecipe',
method: 'get',
params: query
})
}
src/api/analysis/rechargeRecord/rechargeRecord.js
浏览文件 @ fe770abf
...@@ -9,3 +9,11 @@ export function listRrecharge(query) { ...@@ -9,3 +9,11 @@ export function listRrecharge(query) {
}) })
} }
// 查询所有部门
export function alldept() {
return request({
url: '/department/allList',
method: 'get',
})
}
src/api/analysis/summaryAnalysis/summaryAnalysis.js
浏览文件 @ fe770abf
import request from '@/utils/request' import request from '@/utils/request'
// 查询客餐申请列表 // 查询客餐申请列表
export function listApply(query) { export function listRecipeOrder(query) {
return request({ return request({
url: '/formalDishesApply/allList', url: '/summaryAnalysis/getDepAllowanceList',
method: 'get',
params: query
})
}
// 导出客餐申请
export function exportApply(query) {
return request({
url: '/summaryAnalysis/export',
method: 'get', method: 'get',
params: query params: query
}) })
......
src/views/analysis/eattingAnalysis/index.vue
浏览文件 @ fe770abf
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px"> <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
<el-form-item label="部门" prop="status" > <el-form-item label="部门" prop="deptName" >
<el-select v-model="queryParams.deptId" placeholder="请选择部门" clearable size="small" style="width: 120px"> <el-select v-model="queryParams.deptName" placeholder="请选择部门" clearable size="small" style="width: 120px">
<el-option <el-option
v-for="dict in departmentOptions" v-for="dict in departmentOptions"
:key="dict.deptId" :key="dict.deptId"
:label="dict.deptName" :label="dict.deptName"
:value="dict.deptId" :value="dict.deptName"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="日期筛选" prop=" "> <el-form-item label="日期筛选" prop=" ">
<el-date-picker clearable size="small" style="width: 150px" <el-date-picker clearable size="small" style="width: 150px"
v-model="queryParams.createDateStar" v-model="queryParams.createTimeStart"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder=" "> placeholder=" ">
</el-date-picker> </el-date-picker>
</el-form-item> 至
<el-form-item label="至" prop=" ">
<el-date-picker clearable size="small" style="width: 150px" <el-date-picker clearable size="small" style="width: 150px"
v-model="queryParams.createDateEnd" v-model="queryParams.createTimeEnd"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder=" "> placeholder=" ">
...@@ -29,29 +28,31 @@ ...@@ -29,29 +28,31 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-col :span="1.5"> </el-form-item>
<el-button <el-form-item>
type="warning" <el-col :span="1.5">
icon="el-icon-download" <el-button
size="mini" type="warning"
@click="handleExport" icon="el-icon-download"
v-hasPermi="['system:apply:export']" size="mini"
>导出</el-button> @click="handleExport"
</el-col> v-hasPermi="['system:apply:export']"
>导出</el-button>
</el-col>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="applyList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="applyList" @selection-change="handleSelectionChange">
<el-table-column label="所属部门" align="center" prop="userId" /> <el-table-column label="所属部门" align="center" prop="deptName" />
<el-table-column label="名称" align="center" prop="department" /> <el-table-column label="名称" align="center" prop="userName" />
<el-table-column label="账号" align="center" prop="nickName" /> <el-table-column label="账号" align="center" prop="employeeId" />
<el-table-column label="早餐就餐份数" align="center" prop="balance" /> <el-table-column label="早餐就餐份数" align="center" prop="breakfastCount" />
<el-table-column label="早餐就餐总费用" align="center" prop="rechargeTotal" /> <el-table-column label="早餐就餐总费用" align="center" prop="breakfastPrice" />
<el-table-column label="午餐就餐份数" align="center" prop="consumeTotal" /> <el-table-column label="午餐就餐份数" align="center" prop="lunchCount" />
<el-table-column label="午餐就餐总费用" align="center" prop="deptName" /> <el-table-column label="午餐就餐总费用" align="center" prop="lunchPrice" />
<el-table-column label="晚餐就餐份数" align="center" prop="deptName" /> <el-table-column label="晚餐就餐份数" align="center" prop="dinnerCount" />
<el-table-column label="晚餐就餐总费用" align="center" prop="deptName" /> <el-table-column label="晚餐就餐总费用" align="center" prop="dinnerPrice" />
<el-table-column label="全天用餐总费用" align="center" prop="deptName" /> <el-table-column label="全天用餐总费用" align="center" prop="totalPrice" />
<el-table-column label="日期" align="center" prop="deptName" /> <el-table-column label="日期" align="center" prop="createDate" />
</el-table> </el-table>
<pagination <pagination
...@@ -65,7 +66,12 @@ ...@@ -65,7 +66,12 @@
</template> </template>
<script> <script>
import {addApply, allList, exportApply, updateApply } from '../../../api/analysis/eattingAnalysis/enttingAnalysis' import {
addApply,
allList,
alldept,
exportEatting,
updateApply } from '../../../api/analysis/eattingAnalysis/enttingAnalysis'
export default { export default {
name: "Apply", name: "Apply",
...@@ -96,8 +102,9 @@ ...@@ -96,8 +102,9 @@
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
nickName: undefined, nickName: undefined,
createDateStar: undefined, deptName: undefined,
createDateEnd: undefined, createTimeStart: undefined,
createTimeEnd: undefined,
deptId: undefined deptId: undefined
}, },
// 表单参数 // 表单参数
...@@ -127,7 +134,7 @@ ...@@ -127,7 +134,7 @@
/** 查询所有部门 */ /** 查询所有部门 */
getallList() { getallList() {
this.loading = true; this.loading = true;
allList().then(response => { alldept().then(response => {
this.departmentOptions = response.data; this.departmentOptions = response.data;
}); });
}, },
...@@ -140,8 +147,8 @@ ...@@ -140,8 +147,8 @@
applyAmount: undefined, applyAmount: undefined,
applyRemark: undefined, applyRemark: undefined,
status: "0", status: "0",
createDate: undefined, createTimeStart: undefined,
createTime: undefined, createTimeEnd: undefined,
createWeek: undefined, createWeek: undefined,
applyType: undefined applyType: undefined
}; };
...@@ -194,7 +201,7 @@ ...@@ -194,7 +201,7 @@
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}).then(function() { }).then(function() {
return exportApply(queryParams); return exportEatting(queryParams);
}).then(response => { }).then(response => {
this.download(response.msg); this.download(response.msg);
}).catch(function() {}); }).catch(function() {});
......
src/views/analysis/personalAnalysis/index.vue
浏览文件 @ fe770abf
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<el-table-column label="余额" align="center" prop="balance" /> <el-table-column label="余额" align="center" prop="balance" />
<el-table-column label="充值数" align="center" prop="rechargeTotal" /> <el-table-column label="充值数" align="center" prop="rechargeTotal" />
<el-table-column label="消费数" align="center" prop="consumeTotal" /> <el-table-column label="消费数" align="center" prop="consumeTotal" />
<el-table-column label="补贴金额" align="center" prop="allowanceTotal" /> <!-- <el-table-column label="补贴金额" align="center" prop="allowanceTotal" />-->
</el-table> </el-table>
<pagination <pagination
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</template> </template>
<script> <script>
import { listApply, exportApply } from "@/api/analysis/personalAnalysis/personalAnalysis"; import { listApply, exportPerson } from "@/api/analysis/personalAnalysis/personalAnalysis";
export default { export default {
name: "Apply", name: "Apply",
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}).then(function() { }).then(function() {
return exportApply(queryParams); return exportPerson(queryParams);
}).then(response => { }).then(response => {
this.download(response.msg); this.download(response.msg);
}).catch(function() {}); }).catch(function() {});
......
src/views/analysis/rechargeRecord/index.vue
浏览文件 @ fe770abf
...@@ -18,8 +18,7 @@ ...@@ -18,8 +18,7 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder=" "> placeholder=" ">
</el-date-picker> </el-date-picker>
</el-form-item> 至
<el-form-item label="至" prop=" ">
<el-date-picker clearable size="small" style="width: 150px" <el-date-picker clearable size="small" style="width: 150px"
v-model="queryParams.createDateEnd" v-model="queryParams.createDateEnd"
type="date" type="date"
...@@ -59,7 +58,14 @@ ...@@ -59,7 +58,14 @@
</template> </template>
<script> <script>
import { listRrecharge, addApply, allList, exportApply, updateApply } from '../../../api/analysis/rechargeRecord/rechargeRecord' import {
listRrecharge,
alldept,
addApply,
allList,
exportApply,
updateApply
} from '../../../api/analysis/rechargeRecord/rechargeRecord'
export default { export default {
name: "Apply", name: "Apply",
...@@ -120,7 +126,7 @@ ...@@ -120,7 +126,7 @@
/** 查询所有部门 */ /** 查询所有部门 */
getallList() { getallList() {
this.loading = true; this.loading = true;
allList().then(response => { alldept().then(response => {
this.departmentOptions = response.data; this.departmentOptions = response.data;
}); });
}, },
......
src/views/analysis/summaryAnalysis/index.vue
浏览文件 @ fe770abf
...@@ -3,15 +3,14 @@ ...@@ -3,15 +3,14 @@
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px"> <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
<el-form-item label="日期筛选" prop=" "> <el-form-item label="日期筛选" prop=" ">
<el-date-picker clearable size="small" style="width: 150px" <el-date-picker clearable size="small" style="width: 150px"
v-model="queryParams.createDateStar" v-model="queryParams.createTimeStart"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder=" "> placeholder=" ">
</el-date-picker> </el-date-picker>
</el-form-item> 至
<el-form-item label="至" prop=" ">
<el-date-picker clearable size="small" style="width: 150px" <el-date-picker clearable size="small" style="width: 150px"
v-model="queryParams.createDateEnd" v-model="queryParams.createTimeEnd"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder=" "> placeholder=" ">
...@@ -31,19 +30,19 @@ ...@@ -31,19 +30,19 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="applyList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="applyList" @selection-change="handleSelectionChange">
<el-table-column label="部门" align="center" prop="createDate" /> <el-table-column label="部门" align="center" prop="deptName" />
<el-table-column label="职员总报餐" align="center" prop="applyPeriod" /> <el-table-column label="职员总报餐" align="center" prop="totalRecipeCount" />
<el-table-column label="职员总消费" align="center" prop="remark" /> <el-table-column label="职员总消费" align="center" prop="totalRecipePrice" />
<el-table-column label="部门早餐汇总报餐" align="center" prop="applyAmount" /> <el-table-column label="部门早餐汇总报餐" align="center" prop="breakfastCount" />
<el-table-column label="早餐消费" align="center" prop=" " /> <el-table-column label="早餐消费" align="center" prop="breakfastPrice" />
<el-table-column label="部门中餐总报餐" align="center" prop="nickName" /> <el-table-column label="部门中餐总报餐" align="center" prop="lunchCount" />
<el-table-column label="中餐消费" align="center" prop="deptName" /> <el-table-column label="中餐消费" align="center" prop="lunchPrice" />
<el-table-column label="部门晚餐总报餐" align="center" prop="status" /> <el-table-column label="部门晚餐总报餐" align="center" prop="dinnerCount" />
<el-table-column label="晚餐消费" align="center" prop="status" /> <el-table-column label="晚餐消费" align="center" prop="dinnerPrice" />
<el-table-column label="部门总补贴" align="center" prop="status" /> <!-- <el-table-column label="部门总补贴" align="center" prop="status" />-->
<el-table-column label="部门客餐总报餐" align="center" prop="status" /> <el-table-column label="部门客餐总报餐" align="center" prop="formalCount" />
<el-table-column label="客餐消费" align="center" prop="status" /> <el-table-column label="客餐消费" align="center" prop="formalPrice" />
<el-table-column label="日期" align="center" prop="status" /> <el-table-column label="日期" align="center" prop="date" />
</el-table> </el-table>
<pagination <pagination
...@@ -57,7 +56,14 @@ ...@@ -57,7 +56,14 @@
</template> </template>
<script> <script>
import { listApply, getApply, delApply, addApply, updateApply, exportApply } from "@/api/formalRecipe/formalRecipe"; import {
listRecipeOrder,
getApply,
delApply,
addApply,
updateApply,
exportApply
} from '../../../api/analysis/summaryAnalysis/summaryAnalysis';
export default { export default {
name: "Apply", name: "Apply",
...@@ -93,8 +99,8 @@ ...@@ -93,8 +99,8 @@
createDate: undefined, createDate: undefined,
createWeek: undefined, createWeek: undefined,
nickName: undefined, nickName: undefined,
createDateStar: undefined, createTimeStart: undefined,
createDateEnd: undefined, createTimeEnd: undefined,
applyType: undefined applyType: undefined
}, },
// 表单参数 // 表单参数
...@@ -111,10 +117,10 @@ ...@@ -111,10 +117,10 @@
}); });
}, },
methods: { methods: {
/** 查询客餐申请列表 */ /** 查询数据列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listApply(this.queryParams).then(response => { listRecipeOrder(this.queryParams).then(response => {
this.applyList = response.rows; this.applyList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
......
src/views/formalRecipe/formalRecipeCheck/index.vue
浏览文件 @ fe770abf
...@@ -38,22 +38,21 @@ ...@@ -38,22 +38,21 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-col :span="1.5"> </el-form-item>
<el-button <el-form-item>
type="warning" <el-col :span="1.5">
icon="el-icon-download" <el-button
size="mini" type="warning"
@click="handleExport" icon="el-icon-download"
v-hasPermi="['system:apply:export']" size="mini"
>导出</el-button> @click="handleExport"
</el-col> v-hasPermi="['system:apply:export']"
>导出</el-button>
</el-col>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="applyList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="applyList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="主键id" align="center" prop="id" />-->
<!-- <el-table-column label="申请用户id" align="center" prop="applyUserId" />-->
<!-- <el-table-column label="申请时段" align="center" prop="applyPeriod" />-->
<el-table-column label="客餐日期" align="center" prop="createDate" /> <el-table-column label="客餐日期" align="center" prop="createDate" />
<el-table-column label="客餐类型" align="center" prop="applyPeriod" /> <el-table-column label="客餐类型" align="center" prop="applyPeriod" />
<el-table-column label="客餐理由" align="center" prop="remark" /> <el-table-column label="客餐理由" align="center" prop="remark" />
......
src/views/forum/postList/index.vue
浏览文件 @ fe770abf
...@@ -95,7 +95,6 @@ ...@@ -95,7 +95,6 @@
</el-table> </el-table>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<!-- <el-button type="primary" @click="submitForm">确 定</el-button>-->
<el-button @click="cancel">返 回</el-button> <el-button @click="cancel">返 回</el-button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -161,16 +160,6 @@ ...@@ -161,16 +160,6 @@
this.loading = false this.loading = false
}) })
}, },
/** get current announcement */
// getCurrent() {
// this.loading = true;
// getCurrent().then(response=>{
// if (response.data){
// this.announcement = response.data
// this.loading = false
// }
// })
// },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
......
src/views/pullRecipe/addPullRecipe/index.vue
浏览文件 @ fe770abf
<template> <template>
<div class="app-container"> <div class="app-container">
<span align="center">当前挂餐</span> <div align="center" class="addPull" style="margin-top: 30px" >当前挂餐:{{sss}}</div>
<span align="center">当前挂餐</span> <div align="center" class="addPull">当前总挂餐数量:</div>
<span align="center">当前挂餐</span> <div align="center" class="addPull" >员工退餐总数量: 46546546874687867867867</div>
<span align="center">当前挂餐</span> <div align="center" class="addPull">系统挂餐数量:</div>
<span align="center">当前挂餐</span> <div align="center" class="addPull" >添加挂餐数量:</div>
<el-table v-loading="loading" :data="applyList" @selection-change="handleSelectionChange">
<el-table-column label="挂餐时间" align="center" prop="userId" />
<el-table-column label="总挂餐" align="center" prop="department" />
<el-table-column label="系统早餐挂餐" align="center" prop="nickName" />
<el-table-column label="系统早餐挂餐已取" align="center" prop="balance" />
<el-table-column label="系统午餐" align="center" prop="rechargeTotal" />
<el-table-column label="系统午餐挂餐已取" align="center" prop="rechargeTotal" />
<el-table-column label="系统晚餐" align="center" prop="rechargeTotal" />
<el-table-column label="系统晚餐挂餐" align="center" prop="rechargeTotal" />
<el-table-column label="系统晚餐挂餐已取" align="center" prop="rechargeTotal" />
<el-table-column label="员工早餐挂餐" align="center" prop="rechargeTotal" />
<el-table-column label="员工早餐挂餐已取" align="center" prop="rechargeTotal" />
<el-table-column label="员工午餐挂餐" align="center" prop="rechargeTotal" />
<el-table-column label="员工午餐挂餐已取" align="center" prop="rechargeTotal" />
<el-table-column label="员工晚餐挂餐" align="center" prop="rechargeTotal" />
<el-table-column label="员工晚餐挂餐已取" align="center" prop="rechargeTotal" />
<el-table-column label="挂餐总已取" align="center" prop="rechargeTotal" />
<el-table-column label="挂餐总未取" align="center" prop="rechargeTotal" />
</el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
...@@ -42,6 +24,7 @@ ...@@ -42,6 +24,7 @@
name: "Apply", name: "Apply",
data() { data() {
return { return {
resData:{},
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
...@@ -169,9 +152,17 @@ ...@@ -169,9 +152,17 @@
}).then(response => { }).then(response => {
this.download(response.msg); this.download(response.msg);
}).catch(function() {}); }).catch(function() {});
} }
} }
}; };
</script> </script>
<style scoped>
.addPull{
font-size: 20px;
font-weight: bold;
margin-bottom: 20px;
color: #000;
}
</style>
src/views/pullRecipe/pullRecipeAnalyze/index.vue
浏览文件 @ fe770abf
...@@ -3,52 +3,52 @@ ...@@ -3,52 +3,52 @@
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px"> <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
<el-form-item label="日期筛选" prop=" "> <el-form-item label="日期筛选" prop=" ">
<el-date-picker clearable size="small" style="width: 130px" <el-date-picker clearable size="small" style="width: 130px"
v-model="queryParams.createDateStar" v-model="queryParams.pickDateStart"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder=" "> placeholder=" ">
</el-date-picker> </el-date-picker>
至 至
<el-date-picker clearable size="small" style="width: 130px" <el-date-picker clearable size="small" style="width: 130px"
v-model="queryParams.createDateEnd" v-model="queryParams.pickDateEnd"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder=" "> placeholder=" ">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
</el-form-item>
<el-form-item> <el-form-item>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button <el-button
type="warning" type="warning"
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:apply:export']" v-hasPermi="['system:apply:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="applyList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="applyList" @selection-change="handleSelectionChange">
<el-table-column label="挂餐时间" align="center" prop="userId" /> <el-table-column label="挂餐时间" align="center" prop="date" />
<el-table-column label="总挂餐" align="center" prop="department" /> <el-table-column label="总挂餐" align="center" prop="totalCount" />
<el-table-column label="系统早餐挂餐" align="center" prop="nickName" /> <el-table-column label="系统早餐挂餐" align="center" prop="systemBreakfastCount" />
<el-table-column label="系统早餐挂餐已取" align="center" prop="balance" /> <el-table-column label="系统早餐挂餐已取" align="center" prop="systemBreakfastAlreadyCount" />
<el-table-column label="系统午餐" align="center" prop="rechargeTotal" /> <el-table-column label="系统午餐" align="center" prop="systemLunchCount" />
<el-table-column label="系统午餐挂餐已取" align="center" prop="rechargeTotal" /> <el-table-column label="系统午餐挂餐已取" align="center" prop="systemLunchAlreadyCount" />
<el-table-column label="系统晚餐" align="center" prop="rechargeTotal" /> <el-table-column label="系统晚餐挂餐" align="center" prop="systemDinnerCount" />
<el-table-column label="系统晚餐挂餐" align="center" prop="rechargeTotal" /> <el-table-column label="系统晚餐挂餐已取" align="center" prop="systemDinnerAlreadyCount" />
<el-table-column label="系统晚餐挂餐已取" align="center" prop="rechargeTotal" /> <el-table-column label="员工早餐挂餐" align="center" prop="personBreakfastCount" />
<el-table-column label="员工早餐挂餐" align="center" prop="rechargeTotal" /> <el-table-column label="员工早餐挂餐已取" align="center" prop="personBreakfastAlreadyCount" />
<el-table-column label="员工早餐挂餐已取" align="center" prop="rechargeTotal" /> <el-table-column label="员工午餐挂餐" align="center" prop="personLunchCount" />
<el-table-column label="员工午餐挂餐" align="center" prop="rechargeTotal" /> <el-table-column label="员工午餐挂餐已取" align="center" prop="personLunchAlreadyCount" />
<el-table-column label="员工午餐挂餐已取" align="center" prop="rechargeTotal" /> <el-table-column label="员工晚餐挂餐" align="center" prop="personDinnerCount" />
<el-table-column label="员工晚餐挂餐" align="center" prop="rechargeTotal" /> <el-table-column label="员工晚餐挂餐已取" align="center" prop="personDinnerAlreadyCount" />
<el-table-column label="员工晚餐挂餐已取" align="center" prop="rechargeTotal" /> <el-table-column label="挂餐总已取" align="center" prop="totalAlreadyCount" />
<el-table-column label="挂餐总已取" align="center" prop="rechargeTotal" /> <el-table-column label="挂餐总未取" align="center" prop="totalUnAlreadyCount" />
<el-table-column label="挂餐总未取" align="center" prop="rechargeTotal" />
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
...@@ -60,7 +60,10 @@ ...@@ -60,7 +60,10 @@
</template> </template>
<script> <script>
import { listApply, addApply, allList, exportApply, updateApply } from '../../../api/analysis/eattingAnalysis/enttingAnalysis' import {
getPullRecipeList,
exportPullRecipeList
} from '../../../api/analysis/pullRecipe/pullRecipeAnalyze'
export default { export default {
name: "Apply", name: "Apply",
...@@ -76,7 +79,7 @@ ...@@ -76,7 +79,7 @@
multiple: true, multiple: true,
// 总条数 // 总条数
total: 0, total: 0,
// 客餐申请表格数据 // 挂餐汇总数据
applyList: [], applyList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
...@@ -90,10 +93,8 @@ ...@@ -90,10 +93,8 @@
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
nickName: undefined, pickDateStart: undefined,
createDateStar: undefined, pickDateEnd: undefined
createDateEnd: undefined,
deptId: undefined
}, },
// 表单参数 // 表单参数
form: {}, form: {},
...@@ -104,7 +105,6 @@ ...@@ -104,7 +105,6 @@
}, },
created() { created() {
this.getList(); this.getList();
this.getallList();
this.getDicts("t_formal_dishes_apply.status").then(response => { this.getDicts("t_formal_dishes_apply.status").then(response => {
this.statusOptions = response.data; this.statusOptions = response.data;
}); });
...@@ -113,19 +113,12 @@ ...@@ -113,19 +113,12 @@
/** 查询就餐列表 */ /** 查询就餐列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listApply(this.queryParams).then(response => { getPullRecipeList(this.queryParams).then(response => {
this.applyList = response.rows; this.applyList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
}, },
/** 查询所有部门 */
getallList() {
this.loading = true;
allList().then(response => {
this.departmentOptions = response.data;
});
},
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
...@@ -153,34 +146,6 @@ ...@@ -153,34 +146,6 @@
this.single = selection.length!=1 this.single = selection.length!=1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 提交按钮 */
submitForm: function() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != undefined) {
updateApply(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
} else {
this.msgError(response.msg);
}
});
} else {
addApply(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
} else {
this.msgError(response.msg);
}
});
}
}
});
},
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
const queryParams = this.queryParams; const queryParams = this.queryParams;
...@@ -189,7 +154,7 @@ ...@@ -189,7 +154,7 @@
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}).then(function() { }).then(function() {
return exportApply(queryParams); return exportPullRecipeList(queryParams);
}).then(response => { }).then(response => {
this.download(response.msg); this.download(response.msg);
}).catch(function() {}); }).catch(function() {});
......
src/views/pullRecipe/pullRecipeList/index.vue
浏览文件 @ fe770abf
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="80px"> <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="80px">
<el-form-item label="挂餐人账号" prop="nickName" label-width="100px"> <el-form-item label="挂餐人名称" prop="pullUserName" label-width="100px">
<el-input <el-input
v-model="queryParams.nickName" v-model="queryParams.pullUserName"
placeholder="请填写挂餐人名称或账号" placeholder="请填写挂餐人名称"
clearable clearable
size="small" style="width: 150px" size="small" style="width: 150px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="取餐者账号" prop="nickName" label-width="100px"> <el-form-item label="取餐者名称" prop="pickUserName" label-width="100px">
<el-input <el-input
v-model="queryParams.nickName" v-model="queryParams.pickUserName"
placeholder="请填写取餐者账号" placeholder="请填写取餐者名称"
clearable clearable
size="small" style="width: 150px" size="small" style="width: 150px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="日期筛选" prop=" "> <el-form-item label="挂餐日期筛选" prop=" "label-width="130px">
<el-date-picker clearable size="small" style="width: 130px" <el-date-picker clearable size="small" style="width: 130px"
v-model="queryParams.createDateStar" v-model="queryParams.pullDateStart"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder=" "> placeholder=" ">
</el-date-picker> </el-date-picker>
至 至
<el-date-picker clearable size="small" style="width: 130px" <el-date-picker clearable size="small" style="width: 130px"
v-model="queryParams.createDateEnd" v-model="queryParams.pullDateEnd"
type="date"
value-format="yyyy-MM-dd"
placeholder=" ">
</el-date-picker>
</el-form-item>
<el-form-item label="取餐日期筛选" prop=" "label-width="130px">
<el-date-picker clearable size="small" style="width: 130px"
v-model="queryParams.pickDateStart"
type="date"
value-format="yyyy-MM-dd"
placeholder=" ">
</el-date-picker>
至
<el-date-picker clearable size="small" style="width: 130px"
v-model="queryParams.pickDateEnd"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder=" "> placeholder=" ">
...@@ -47,18 +62,16 @@ ...@@ -47,18 +62,16 @@
</el-col> </el-col>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="applyList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="pullRecipeList" @selection-change="handleSelectionChange">
<el-table-column label="是否系统挂餐" align="center" prop="userId" /> <el-table-column label="挂餐类型" align="center" prop="pullType" />
<el-table-column label="挂餐类型" align="center" prop="department" /> <el-table-column label="挂餐人名称" align="center" prop="pullUserName" />
<el-table-column label="挂餐人名称" align="center" prop="nickName" /> <el-table-column label="挂餐人部门" align="center" prop="pullDeptName" />
<el-table-column label="挂餐人部门" align="center" prop="balance" /> <el-table-column label="挂餐人账号" align="center" prop="pullUserId" />
<el-table-column label="挂餐人账号" align="center" prop="rechargeTotal" /> <el-table-column label="挂餐时间" align="center" prop="pullDate" />
<el-table-column label="挂餐时间" align="center" prop="rechargeTotal" /> <el-table-column label="取餐人名称" align="center" prop="pickUserName" />
<el-table-column label="取餐人名称" align="center" prop="rechargeTotal" /> <el-table-column label="取餐人部门" align="center" prop="pickDeptName" />
<el-table-column label="取餐人部门" align="center" prop="rechargeTotal" /> <el-table-column label="取餐人账号" align="center" prop="pickUserId" />
<el-table-column label="取餐人账号" align="center" prop="rechargeTotal" /> <el-table-column label="领餐时间" align="center" prop="pickDate" />
<el-table-column label="挂餐时间" align="center" prop="rechargeTotal" />
<el-table-column label="挂餐时间" align="center" prop="rechargeTotal" />
</el-table> </el-table>
<pagination <pagination
...@@ -72,7 +85,14 @@ ...@@ -72,7 +85,14 @@
</template> </template>
<script> <script>
import { listApply, addApply, allList, exportApply, updateApply } from '../../../api/analysis/eattingAnalysis/enttingAnalysis' import {
getPullRecipeList,
listApply,
addApply,
allList,
exportApply,
updateApply
} from '../../../api/analysis/pullRecipe/pullRecipe'
export default { export default {
name: "Apply", name: "Apply",
...@@ -88,8 +108,8 @@ ...@@ -88,8 +108,8 @@
multiple: true, multiple: true,
// 总条数 // 总条数
total: 0, total: 0,
// 客餐申请表格数据 // 挂餐表格数据
applyList: [], pullRecipeList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
...@@ -102,9 +122,12 @@ ...@@ -102,9 +122,12 @@
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
nickName: undefined, pullUserName: undefined,
createDateStar: undefined, pickUserName: undefined,
createDateEnd: undefined, pullDateStart: undefined,
pickDateStart: undefined,
pullDateEnd: undefined,
pickDateEnd: undefined,
deptId: undefined deptId: undefined
}, },
// 表单参数 // 表单参数
...@@ -116,28 +139,28 @@ ...@@ -116,28 +139,28 @@
}, },
created() { created() {
this.getList(); this.getList();
this.getallList(); // this.getallList();
this.getDicts("t_formal_dishes_apply.status").then(response => { this.getDicts("t_formal_dishes_apply.status").then(response => {
this.statusOptions = response.data; this.statusOptions = response.data;
}); });
}, },
methods: { methods: {
/** 查询就餐列表 */ /** 查询挂餐列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listApply(this.queryParams).then(response => { getPullRecipeList(this.queryParams).then(response => {
this.applyList = response.rows; this.pullRecipeList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
}, },
/** 查询所有部门 */ // /** 查询所有部门 */
getallList() { // getallList() {
this.loading = true; // this.loading = true;
allList().then(response => { // allList().then(response => {
this.departmentOptions = response.data; // this.departmentOptions = response.data;
}); // });
}, // },
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
...@@ -201,7 +224,7 @@ ...@@ -201,7 +224,7 @@
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}).then(function() { }).then(function() {
return exportApply(queryParams); return exportPullRecipeList(queryParams);
}).then(response => { }).then(response => {
this.download(response.msg); this.download(response.msg);
}).catch(function() {}); }).catch(function() {});
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论