Merge remote-tracking branch 'origin/master'

zhaowei

2 天以前 8d4c67323bee47d6225f150e9f61868c6434a358

 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>
@@ -505,15 +565,19 @@
    edit(record) {
      this.editable = true;
      this.model = Object.assign({}, record)
      this.chineseNameChange1 = record.chineseName
      this.toolModelChange1 = '-'+record.toolModel
      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() {