From de73daaafb0d87b8b7795901f61e4bdb845ad0b2 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 16 Aug 2024 17:34:23 +0800
Subject: [PATCH] =?UTF-8?q?2024-08-16=20ifs=E6=8E=A5=E5=8F=A3=E6=9B=B4?=
=?UTF-8?q?=E6=96=B02?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/part/bomManagement.vue | 7 ++++++-
.../modules/part/partCatalogInformation.vue | 2 +-
src/views/modules/part/partInformation.vue | 13 +++++++++----
src/views/modules/part/routingManagement.vue | 16 +++++++++-------
4 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue
index 699f883..2b48f64 100644
--- a/src/views/modules/part/bomManagement.vue
+++ b/src/views/modules/part/bomManagement.vue
@@ -168,7 +168,7 @@
Copy
Build
Retire
- 转正式BOM
+ 转正式BOM
@@ -899,6 +899,7 @@ export default {
saveHeaderLoading: false,
saveDetailLoading: false,
saveAllLoading: false,
+ toBecomeOfficialLoading: false,
// 初始页签
detailTable: 'bom_detail',
subDetailTable: 'bom_sub_detail',
@@ -3878,6 +3879,7 @@ export default {
// 临时Bom转为正式Bom
toBecomeOfficialBom () {
+ this.toBecomeOfficialLoading = true
toBecomeOfficialBom(this.detailData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
@@ -3893,6 +3895,9 @@ export default {
confirmButtonText: '确定'
})
}
+ this.toBecomeOfficialLoading = false
+ }).catch(()=>{
+ this.toBecomeOfficialLoading = false
})
},
diff --git a/src/views/modules/part/partCatalogInformation.vue b/src/views/modules/part/partCatalogInformation.vue
index eb0b537..60a41ea 100644
--- a/src/views/modules/part/partCatalogInformation.vue
+++ b/src/views/modules/part/partCatalogInformation.vue
@@ -447,7 +447,7 @@
deep: true,
handler: function (newV, oldV) {
this.modalData.partNo = this.modalData.partNo.toUpperCase()
- this.modalData.umId = this.modalData.umId.toUpperCase()
+ //this.modalData.umId = this.modalData.umId.toUpperCase()
this.modalData.codeNo = this.modalData.codeNo.toUpperCase()
}
},
diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue
index 3558032..0a10b10 100644
--- a/src/views/modules/part/partInformation.vue
+++ b/src/views/modules/part/partInformation.vue
@@ -116,7 +116,7 @@
-
+
@@ -571,9 +571,9 @@
- 同步
+ 同步
保存
- 关闭
+ 关闭
@@ -1440,7 +1440,7 @@
this.modalData.productGroupId4 = this.modalData.productGroupId4.toUpperCase()
this.modalData.hazardCode = this.modalData.hazardCode.toUpperCase()
this.modalData.productGroupId3 = this.modalData.productGroupId3.toUpperCase()
- this.modalData.umId = this.modalData.umId.toUpperCase()
+ //this.modalData.umId = this.modalData.umId.toUpperCase()
this.modalData.groupId = this.modalData.groupId.toUpperCase()
this.modalData.productGroupId1 = this.modalData.productGroupId1.toUpperCase()
this.modalData.familyId = this.modalData.familyId.toUpperCase()
@@ -1518,6 +1518,7 @@
},
// 其它
loading: false,
+ toBecomeOfficialLoading: false,
// 初始页签
activeTable: 'part_item',
inventoryPartTable: 'General',
@@ -4552,6 +4553,7 @@
this.$message.warning('IFS物料编码不能等于PLM物料编码！')
return
}
+ this.toBecomeOfficialLoading = true
this.modalData.bomAlternativeList = this.bomAlternativeSelections
this.modalData.routingAlternativeList = this.routingAlternativeSelections
partInformationToOfficial(this.modalData).then(({data}) => {
@@ -4569,6 +4571,9 @@
confirmButtonText: '确定'
})
}
+ this.toBecomeOfficialLoading = false
+ }).catch(()=>{
+ this.toBecomeOfficialLoading = false
})
} else {
partInformationEdit(this.modalData).then(({data}) => {
diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue
index 50dc4e1..5d1a3a4 100644
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@@ -158,7 +158,7 @@
Copy
Build
Retire
- 转正式Routing
+ 转正式Routing
@@ -436,12 +436,9 @@
-
-
-
-
-
-
+
+
+
@@ -927,6 +924,7 @@ export default {
saveHeaderLoading: false,
saveDetailLoading: false,
saveAllLoading: false,
+ toBecomeOfficialLoading: false,
// 初始页签
detailTable: 'routing_detail',
subDetailTable: 'routing_sub_detail',
@@ -3804,6 +3802,7 @@ export default {
// 临时Routing转为正式Routing
toBecomeOfficialRouting () {
+ this.toBecomeOfficialLoading = true
toBecomeOfficialRouting(this.detailData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
@@ -3819,6 +3818,9 @@ export default {
confirmButtonText: '确定'
})
}
+ this.toBecomeOfficialLoading = false
+ }).catch(()=>{
+ this.toBecomeOfficialLoading = false
})
},