From 20627b21a8349fb1abd33861cff5f0bf3ad35320 Mon Sep 17 00:00:00 2001 From: Aoi_Tori <2547614904@qq.com> Date: Fri, 30 May 2025 17:43:00 +0800 Subject: [PATCH] 2025/5/30 --- src/views/modules/part/routingManagement.vue | 59 +- src/views/modules/test/requestForTest.vue | 5535 +++++++++-------- .../test/testSoRouting/testRoutingTable.vue | 2 +- 3 files changed, 2859 insertions(+), 2737 deletions(-) diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue index c0dfa98..a1c0797 100644 --- a/src/views/modules/part/routingManagement.vue +++ b/src/views/modules/part/routingManagement.vue @@ -850,7 +850,8 @@ - + @@ -934,10 +935,13 @@ - - + + - + @@ -946,7 +950,8 @@ - + @@ -959,7 +964,8 @@ - + @@ -1008,7 +1014,8 @@ :label="item.columnLabel"> @@ -1032,12 +1039,13 @@ - + - + @@ -1062,7 +1070,8 @@ :label="item.columnLabel"> @@ -1083,7 +1092,8 @@ - + @@ -1113,7 +1123,8 @@ :label="item.columnLabel"> @@ -1133,7 +1144,8 @@ - + @@ -1273,9 +1285,10 @@ export default { componentData: { deep: true, handler: function (newV, oldV) { - this.componentData.workCenterNo = this.componentData.workCenterNo.toUpperCase() - this.componentData.laborClassDesc = this.componentData.laborClassDesc.toUpperCase() - this.componentData.setupLaborClassDesc = this.componentData.setupLaborClassDesc.toUpperCase() + // 不用转大写 + // this.componentData.workCenterNo = this.componentData.workCenterNo.toUpperCase() + // this.componentData.laborClassDesc = this.componentData.laborClassDesc.toUpperCase() + // this.componentData.setupLaborClassDesc = this.componentData.setupLaborClassDesc.toUpperCase() } }, routingToolData: { @@ -5004,6 +5017,7 @@ export default { // 加工中心输入校验 workCenterBlur(tagNo) { + console.log('@change触发') if (this.componentData.workCenterNo != null && this.componentData.workCenterNo !== '') { let tempData = { tagno: tagNo, @@ -5172,6 +5186,18 @@ export default { this.componentData.workCenterNo = row.workCenterNo this.componentData.workCenterDesc = row.workCenterDesc this.componentData.workCenterType = row.workCenterType + this.searchData.levelId = row.workCenterNo + this.searchData.lavelDesc = row.workCenterDesc + queryWorkerLevelList(this.searchData).then(({data}) => { + if (data && data.code === 0) { + this.componentData.setupLaborClassNo = data.page.list[0].levelId + this.componentData.setupLaborClassDesc = data.page.list[0].levelDesc + this.componentData.laborClassNo = data.page.list[0].levelId + this.componentData.laborClassDesc = data.page.list[0].levelDesc + } else { + this.workCenterList = [] + } + }) this.workCenterModelFlag = false }, @@ -5189,7 +5215,6 @@ export default { }, - } } diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue index cc7f9df..c5646de 100644 --- a/src/views/modules/test/requestForTest.vue +++ b/src/views/modules/test/requestForTest.vue @@ -53,7 +53,8 @@ - + @@ -133,7 +134,8 @@ @@ -146,13 +148,16 @@ @@ -161,17 +166,18 @@ + @size-change="sizeChangeHandle" + @current-change="currentChangeHandle" + :current-page="pageIndex" + :page-sizes="[20, 50, 100, 200, 500]" + :page-size="pageSize" + :total="totalPage" + layout="total, sizes, prev, pager, next, jumper"> - + @@ -179,7 +185,8 @@ 客户编码 - + @@ -194,12 +201,13 @@
+ v-model="modalData.testNumber" + @input="modalData.testNumber = modalData.testNumber.replace(/^(0+)|[^\d]+/g, '')">
- + @@ -209,7 +217,8 @@ + style="width: 100%" type="date" value-format="yyyy-MM-dd" + placeholder="选择日期"> @@ -225,8 +234,10 @@ - 项目号 - + 项目号 + @@ -238,12 +249,14 @@ - + - + @@ -252,8 +265,10 @@ - 物料编码 - + 物料编码 + @@ -265,38 +280,52 @@ - - Artwork - Artwork - - + + Artwork + Artwork + + - TP工程师 + TP工程师 TP工程师 - - + + - CQC + CQC CQC - - + + - FAI + FAI FAI - - + + @@ -304,20 +333,26 @@ -
- 下一步 + 下一步 + - - + + - + - + - + - + + + +
-