Merge remote-tracking branch 'origin/master'

zhaowei

2 天以前 8d4c67323bee47d6225f150e9f61868c6434a358

 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() {