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 | 468 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 342 insertions(+), 126 deletions(-)
diff --git a/src/views/tms/modules/baseTools/BaseToolsListRight.vue b/src/views/tms/modules/baseTools/BaseToolsListRight.vue
index 78e0e0b..88c05da 100644
--- a/src/views/tms/modules/baseTools/BaseToolsListRight.vue
+++ b/src/views/tms/modules/baseTools/BaseToolsListRight.vue
@@ -449,68 +449,115 @@
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.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.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.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.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.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.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)
- }
- })
+ 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() {
@@ -525,27 +572,27 @@
},
//缂栬緫
handleEdit(record) {
- if (record.paramaTableName === '1') {
+ if (record.paraTypeFlag === '1') {
this.$refs.paraCommonToolModal.edit(record)
this.$refs.paraCommonToolModal.title = '缂栬緫'
this.$refs.paraCommonToolModal.disableSubmit = false
- } else if (record.paramaTableName === '2') {
+ } else if (record.paraTypeFlag === '2') {
this.$refs.paraHoleToolsModal.edit(record)
this.$refs.paraHoleToolsModal.title = '缂栬緫'
this.$refs.paraHoleToolsModal.disableSubmit = false
- } else if (record.paramaTableName === '3') {
+ } else if (record.paraTypeFlag === '3') {
this.$refs.paraThreadingToolModal.edit(record)
this.$refs.paraThreadingToolModal.title = '缂栬緫'
this.$refs.paraThreadingToolModal.disableSubmit = false
- } else if (record.paramaTableName === '4') {
+ } else if (record.paraTypeFlag === '4') {
this.$refs.paraMillToolModal.edit(record)
this.$refs.paraMillToolModal.title = '缂栬緫'
this.$refs.paraMillToolModal.disableSubmit = false
- } else if (record.paramaTableName === '5') {
+ } else if (record.paraTypeFlag === '5') {
this.$refs.paraTurningToolsModal.edit(record)
this.$refs.paraTurningToolsModal.title = '缂栬緫'
this.$refs.paraTurningToolsModal.disableSubmit = false
- } else if (record.paramaTableName === '6') {
+ } else if (record.paraTypeFlag === '6') {
this.$refs.paraBladeModal.edit(record)
this.$refs.paraBladeModal.title = '缂栬緫'
this.$refs.paraBladeModal.disableSubmit = false
@@ -553,27 +600,27 @@
},
//璇︽儏
handleDetail: function (record) {
- if (record.paramaTableName === '1') {
+ if (record.paraTypeFlag === '1') {
this.$refs.paraCommonToolModal.edit(record)
this.$refs.paraCommonToolModal.title = '璇︽儏'
this.$refs.paraCommonToolModal.disableSubmit = true
- } else if (record.paramaTableName === '2') {
+ } else if (record.paraTypeFlag === '2') {
this.$refs.paraHoleToolsModal.edit(record)
this.$refs.paraHoleToolsModal.title = '璇︽儏'
this.$refs.paraHoleToolsModal.disableSubmit = true
- } else if (record.paramaTableName === '3') {
+ } else if (record.paraTypeFlag === '3') {
this.$refs.paraThreadingToolModal.edit(record)
this.$refs.paraThreadingToolModal.title = '璇︽儏'
this.$refs.paraThreadingToolModal.disableSubmit = true
- } else if (record.paramaTableName === '4') {
+ } else if (record.paraTypeFlag === '4') {
this.$refs.paraMillToolModal.edit(record)
this.$refs.paraMillToolModal.title = '璇︽儏'
this.$refs.paraMillToolModal.disableSubmit = true
- } else if (record.paramaTableName === '5') {
+ } else if (record.paraTypeFlag === '5') {
this.$refs.paraTurningToolsModal.edit(record)
this.$refs.paraTurningToolsModal.title = '璇︽儏'
this.$refs.paraTurningToolsModal.disableSubmit = true
- } else if (record.paramaTableName === '6') {
+ } else if (record.paraTypeFlag === '6') {
this.$refs.paraBladeModal.edit(record)
this.$refs.paraBladeModal.title = '璇︽儏'
this.$refs.paraBladeModal.disableSubmit = true
@@ -709,104 +756,273 @@
}
},
paraHoleToolsOk(data) {
- this.queryParam.chineseName = data.chineseName
- this.queryParam.foreignLanguageName = data.foreignLanguageName
- this.queryParam.standardLevel = data.standardLevel
- this.queryParam.standardCode = data.standardCode
- this.queryParam.diameter = data.diameter
- this.queryParam.coneAngle = data.coneAngle
- this.queryParam.edgeLength = data.edgeLength
- this.queryParam.totalLength = data.totalLength
- this.queryParam.toolMaterial = data.toolMaterial
- this.queryParam.partMaterial = data.partMaterial
- this.queryParam.paintcoatFlag = data.paintcoatFlag
- this.queryParam.toolPattern = data.toolPattern
- this.queryParam.handleSpecifications = data.handleSpecifications
- this.queryParam.coolingMethod = data.coolingMethod
- this.queryParam.bladeCount = data.bladeCount
- this.queryParam.technicalConditions = data.technicalConditions
- this.queryParam.conditionsInfo = data.conditionsInfo
- this.queryParam.toolModel = data.toolModel
+ const fields = [
+ 'chineseName',
+ 'foreignLanguageName',
+ 'standardLevel',
+ 'standardCode',
+ 'coneAngle',
+ 'edgeLength',
+ 'totalLength',
+ 'toolMaterial',
+ 'partMaterial',
+ 'paintcoatFlag',
+ 'toolPattern',
+ 'handleSpecifications',
+ 'coolingMethod',
+ 'bladeCount',
+ 'technicalConditions',
+ 'conditionsInfo',
+ 'toolModel',
+ 'shortCalled',
+ 'groupCompanyCode',
+ 'groupCompanySign',
+ 'brand',
+ 'toleranceClass',
+ 'fitterPart',
+ 'connectorType',
+ 'smallDiameter',
+ 'chamferAngle',
+ 'effectiveLength',
+ 'drillDiameterRange',
+ 'knifeDiameter',
+ 'boreDiameter',
+ 'slotSpecification',
+ 'headsNumber',
+ 'adaptHolder',
+ 'guidanceLength',
+ 'guidanceDiameter',
+ 'accuracyClass',
+ 'types',
+ 'fluteForm',
+ 'handleForm',
+ 'scopeOfApplication',
+ 'processingmethod',
+ 'littleDiameter',
+ 'bigDiameter',
+ 'smallEdgeLength',
+ 'bigEdgeLength',
+ 'smallTotalLength',
+ 'bigTotalLength',
+ 'smallLatestBoringDiameter',
+ 'bigLatestBoringDiameter',
+ 'smallMaxBoringDiameter',
+ 'bigMaxBoringDiameter',
+ ]
+
+ fields.forEach((field) => {
+ this.queryParam[field] = data[field]
+ })
this.loadData()
},
paraBladeOk(data) {
- this.queryParam.chineseName = data.chineseName
- this.queryParam.foreignLanguageName = data.foreignLanguageName
- this.queryParam.standardLevel = data.standardLevel
- this.queryParam.standardCode = data.standardCode
- this.queryParam.bladeShape = data.bladeShape
- this.queryParam.bladeLength = data.bladeLength
- this.queryParam.cuttingEdgeCount = data.cuttingEdgeCount
- this.queryParam.bladeThickness = data.bladeThickness
- this.queryParam.toolMaterial = data.toolMaterial
- this.queryParam.partMaterial = data.partMaterial
- this.queryParam.paintcoatFlag = data.paintcoatFlag
- this.queryParam.clampingType = data.clampingType
- this.queryParam.noseAngleR = data.noseAngleR
- this.queryParam.technicalConditions = data.technicalConditions
- this.queryParam.conditionsInfo = data.conditionsInfo
- this.queryParam.toolModel = data.toolModel
+ const fields = [
+ 'chineseName',
+ 'foreignLanguageName',
+ 'shortCalled',
+ 'groupCompanyCode',
+ 'groupCompanySign',
+ 'standardLevel',
+ 'standardCode',
+ 'toolModel',
+ 'partMaterial',
+ 'technicalConditions',
+ 'conditionsInfo',
+ 'brand',
+ 'coatingMaterial',
+ 'processingClassify',
+ 'bladePosterior',
+ 'bladeSize',
+ 'cuttingEdgeCount',
+ 'noseAngleR',
+ 'dentalAngle',
+ 'pitch',
+ 'accuracyClass',
+ 'bladeShape',
+ 'clampingType',
+ 'toolMaterial',
+ 'paintcoatFlag',
+ 'types',
+ 'cuttingDirection',
+ 'inOutThread',
+ 'threadStandard',
+ 'smallBladeLength',
+ 'bigBladeLength',
+ 'smallBladeThickness',
+ 'bigBladeThickness',
+ 'smallBladeWide',
+ 'bigBladeWide',
+ 'smallMinInternalThread',
+ 'bigMinInternalThread'
+ ]
+ fields.forEach((field) => {
+ this.queryParam[field] = data[field]
+ })
this.loadData()
},
paraThreadingToolOk(data) {
- this.queryParam.chineseName = data.chineseName
- this.queryParam.foreignLanguageName = data.foreignLanguageName
- this.queryParam.threadCode = data.threadCode
- this.queryParam.pitch = data.pitch
- this.queryParam.rotationDirection = data.rotationDirection
- this.queryParam.tolerancezoneLevel = data.tolerancezoneLevel
- this.queryParam.edgeLength = data.edgeLength
- this.queryParam.totalLength = data.totalLength
- this.queryParam.toolMaterial = data.toolMaterial
- this.queryParam.partMaterial = data.partMaterial
- this.queryParam.paintcoatFlag = data.paintcoatFlag
- this.queryParam.externalDimensions = data.externalDimensions
- this.queryParam.handleSpecifications = data.handleSpecifications
- this.queryParam.technicalConditions = data.technicalConditions
- this.queryParam.conditionsInfo = data.conditionsInfo
- this.queryParam.toolModel = data.toolModel
+ const fields = [
+ 'chineseName',
+ 'foreignLanguageName',
+ 'shortCalled',
+ 'groupCompanyCode',
+ 'groupCompanySign',
+ 'standardLevel',
+ 'standardCode',
+ 'toolModel',
+ 'partMaterial',
+ 'technicalConditions',
+ 'conditionsInfo',
+ 'brand',
+ 'threadCode',
+ 'tolerancezoneLevel',
+ 'pitch',
+ 'handleSpecifications',
+ 'guidingSize',
+ 'connectionAperture',
+ 'connectingKeyway',
+ 'accuracyClass',
+ 'rotationDirection',
+ 'paintcoatFlag',
+ 'toolMaterial',
+ 'coolingMethod',
+ 'types',
+ 'screwHoleType',
+ 'threadStandard',
+ 'fluteSoltType',
+ 'smallExternalDimensions',
+ 'bigExternalDimensions',
+ 'smallEdgeLength',
+ 'bigEdgeLength',
+ 'smallTotalLength',
+ 'bigTotalLength'
+ ]
+ fields.forEach((field) => {
+ this.queryParam[field] = data[field]
+ })
+
this.loadData()
},
paraMillToolOk(data) {
- this.queryParam.chineseName = data.chineseName
- this.queryParam.foreignLanguageName = data.foreignLanguageName
- this.queryParam.standardLevel = data.standardLevel
- this.queryParam.standardCode = data.standardCode
- this.queryParam.diameter = data.diameter
- this.queryParam.noseAngleR = data.noseAngleR
- this.queryParam.edgeLength = data.edgeLength
- this.queryParam.totalLength = data.totalLength
- this.queryParam.toolMaterial = data.toolMaterial
- this.queryParam.partMaterial = data.partMaterial
- this.queryParam.paintcoatFlag = data.paintcoatFlag
- this.queryParam.toolPattern = data.toolPattern
- this.queryParam.clampingSpecifications = data.clampingSpecifications
- this.queryParam.coolingMethod = data.coolingMethod
- this.queryParam.numberOfTeeth = data.numberOfTeeth
- this.queryParam.technicalConditions = data.technicalConditions
- this.queryParam.conditionsInfo = data.conditionsInfo
- this.queryParam.toolModel = data.toolModel
+ const fields = [
+ 'chineseName',
+ 'foreignLanguageName',
+ 'shortCalled',
+ 'groupCompanyCode',
+ 'groupCompanySign',
+ 'standardLevel',
+ 'standardCode',
+ 'toolModel',
+ 'partMaterial',
+ 'technicalConditions',
+ 'conditionsInfo',
+ 'brand',
+ 'clampingSpecifications',
+ 'sizeSpecifications',
+ 'adaptBlade',
+ 'noseAngleR',
+ 'noseAngleC',
+ 'angleInsideR',
+ 'numberOfTeeth',
+ 'smallDiameter',
+ 'toolAngle',
+ 'mainAngleK',
+ 'deepestDepth',
+ 'pitch',
+ 'recentlyDiameter',
+ 'accuracyClass',
+ 'toolMaterial',
+ 'coolingMethod',
+ 'paintcoatFlag',
+ 'toolPattern',
+ 'handleForm',
+ 'handleNeckForm',
+ 'numberPatterns',
+ 'millingHeadForm',
+ 'cuttingEdgeForm',
+ 'littleDiameter',
+ 'bigDiameter',
+ 'smallEdgeLength',
+ 'bigEdgeLength',
+ 'smallTotalLength',
+ 'bigTotalLength',
+ 'smallNeckDiameter',
+ 'bigNeckDiameter',
+ 'smallHandleLength',
+ 'bigHandleLength',
+ 'smallHandleNeckLength',
+ 'bigHandleNeckLength',
+ 'smallOverhangingLength',
+ 'bigOverhangingLength'
+ ]
+ fields.forEach((field) => {
+ this.queryParam[field] = data[field]
+ })
this.loadData()
},
paraTurningToolsOk(data) {
- this.queryParam.chineseName = data.chineseName
- this.queryParam.foreignLanguageName = data.foreignLanguageName
- this.queryParam.standardLevel = data.standardLevel
- this.queryParam.standardCode = data.standardCode
- this.queryParam.headSpecifications = data.headSpecifications
- this.queryParam.matchingNumber = data.matchingNumber
- this.queryParam.leadAngle = data.leadAngle
- this.queryParam.totalLength = data.totalLength
- this.queryParam.toolMaterial = data.toolMaterial
- this.queryParam.partMaterial = data.partMaterial
- this.queryParam.paintcoatFlag = data.paintcoatFlag
- this.queryParam.toolPattern = data.toolPattern
- this.queryParam.crossSectionalSize = data.crossSectionalSize
- this.queryParam.coolingMethod = data.coolingMethod
- this.queryParam.cuttingDirection = data.cuttingDirection
- this.queryParam.technicalConditions = data.technicalConditions
- this.queryParam.conditionsInfo = data.conditionsInfo
- this.queryParam.toolModel = data.toolModel
+ const fields = [
+ 'chineseName',
+ 'foreignLanguageName',
+ 'shortCalled',
+ 'groupCompanyCode',
+ 'groupCompanySign',
+ 'standardLevel',
+ 'standardCode',
+ 'toolModel',
+ 'partMaterial',
+ 'technicalConditions',
+ 'conditionsInfo',
+ 'brand',
+ 'paintcoatFlag',
+ 'headSpecifications',
+ 'matchingNumber',
+ 'knifeClipModel',
+ 'leadAngle',
+ 'crossSectionalSize',
+ 'knifeSize',
+ 'bladePosterior',
+ 'accuracyClass',
+ 'cuttingDirection',
+ 'toolMaterial',
+ 'toolPattern',
+ 'types',
+ 'coolingMethod',
+ 'fasteningForm',
+ 'holderCategory',
+ 'bladeShape',
+ 'clampingMethod',
+ 'barDirection',
+ 'smallTotalLength',
+ 'bigTotalLength',
+ 'smallBoringBarDiameter',
+ 'bigBoringBarDiameter',
+ 'smallBladeLength',
+ 'bigBladeLength',
+ 'smallToolDiameter',
+ 'bigToolDiameter',
+ 'smallBladeHeight',
+ 'bigBladeHeight',
+ 'smallBladeWide',
+ 'bigBladeWide',
+ 'smallBladeSize',
+ 'bigBladeSize',
+ 'smallSlotWidth',
+ 'bigSlotWidth',
+ 'smallSmallDiameter',
+ 'bigSmallDiameter',
+ 'smallMaxDiameter',
+ 'bigMaxDiameter',
+ 'smallMaxDepth',
+ 'bigMaxDepth',
+ 'smallMinDiameter',
+ 'bigMinDiameter',
+ 'smallBladeThickness',
+ 'bigBladeThickness'
+ ]
+ fields.forEach((field) => {
+ this.queryParam[field] = data[field]
+ })
this.loadData()
},
},
--
Gitblit v1.9.3