From 415f1585b4b56b9161977c5cfa7801f798bcd028 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Wed, 16 Oct 2024 17:49:33 +0800 Subject: [PATCH] plm BMM --- .../base/propertiesItem/propertiesItem.vue | 9 ++ .../com_project_info_quotation.vue | 72 ++++----- .../projectInfo/com_project_puotation.vue | 144 +++++++++--------- .../projectInfo/com_project_sample.vue | 144 +++++++++--------- .../project/projectInfo/com_project_test.vue | 144 +++++++++--------- .../project/projectInfo/projectInfo.vue | 38 ++--- .../com_bm_routing.vue | 20 ++- src/views/modules/sys/user.vue | 21 +++ src/views/modules/tooling/searchToolApply.vue | 26 ++++ 9 files changed, 346 insertions(+), 272 deletions(-) diff --git a/src/views/modules/base/propertiesItem/propertiesItem.vue b/src/views/modules/base/propertiesItem/propertiesItem.vue index 3d25587..c07833d 100644 --- a/src/views/modules/base/propertiesItem/propertiesItem.vue +++ b/src/views/modules/base/propertiesItem/propertiesItem.vue @@ -12,6 +12,14 @@ + + + + + + + + 查询 新增 @@ -241,6 +249,7 @@ itemNo: '', itemDesc: '', itemType:'', + valueType:'', page: 1, limit: 10, }, diff --git a/src/views/modules/project/projectInfo/com_project_info_quotation.vue b/src/views/modules/project/projectInfo/com_project_info_quotation.vue index 948d08b..20ff4ea 100644 --- a/src/views/modules/project/projectInfo/com_project_info_quotation.vue +++ b/src/views/modules/project/projectInfo/com_project_info_quotation.vue @@ -43,42 +43,42 @@ export default { fixed: '', columnWidth: 100 }, - { - userId: this.$store.state.user.name, - functionId: 101002001, - serialNumber: '101002001Table5CustomerNo', - tableId: '101002001Table5', - tableName: '报价信息表', - columnProp: 'customerNo', - headerAlign: 'center', - align: 'center', - columnLabel: '客户编码', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - }, - { - userId: this.$store.state.user.name, - functionId: 101002001, - serialNumber: '101002001Table5CustomerName', - tableId: '101002001Table5', - tableName: '报价信息表', - columnProp: 'customerName', - headerAlign: 'center', - align: 'center', - columnLabel: '客户名称', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - }, + // { + // userId: this.$store.state.user.name, + // functionId: 101002001, + // serialNumber: '101002001Table5CustomerNo', + // tableId: '101002001Table5', + // tableName: '报价信息表', + // columnProp: 'customerNo', + // headerAlign: 'center', + // align: 'center', + // columnLabel: '客户编码', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 120 + // }, + // { + // userId: this.$store.state.user.name, + // functionId: 101002001, + // serialNumber: '101002001Table5CustomerName', + // tableId: '101002001Table5', + // tableName: '报价信息表', + // columnProp: 'customerName', + // headerAlign: 'center', + // align: 'center', + // columnLabel: '客户名称', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 120 + // }, { userId: this.$store.state.user.name, functionId: 101002001, diff --git a/src/views/modules/project/projectInfo/com_project_puotation.vue b/src/views/modules/project/projectInfo/com_project_puotation.vue index 6f77fa0..1a4a873 100644 --- a/src/views/modules/project/projectInfo/com_project_puotation.vue +++ b/src/views/modules/project/projectInfo/com_project_puotation.vue @@ -140,78 +140,78 @@ fixed: '', columnWidth: 60 }, - { - userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table1CustomerNo', - tableId: '102001Table1', - tableName: '询价信息表', - columnProp: 'customerNo', - 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: '102001Table1CustomerDesc', - tableId: '102001Table1', - tableName: '询价信息表', - columnProp: 'customerDesc', - headerAlign: 'center', - align: 'left', - columnLabel: '客户名称', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - }, - { - userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table1ProjectId', - tableId: '102001Table1', - tableName: '询价信息表', - columnProp: 'projectId', - headerAlign: 'center', - align: 'center', - columnLabel: '项目编码', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - }, - { - userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table1ProjectName', - tableId: '102001Table1', - tableName: '询价信息表', - columnProp: 'projectName', - headerAlign: 'center', - align: 'left', - columnLabel: '项目名称', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - }, + // { + // userId: this.$store.state.user.name, + // functionId: 102001, + // serialNumber: '102001Table1CustomerNo', + // tableId: '102001Table1', + // tableName: '询价信息表', + // columnProp: 'customerNo', + // 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: '102001Table1CustomerDesc', + // tableId: '102001Table1', + // tableName: '询价信息表', + // columnProp: 'customerDesc', + // headerAlign: 'center', + // align: 'left', + // columnLabel: '客户名称', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 120 + // }, + // { + // userId: this.$store.state.user.name, + // functionId: 102001, + // serialNumber: '102001Table1ProjectId', + // tableId: '102001Table1', + // tableName: '询价信息表', + // columnProp: 'projectId', + // headerAlign: 'center', + // align: 'center', + // columnLabel: '项目编码', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 120 + // }, + // { + // userId: this.$store.state.user.name, + // functionId: 102001, + // serialNumber: '102001Table1ProjectName', + // tableId: '102001Table1', + // tableName: '询价信息表', + // columnProp: 'projectName', + // headerAlign: 'center', + // align: 'left', + // columnLabel: '项目名称', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 120 + // }, { userId: this.$store.state.user.name, functionId: 102001, diff --git a/src/views/modules/project/projectInfo/com_project_sample.vue b/src/views/modules/project/projectInfo/com_project_sample.vue index 720a74f..aad3e4b 100644 --- a/src/views/modules/project/projectInfo/com_project_sample.vue +++ b/src/views/modules/project/projectInfo/com_project_sample.vue @@ -105,78 +105,78 @@ fixed: '', columnWidth: 120 }, - { - userId: this.$store.state.user.name, - functionId: 103001, - serialNumber: '103001Table1CustomerNo', - tableId: '103001Table1', - tableName: '打样信息表', - columnProp: 'customerNo', - 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: 103001, - serialNumber: '103001Table1CustomerDesc', - tableId: '103001Table1', - tableName: '打样信息表', - columnProp: 'customerDesc', - headerAlign: 'center', - align: 'center', - columnLabel: '客户名称', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - }, - { - userId: this.$store.state.user.name, - functionId: 103001, - serialNumber: '103001Table1ProjectId', - tableId: '103001Table1', - tableName: '打样信息表', - columnProp: 'projectId', - headerAlign: 'center', - align: 'center', - columnLabel: '项目编码', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 110 - }, - { - userId: this.$store.state.user.name, - functionId: 103001, - serialNumber: '103001Table1ProjectName', - tableId: '103001Table1', - tableName: '打样信息表', - columnProp: 'projectName', - headerAlign: 'center', - align: 'center', - columnLabel: '项目名称', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - }, + // { + // userId: this.$store.state.user.name, + // functionId: 103001, + // serialNumber: '103001Table1CustomerNo', + // tableId: '103001Table1', + // tableName: '打样信息表', + // columnProp: 'customerNo', + // 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: 103001, + // serialNumber: '103001Table1CustomerDesc', + // tableId: '103001Table1', + // tableName: '打样信息表', + // columnProp: 'customerDesc', + // headerAlign: 'center', + // align: 'center', + // columnLabel: '客户名称', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 120 + // }, + // { + // userId: this.$store.state.user.name, + // functionId: 103001, + // serialNumber: '103001Table1ProjectId', + // tableId: '103001Table1', + // tableName: '打样信息表', + // columnProp: 'projectId', + // headerAlign: 'center', + // align: 'center', + // columnLabel: '项目编码', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 110 + // }, + // { + // userId: this.$store.state.user.name, + // functionId: 103001, + // serialNumber: '103001Table1ProjectName', + // tableId: '103001Table1', + // tableName: '打样信息表', + // columnProp: 'projectName', + // headerAlign: 'center', + // align: 'center', + // columnLabel: '项目名称', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 120 + // }, { userId: this.$store.state.user.name, functionId: 103001, diff --git a/src/views/modules/project/projectInfo/com_project_test.vue b/src/views/modules/project/projectInfo/com_project_test.vue index 1db016d..75ff9b1 100644 --- a/src/views/modules/project/projectInfo/com_project_test.vue +++ b/src/views/modules/project/projectInfo/com_project_test.vue @@ -87,78 +87,78 @@ export default { fixed: '', columnWidth: 120 }, - { - userId: this.$store.state.user.name, - functionId: 103001, - serialNumber: '103001Table1CustomerNo', - tableId: '103001Table1', - tableName: '测试信息表', - columnProp: 'customerNo', - 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: 103001, - serialNumber: '103001Table1CustomerDesc', - tableId: '103001Table1', - tableName: '测试信息表', - columnProp: 'customerDesc', - headerAlign: 'center', - align: 'center', - columnLabel: '客户名称', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - }, - { - userId: this.$store.state.user.name, - functionId: 103001, - serialNumber: '103001Table1ProjectId', - tableId: '103001Table1', - tableName: '测试信息表', - columnProp: 'projectId', - headerAlign: 'center', - align: 'center', - columnLabel: '项目编码', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 110 - }, - { - userId: this.$store.state.user.name, - functionId: 103001, - serialNumber: '103001Table1ProjectName', - tableId: '103001Table1', - tableName: '测试信息表', - columnProp: 'projectName', - headerAlign: 'center', - align: 'center', - columnLabel: '项目名称', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - }, + // { + // userId: this.$store.state.user.name, + // functionId: 103001, + // serialNumber: '103001Table1CustomerNo', + // tableId: '103001Table1', + // tableName: '测试信息表', + // columnProp: 'customerNo', + // 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: 103001, + // serialNumber: '103001Table1CustomerDesc', + // tableId: '103001Table1', + // tableName: '测试信息表', + // columnProp: 'customerDesc', + // headerAlign: 'center', + // align: 'center', + // columnLabel: '客户名称', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 120 + // }, + // { + // userId: this.$store.state.user.name, + // functionId: 103001, + // serialNumber: '103001Table1ProjectId', + // tableId: '103001Table1', + // tableName: '测试信息表', + // columnProp: 'projectId', + // headerAlign: 'center', + // align: 'center', + // columnLabel: '项目编码', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 110 + // }, + // { + // userId: this.$store.state.user.name, + // functionId: 103001, + // serialNumber: '103001Table1ProjectName', + // tableId: '103001Table1', + // tableName: '测试信息表', + // columnProp: 'projectName', + // headerAlign: 'center', + // align: 'center', + // columnLabel: '项目名称', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 120 + // }, { userId: this.$store.state.user.name, functionId: 103001, diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue index a65e997..39bbc72 100644 --- a/src/views/modules/project/projectInfo/projectInfo.vue +++ b/src/views/modules/project/projectInfo/projectInfo.vue @@ -253,7 +253,7 @@ - + 编辑 @@ -809,24 +809,24 @@ }, ], columnList2: [ - { - userId: this.$store.state.user.name, - functionId: 101002001, - serialNumber: '101002001Table2ContactName', - tableId: '101002001Table2', - tableName: '项目联系人表', - columnProp: 'contactId', - 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: 101002001, + // serialNumber: '101002001Table2ContactName', + // tableId: '101002001Table2', + // tableName: '项目联系人表', + // columnProp: 'contactId', + // 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: 101002001, diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue index 7bd0498..aa0ee19 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue @@ -797,6 +797,24 @@ fixed: '', columnWidth: 80 }, + { + userId: this.$store.state.user.name, + functionId: 104003, + serialNumber: '104003Table2WorkCenterNo', + tableId: '104003Table2', + tableName: 'Routing工序表', + columnProp: 'workCenterNo', + headerAlign: 'center', + align: 'center', + columnLabel: '加工中心编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 85 + }, { userId: this.$store.state.user.name, functionId: 104003, @@ -813,7 +831,7 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 120 + columnWidth: 100 }, { userId: this.$store.state.user.name, diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue index cd63dff..433620c 100644 --- a/src/views/modules/sys/user.vue +++ b/src/views/modules/sys/user.vue @@ -77,6 +77,12 @@ align="center" :label="'岗位'"> + + { let itemSite = { userid: this.selectUser.username, diff --git a/src/views/modules/tooling/searchToolApply.vue b/src/views/modules/tooling/searchToolApply.vue index 2c0899c..2b4b6f7 100644 --- a/src/views/modules/tooling/searchToolApply.vue +++ b/src/views/modules/tooling/searchToolApply.vue @@ -1808,7 +1808,33 @@ }, }, activated() { + if (this.$route.params.type === 'tokenLogin') { + if (this.$route.params.docNo) { + this.searchData.applyNo = this.$route.params.docNo + } + this.searchData.limit = this.pageSize + this.searchData.page = this.pageIndex + searchProjectToolApplyHeader(this.searchData).then(({data}) => { + if (data.code == 0) { + this.dataList1 = data.page.list + this.pageIndex = data.page.currPage + this.pageSize = data.page.pageSize + this.totalPage = data.page.totalCount + if(this.dataList1.length>0){ + this.$refs.mainTable.setCurrentRow(this.dataList1[0]); + this.currentRow = JSON.parse( JSON.stringify(this.dataList1[0])); + this.editModal(this.dataList1[0]) + }else { + this.currentRow ={} + } + this.refreshCurrentTabTable () + } + this.dataListLoading = false + }) + } else { + + } }, }