Merge remote-tracking branch 'origin/master'

zhaowei

2 天以前 8d4c67323bee47d6225f150e9f61868c6434a358

 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
@@ -632,14 +659,15 @@
      url: {
        add: '/tms/baseTools/add',
        edit: '/tms/baseTools/edit',
        queryParaByToolCode: '/tms/baseTools/queryByToolCode',
      },
      locationCodeOptions: [],
      chineseNameChange1:'',
      toolModelChange1:'',
      bladeShapeChange1:'',
      bladeLengthChange1:'',
      cuttingEdgeCountChange1:'',
      noseAngleRChange1:''
      chineseNameChange1: '',
      toolModelChange1: '',
      bladeShapeChange1: '',
      bladeLengthChange1: '',
      cuttingEdgeCountChange1: '',
      noseAngleRChange1: '',
    }
  },
  created() {
@@ -659,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
@@ -670,18 +698,33 @@
    edit(record) {
      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
      //通过id查询管理参数和参数数据
      // 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 = []
@@ -755,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>