Merge remote-tracking branch 'origin/master'

zhaowei

2 天以前 8d4c67323bee47d6225f150e9f61868c6434a358

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