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/toolLedger/ToolLedgerListRight.vue | 86 +++++++++++++++++++++++++++++++++----------
1 files changed, 66 insertions(+), 20 deletions(-)
diff --git a/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue b/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
index c791a83..518c812 100644
--- a/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
+++ b/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
@@ -453,10 +453,8 @@
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows
//閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
- getAction(this.url.queryParaByToolCode, { toolCode: this.selectionRows[0].toolCodeId,paraTypeFlag:this.selectionRows[0].paraTypeFlag}).then((res) => {
- if (res.success) {
- if(this.selectionRows[0].paraTypeFlag === "1"){
- this.$refs.paraCommonToolList.getPara(res.result);
+ if(this.selectionRows[0].paraTypeFlag === "1"){
+ this.$refs.paraCommonToolList.getPara(this.selectionRows[0]);
//闅愯棌鍏朵粬绫诲瀷鍙傛暟
this.$refs.paraHoleToolsList.visable =false
this.$refs.paraThreadingToolList.visable = false
@@ -464,35 +462,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 +498,65 @@
this.$refs.paraTurningToolsList.visable = false
this.$refs.paraBladeList.visable = false
}
- } else {
- this.$message.warning(res.message);
- }
- })
- getAction(this.url.queryByToolCode, { toolCode: this.selectionRows[0].toolCodeId}).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.selectionRows[0].toolCodeId,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.selectionRows[0].toolCodeId}).then((res) => {
+ // if (res.success) {
+ // this.$refs.toolsConfigPropertyList.getPara(res.result);
+ // } else {
+ // this.$message.warning(res.message);
+ // }
+ // })
this.$bus.$emit('getToolLedgerData', this.selectionRows[0])
},
//绂佺敤鐘舵�佹牱寮�
--
Gitblit v1.9.3