diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue index b934122..ca75432 100644 --- a/src/views/modules/part/routingManagement.vue +++ b/src/views/modules/part/routingManagement.vue @@ -539,7 +539,7 @@ - 调机过程中人员等级 @@ -575,7 +575,8 @@ - 人员等级 + 人员等级 @@ -1080,6 +1081,111 @@ 关闭 + + + + + + + + + + + + 查询 + + + + + + + + + + + + 关闭 + + + + + + + + + + + + + 查询 + + + + + + + + + + + + 关闭 + + @@ -1128,6 +1234,7 @@ import { import {getChooselistData, verifyData} from "@/api/chooselist/chooselist.js" import ChooseList from '@/views/modules/common/Chooselist' import {queryWorkCenterList} from "../../../api/part/workCenter"; +import {queryWorkerLevelList} from "../../../api/base/laborClass"; export default { // 组件 @@ -1209,6 +1316,12 @@ export default { pageIndex5: 1, pageSize5: 20, totalPage5: 0, + pageIndex6: 1, + pageSize6: 20, + totalPage6: 0, + pageIndex7: 1, + pageSize7: 20, + totalPage7: 0, selectedDataNum: 0, // 条件查询 searchData: { @@ -1222,7 +1335,9 @@ export default { page: 1, limit: 10, workCenterNo: '', - workCenterDesc: '' + workCenterDesc: '', + levelId: '', + levelDesc: '' }, // loading queryLoading: false, @@ -1232,6 +1347,8 @@ export default { toBecomeOfficialLoading: false, copyLoading: false, workCenterModelFlag: false, + workerLevelModelFlag1: false, + workerLevelModelFlag2: false, // 初始页签 detailTable: 'routing_detail', subDetailTable: 'routing_sub_detail', @@ -1313,7 +1430,9 @@ export default { updateDate: '', updateBy: '', ifsRowId: '', - ifsRowVersion: '' + ifsRowVersion: '', + levelId: '', + levelDesc: '', }, partData: { site: this.$store.state.user.site, @@ -1480,6 +1599,7 @@ export default { copyPartList: [], toolList: [], workCenterList: [], + workerLevelList: [], // ======== 列表表头 ======== columnList: [ { @@ -2503,6 +2623,32 @@ export default { columnWidth: 100 }, ], + workerLevelColumnList: [ + { + userId: this.$store.state.user.name, + columnProp: 'levelId', + headerAlign: "center", + align: "left", + columnLabel: '编码', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 100 + }, + { + userId: this.$store.state.user.name, + columnProp: 'levelDesc', + headerAlign: "center", + align: "left", + columnLabel: '名称', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 200 + } + ], componentPartColumnList: [ { columnProp: 'plmPartNo', @@ -2972,6 +3118,32 @@ export default { this.queryWorkCenter() }, + // 每页数 + sizeChangeHandle6(val) { + this.pageSize6 = val + this.pageIndex6 = 1 + this.queryWorkerLevel1() + }, + + // 当前页 + currentChangeHandle6(val) { + this.pageIndex6 = val + this.queryWorkerLevel1() + }, + + // 每页数 + sizeChangeHandle7(val) { + this.pageSize7 = val + this.pageIndex7 = 1 + this.queryWorkerLevel2() + }, + + // 当前页 + currentChangeHandle7(val) { + this.pageIndex7 = val + this.queryWorkerLevel2() + }, + // copy物料列表 queryCopyPartModal() { this.copyPartData.limit = this.pageSize4 @@ -4962,13 +5134,66 @@ export default { }) }, + // 查询人员等级列表 + queryWorkerLevel1() { + //调机过程中人员等级 + this.searchData.limit = this.pageSize6 + this.searchData.page = this.pageIndex6 + queryWorkerLevelList(this.searchData).then(({data}) => { + if (data && data.code === 0) { + this.workerLevelList = data.page.list + this.pageIndex6 = data.page.currPage + this.pageSize6 = data.page.pageSize + this.totalPage6 = data.page.totalCount + this.workerLevelModelFlag1 = true + } else { + this.workerLevelList = [] + } + }) + + }, + + queryWorkerLevel2() { + //调机过程中人员等级 + this.searchData.limit = this.pageSize6 + this.searchData.page = this.pageIndex6 + queryWorkerLevelList(this.searchData).then(({data}) => { + if (data && data.code === 0) { + this.workerLevelList = data.page.list + this.pageIndex6 = data.page.currPage + this.pageSize6 = data.page.pageSize + this.totalPage6 = data.page.totalCount + this.workerLevelModelFlag2 = true + } else { + this.workerLevelList = [] + } + }) + }, + // 双击选中加工中心 - getWorkCenterRowData (row) { - this.modalData.workCenterNo = row.workCenterNo - this.modalData.workCenterDesc = row.workCenterDesc - this.modalData.workCenterType = row.workCenterType + getWorkCenterRowData(row) { + this.componentData.workCenterNo = row.workCenterNo + this.componentData.workCenterDesc = row.workCenterDesc + this.componentData.workCenterType = row.workCenterType this.workCenterModelFlag = false }, + + // 双击选中人员等级 + getWorkerLevelRowData1(row) { + console.log(row.levelId) + this.componentData.setupLaborClassNo = row.levelId + this.componentData.setupLaborClassDesc = row.levelDesc + this.workerLevelModelFlag1 = false + }, + + getWorkerLevelRowData2(row) { + this.componentData.laborClassNo = row.levelId + this.componentData.laborClassDesc = row.levelDesc + this.workerLevelModelFlag2 = false + }, + + + } }