From 8d4c67323bee47d6225f150e9f61868c6434a358 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 03 九月 2025 17:48:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/tms/modules/baseTools/BaseToolsListRight.vue | 93 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 70 insertions(+), 23 deletions(-)
diff --git a/src/views/tms/modules/baseTools/BaseToolsListRight.vue b/src/views/tms/modules/baseTools/BaseToolsListRight.vue
index b98df66..88c05da 100644
--- a/src/views/tms/modules/baseTools/BaseToolsListRight.vue
+++ b/src/views/tms/modules/baseTools/BaseToolsListRight.vue
@@ -449,14 +449,9 @@
this.selectedRowKeys = selectedRowKeys
this.selectionRows = selectionRows
//閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
- getAction(this.url.queryParaByToolCode, {
- toolCode: this.selectedRowKeys[0],
- paraTypeFlag: this.selectionRows[0].paraTypeFlag,
- }).then((res) => {
- if (res.success) {
- if (this.selectionRows[0].paraTypeFlag === '1') {
+ if (this.selectionRows[0].paraTypeFlag === '1') {
//鏄剧ず褰撳墠閫変腑绫诲瀷鍙傛暟
- this.$refs.paraCommonToolList.getPara(res.result)
+ this.$refs.paraCommonToolList.getPara(this.selectionRows[0])
//闅愯棌鍏朵粬绫诲瀷鍙傛暟
this.$refs.paraHoleToolsList.visable = false
this.$refs.paraThreadingToolList.visable = false
@@ -464,35 +459,35 @@
this.$refs.paraTurningToolsList.visable = false
this.$refs.paraBladeList.visable = false
} else if (this.selectionRows[0].paraTypeFlag === '2') {
- this.$refs.paraHoleToolsList.getPara(res.result)
+ this.$refs.paraHoleToolsList.getPara(this.selectionRows[0])
this.$refs.paraCommonToolList.visable = false
this.$refs.paraThreadingToolList.visable = false
this.$refs.paraMillToolList.visable = false
this.$refs.paraTurningToolsList.visable = false
this.$refs.paraBladeList.visable = false
} else if (this.selectionRows[0].paraTypeFlag === '3') {
- this.$refs.paraThreadingToolList.getPara(res.result)
+ this.$refs.paraThreadingToolList.getPara(this.selectionRows[0])
this.$refs.paraCommonToolList.visable = false
this.$refs.paraHoleToolsList.visable = false
this.$refs.paraMillToolList.visable = false
this.$refs.paraTurningToolsList.visable = false
this.$refs.paraBladeList.visable = false
} else if (this.selectionRows[0].paraTypeFlag === '4') {
- this.$refs.paraMillToolList.getPara(res.result)
+ this.$refs.paraMillToolList.getPara(this.selectionRows[0])
this.$refs.paraCommonToolList.visable = false
this.$refs.paraHoleToolsList.visable = false
this.$refs.paraThreadingToolList.visable = false
this.$refs.paraTurningToolsList.visable = false
this.$refs.paraBladeList.visable = false
} else if (this.selectionRows[0].paraTypeFlag === '5') {
- this.$refs.paraTurningToolsList.getPara(res.result)
+ this.$refs.paraTurningToolsList.getPara(this.selectionRows[0])
this.$refs.paraCommonToolList.visable = false
this.$refs.paraHoleToolsList.visable = false
this.$refs.paraThreadingToolList.visable = false
this.$refs.paraMillToolList.visable = false
this.$refs.paraBladeList.visable = false
} else if (this.selectionRows[0].paraTypeFlag === '6') {
- this.$refs.paraBladeList.getPara(res.result)
+ this.$refs.paraBladeList.getPara(this.selectionRows[0])
this.$refs.paraCommonToolList.visable = false
this.$refs.paraHoleToolsList.visable = false
this.$refs.paraThreadingToolList.visable = false
@@ -500,17 +495,69 @@
this.$refs.paraTurningToolsList.visable = false
this.$refs.paraBladeList.visable = false
}
- } else {
- this.$message.warning(res.message)
- }
- })
- getAction(this.url.queryByToolCode, { toolCode: this.selectedRowKeys[0] }).then((res) => {
- if (res.success) {
- this.$refs.toolsConfigPropertyList.getPara(res.result)
- } else {
- this.$message.warning(res.message)
- }
- })
+ this.$refs.toolsConfigPropertyList.getPara(this.selectionRows[0])
+ // getAction(this.url.queryParaByToolCode, {
+ // toolCode: this.selectedRowKeys[0],
+ // paraTypeFlag: this.selectionRows[0].paraTypeFlag,
+ // }).then((res) => {
+ // if (res.success) {
+ // if (this.selectionRows[0].paraTypeFlag === '1') {
+ // //鏄剧ず褰撳墠閫変腑绫诲瀷鍙傛暟
+ // this.$refs.paraCommonToolList.getPara(res.result)
+ // //闅愯棌鍏朵粬绫诲瀷鍙傛暟
+ // this.$refs.paraHoleToolsList.visable = false
+ // this.$refs.paraThreadingToolList.visable = false
+ // this.$refs.paraMillToolList.visable = false
+ // this.$refs.paraTurningToolsList.visable = false
+ // this.$refs.paraBladeList.visable = false
+ // } else if (this.selectionRows[0].paraTypeFlag === '2') {
+ // this.$refs.paraHoleToolsList.getPara(res.result)
+ // this.$refs.paraCommonToolList.visable = false
+ // this.$refs.paraThreadingToolList.visable = false
+ // this.$refs.paraMillToolList.visable = false
+ // this.$refs.paraTurningToolsList.visable = false
+ // this.$refs.paraBladeList.visable = false
+ // } else if (this.selectionRows[0].paraTypeFlag === '3') {
+ // this.$refs.paraThreadingToolList.getPara(res.result)
+ // this.$refs.paraCommonToolList.visable = false
+ // this.$refs.paraHoleToolsList.visable = false
+ // this.$refs.paraMillToolList.visable = false
+ // this.$refs.paraTurningToolsList.visable = false
+ // this.$refs.paraBladeList.visable = false
+ // } else if (this.selectionRows[0].paraTypeFlag === '4') {
+ // this.$refs.paraMillToolList.getPara(res.result)
+ // this.$refs.paraCommonToolList.visable = false
+ // this.$refs.paraHoleToolsList.visable = false
+ // this.$refs.paraThreadingToolList.visable = false
+ // this.$refs.paraTurningToolsList.visable = false
+ // this.$refs.paraBladeList.visable = false
+ // } else if (this.selectionRows[0].paraTypeFlag === '5') {
+ // this.$refs.paraTurningToolsList.getPara(res.result)
+ // this.$refs.paraCommonToolList.visable = false
+ // this.$refs.paraHoleToolsList.visable = false
+ // this.$refs.paraThreadingToolList.visable = false
+ // this.$refs.paraMillToolList.visable = false
+ // this.$refs.paraBladeList.visable = false
+ // } else if (this.selectionRows[0].paraTypeFlag === '6') {
+ // this.$refs.paraBladeList.getPara(res.result)
+ // this.$refs.paraCommonToolList.visable = false
+ // this.$refs.paraHoleToolsList.visable = false
+ // this.$refs.paraThreadingToolList.visable = false
+ // this.$refs.paraMillToolList.visable = false
+ // this.$refs.paraTurningToolsList.visable = false
+ // this.$refs.paraBladeList.visable = false
+ // }
+ // } else {
+ // this.$message.warning(res.message)
+ // }
+ // })
+ // getAction(this.url.queryByToolCode, { toolCode: this.selectedRowKeys[0] }).then((res) => {
+ // if (res.success) {
+ // this.$refs.toolsConfigPropertyList.getPara(res.result)
+ // } else {
+ // this.$message.warning(res.message)
+ // }
+ // })
},
// 澶勭悊缂栬緫鎸夐挳鐐瑰嚮浜嬩欢
handleEditSelected() {
--
Gitblit v1.9.3