Merge remote-tracking branch 'origin/master'

zhaowei

2 天以前 8d4c67323bee47d6225f150e9f61868c6434a358

 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() {
@@ -709,114 +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
      this.queryParam.shortCalled = data.shortCalled
      this.queryParam.groupCompanyCode = data.groupCompanyCode
      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
      this.queryParam.shortCalled = data.shortCalled
      this.queryParam.groupCompanyCode = data.groupCompanyCode
     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
      this.queryParam.shortCalled = data.shortCalled
      this.queryParam.groupCompanyCode = data.groupCompanyCode
      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
      this.queryParam.shortCalled = data.shortCalled
      this.queryParam.groupCompanyCode = data.groupCompanyCode
      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
      this.queryParam.shortCalled = data.shortCalled
      this.queryParam.groupCompanyCode = data.groupCompanyCode
     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()
    },
  },