zhaowei
昨天 8d4c67323bee47d6225f150e9f61868c6434a358
Merge remote-tracking branch 'origin/master'
已修改11个文件
816 ■■■■ 文件已修改
src/views/tms/modules/baseTools/BaseToolsListRight.vue 93 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaBladeModal.vue 235 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaBladeSearchModal.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaHoleToolsModal.vue 90 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaMillToolModal.vue 90 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaMillToolSearchModal.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaThreadingToolModal.vue 90 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaTurningToolsModal.vue 106 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/toolLedger/ToolLedgerListRight.vue 86 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/toolsClassify/ToolsClassifyListRight.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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() {
src/views/tms/modules/baseTools/ParaBladeModal.vue
@@ -68,7 +68,7 @@
                    :placeholder="disableSubmit ? '' : '请输入中文名称'"
                    v-model="model.chineseName"
                    :disabled="disableSubmit"
                    @change="e => chineseNameChange(e.target.value)"
                    @change="(e) => chineseNameChange(e.target.value)"
                  />
                </a-form-model-item>
              </a-col>
@@ -91,7 +91,7 @@
                    :placeholder="disableSubmit ? '' : '请输入型号/图号'"
                    v-model="model.toolModel"
                    :disabled="disableSubmit"
                    @change="e => toolModelChange(e.target.value)"
                    @change="(e) => toolModelChange(e.target.value)"
                  />
                </a-form-model-item>
              </a-col>
@@ -256,7 +256,7 @@
          </a-col>
        </a-row>
        <a-row :gutter="24">
        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="price" label="单价">
              <a-input
@@ -288,7 +288,12 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="集团公司编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupCompanyCode">
            <a-form-model-item
              label="集团公司编码"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="groupCompanyCode"
            >
              <a-input
                v-model="model.groupCompanyCode"
                :placeholder="disableSubmit ? '' : '请输入集团公司编码'"
@@ -297,11 +302,13 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="集团公司标记" :labelCol="{span:4}" :wrapperCol="{span:20}" prop="groupCompanySign">
              <a-input
                v-model="model.groupCompanySign"
                :disabled="true"
              ></a-input>
            <a-form-model-item
              label="集团公司标记"
              :labelCol="{ span: 4 }"
              :wrapperCol="{ span: 20 }"
              prop="groupCompanySign"
            >
              <a-input v-model="model.groupCompanySign" :disabled="true"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -309,12 +316,14 @@
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-model-item label="刀片形状" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeShape">
              <a-input
              <j-dict-select-tag
                type="list"
                v-model="model.bladeShape"
                :placeholder="disableSubmit ? '' : '请输入刀片形状'"
                :triggerChange="true"
                dictCode="blade_shape"
                placeholder="请选择刀片形状"
                :disabled="disableSubmit"
                @change="e => bladeShapeChange(e.target.value)"
              ></a-input>
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -323,7 +332,7 @@
                v-model="model.bladeLength"
                :placeholder="disableSubmit ? '' : '请输入刀片长度'"
                :disabled="disableSubmit"
                @change="e => bladeLengthChange(e.target.value)"
                @change="(e) => bladeLengthChange(e.target.value)"
              ></a-input>
            </a-form-model-item>
          </a-col>
@@ -333,7 +342,7 @@
                v-model="model.cuttingEdgeCount"
                :placeholder="disableSubmit ? '' : '请输入切削刃数'"
                :disabled="disableSubmit"
                @change="e => cuttingEdgeCountChange(e.target.value)"
                @change="(e) => cuttingEdgeCountChange(e.target.value)"
              ></a-input>
            </a-form-model-item>
          </a-col>
@@ -351,11 +360,14 @@
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-model-item label="夹固型式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clampingType">
              <a-input
             <j-dict-select-tag
                type="list"
                v-model="model.clampingType"
                :placeholder="disableSubmit ? '' : '请输入夹固型式'"
                :triggerChange="true"
                dictCode="clamping_type"
                placeholder="请选择夹固型式"
                :disabled="disableSubmit"
              ></a-input>
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -364,17 +376,20 @@
                v-model="model.noseAngleR"
                :placeholder="disableSubmit ? '' : '请输入刀尖R'"
                :disabled="disableSubmit"
                @change="e => noseAngleRChange(e.target.value)"
                @change="(e) => noseAngleRChange(e.target.value)"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="刀片材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
              <a-input
              <j-dict-select-tag
                type="list"
                v-model="model.toolMaterial"
                :placeholder="disableSubmit ? '' : '请输入刀片材料'"
                :triggerChange="true"
                dictCode="tool_material"
                placeholder="请选择刀片材料"
                :disabled="disableSubmit"
              ></a-input>
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -417,8 +432,8 @@
          <a-col :span="6">
            <a-form-model-item
              label="附加技术条件说明"
              :labelCol="{span:12}"
              :wrapperCol="{span:12}"
              :labelCol="{ span: 12 }"
              :wrapperCol="{ span: 12 }"
              prop="conditionsInfo"
            >
              <a-input
@@ -450,11 +465,14 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="制式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="types">
              <a-input
              <j-dict-select-tag
                type="list"
                v-model="model.types"
                :placeholder="disableSubmit ? '' : '请输入制式'"
                :triggerChange="true"
                dictCode="types"
                placeholder="请选择制式"
                :disabled="disableSubmit"
              ></a-input>
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -479,11 +497,14 @@
        <a-row>
          <a-col :span="6">
            <a-form-model-item label="切削方向" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingDirection">
              <a-input
              <j-dict-select-tag
                type="list"
                v-model="model.cuttingDirection"
                :placeholder="disableSubmit ? '' : '请输入切削方向'"
                :triggerChange="true"
                dictCode="cutting_direction"
                placeholder="请选择切削方向"
                :disabled="disableSubmit"
              ></a-input>
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -506,22 +527,28 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="内外螺纹" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inOutThread">
              <a-input
              <j-dict-select-tag
                type="list"
                v-model="model.inOutThread"
                :placeholder="disableSubmit ? '' : '请输入内外螺纹'"
                :triggerChange="true"
                dictCode="in_out_thread"
                placeholder="请选择内外螺纹"
                :disabled="disableSubmit"
              ></a-input>
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item label="螺纹标准" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadStandard">
              <a-input
             <j-dict-select-tag
                type="list"
                v-model="model.threadStandard"
                :placeholder="disableSubmit ? '' : '请输入螺纹标准'"
                :triggerChange="true"
                dictCode="tool_thread_standard"
                placeholder="请选择螺纹标准"
                :disabled="disableSubmit"
              ></a-input>
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -545,8 +572,8 @@
          <a-col :span="6">
            <a-form-model-item
              label="最小加工内螺纹公称直径"
              :labelCol="{span:15}"
              :wrapperCol="{span:9}"
              :labelCol="{ span: 15 }"
              :wrapperCol="{ span: 9 }"
              prop="minInternalThread"
            >
              <a-input
@@ -635,12 +662,12 @@
        queryParaByToolCode: '/tms/baseTools/queryByToolCode',
      },
      locationCodeOptions: [],
      chineseNameChange1:'',
      toolModelChange1:'',
      bladeShapeChange1:'',
      bladeLengthChange1:'',
      cuttingEdgeCountChange1:'',
      noseAngleRChange1:''
      chineseNameChange1: '',
      toolModelChange1: '',
      bladeShapeChange1: '',
      bladeLengthChange1: '',
      cuttingEdgeCountChange1: '',
      noseAngleRChange1: '',
    }
  },
  created() {
@@ -660,8 +687,8 @@
      this.editable = false
      //初始化默认值
      this.model = {
        positionCode: ''
      };
        positionCode: '',
      }
      this.model.classifyId = nodeSelected.key
      this.model.classifyNum = nodeSelected.entity.classifyId
      this.model.classifyName = nodeSelected.entity.typeName
@@ -672,32 +699,32 @@
      this.editable = true
      this.model = Object.assign({}, record)
      this.chineseNameChange1 = record.chineseName
      this.toolModelChange1 = '-'+record.toolModel
      this.bladeShapeChange1 = '-'+record.bladeShape
      this.bladeLengthChange1 = '-'+record.bladeLength
      this.cuttingEdgeCountChange1 = '-'+record.cuttingEdgeCount
      this.noseAngleRChange1 = '-'+record.noseAngleR
      this.toolModelChange1 = '-' + record.toolModel
      this.bladeShapeChange1 = '-' + record.bladeShape
      this.bladeLengthChange1 = '-' + record.bladeLength
      this.cuttingEdgeCountChange1 = '-' + record.cuttingEdgeCount
      this.noseAngleRChange1 = '-' + record.noseAngleR
      //通过id查询管理参数和参数数据
      getAction(this.url.queryParaByToolCode, {
        toolCode: record.toolCodeId,
        paraTypeFlag: record.paraTypeFlag,
      }).then((res) => {
        if (res.success) {
          this.model = Object.assign({}, res.result)
        }
      })
      // getAction(this.url.queryParaByToolCode, {
      //   toolCode: record.toolCodeId,
      //   paraTypeFlag: record.paraTypeFlag,
      // }).then((res) => {
      //   if (res.success) {
      //     this.model = Object.assign({}, res.result)
      //   }
      // })
      this.visible = true
    },
    close() {
      this.$emit('close')
      this.visible = false
      this.$refs.form.clearValidate()
      this.chineseNameChange1 = '',
      this.toolModelChange1 = '',
      this.bladeShapeChange1 = '',
      this.bladeLengthChange1 = '',
      this.cuttingEdgeCountChange1 = '',
      this.noseAngleRChange1 = ''
      ;(this.chineseNameChange1 = ''),
        (this.toolModelChange1 = ''),
        (this.bladeShapeChange1 = ''),
        (this.bladeLengthChange1 = ''),
        (this.cuttingEdgeCountChange1 = ''),
        (this.noseAngleRChange1 = '')
    },
    positionCodeSearch() {
      let positionCode = []
@@ -771,36 +798,66 @@
        }
      })
    },
    chineseNameChange(chineseNameChange){
    chineseNameChange(chineseNameChange) {
      this.chineseNameChange1 = chineseNameChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1
      +this.cuttingEdgeCountChange1+this.noseAngleRChange1
      this.model.groupCompanySign =
        this.chineseNameChange1 +
        this.toolModelChange1 +
        this.bladeShapeChange1 +
        this.bladeLengthChange1 +
        this.cuttingEdgeCountChange1 +
        this.noseAngleRChange1
    },
    toolModelChange(toolModelChange){
      this.toolModelChange1 = toolModelChange == '' ? '' : '-'+toolModelChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1
      +this.cuttingEdgeCountChange1+this.noseAngleRChange1
    toolModelChange(toolModelChange) {
      this.toolModelChange1 = toolModelChange == '' ? '' : '-' + toolModelChange
      this.model.groupCompanySign =
        this.chineseNameChange1 +
        this.toolModelChange1 +
        this.bladeShapeChange1 +
        this.bladeLengthChange1 +
        this.cuttingEdgeCountChange1 +
        this.noseAngleRChange1
    },
    bladeShapeChange(bladeShapeChange){
      this.bladeShapeChange1 = bladeShapeChange == '' ? '' : '-'+bladeShapeChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1
      +this.cuttingEdgeCountChange1+this.noseAngleRChange1
    bladeShapeChange(bladeShapeChange) {
      this.bladeShapeChange1 = bladeShapeChange == '' ? '' : '-' + bladeShapeChange
      this.model.groupCompanySign =
        this.chineseNameChange1 +
        this.toolModelChange1 +
        this.bladeShapeChange1 +
        this.bladeLengthChange1 +
        this.cuttingEdgeCountChange1 +
        this.noseAngleRChange1
    },
    bladeLengthChange(bladeLengthChange){
      this.bladeLengthChange1 = bladeLengthChange == '' ? '' : '-'+bladeLengthChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1
      +this.cuttingEdgeCountChange1+this.noseAngleRChange1
    bladeLengthChange(bladeLengthChange) {
      this.bladeLengthChange1 = bladeLengthChange == '' ? '' : '-' + bladeLengthChange
      this.model.groupCompanySign =
        this.chineseNameChange1 +
        this.toolModelChange1 +
        this.bladeShapeChange1 +
        this.bladeLengthChange1 +
        this.cuttingEdgeCountChange1 +
        this.noseAngleRChange1
    },
    cuttingEdgeCountChange(cuttingEdgeCountChange){
      this.cuttingEdgeCountChange1 = cuttingEdgeCountChange == '' ? '' : '-'+cuttingEdgeCountChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1
      +this.cuttingEdgeCountChange1+this.noseAngleRChange1
    cuttingEdgeCountChange(cuttingEdgeCountChange) {
      this.cuttingEdgeCountChange1 = cuttingEdgeCountChange == '' ? '' : '-' + cuttingEdgeCountChange
      this.model.groupCompanySign =
        this.chineseNameChange1 +
        this.toolModelChange1 +
        this.bladeShapeChange1 +
        this.bladeLengthChange1 +
        this.cuttingEdgeCountChange1 +
        this.noseAngleRChange1
    },
    noseAngleRChange(noseAngleRChange){
      this.noseAngleRChange1 = noseAngleRChange == '' ? '' : '-'+noseAngleRChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1
      +this.cuttingEdgeCountChange1+this.noseAngleRChange1
    }
    noseAngleRChange(noseAngleRChange) {
      this.noseAngleRChange1 = noseAngleRChange == '' ? '' : '-' + noseAngleRChange
      this.model.groupCompanySign =
        this.chineseNameChange1 +
        this.toolModelChange1 +
        this.bladeShapeChange1 +
        this.bladeLengthChange1 +
        this.cuttingEdgeCountChange1 +
        this.noseAngleRChange1
    },
  },
}
</script>
src/views/tms/modules/baseTools/ParaBladeSearchModal.vue
@@ -221,7 +221,7 @@
                type="list"
                v-model="model.inOutThread"
                :triggerChange="true"
                dictCode="in_out_thread"
                dictCode="number_patterns"
                placeholder="请选择内外螺纹"
              />
            </a-form-model-item>
@@ -232,7 +232,7 @@
                type="list"
                v-model="model.threadStandard"
                :triggerChange="true"
                dictCode="thread_standard"
                dictCode="tool_thread_standard"
                placeholder="请选择螺纹标准"
              />
            </a-form-model-item>
src/views/tms/modules/baseTools/ParaHoleToolsModal.vue
@@ -264,7 +264,14 @@
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-model-item label="刀具材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
              <a-input v-model="model.toolMaterial" :placeholder="disableSubmit?'':'请输入刀具材料'"  :disabled="disableSubmit"></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.toolMaterial"
                :triggerChange="true"
                dictCode="tool_material"
                placeholder="请选择刀具材料"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -282,7 +289,14 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="刀具型式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern">
              <a-input v-model="model.toolPattern" :placeholder="disableSubmit?'':'请输入刀具型式'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.toolPattern"
                :triggerChange="true"
                dictCode="tool_pattern"
                placeholder="请选择刀具型式"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -294,7 +308,14 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="冷却方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
              <a-input v-model="model.coolingMethod" :placeholder="disableSubmit?'':'请输入冷却方式'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.coolingMethod"
                :triggerChange="true"
                dictCode="cooling_method"
                placeholder="请选择冷却方式"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -316,7 +337,14 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="制式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="types">
              <a-input v-model="model.types" :placeholder="disableSubmit?'':'请输入制式'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.types"
                :triggerChange="true"
                dictCode="types"
                placeholder="请选择制式"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -326,14 +354,28 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="排屑槽形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fluteForm">
              <a-input v-model="model.fluteForm" :placeholder="disableSubmit?'':'请输入排屑槽形式'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.fluteForm"
                :triggerChange="true"
                dictCode="flute_form"
                placeholder="请选择排屑槽形式"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item label="柄部形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handleForm">
              <a-input v-model="model.handleForm" :placeholder="disableSubmit?'':'请输入柄部形式'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.handleForm"
                :triggerChange="true"
                dictCode="handle_form"
                placeholder="请选择柄部形式"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -392,7 +434,14 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="适用范围" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scopeOfApplication">
              <a-input v-model="model.scopeOfApplication" :placeholder="disableSubmit?'':'请输入适用范围'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.scopeOfApplication"
                :triggerChange="true"
                dictCode="scope_of_application"
                placeholder="请选择适用范围"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -409,7 +458,14 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="加工方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processingmethod">
              <a-input v-model="model.processingmethod" :placeholder="disableSubmit?'':'请输入加工方式'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.processingmethod"
                :triggerChange="true"
                dictCode="processingmethod"
                placeholder="请选择加工方式"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -565,20 +621,22 @@
    },
    edit(record) {
      this.editable = true;
      console.log("1111",this.model.classifyNum)
      this.model = Object.assign({}, record)
      console.log("2222",this.model.classifyNum)
      this.chineseNameChange1 = record.chineseName
      this.toolModelChange1 = '-'+record.toolModel
      this.diameterChange1 = '-'+record.diameter
      this.totalLengthChange1 = '-'+record.totalLength
      //通过id查询管理参数和参数数据
      getAction(this.url.queryParaByToolCode, {
        toolCode: record.toolCodeId,
        paraTypeFlag: record.paraTypeFlag,
      }).then((res) => {
        if (res.success) {
          this.model = Object.assign({}, res.result)
        }
      })
      // getAction(this.url.queryParaByToolCode, {
      //   toolCode: record.toolCodeId,
      //   paraTypeFlag: record.paraTypeFlag,
      // }).then((res) => {
      //   if (res.success) {
      //     this.model = Object.assign({}, res.result)
      //   }
      // })
      this.visible = true
    },
    close() {
src/views/tms/modules/baseTools/ParaMillToolModal.vue
@@ -263,7 +263,14 @@
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-model-item label="刀具材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
              <a-input v-model="model.toolMaterial" :placeholder="disableSubmit?'':'请输入刀具材料'"  :disabled="disableSubmit"></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.toolMaterial"
                :triggerChange="true"
                dictCode="tool_material"
                placeholder="请选择刀具材料"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -281,7 +288,14 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="刀具型式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern">
              <a-input v-model="model.toolPattern" :placeholder="disableSubmit?'':'请输入刀具型式'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.toolPattern"
                :triggerChange="true"
                dictCode="tool_pattern"
                placeholder="请选择刀具型式"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -293,12 +307,26 @@
          </a-col>
           <a-col :span="6">
            <a-form-model-item label="柄部形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handleForm">
              <a-input v-model="model.handleForm" :placeholder="disableSubmit?'':'请输入柄部形式'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.handleForm"
                :triggerChange="true"
                dictCode="mill_handle_form"
                placeholder="请选择柄部形式"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="冷却方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
              <a-input v-model="model.coolingMethod" :placeholder="disableSubmit?'':'请输入冷却方式'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.coolingMethod"
                :triggerChange="true"
                dictCode="cooling_method"
                placeholder="请选择冷却方式"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -371,7 +399,14 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="柄颈形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handleNeckForm">
              <a-input v-model="model.handleNeckForm" :placeholder="disableSubmit?'':'请输入柄颈形式'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.handleNeckForm"
                :triggerChange="true"
                dictCode="handle_neck_form"
                placeholder="请选择柄颈形式"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -388,7 +423,14 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="铣刀头形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="millingHeadForm">
              <a-input v-model="model.millingHeadForm" :placeholder="disableSubmit?'':'请输入铣刀头形式'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.millingHeadForm"
                :triggerChange="true"
                dictCode="milling_head_form"
                placeholder="请选择铣刀头形式"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -398,7 +440,14 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="切削刃形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingEdgeForm">
              <a-input v-model="model.cuttingEdgeForm" :placeholder="disableSubmit?'':'请输入切削刃形式'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.cuttingEdgeForm"
                :triggerChange="true"
                dictCode="cutting_edge_form"
                placeholder="请选择切削刃形式"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -409,8 +458,15 @@
            </a-form-model-item>
          </a-col>
           <a-col :span="6">
            <a-form-model-item label="内外纹数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="numberPatterns">
              <a-input v-model="model.numberPatterns" :placeholder="disableSubmit?'':'请输入内外纹数'" :disabled="disableSubmit" ></a-input>
            <a-form-model-item label="内外螺纹" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="numberPatterns">
              <j-dict-select-tag
                type="list"
                v-model="model.numberPatterns"
                :triggerChange="true"
                dictCode="number_patterns"
                placeholder="请选择内外螺纹"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -576,14 +632,14 @@
      this.totalLengthChange1 = '-'+record.totalLength
      this.noseAngleRChange1 = '-' + record.noseAngleR
      //通过id查询管理参数和参数数据
      getAction(this.url.queryParaByToolCode, {
        toolCode: record.toolCodeId,
        paraTypeFlag: record.paraTypeFlag,
      }).then((res) => {
        if (res.success) {
          this.model = Object.assign({}, res.result)
        }
      })
      // getAction(this.url.queryParaByToolCode, {
      //   toolCode: record.toolCodeId,
      //   paraTypeFlag: record.paraTypeFlag,
      // }).then((res) => {
      //   if (res.success) {
      //     this.model = Object.assign({}, res.result)
      //   }
      // })
      this.visible = true
    },
    close() {
src/views/tms/modules/baseTools/ParaMillToolSearchModal.vue
@@ -279,7 +279,7 @@
                type="list"
                v-model="model.handleForm"
                :triggerChange="true"
                dictCode="handle_form"
                dictCode="mill_handle_form"
                placeholder="请选择柄部形式"
              />
            </a-form-model-item>
src/views/tms/modules/baseTools/ParaThreadingToolModal.vue
@@ -250,7 +250,14 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="螺纹旋向" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="rotationDirection">
              <a-input v-model="model.rotationDirection" :placeholder="disableSubmit?'':'请输入螺纹旋向'"  :disabled="disableSubmit"></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.rotationDirection"
                :triggerChange="true"
                dictCode="rotation_direction"
                placeholder="请选择螺纹旋向"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
           <a-col :span="6">
@@ -273,7 +280,14 @@
          </a-col>
           <a-col :span="6">
            <a-form-model-item label="刀具材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
              <a-input v-model="model.toolMaterial" :placeholder="disableSubmit?'':'请输入刀具材料'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.toolMaterial"
                :triggerChange="true"
                dictCode="tool_material"
                placeholder="请选择刀具材料"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
           <a-col :span="6">
@@ -320,29 +334,64 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="制式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="types">
              <a-input v-model="model.types" :placeholder="disableSubmit?'':'请输入制式'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.types"
                :triggerChange="true"
                dictCode="types"
                placeholder="请选择制式"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
         <a-col :span="6">
            <a-form-model-item label="冷却方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
              <a-input v-model="model.coolingMethod" :placeholder="disableSubmit?'':'请输入冷却方式'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.coolingMethod"
                :triggerChange="true"
                dictCode="cooling_method"
                placeholder="请选择冷却方式"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
           <a-col :span="6">
            <a-form-model-item label="螺纹标准" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadStandard">
              <a-input v-model="model.threadStandard" :placeholder="disableSubmit?'':'请输入螺纹标准'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.threadStandard"
                :triggerChange="true"
                dictCode="thread_standard"
                placeholder="请选择螺纹标准"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="排屑槽型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fluteSoltType">
              <a-input v-model="model.fluteSoltType" :placeholder="disableSubmit?'':'请输入排屑槽型'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.fluteSoltType"
                :triggerChange="true"
                dictCode="flute_solt_type"
                placeholder="请选择排屑槽型"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="螺纹类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadType">
              <a-input v-model="model.threadType" :placeholder="disableSubmit?'':'请输入螺纹类型'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.threadType"
                :triggerChange="true"
                dictCode="thread_type"
                placeholder="请选择螺纹类型"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -352,6 +401,17 @@
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item label="螺孔类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="screwHoleType">
              <j-dict-select-tag
                type="list"
                v-model="model.screwHoleType"
                :triggerChange="true"
                dictCode="screw_hole_type"
                placeholder="请选择螺孔类型"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="连接孔径" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="connectionAperture">
              <a-input v-model="model.connectionAperture" :placeholder="disableSubmit?'':'请输入连接孔径'" :disabled="disableSubmit" ></a-input>
@@ -510,14 +570,14 @@
      this.threadCodeChange1 = '-'+record.threadCode
      this.pitchChange1 = '-'+record.pitch
       //通过id查询管理参数和参数数据
      getAction(this.url.queryParaByToolCode, {
        toolCode: record.toolCodeId,
        paraTypeFlag: record.paraTypeFlag,
      }).then((res) => {
        if (res.success) {
          this.model = Object.assign({}, res.result)
        }
      })
      // getAction(this.url.queryParaByToolCode, {
      //   toolCode: record.toolCodeId,
      //   paraTypeFlag: record.paraTypeFlag,
      // }).then((res) => {
      //   if (res.success) {
      //     this.model = Object.assign({}, res.result)
      //   }
      // })
      this.visible = true
    },
    close() {
src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue
@@ -231,6 +231,17 @@
          </a-col>
        </a-row>
        <a-row>
           <a-col :span="8">
            <a-form-model-item label="螺纹类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadType">
              <j-dict-select-tag
                type="list"
                v-model="model.threadType"
                :triggerChange="true"
                dictCode="thread_type"
                placeholder="请选择螺纹类型"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="排屑槽型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fluteSoltType">
              <j-dict-select-tag
@@ -257,6 +268,9 @@
              ></a-input>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-item label="切削刃长">
              <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallEdgeLength"></a-input>
@@ -264,8 +278,6 @@
              <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigEdgeLength"></a-input>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-item label="刀具总长">
              <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallTotalLength"></a-input>
src/views/tms/modules/baseTools/ParaTurningToolsModal.vue
@@ -268,12 +268,26 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="切削方向" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingDirection">
              <a-input v-model="model.cuttingDirection" :placeholder="disableSubmit?'':'请输入切削方向'"  :disabled="disableSubmit"></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.cuttingDirection"
                :triggerChange="true"
                dictCode="cutting_direction"
                placeholder="请选择切削方向"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="刀具材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
              <a-input v-model="model.toolMaterial" :placeholder="disableSubmit?'':'请输入刀具材料'"  :disabled="disableSubmit"></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.toolMaterial"
                :triggerChange="true"
                dictCode="tool_material"
                placeholder="请选择刀具材料"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -294,7 +308,14 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="刀具型式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern">
              <a-input v-model="model.toolPattern" :placeholder="disableSubmit?'':'请输入刀具型式'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.toolPattern"
                :triggerChange="true"
                dictCode="tool_pattern"
                placeholder="请选择刀具型式"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -316,7 +337,14 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="制式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="types">
              <a-input v-model="model.types" :placeholder="disableSubmit?'':'请输入制式'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.types"
                :triggerChange="true"
                dictCode="types"
                placeholder="请选择制式"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -326,14 +354,28 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="冷却方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
              <a-input v-model="model.coolingMethod" :placeholder="disableSubmit?'':'请输入冷却方式'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.coolingMethod"
                :triggerChange="true"
                dictCode="cooling_method"
                placeholder="请选择冷却方式"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item label="刀杆类别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="holderCategory">
              <a-input v-model="model.holderCategory" :placeholder="disableSubmit?'':'请输入刀杆类别'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.holderCategory"
                :triggerChange="true"
                dictCode="holder_category"
                placeholder="请选择刀杆类别"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -343,7 +385,14 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="接口紧固形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fasteningForm">
              <a-input v-model="model.fasteningForm" :placeholder="disableSubmit?'':'请输入接口紧固形式'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.fasteningForm"
                :triggerChange="true"
                dictCode="fastening_form"
                placeholder="请选择接口紧固形式"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -360,7 +409,14 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="刀片形状" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeShape">
              <a-input v-model="model.bladeShape" :placeholder="disableSubmit?'':'请输入刀片形状'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.bladeShape"
                :triggerChange="true"
                dictCode="blade_shape"
                placeholder="请选择刀片形状"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -370,7 +426,14 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="刀杆方向" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="barDirection">
              <a-input v-model="model.barDirection" :placeholder="disableSubmit?'':'请输入刀杆方向'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.barDirection"
                :triggerChange="true"
                dictCode="bar_direction"
                placeholder="请选择刀杆方向"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -399,7 +462,14 @@
        <a-row>
           <a-col :span="6">
            <a-form-model-item label="刀片装夹方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clampingMethod">
              <a-input v-model="model.clampingMethod" :placeholder="disableSubmit?'':'请输入刀片装夹方式'" :disabled="disableSubmit" ></a-input>
              <j-dict-select-tag
                type="list"
                v-model="model.clampingMethod"
                :triggerChange="true"
                dictCode="clamping_method"
                placeholder="请选择刀片装夹方式"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -587,14 +657,14 @@
      this.headSpecificationsChange1 = '-'+record.headSpecifications
      this.leadAngleChange1 = '-'+record.leadAngle
       //通过id查询管理参数和参数数据
      getAction(this.url.queryParaByToolCode, {
        toolCode: record.toolCodeId,
        paraTypeFlag: record.paraTypeFlag,
      }).then((res) => {
        if (res.success) {
          this.model = Object.assign({}, res.result)
        }
      })
      // getAction(this.url.queryParaByToolCode, {
      //   toolCode: record.toolCodeId,
      //   paraTypeFlag: record.paraTypeFlag,
      // }).then((res) => {
      //   if (res.success) {
      //     this.model = Object.assign({}, res.result)
      //   }
      // })
      this.visible = true
    },
    close() {
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])
      },
      //禁用状态样式
src/views/tms/modules/toolsClassify/ToolsClassifyListRight.vue
@@ -54,10 +54,10 @@
      >
          <a-button @click="handleAdd(nodeSelected)" type="primary" icon="plus" :disabled="!nodeSelected.key || nodeSelected.entity.leafFlag === '1'">新增</a-button>
      </Tooltip>
      <!-- <a-button type="primary" icon="download" @click="handleExportXls('工具分类信息')">导出</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('工具分类信息')">导出</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload> -->
      </a-upload>
    </div>
    <!-- table区域-begin -->