From 8ebb2c43c2389d4a3b6990752d565d9fc87280c4 Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Wed, 16 Oct 2024 16:00:14 +0800 Subject: [PATCH] 2024-10-16 --- .../com_project_info_quotation.vue | 2 +- .../project/projectInfo/projectInfo.vue | 9 +- .../modules/proofing/requestForProofing.vue | 87 ++++++++++--------- .../modules/quotation/requestForQuote.vue | 71 +++++++-------- src/views/modules/quotation/toBeQuoted.vue | 6 +- src/views/modules/sys/dict-data.vue | 2 +- src/views/modules/test/requestForTest.vue | 81 ++++++++--------- 7 files changed, 134 insertions(+), 124 deletions(-) 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 cc9620a..948d08b 100644 --- a/src/views/modules/project/projectInfo/com_project_info_quotation.vue +++ b/src/views/modules/project/projectInfo/com_project_info_quotation.vue @@ -221,7 +221,7 @@ export default { if (this.$router.resolve(`/quotation-sellForQuotation`).resolved.name === '404'){ this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',}); }else { - this.$router.push({name:`quotation-sellForQuotation`,params:{quotationNo:row.quotationNo,versionCode:row.versionCode},}) + this.$router.push({name:`quotation-sellForQuotation`,params:{quotationNo:row.quotationNo+"-"+row.versionCode},}) } } } diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue index fd2edef..a65e997 100644 --- a/src/views/modules/project/projectInfo/projectInfo.vue +++ b/src/views/modules/project/projectInfo/projectInfo.vue @@ -1618,6 +1618,7 @@ let inData={ site: this.currentRow.site, projectId: this.currentRow.projectId, + userName:this.$store.state.user.name, page: 1, limit: 1000 } @@ -1627,7 +1628,7 @@ let inData={ site: this.currentRow.site, projectId: this.currentRow.projectId, - username:this.$store.state.user.name, + createBy:this.$store.state.user.name, no: 1, size: 1000 } @@ -1637,7 +1638,7 @@ let inData={ site: this.currentRow.site, projectId: this.currentRow.projectId, - username:this.$store.state.user.name, + createBy:this.$store.state.user.name, page: 1, limit: 1000 } @@ -1647,7 +1648,7 @@ let inData={ site: this.currentRow.site, projectId: this.currentRow.projectId, - // username:this.$store.state.user.name, + createBy:this.$store.state.user.name, page: 1, limit: 1000 } @@ -1657,7 +1658,7 @@ let inData={ site: this.currentRow.site, projectId: this.currentRow.projectId, - username:this.$store.state.user.name, + createBy:this.$store.state.user.name, page: 1, limit: 1000 } diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue index 95228d6..b1de03e 100644 --- a/src/views/modules/proofing/requestForProofing.vue +++ b/src/views/modules/proofing/requestForProofing.vue @@ -2304,52 +2304,55 @@ export default { }) }, created() { - + this.handleRouteQuery(); }, activated() { - if (this.$route.params.type === 'tokenLogin'){ - let params = { - site: this.$route.params.site, - proofingNo: this.$route.params.docNo, - limit: this.pageSize, - createBy: this.$store.state.user.name, - page : 1, - } - this.dataListLoading = true - proofingInformationSearch(params).then(({data}) => { - if (data && data.code === 0) { - this.dataList = data.page.list - this.totalPage = data.page.totalCount - this.$refs.selectDiv.setLengthAll(this.dataList.length) - // 判断是否全部存在数据 - if (this.totalPage > 0) { - //设置选中行 - this.$refs.proofingTable.setCurrentRow(this.dataList[0]) - //加载当前的页签的table - this.refreshCurrentTabTable() - this.proofingClickRow(this.dataList[0]) - this.updateModal(this.dataList[0]) - } else { - //设置选中行 - this.$refs.proofingTable.setCurrentRow({}) - // 加载当前的页签的table - this.refreshCurrentTabTable() - this.testClickRow({}) - } - } - this.dataListLoading = false - }) - }else if (this.$route.params.proofingNo){ - this.searchData.proofingNo = this.$route.params.proofingNo - this.getDataList(); - setTimeout(()=>{ - this.searchData.proofingNo = '' - },200) - }else { - this.getDataList(); - } + this.handleRouteQuery(); }, methods: { + handleRouteQuery(){ + if (this.$route.params.type === 'tokenLogin'){ + let params = { + site: this.$route.params.site, + proofingNo: this.$route.params.docNo, + limit: this.pageSize, + createBy: this.$store.state.user.name, + page : 1, + } + this.dataListLoading = true + proofingInformationSearch(params).then(({data}) => { + if (data && data.code === 0) { + this.dataList = data.page.list + this.totalPage = data.page.totalCount + this.$refs.selectDiv.setLengthAll(this.dataList.length) + // 判断是否全部存在数据 + if (this.totalPage > 0) { + //设置选中行 + this.$refs.proofingTable.setCurrentRow(this.dataList[0]) + //加载当前的页签的table + this.refreshCurrentTabTable() + this.proofingClickRow(this.dataList[0]) + this.updateModal(this.dataList[0]) + } else { + //设置选中行 + this.$refs.proofingTable.setCurrentRow({}) + // 加载当前的页签的table + this.refreshCurrentTabTable() + this.testClickRow({}) + } + } + this.dataListLoading = false + }) + }else if (this.$route.params.proofingNo){ + this.searchData.proofingNo = this.$route.params.proofingNo + this.getDataList(); + setTimeout(()=>{ + this.searchData.proofingNo = '' + },200) + }else { + this.getDataList(); + } + }, // ======== 分页相关方法 ======== /** * 每页数 diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue index 49e816e..0621165 100644 --- a/src/views/modules/quotation/requestForQuote.vue +++ b/src/views/modules/quotation/requestForQuote.vue @@ -2111,40 +2111,43 @@ export default { }) }, created() { - this.getDataList() + this.handleRouteQuery() }, activated () { - if (this.$route.params.type === 'tokenLogin') { - if (this.$route.params.docNo) { - this.searchData.quotationBatchNo = this.$route.params.docNo - } - this.searchData.limit = this.pageSize - this.searchData.page = this.pageIndex - let params = { - ...this.searchData, - createBy: this.$store.state.user.name - } - quotationInformationSearch(params).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.$refs.selectDiv.setLengthAll(this.dataList.length) - //判断是否全部存在数据 - if (this.dataList.length > 0) { - //设置选中行 - // this.$refs.quotationTable.setCurrentRow(this.dataList[0]) - // this.refreshCurrentTabTable() //加载当前的页签的table - this.quotationClickRow(this.dataList[0]) - this.updateModal(this.dataList[0]) - }else { - this.quotationCurrentRow = {} - } + this.handleRouteQuery() + }, + methods: { + handleRouteQuery(){ + if (this.$route.params.type === 'tokenLogin') { + if (this.$route.params.docNo) { + this.searchData.quotationBatchNo = this.$route.params.docNo } - }) - }else { - if (this.$route.params.quotationNo) { + this.searchData.limit = this.pageSize + this.searchData.page = this.pageIndex + let params = { + ...this.searchData, + createBy: this.$store.state.user.name + } + quotationInformationSearch(params).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.$refs.selectDiv.setLengthAll(this.dataList.length) + //判断是否全部存在数据 + if (this.dataList.length > 0) { + //设置选中行 + // this.$refs.quotationTable.setCurrentRow(this.dataList[0]) + // this.refreshCurrentTabTable() //加载当前的页签的table + this.quotationClickRow(this.dataList[0]) + this.updateModal(this.dataList[0]) + }else { + this.quotationCurrentRow = {} + } + } + }) + }else if (this.$route.params.quotationNo) { this.searchData.quotationNo = this.$route.params.quotationNo this.searchData.limit = this.pageSize this.searchData.page = this.pageIndex @@ -2172,10 +2175,10 @@ export default { } } }) + }else { + this.getDataList() } - } - }, - methods: { + }, // ======== 分页相关方法 ======== /** * 每页数 diff --git a/src/views/modules/quotation/toBeQuoted.vue b/src/views/modules/quotation/toBeQuoted.vue index b275018..77ecaac 100644 --- a/src/views/modules/quotation/toBeQuoted.vue +++ b/src/views/modules/quotation/toBeQuoted.vue @@ -142,7 +142,7 @@ @size-change="sizeChangeHandle" @current-change="currentChangeHandle" :current-page="pageIndex" - :page-sizes="[50, 100, 200, 500]" + :page-sizes="[20,50, 100, 200, 500]" :page-size="pageSize" :total="totalPage" layout="total, sizes, prev, pager, next, jumper"> @@ -181,7 +181,7 @@ export default { trackerName: '', testPartNo: '', partName: '', - quotationStatus: '已完成', + quotationStatus: '审批中', quotationResultStatus: '', startDate: '', endDate: '', @@ -194,7 +194,7 @@ export default { }, // 分页 pageIndex: 1,//当前页码 - pageSize:50,//每页条数 + pageSize:20,//每页条数 totalPage:0,//总条数 // 表格数据 dataList:[],//表格数据 diff --git a/src/views/modules/sys/dict-data.vue b/src/views/modules/sys/dict-data.vue index f6264df..33c3419 100644 --- a/src/views/modules/sys/dict-data.vue +++ b/src/views/modules/sys/dict-data.vue @@ -330,7 +330,7 @@ export default { diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue index 20bad85..9a3875e 100644 --- a/src/views/modules/test/requestForTest.vue +++ b/src/views/modules/test/requestForTest.vue @@ -2179,54 +2179,57 @@ }) }, created () { - this.getDataList() + this.handleRouteQuery() }, activated () { - if (this.$route.params.type === 'tokenLogin') { - if (this.$route.params.docNo) { - this.searchData.testNo = this.$route.params.docNo - } - this.searchData.limit = this.pageSize - this.searchData.page = this.pageIndex - let params = { - ...this.searchData, - createBy:this.$store.state.user.name, - } - testInformationSearch(params).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.$refs.selectDiv.setLengthAll( this.dataList.length) - // 判断是否全部存在数据 - if (this.totalPage > 0) { - //设置选中行 - this.$refs.testTable.setCurrentRow(this.dataList[0]) - // 加载当前的页签的table - this.refreshCurrentTabTable() - this.testClickRow(this.dataList[0]) - this.updateModal(this.dataList[0]) - } else { - //设置选中行 - this.$refs.testTable.setCurrentRow({}) - // 加载当前的页签的table - this.refreshCurrentTabTable() - this.testClickRow({}) - } + this.handleRouteQuery() + }, + methods: { + handleRouteQuery(){ + if (this.$route.params.type === 'tokenLogin') { + if (this.$route.params.docNo) { + this.searchData.testNo = this.$route.params.docNo } - }) - }else { - if (this.$route.params.testNo){ + this.searchData.limit = this.pageSize + this.searchData.page = this.pageIndex + let params = { + ...this.searchData, + createBy:this.$store.state.user.name, + } + testInformationSearch(params).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.$refs.selectDiv.setLengthAll( this.dataList.length) + // 判断是否全部存在数据 + if (this.totalPage > 0) { + //设置选中行 + this.$refs.testTable.setCurrentRow(this.dataList[0]) + // 加载当前的页签的table + this.refreshCurrentTabTable() + this.testClickRow(this.dataList[0]) + this.updateModal(this.dataList[0]) + } else { + //设置选中行 + this.$refs.testTable.setCurrentRow({}) + // 加载当前的页签的table + this.refreshCurrentTabTable() + this.testClickRow({}) + } + } + }) + }else if(this.$route.params.testNo){ this.searchData.testNo = this.$route.params.testNo this.getDataList() setTimeout(()=>{ this.searchData.testNo = '' },200) + }else{ + this.getDataList(); } - } - }, - methods: { + }, searchTestPropertiesItem(){ let params={ site:this.$store.state.user.site,