From 0ecf8cf0a7fb1e5894491930fde053cbb2816d52 Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Wed, 30 Oct 2024 21:40:25 +0800 Subject: [PATCH] 2024-10-30 --- .../projectInfo/com_project_puotation.vue | 36 +++++++++++++++++++ .../projectInfo/com_project_sample.vue | 34 ++++++++++++++++++ .../project/projectInfo/com_project_test.vue | 36 +++++++++++++++++++ .../project/projectInfo/projectInfo.vue | 3 ++ .../project/projectPart/searchProjectPart.vue | 3 ++ 5 files changed, 112 insertions(+) diff --git a/src/views/modules/project/projectInfo/com_project_puotation.vue b/src/views/modules/project/projectInfo/com_project_puotation.vue index 90aac59..3c88d48 100644 --- a/src/views/modules/project/projectInfo/com_project_puotation.vue +++ b/src/views/modules/project/projectInfo/com_project_puotation.vue @@ -268,6 +268,42 @@ fixed: '', columnWidth: 100 }, + { + userId: this.$store.state.user.name, + functionId: 102001, + serialNumber: '102001Table1NodeName', + tableId: '102001Table1', + tableName: '询价信息表', + columnProp: 'nodeName', + 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: 102001, + serialNumber: '102001Table1NodeCreateBy', + tableId: '102001Table1', + tableName: '询价信息表', + columnProp: 'nodeCreateBy', + headerAlign: 'center', + align: 'center', + columnLabel: '节点审批人', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, ], // 导出 start exportData: [], diff --git a/src/views/modules/project/projectInfo/com_project_sample.vue b/src/views/modules/project/projectInfo/com_project_sample.vue index 02a3f9c..86a3732 100644 --- a/src/views/modules/project/projectInfo/com_project_sample.vue +++ b/src/views/modules/project/projectInfo/com_project_sample.vue @@ -302,6 +302,40 @@ status: true, fixed: '', columnWidth: 80 + },{ + userId: this.$store.state.user.name, + functionId: 103001, + serialNumber: '103001Table1NodeName', + tableId: '103001Table1', + tableName: '打样信息表', + columnProp: 'nodeName', + 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: 103001, + serialNumber: '103001Table1NodeCreateBy', + tableId: '103001Table1', + tableName: '打样信息表', + columnProp: 'nodeCreateBy', + headerAlign: 'center', + align: 'center', + columnLabel: '节点审批人', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80 }, ], // 导出 start diff --git a/src/views/modules/project/projectInfo/com_project_test.vue b/src/views/modules/project/projectInfo/com_project_test.vue index d2a4814..b50d6b5 100644 --- a/src/views/modules/project/projectInfo/com_project_test.vue +++ b/src/views/modules/project/projectInfo/com_project_test.vue @@ -267,6 +267,42 @@ export default { fixed: '', columnWidth: 80 }, + { + userId: this.$store.state.user.name, + functionId: 103001, + serialNumber: '103001Table1NodeName', + tableId: '103001Table1', + tableName: '测试信息表', + columnProp: 'nodeName', + 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: 103001, + serialNumber: '103001Table1NodeCreateBy', + tableId: '103001Table1', + tableName: '测试信息表', + columnProp: 'nodeCreateBy', + headerAlign: 'center', + align: 'center', + columnLabel: '节点审批人', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80 + }, ], // 导出 start exportData: [], diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue index c10a1eb..4d41485 100644 --- a/src/views/modules/project/projectInfo/projectInfo.vue +++ b/src/views/modules/project/projectInfo/projectInfo.vue @@ -1552,6 +1552,7 @@ site: this.currentRow.site, projectId: this.currentRow.projectId, createBy:this.$store.state.user.name, + menuId:102001, page: 1, limit: 1000 } @@ -1562,6 +1563,7 @@ site: this.currentRow.site, projectId: this.currentRow.projectId, createBy:this.$store.state.user.name, + menuId:103001, page: 1, limit: 1000 } @@ -1572,6 +1574,7 @@ site: this.currentRow.site, projectId: this.currentRow.projectId, createBy:this.$store.state.user.name, + menuId:107001, page: 1, limit: 1000 } diff --git a/src/views/modules/project/projectPart/searchProjectPart.vue b/src/views/modules/project/projectPart/searchProjectPart.vue index 28365dd..73d1839 100644 --- a/src/views/modules/project/projectPart/searchProjectPart.vue +++ b/src/views/modules/project/projectPart/searchProjectPart.vue @@ -940,15 +940,18 @@ this.$refs.technicalSpecification.init(inData) } if (type==='projectQuotation') { + inData.menuId = 102001 this.$refs.projectQuotation.init(inData) } // if(type==='quotationHeader'){ // this.$refs.quotationHeader.init(inData) // } if (type==='sample') { + inData.menuId = 103001 this.$refs.sample.init(inData) } if (type==='test') { + inData.menuId = 107001 this.$refs.test.init(inData) } if (type==='toolApply') {