From 492b687f5b4d73e6baacc83dad33847a48f38e34 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 20 Jan 2025 09:59:44 +0800 Subject: [PATCH] =?UTF-8?q?2025-01-20=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/changeManagement/changeManagement.js | 7 + .../modules/changeManagement/changeRecord.vue | 168 ++++++++++++++++- .../changeManagement/changeRequest.vue | 176 +++++++++++++++++- src/views/modules/part/bomSearch3.vue | 69 ++----- 4 files changed, 356 insertions(+), 64 deletions(-) diff --git a/src/api/changeManagement/changeManagement.js b/src/api/changeManagement/changeManagement.js index 2efbbfe..834b70d 100644 --- a/src/api/changeManagement/changeManagement.js +++ b/src/api/changeManagement/changeManagement.js @@ -228,6 +228,13 @@ export const getBuBySite = data => createAPI(`/plm/changeManagement/getBuBySite` */ export const getNodeAuthorityForCheck = data => createAPI(`/plm/changeManagement/getNodeAuthorityForCheck`,'post',data) +/** + * 根据视图查物料计划 + * @param data + * @returns {*} + */ +export const choosePartNoList = data => createAPI(`/plm/changeManagement/choosePartNoList`,'post',data) + diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue index 822bc7a..b1bd7b2 100644 --- a/src/views/modules/changeManagement/changeRecord.vue +++ b/src/views/modules/changeManagement/changeRecord.vue @@ -1015,6 +1015,65 @@ + + +
+ + + + + + + + + + + + + + + 查询 + + + + + + + + + + +
+ + 关闭 + + + @@ -1049,6 +1108,7 @@ getApprovalList, // 查询审批信息 getBuBySite, // 根据site查bu technicalSpecificationSearch2, // 获取技术参数卡列表 + choosePartNoList, // 根据视图查物料计划 } from '@/api/changeManagement/changeManagement.js' import ChooseList from '@/views/modules/common/Chooselist' import {verifyData} from "@/api/chooselist/chooselist.js" @@ -1210,6 +1270,9 @@ pageIndex: 1, pageSize: 50, totalPage: 0, + pageIndex2: 1, + pageSize2: 20, + totalPage2: 0, // 条件查询 searchData: { site: this.$store.state.user.site, @@ -1364,6 +1427,16 @@ updateBy: '', chooseCSItemList: [] }, + partData: { + site: '', + buNo: '', + finalPartNo: '', + testPartNo: '', + customerPartNo: '', + partDesc: '', + page: 1, + limit: 10 + }, // ======== 数据列表 ======== dataList: [], dataList2: [], @@ -1382,6 +1455,7 @@ itemCSList: [], chooseFileList: [], approvalList: [], + partList: [], // ======== 列表表头 ======== columnList: [ { @@ -2362,6 +2436,58 @@ columnWidth: 300 }, ], + partColumnList: [ + { + columnProp: 'finalPartNo', + headerAlign: "center", + align: "left", + columnLabel: 'IFS料号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, + { + columnProp: 'testPartNo', + headerAlign: "center", + align: "left", + columnLabel: '物料编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, + { + columnProp: 'customerPartNo', + headerAlign: "center", + align: "left", + columnLabel: '客户料号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, + { + columnProp: 'partDesc', + headerAlign: "center", + align: "left", + columnLabel: '物料名称', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 200 + }, + ], // ======== 必填规则 ======== rules: { applicantId: [ @@ -2520,6 +2646,7 @@ authFileDownLoad: false, authFileRemove: false, authFilePreview: false, + partModelFlag: false, } }, @@ -2811,11 +2938,50 @@ }, choosePartNo (row) { + this.partData.site = row.site + this.partData.buNo = row.buNo this.tempPartRow = row if (this.tempPartRow.newPartNo == null) { this.tempPartRow.newPartNo = '' } - this.getBaseList(133) + this.queryPartList() + //this.getBaseList(133) + }, + + // 查询物料 + queryPartList () { + this.partData.limit = this.pageSize2 + this.partData.page = this.pageIndex2 + choosePartNoList(this.partData).then(({data}) => { + if (data && data.code === 0) { + this.partList = data.page.list + this.pageIndex2 = data.page.currPage + this.pageSize2 = data.page.pageSize + this.totalPage2 = data.page.totalCount + this.partModelFlag = true + } else { + this.partList = [] + } + }) + }, + + // 双击选中物料 + getRowData (row) { + this.$set(this.tempPartRow,'newPartNo', row.testPartNo) + this.partModelFlag = false + }, + + // 每页数 + sizeChangeHandle2 (val) { + this.pageSize2 = val + this.pageIndex2 = 1 + this.queryPartList() + }, + + // 当前页 + currentChangeHandle2 (val) { + this.pageIndex2 = val + this.queryPartList() }, chooseExecutor (row) { diff --git a/src/views/modules/changeManagement/changeRequest.vue b/src/views/modules/changeManagement/changeRequest.vue index b47bdb0..4024c7b 100644 --- a/src/views/modules/changeManagement/changeRequest.vue +++ b/src/views/modules/changeManagement/changeRequest.vue @@ -867,6 +867,65 @@ + + +
+ + + + + + + + + + + + + + + 查询 + + + + + + + + + + +
+ + 关闭 + + + @@ -891,6 +950,7 @@ getItemList, // 查询模板属性 countersignatureSave, // 新增会签信息 getBuBySite, // 根据site查bu + choosePartNoList, // 根据视图查物料计划 } from "@/api/changeManagement/changeManagement.js" import {getChooselistData, verifyData} from "@/api/chooselist/chooselist.js" import ChooseList from '@/views/modules/common/Chooselist' @@ -943,6 +1003,9 @@ pageIndex: 1, pageSize: 50, totalPage: 0, + pageIndex2: 1, + pageSize2: 20, + totalPage2: 0, activeName: 'basicInformation', tempPartRow: {}, tempExecutorRow: {}, @@ -1091,6 +1154,16 @@ fileRemark: '', folder: '' }, + partData: { + site: '', + buNo: '', + finalPartNo: '', + testPartNo: '', + customerPartNo: '', + partDesc: '', + page: 1, + limit: 10 + }, // ======== 数据列表 ======== dataList: [], dataList2: [], @@ -1105,6 +1178,7 @@ chooseItemList: [], chooseItemList2: [], chooseCSItemList: [], + partList: [], // ======== 列表表头 ======== columnList: [ { @@ -1790,6 +1864,58 @@ columnWidth: 150 }, ], + partColumnList: [ + { + columnProp: 'finalPartNo', + headerAlign: "center", + align: "left", + columnLabel: 'IFS料号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, + { + columnProp: 'testPartNo', + headerAlign: "center", + align: "left", + columnLabel: '物料编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, + { + columnProp: 'customerPartNo', + headerAlign: "center", + align: "left", + columnLabel: '客户料号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, + { + columnProp: 'partDesc', + headerAlign: "center", + align: "left", + columnLabel: '物料名称', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 200 + }, + ], // ======== 必填规则 ======== rules: { applicantId: [ @@ -1936,7 +2062,8 @@ chooseModelFlag2: false, chooseCSModelFlag: false, CountersignatureFlag: false, - addDetailModal: false + addDetailModal: false, + partModelFlag: false, } }, @@ -2009,18 +2136,51 @@ }, choosePartNo (row) { + this.partData.site = row.site + this.partData.buNo = row.buNo this.tempPartRow = row - // if (!this.tempPartRow.newPartNo) { - // this.tempPartRow.newPartNo = '' - // } - this.getBaseList(133) + this.queryPartList() + //this.getBaseList(133) + }, + + // 查询物料 + queryPartList () { + this.partData.limit = this.pageSize2 + this.partData.page = this.pageIndex2 + choosePartNoList(this.partData).then(({data}) => { + if (data && data.code === 0) { + this.partList = data.page.list + this.pageIndex2 = data.page.currPage + this.pageSize2 = data.page.pageSize + this.totalPage2 = data.page.totalCount + this.partModelFlag = true + } else { + this.partList = [] + } + }) + }, + + // 双击选中物料 + getRowData (row) { + this.$set(this.tempPartRow,'newPartNo', row.testPartNo) + this.partModelFlag = false + }, + + // 每页数 + sizeChangeHandle2 (val) { + this.pageSize2 = val + this.pageIndex2 = 1 + this.queryPartList() + }, + + // 当前页 + currentChangeHandle2 (val) { + this.pageIndex2 = val + this.queryPartList() }, chooseExecutor (row) { this.tempExecutorRow = row - // if (this.tempExecutorRow.executor == null) { - // this.tempExecutorRow.executor = '' - // } this.getBaseList(103, 7) }, diff --git a/src/views/modules/part/bomSearch3.vue b/src/views/modules/part/bomSearch3.vue index d1a8f04..4d5a800 100644 --- a/src/views/modules/part/bomSearch3.vue +++ b/src/views/modules/part/bomSearch3.vue @@ -645,13 +645,7 @@ export default { fixed: '', columnWidth: 150 }, - ] - // ======== 必填规则 ======== - - // ======== 复选数据集 ======== - - // ======== 模态框开关控制 ======== - + ], } }, @@ -670,29 +664,21 @@ export default { // js methods: { // ======== 分页相关方法 ======== - /** - * 每页数 - * @param val - */ + // 每页数 sizeChangeHandle (val) { this.pageSize = val this.pageIndex = 1 this.getDataList() }, - /** - * 当前页 - * @param val - */ + // 当前页 currentChangeHandle (val) { this.pageIndex = val this.getDataList() }, // ======== 列表数据操作方法 ======== - /** - * 获取数据列表 - */ + // 获取数据列表 getDataList () { this.searchData.limit = this.pageSize this.searchData.page = this.pageIndex @@ -718,20 +704,13 @@ export default { }) }, - /** - * 单机选中信息 - * @param row - */ + // 单机选中信息 headerClickRow (row) { this.$refs.bomHeaderTable.toggleRowSelection(row) this.headerCurrentRow = JSON.parse(JSON.stringify(row)) }, - /** - * 树节点单机事件 - * @param e - * @param node - */ + // 树节点单机事件 handleNodeClick (e, node) { this.alternativeData = { site: e.site, @@ -755,21 +734,13 @@ export default { }) }, // ======== 页签切换相关方法 ======== - /** - * 列表表格选择替换 - * @param tab - * @param event - */ + // 列表表格选择替换 tabClick (tab, event) { // 刷新列表数据 this.refreshCurrentTabTable() }, - /** - * 当前值发生变化的时候修改 - * @param row - * @param oldRow - */ + // 当前值发生变化的时候修改 changeCurrentRow (row, oldRow) { // 判断是否是获取焦点的事件 if (row) { @@ -793,9 +764,7 @@ export default { } }, - /** - * 刷新页签的table数据 - */ + // 刷新页签的table数据 refreshCurrentTabTable () { if (this.activeTable === 'GraphicalStructure') { // 获取bom替代树形 @@ -803,9 +772,7 @@ export default { } }, - /** - * 获取bom替代树形 - */ + // 获取bom替代树形 getAlternativeTree () { getAlternativeTree(this.headerCurrentRow).then(({data}) => { if (data && data.code === 0) { @@ -817,11 +784,7 @@ export default { }, // ======== chooseList相关方法 ======== - /** - * 获取基础数据列表S - * @param val - * @param type - */ + // 获取基础数据列表S getBaseList (val, type) { this.tagNo = val this.$nextTick(() => { @@ -832,10 +795,8 @@ export default { this.$refs.baseList.init(val, strVal) }) }, - /** - * 列表方法的回调 - * @param val - */ + + // 列表方法的回调 getBaseData (val) { if (this.tagNo === 117) { this.componentData.issueToLoc = val.location_id @@ -844,9 +805,7 @@ export default { }, // ======== 导出相关方法 ======== - /** - * 导出excel - */ + // 导出excel async createExportData () { this.searchData.limit = -1 this.searchData.page = 1