From 572f8656a05cdd9981def85c2603d2125e5e20f5 Mon Sep 17 00:00:00 2001 From: Aoi_Tori <2547614904@qq.com> Date: Fri, 4 Jul 2025 16:18:53 +0800 Subject: [PATCH] 2025/7/4 --- .../modules/part/locationInformation.vue | 14 ++++++++ .../modules/part/partFamilyInformation.vue | 33 ++++++++++++++++++- .../modules/part/partGroupInformation.vue | 22 +++++++++++++ .../project/projectInfo/projectInfo.vue | 20 ++++++++--- .../com_bm_printingFlexo.vue | 19 ++++++----- .../com_tsd_basicInformation.vue | 13 +++++--- 6 files changed, 103 insertions(+), 18 deletions(-) diff --git a/src/views/modules/part/locationInformation.vue b/src/views/modules/part/locationInformation.vue index d009fac..29cb3fc 100644 --- a/src/views/modules/part/locationInformation.vue +++ b/src/views/modules/part/locationInformation.vue @@ -191,6 +191,20 @@ export default { fixed: '', columnWidth: 100 }, + { + userId: this.$store.state.user.name, + columnProp: 'showInQueryFlag', + headerAlign: "center", + align: "center", + columnLabel: '是否显示', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, ], } }, diff --git a/src/views/modules/part/partFamilyInformation.vue b/src/views/modules/part/partFamilyInformation.vue index 9095eb7..1b281bb 100644 --- a/src/views/modules/part/partFamilyInformation.vue +++ b/src/views/modules/part/partFamilyInformation.vue @@ -94,6 +94,12 @@ + + + + + + 保存 @@ -154,6 +160,7 @@ export default { familyId: '', familyName: '', active: '', + showInQueryFlag: '', page: 1, limit: 10 }, @@ -165,7 +172,8 @@ export default { site: this.$store.state.user.site, familyId: '', familyName: '', - active: '' + active: '', + showInQueryFlag: '' }, // ======== 数据列表 ======== dataList: [], @@ -224,6 +232,20 @@ export default { fixed: '', columnWidth: 100 }, + { + userId: this.$store.state.user.name, + columnProp: 'showInQueryFlag', + headerAlign: "center", + align: "center", + columnLabel: '是否显示', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, { userId: this.$store.state.user.name, functionId: 100004, @@ -319,6 +341,13 @@ export default { trigger: 'change' } ], + showInQueryFlag:[ + { + required: true, + message: ' ', + trigger: 'change' + } + ], }, // ======== 模态框开关控制 ======== modalFlag: false, @@ -399,6 +428,7 @@ export default { familyId: '', familyName: '', active: 'Y', + showInQueryFlag: 'Y', } this.modalDisableFlag = false this.modalFlag = true @@ -415,6 +445,7 @@ export default { familyId: row.familyId, familyName: row.familyName, active: row.active, + showInQueryFlag: row.showInQueryFlag, updateBy: this.$store.state.user.name, } this.modalDisableFlag = true diff --git a/src/views/modules/part/partGroupInformation.vue b/src/views/modules/part/partGroupInformation.vue index 4a0c9c2..5a9cb85 100644 --- a/src/views/modules/part/partGroupInformation.vue +++ b/src/views/modules/part/partGroupInformation.vue @@ -94,6 +94,12 @@ + + + + + + 保存 @@ -146,6 +152,7 @@ export default { groupId: '', groupName: '', active: '', + showInQueryFlag: '', page: 1, limit: 10 }, @@ -157,6 +164,7 @@ export default { site: this.$store.state.user.site, groupId: '', groupName: '', + showInQueryFlag: '', active: '' }, // ======== 数据列表 ======== @@ -216,6 +224,20 @@ export default { fixed: '', columnWidth: 100 }, + { + userId: this.$store.state.user.name, + columnProp: 'showInQueryFlag', + headerAlign: "center", + align: "center", + columnLabel: '是否显示', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, { userId: this.$store.state.user.name, functionId: 100005, diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue index c87fd0f..cb70db4 100644 --- a/src/views/modules/project/projectInfo/projectInfo.vue +++ b/src/views/modules/project/projectInfo/projectInfo.vue @@ -2015,7 +2015,11 @@ projectId: row.projectId, searchType: 'Y', username: this.$store.state.user.name, - customerId: row.customerId + customerId: row.customerId, + limit: 10, + limit2: 20, + page: 1, + page2: 1 } getProjectInfoPartList(partParams).then(({data}) => { if (data && data.code === 0) { @@ -2037,7 +2041,9 @@ site: row.site, projectId: row.projectId, createBy: this.$store.state.user.name, - menuId: '102001' + menuId: '102001', + limit: 10, + page: 1 } quotationInformationSearch(quotationParams).then(({data}) => { //区分请求成功和失败的状况 @@ -2084,7 +2090,9 @@ site: row.site, projectId: row.projectId, createBy: this.$store.state.user.name, - menuId: '103001' + menuId: '103001', + limit: 10, + page: 1 } proofingInformationSearch(proofingParams).then(({data}) => { if (data && data.code === 0) { @@ -2108,7 +2116,9 @@ site: row.site, projectId: row.projectId, createBy: this.$store.state.user.name, - menuId: '107001' + menuId: '107001', + limit: 10, + page: 1 } testInformationList(testParams).then(({data}) => { if (data && data.code === 0) { @@ -2132,7 +2142,7 @@ let toolParams = { orderRef1: row.projectId, site: row.site, - username: this.$store.state.user.name + username: this.$store.state.user.name, } searchProjectToolApplyDetail(toolParams).then(({data}) => { if (data && data.code === 0) { diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingFlexo.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingFlexo.vue index 2bb4619..8f1f378 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingFlexo.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingFlexo.vue @@ -36,7 +36,7 @@ - - + + - + + @@ -297,7 +298,8 @@ updateBy:'', updateDate:'', resourceNo: '', - speed: '' + speed: '', + showOrder: null }, colorFlag:false, } @@ -355,8 +357,8 @@ } let number = 1 for (let i = 0; i
- 数据录入 + 数据录入
@@ -403,7 +403,7 @@ - + @@ -1405,8 +1405,13 @@ }, refresh1(){ - this.dataEntryForm.remarkPage = this.dataForm.remarkPage - this.dataEntryForm.relevancePartNo = this.dataForm.relevancePartNo + this.$clearHighLight() + tsdBasicInformationSearch(this.searchData).then(({data}) => { + if (data&&data.code === 0){ + this.dataEntryForm.remarkPage = data.row.remarkPage + this.dataEntryForm.relevancePartNo = data.row.relevancePartNo + } + }) }, submitDataEntry(){