fix: 修复产线能力查询参数错误及调整分页默认值
修复产线能力查询时lineId参数传递错误的问题,增加参数校验 调整分页组件默认的pageSizes选项,增加10的选项 修改物料线圈查询状态参数为0 优化线圈吞吐记录展示方式,改为行点击触发 移除用餐记录中不必要的部门字典依赖
This commit is contained in:
@@ -31,7 +31,6 @@
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="部门名称" prop="deptName">
|
||||
<!-- <DictSelect dictType="hrm_department" v-model="queryParams.deptName" placeholder="请选择部门名称"></DictSelect> -->
|
||||
<el-select v-model="queryParams.deptName" placeholder="请选择部门名称">
|
||||
<el-option
|
||||
v-for="dict in deptOptions"
|
||||
@@ -98,11 +97,7 @@
|
||||
<dict-tag :options="dict.type.hrm_meal_type" :value="scope.row.mealType"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="部门名称" align="center" prop="deptName">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.hrm_department" :value="scope.row.deptName"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="部门名称" align="center" prop="deptName"></el-table-column>
|
||||
<el-table-column label="用餐总人数" align="center" prop="totalPeople" />
|
||||
<el-table-column label="堂食人数" align="center" prop="dineInPeople">
|
||||
<template slot-scope="scope">
|
||||
@@ -172,7 +167,6 @@
|
||||
:value="dict.deptName"
|
||||
></el-option>
|
||||
</el-select>
|
||||
<!-- <DictSelect dictType="hrm_department" v-model="form.deptName" placeholder="请选择部门名称"></DictSelect> -->
|
||||
</el-form-item>
|
||||
<el-form-item label="堂食成员" prop="dineInPeopleList">
|
||||
<employee-selector v-model="form.dineInPeopleList" :key-field="'name'" :multiple="true" placeholder="请选择堂食成员" @change="handleDineInPeopleChange" :disabled-names="form.takeoutPeopleList || ''" />
|
||||
@@ -208,7 +202,7 @@ import { listDept } from "@/api/wms/dept"
|
||||
|
||||
export default {
|
||||
name: "MealReport",
|
||||
dicts: ['hrm_meal_type', 'hrm_department'],
|
||||
dicts: ['hrm_meal_type'],
|
||||
components: { DictSelect, EmployeeSelector },
|
||||
data() {
|
||||
// 用餐日期默认选中今天
|
||||
@@ -241,7 +235,24 @@ export default {
|
||||
status: undefined,
|
||||
deadlineTime: '12:00:00' // 新增:截至时间默认12点
|
||||
},
|
||||
form: {},
|
||||
form: {
|
||||
reportId: undefined,
|
||||
reportDate: nowTime,
|
||||
mealType: undefined,
|
||||
deptName: undefined,
|
||||
totalPeople: undefined,
|
||||
dineInPeopleList: '',
|
||||
dineInPeople: 0,
|
||||
takeoutPeopleList: '',
|
||||
takeoutPeople: 0,
|
||||
reportUserName: undefined,
|
||||
status: undefined,
|
||||
createBy: undefined,
|
||||
createTime: undefined,
|
||||
updateBy: undefined,
|
||||
updateTime: undefined,
|
||||
remark: undefined
|
||||
},
|
||||
// 替换原有统计变量,新增6个有效/无效统计项
|
||||
validDineIn: 0, // 有效堂食人数
|
||||
validTakeout: 0, // 有效打包人数
|
||||
@@ -372,8 +383,10 @@ export default {
|
||||
mealType: undefined,
|
||||
deptName: undefined,
|
||||
totalPeople: undefined,
|
||||
dineInPeople: undefined,
|
||||
takeoutPeople: undefined,
|
||||
dineInPeopleList: '',
|
||||
dineInPeople: 0,
|
||||
takeoutPeopleList: '',
|
||||
takeoutPeople: 0,
|
||||
reportUserName: undefined,
|
||||
status: undefined,
|
||||
createBy: undefined,
|
||||
|
||||
Reference in New Issue
Block a user