fix: 修复产线能力查询参数错误及调整分页默认值
修复产线能力查询时lineId参数传递错误的问题,增加参数校验 调整分页组件默认的pageSizes选项,增加10的选项 修改物料线圈查询状态参数为0 优化线圈吞吐记录展示方式,改为行点击触发 移除用餐记录中不必要的部门字典依赖
This commit is contained in:
@@ -77,7 +77,7 @@
|
||||
</el-row>
|
||||
|
||||
<KLPTable v-loading="loading" :data="materialCoilList" @selection-change="handleSelectionChange" :floatLayer="true"
|
||||
:floatLayerConfig="floatLayerConfig">
|
||||
:floatLayerConfig="floatLayerConfig" @row-click="handleRowClick">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
|
||||
<template slot-scope="scope">
|
||||
@@ -249,8 +249,8 @@
|
||||
@click="handleAbnormal(scope.row)">查看异常</el-button>
|
||||
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleCheck(scope.row)"
|
||||
v-if="showControl">修正</el-button>
|
||||
<el-button size="mini" type="text" icon="el-icon-time" @click="handleLog(scope.row)"
|
||||
v-if="showWareLog">吞吐记录</el-button>
|
||||
<!-- <el-button size="mini" type="text" icon="el-icon-time" @click="handleLog(scope.row)"
|
||||
v-if="showWareLog">吞吐记录</el-button> -->
|
||||
<!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
|
||||
v-if="showControl">删除</el-button> -->
|
||||
<el-button size="mini" type="text" icon="el-icon-search" @click="handleTrace(scope.row)">追溯</el-button>
|
||||
@@ -387,9 +387,9 @@
|
||||
</el-dialog>
|
||||
|
||||
<!-- 吞吐记录 -->
|
||||
<el-dialog v-if="showWareLog" title="吞吐记录" :visible.sync="logOpen" width="90%" append-to-body>
|
||||
<log-table :coil-id="currentCoilId"></log-table>
|
||||
</el-dialog>
|
||||
<!-- <el-dialog v-if="showWareLog" title="吞吐记录" :visible.sync="logOpen" width="90%" append-to-body> -->
|
||||
<log-table v-if="showWareLog && currentCoilId" :coil-id="currentCoilId"></log-table>
|
||||
<!-- </el-dialog> -->
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -721,6 +721,12 @@ export default {
|
||||
this.getUserList();
|
||||
},
|
||||
methods: {
|
||||
// 处理行点击事件
|
||||
handleRowClick(row) {
|
||||
this.currentCoilId = row.coilId;
|
||||
this.logOpen = true;
|
||||
},
|
||||
// 获取用户列表
|
||||
getUserList() {
|
||||
listUser({ pageNum: 1, pageSize: 1000 }).then(res => {
|
||||
this.userList = res.rows || [];
|
||||
|
||||
Reference in New Issue
Block a user