From b6337c9a5ffb165b6f94da8bc57205e1a997d6be Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 20 Dec 2023 11:31:02 +0800 Subject: [PATCH] =?UTF-8?q?2023-12-20=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/part/bomManagement.vue | 15 +- src/views/modules/part/partInformation.vue | 4 +- src/views/modules/part/routingManagement.vue | 2 + .../proofing/batchRequestForProofing.vue | 14 +- .../modules/proofing/requestForProofing.vue | 52 +- .../quotation/batchRequestForQuote.vue | 14 +- .../modules/quotation/requestForQuote.vue | 16 +- .../modules/test/batchRequestForTest.vue | 1431 +++++++++++++++++ src/views/modules/test/requestForTest.vue | 52 +- 9 files changed, 1505 insertions(+), 95 deletions(-) create mode 100644 src/views/modules/test/batchRequestForTest.vue diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue index efea22f..e8ee565 100644 --- a/src/views/modules/part/bomManagement.vue +++ b/src/views/modules/part/bomManagement.vue @@ -98,6 +98,9 @@ + + + @@ -384,13 +387,9 @@ - - - - - - - + + + @@ -1543,7 +1542,7 @@ export default { printUnitName: '', qtyPerAssembly: 0, componentScrap: 0, - issueType: '', + issueType: 'ReserveAndBackflush', shrinkageFactor: 0, lineItemNo: '', operationName: '', diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue index 317f994..9912fa1 100644 --- a/src/views/modules/part/partInformation.vue +++ b/src/views/modules/part/partInformation.vue @@ -135,11 +135,11 @@ - 材料分类1 + 材料分类 - 材料分类2 + 材料分组 diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue index ea625be..5b0a936 100644 --- a/src/views/modules/part/routingManagement.vue +++ b/src/views/modules/part/routingManagement.vue @@ -98,6 +98,8 @@ + + diff --git a/src/views/modules/proofing/batchRequestForProofing.vue b/src/views/modules/proofing/batchRequestForProofing.vue index 68a387b..73b903e 100644 --- a/src/views/modules/proofing/batchRequestForProofing.vue +++ b/src/views/modules/proofing/batchRequestForProofing.vue @@ -158,10 +158,10 @@ - + - + 上传文件 @@ -198,7 +198,7 @@ - + 保存 关闭 @@ -221,10 +221,10 @@ - + - + 保存 关闭 @@ -248,10 +248,10 @@ - + - + 保存 关闭 diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue index 3113c85..d70d76b 100644 --- a/src/views/modules/proofing/requestForProofing.vue +++ b/src/views/modules/proofing/requestForProofing.vue @@ -194,7 +194,7 @@ - + @@ -202,18 +202,10 @@ - - + - + 保存 关闭 @@ -228,10 +220,10 @@ - + - + 上传文件 @@ -268,7 +260,7 @@ - + 保存 关闭 @@ -293,10 +285,10 @@ - + - + 保存 关闭 @@ -320,10 +312,10 @@ - + - + 保存 关闭 @@ -389,16 +381,7 @@ - - + @@ -1769,12 +1752,19 @@ this.pageSize = data.page.pageSize this.totalPage = data.page.totalCount this.$refs.selectDiv.setLengthAll( this.dataList.length) - //判断是否全部存在数据 - if(this.totalPage > 0){ + // 判断是否全部存在数据 + if (this.totalPage > 0) { //设置选中行 this.$refs.proofingTable.setCurrentRow(this.dataList[0]) - this.refreshCurrentTabTable() //加载当前的页签的table + //加载当前的页签的table + this.refreshCurrentTabTable() this.proofingClickRow(this.dataList[0]) + } else { + //设置选中行 + this.$refs.proofingTable.setCurrentRow({}) + // 加载当前的页签的table + this.refreshCurrentTabTable() + this.testClickRow({}) } } this.dataListLoading = false diff --git a/src/views/modules/quotation/batchRequestForQuote.vue b/src/views/modules/quotation/batchRequestForQuote.vue index 12df996..63ca4c7 100644 --- a/src/views/modules/quotation/batchRequestForQuote.vue +++ b/src/views/modules/quotation/batchRequestForQuote.vue @@ -158,10 +158,10 @@ - + - + 上传文件 @@ -198,7 +198,7 @@ - + 保存 关闭 @@ -221,10 +221,10 @@ - + - + 保存 关闭 @@ -248,10 +248,10 @@ - + - + 保存 关闭 diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue index 8450222..7b7cf20 100644 --- a/src/views/modules/quotation/requestForQuote.vue +++ b/src/views/modules/quotation/requestForQuote.vue @@ -201,7 +201,6 @@ v-model="modalData.technicalConsiderations" :rows="1" resize='none' - maxlength="300" show-word-limit style="width: 456px;height: 20px"> @@ -222,10 +221,10 @@ - + - + 上传文件 @@ -262,7 +261,7 @@ - + 保存 关闭 @@ -285,10 +284,10 @@ - + - + 保存 关闭 @@ -312,10 +311,10 @@ - + - + 保存 关闭 @@ -387,7 +386,6 @@ readonly :rows="3" resize='none' - maxlength="300" show-word-limit style="width: 600px;height: 30px"> diff --git a/src/views/modules/test/batchRequestForTest.vue b/src/views/modules/test/batchRequestForTest.vue new file mode 100644 index 0000000..158c57e --- /dev/null +++ b/src/views/modules/test/batchRequestForTest.vue @@ -0,0 +1,1431 @@ + + + + + + diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue index 7ced838..56d6a9c 100644 --- a/src/views/modules/test/requestForTest.vue +++ b/src/views/modules/test/requestForTest.vue @@ -194,7 +194,7 @@ - + @@ -202,18 +202,10 @@ - - + - + 保存 关闭 @@ -228,10 +220,10 @@ - + - + 上传文件 @@ -268,7 +260,7 @@ - + 保存 关闭 @@ -293,10 +285,10 @@ - + - + 保存 关闭 @@ -320,10 +312,10 @@ - + - + 保存 关闭 @@ -389,16 +381,7 @@ - - + @@ -1769,12 +1752,19 @@ this.pageSize = data.page.pageSize this.totalPage = data.page.totalCount this.$refs.selectDiv.setLengthAll( this.dataList.length) - //判断是否全部存在数据 - if(this.totalPage > 0){ + // 判断是否全部存在数据 + if (this.totalPage > 0) { //设置选中行 this.$refs.testTable.setCurrentRow(this.dataList[0]) - this.refreshCurrentTabTable() //加载当前的页签的table + // 加载当前的页签的table + this.refreshCurrentTabTable() this.testClickRow(this.dataList[0]) + } else { + //设置选中行 + this.$refs.testTable.setCurrentRow({}) + // 加载当前的页签的table + this.refreshCurrentTabTable() + this.testClickRow({}) } } this.dataListLoading = false