diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js index 7ad2ca4..9c4e7d8 100644 --- a/src/api/qc/qc.js +++ b/src/api/qc/qc.js @@ -134,6 +134,7 @@ export const queryController = data => createAPI(`/pms/qc/queryController`,'post export const queryTemplateList = data => createAPI(`/pms/qc/queryTemplateList`,'post',data) export const getPartInformation = data => createAPI(`/pms/qc/getPartInformation`,'post',data) export const getSpecialOperationList = data => createAPI(`/pms/qc/getSpecialOperationList`,'post',data) +export const getRollNo = data => createAPI(`/pms/qc/getRollNo`,'post',data) // ===================================== IQC检验 ===================================== export const qcIQCInspectionSearch = data => createAPI(`/pms/qc/qcIQCInspectionSearch`,'post',data) diff --git a/src/views/modules/eam/eamAdmin.vue b/src/views/modules/eam/eamAdmin.vue index 5af8890..84530d1 100644 --- a/src/views/modules/eam/eamAdmin.vue +++ b/src/views/modules/eam/eamAdmin.vue @@ -7,10 +7,13 @@ - + - + + + + @@ -172,10 +175,10 @@
- + - + 查询 @@ -272,6 +275,7 @@ site: this.$store.state.user.site, adminID: '', adminName: '', + departmentName: '', active: 'Y', page: 1, limit: 10, @@ -702,10 +706,10 @@ }, //导出excel async createExportData() { - this.searchData.limit = -1 - this.searchData.page = 1 + // this.searchData.limit = -1 + // this.searchData.page = 1 await eamAdminSearch(this.searchData).then(({data}) => { - this.exportList= data.page.list; + this.exportList= data.rows }) return this.exportList; }, @@ -731,14 +735,14 @@ // 导出 end // 获取数据列表 getDataList () { - this.searchData.limit = this.pageSize - this.searchData.page = this.pageIndex + // this.searchData.limit = this.pageSize + // this.searchData.page = this.pageIndex eamAdminSearch(this.searchData).then(({data}) => { if (data.code === 0) { - this.dataList = data.page.list - this.pageIndex = data.page.currPage - this.pageSize = data.page.pageSize - this.totalPage = data.page.totalCount + this.dataList = data.rows + // this.pageIndex = data.page.currPage + // this.pageSize = data.page.pageSize + // this.totalPage = data.page.totalCount } this.dataListLoading = false }) diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue index ca068d7..e0704c5 100644 --- a/src/views/modules/eam/eamWorkOrderForDefect.vue +++ b/src/views/modules/eam/eamWorkOrderForDefect.vue @@ -165,7 +165,7 @@ - + @@ -194,6 +194,17 @@ 备件图片 + + + + + + + + + + + @@ -406,6 +417,42 @@ fixed: '', columnWidth: 90, }, + { + userId: this.$store.state.user.name, + functionId: 101014, + serialNumber: '101014TableResult', + tableId: "101014Table", + tableName: "common", + columnProp: 'result', + headerAlign: "center", + align: "center", + columnLabel: '维修结论', + columnHidden: false, + columnImage: false, + columnSortable: true, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80, + }, + { + userId: this.$store.state.user.name, + functionId: 101014, + serialNumber: '101014TableResult', + tableId: "101014Table", + tableName: "common", + columnProp: 'disposalMeasures', + headerAlign: "center", + align: "center", + columnLabel: '处置措施', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80, + }, { userId: this.$store.state.user.name, functionId: 101018, @@ -586,42 +633,6 @@ fixed: '', columnWidth: 80, }, - { - userId: this.$store.state.user.name, - functionId: 101014, - serialNumber: '101014TableResult', - tableId: "101014Table", - tableName: "common", - columnProp: 'result', - headerAlign: "center", - align: "center", - columnLabel: '维修结果', - columnHidden: false, - columnImage: false, - columnSortable: true, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 80, - }, - { - userId: this.$store.state.user.name, - functionId: 101014, - serialNumber: '101014TableResult', - tableId: "101014Table", - tableName: "common", - columnProp: 'disposalMeasures', - headerAlign: "center", - align: "center", - columnLabel: '处置措施', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 80, - }, { userId: this.$store.state.user.name, functionId: 101018, @@ -1186,6 +1197,7 @@ orderNo: row.orderNo, planID: row.planID, objectID: row.objectID, + objectDesc: row.objectDesc, status: row.status, remark: row.remark, workTime: row.workTime, @@ -1199,9 +1211,10 @@ planDesc: row.planDesc, disposalMeasures: row.disposalMeasures, handlingMethod: row.handlingMethod, - functionType: row.functionType + functionType: row.functionType, + resourceDesc: row.resourceDesc } - this.detailModelFlag = true; + this.detailModelFlag = true }, updateResult () { diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue index ad9fefe..78fd4c8 100644 --- a/src/views/modules/qc/FAIResultEntry.vue +++ b/src/views/modules/qc/FAIResultEntry.vue @@ -134,6 +134,18 @@ + + + + + + + + 派工单号 @@ -159,7 +171,7 @@ - + { + if (data.code === 0) { + let result = data.rows + // 循环放到一个远程搜索需要的数组 + for (let i = 0; i < result.length; i++) { + const element = result[i] + results.push({ + value: element.rollNo, + seqNo: element.seqNo, + orderNo: element.orderNo + }) + } + cb(results) + } else { + results = [] + cb(results) + } + }) + } + }, + + //点击出现搜索后点击的每一项 + handleSelect (item) { + this.modalData.rollNo = item.value + this.modalData.seqNo = item.seqNo + this.modalData.orderNo = item.orderNo + this.getOperationList() + this.getPartList() + }, + // 获取处置措施列表 disposalMeasuresSearch(){ let tempData = { @@ -1346,6 +1451,9 @@ getResourceList(this.modalData).then(({data}) => { if (data && data.code === 0) { this.resourceList = data.rows + this.modalData.workCenterNo = data.rows[0].workCenterNo + this.modalData.resourceId = data.rows[0].resourceId + this.modalData.resourceDesc = data.rows[0].resourceDesc } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' @@ -1360,6 +1468,8 @@ getOperationList(this.modalData).then(({data}) => { if (data && data.code === 0) { this.operationList = data.rows + this.modalData.operationDesc = data.rows[0].operationDesc + this.getResourceList() } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' @@ -1412,7 +1522,9 @@ specialRequirements: '', templateId: '', templateName: '', - specialTaskFlag: '' + specialTaskFlag: '', + workCenterNo: '', + rollNo: '' } // 获取选中框 let obj = document.getElementsByName('specialTask') @@ -1539,7 +1651,9 @@ specialRequirements: '', templateId: '', templateName: '', - specialTaskFlag: '' + specialTaskFlag: '', + workCenterNo: '', + rollNo: '' } this.operationList = [] this.resourceList = [] diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue index 869d6ca..426d6a4 100644 --- a/src/views/modules/qc/FQCResultEntry.vue +++ b/src/views/modules/qc/FQCResultEntry.vue @@ -132,6 +132,18 @@ + + + + + + + + 派工单号 @@ -157,7 +169,7 @@ - + { + if (data.code === 0) { + let result = data.rows + // 循环放到一个远程搜索需要的数组 + for (let i = 0; i < result.length; i++) { + const element = result[i] + results.push({ + value: element.rollNo, + seqNo: element.seqNo, + orderNo: element.orderNo + }) + } + cb(results) + } else { + results = [] + cb(results) + } + }) + } + }, + + //点击出现搜索后点击的每一项 + handleSelect (item) { + this.modalData.rollNo = item.value + this.modalData.seqNo = item.seqNo + this.modalData.orderNo = item.orderNo + this.getOperationList() + this.getPartList() + }, + // 获取处置措施列表 disposalMeasuresSearch(){ let tempData = { @@ -1344,6 +1448,9 @@ getResourceList(this.modalData).then(({data}) => { if (data && data.code === 0) { this.resourceList = data.rows + this.modalData.workCenterNo = data.rows[0].workCenterNo + this.modalData.resourceId = data.rows[0].resourceId + this.modalData.resourceDesc = data.rows[0].resourceDesc } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' @@ -1358,6 +1465,8 @@ getOperationList(this.modalData).then(({data}) => { if (data && data.code === 0) { this.operationList = data.rows + this.modalData.operationDesc = data.rows[0].operationDesc + this.getResourceList() } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' @@ -1410,7 +1519,9 @@ specialRequirements: '', templateId: '', templateName: '', - specialTaskFlag: '' + specialTaskFlag: '', + workCenterNo: '', + rollNo: '' } // 获取选中框 let obj = document.getElementsByName('specialTask') @@ -1537,7 +1648,9 @@ specialRequirements: '', templateId: '', templateName: '', - specialTaskFlag: '' + specialTaskFlag: '', + workCenterNo: '', + rollNo: '' } this.operationList = [] this.resourceList = [] diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index efd0abd..319675b 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -142,6 +142,18 @@ + + + + + + + + 派工单号 @@ -167,7 +179,7 @@ - + { + if (data.code === 0) { + let result = data.rows + // 循环放到一个远程搜索需要的数组 + for (let i = 0; i < result.length; i++) { + const element = result[i] + results.push({ + value: element.rollNo, + seqNo: element.seqNo, + orderNo: element.orderNo + }) + } + cb(results) + } else { + results = [] + cb(results) + } + }) + } + }, + + //点击出现搜索后点击的每一项 + handleSelect (item) { + this.modalData.rollNo = item.value + this.modalData.seqNo = item.seqNo + this.modalData.orderNo = item.orderNo + this.getOperationList() + this.getPartList() + }, + // 获取处置措施列表 disposalMeasuresSearch(){ let tempData = { @@ -1567,72 +1674,13 @@ }) }, - // // 工单号改变事件 - // orderNoChange () { - // this.getOperationList() - // this.getPartList() - // }, - // - // // 获取工单列表 - // getOrderNoList(){ - // // this.orderNoData.limit = this.pageSize2 - // // this.orderNoData.page = this.pageIndex2 - // getOrderNoList(this.orderNoData).then(({data}) => { - // if (data && data.code === 0) { - // this.orderNoList = data.rows - // // this.pageIndex2 = data.page.currPage - // // this.pageSize2 = data.page.pageSize - // // this.totalPage2 = data.page.totalCount - // this.orderNoModelFlag = true - // } else { - // this.$alert(data.msg, '错误', { - // confirmButtonText: '确定' - // }) - // } - // }) - // }, - // // 条件查询获取工单列表 - // getOrderNoList2(){ - // // this.orderNoData.limit = this.pageSize2 - // // this.orderNoData.page = this.pageIndex2 - // getOrderNoList(this.orderNoData).then(({data}) => { - // if (data && data.code === 0) { - // this.orderNoList = data.rows - // // this.pageIndex2 = data.page.currPage - // // this.pageSize2 = data.page.pageSize - // // this.totalPage2 = data.page.totalCount - // this.orderNoCurrent = -1 - // } else { - // this.$alert(data.msg, '错误', { - // confirmButtonText: '确定' - // }) - // } - // }) - // }, - // // 点击行选中机台复选框 - // orderNoClickRow (row) { - // this.$refs.orderNoTable.toggleRowSelection(row); - // }, - // // 单选工单 - // selectionOrderNoChangeHandle (val) { - // this.modalData.orderNo = val[0].orderNo - // if (val) { - // this.orderNoCurrent = val.index; - // } - // }, - // orderNoRowClassName ({row, rowIndex}) { - // row.index = rowIndex; // 在原有的数据上加一个index - // }, - // // 确认选择工单 - // confirmOrderNo () { - // this.orderNoModelFlag = false - // }, - // 获取工序列表 - getOperationList(){ + getOperationList () { getOperationList(this.modalData).then(({data}) => { if (data && data.code === 0) { this.operationList = data.rows + this.modalData.operationDesc = data.rows[0].operationDesc + this.getResourceList() } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' @@ -1650,6 +1698,9 @@ getResourceList(this.modalData).then(({data}) => { if (data && data.code === 0) { this.resourceList = data.rows + this.modalData.workCenterNo = data.rows[0].workCenterNo + this.modalData.resourceId = data.rows[0].resourceId + this.modalData.resourceDesc = data.rows[0].resourceDesc } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' @@ -1720,7 +1771,9 @@ specialRequirements: '', templateId: '', templateName: '', - specialTaskFlag: '' + specialTaskFlag: '', + workCenterNo: '', + rollNo: '' } this.operationList = [] this.resourceList = [] @@ -1779,7 +1832,9 @@ specialRequirements: '', templateId: '', templateName: '', - specialTaskFlag: '' + specialTaskFlag: '', + workCenterNo: '', + rollNo: '' } // 获取选中框 let obj = document.getElementsByName('specialTask') @@ -1853,8 +1908,7 @@ message: '操作成功', type: 'success', duration: 1500, - onClose: () => { - } + onClose: () => {} }) } else { this.$alert(data.msg, '错误', { @@ -2258,7 +2312,6 @@ userId: this.$store.state.user.id, languageCode: this.$i18n.locale } - console.log(this.$route.meta.menuId) userFavoriteList(userFavorite).then(({data}) => { for (let i = 0; i < data.list.length; i++) { if(this.$route.meta.menuId==data.list[i].menuId){ diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue index 90edded..1204dec 100644 --- a/src/views/modules/sys/user.vue +++ b/src/views/modules/sys/user.vue @@ -10,7 +10,7 @@ - {{ buttons.search || '查询' }} + {{ buttons.search || '查询' }} {{ buttons.add || '新增' }}