现场问题处理

cuijian

14 小时以前 135b5b2e497514dc4456e33b0db0fe5e7fa4e62f

现场问题处理

 src/views/tms/ToolVerificationList.vue

@@ -33,9 +33,6 @@
    <!-- æŸ¥è¯¢åŒºåŸŸ-END -->

    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
    </div>

    <!-- table区域-begin -->
    <div>
@@ -53,25 +50,6 @@
        :rowSelection="null"
        class="j-table-force-nowrap"
        @change="handleTableChange">

        <span slot="action" slot-scope="text, record">
          <a @click="handleDetail(record)">详情</a>

          <a-divider type="vertical" />
          <a-dropdown>
            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
            <a-menu slot="overlay">
              <a-menu-item>
                <a @click="handleEdit(record)">编辑</a>
              </a-menu-item>
              <a-menu-item>
                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                  <a>删除</a>
                </a-popconfirm>
              </a-menu-item>
            </a-menu>
          </a-dropdown>
        </span>

      </a-table>
    </div>
@@ -113,7 +91,7 @@
          {
            title:'唯一编码',
            align:"center",
            dataIndex: 'toolId',
            dataIndex: 'onlyCode',
          },
          {
            title:'量具名称',
@@ -123,7 +101,7 @@
          {
            title:'规格',
            align:"center",
            dataIndex: 'model'
            dataIndex: 'toolModel'
          },
          {
            title:'计量号',
@@ -140,17 +118,9 @@
            align:"center",
            dataIndex: 'nextVerificationDate'
          },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            fixed:"right",
            width:147,
            scopedSlots: { customRender: 'action' }
          }
        ],
        url: {
          list: "/tms/toolVerificationRecord/list",
          list: "/tms/toolVerificationRecord/queryPageList",
          delete: "/tms/toolVerificationRecord/delete",
          deleteBatch: "/tms/toolVerificationRecord/deleteBatch",
          exportXlsUrl: "/tms/toolVerificationRecord/exportXls",

 src/views/tms/ToolVerificationRecordList.vue

@@ -117,7 +117,7 @@
          {
            title:'唯一编码',
            align:"center",
            dataIndex: 'toolId',
            dataIndex: 'onlyCode',
          },
          {
            title:'量具名称',
@@ -127,7 +127,7 @@
          {
            title:'规格',
            align:"center",
            dataIndex: 'model'
            dataIndex: 'toolModel'
          },
          {
            title:'计量号',
@@ -149,16 +149,16 @@
            align:"center",
            dataIndex: 'personResponsible'
          },
          {
            title:'创建人',
            align:"center",
            dataIndex: 'createBy'
          },
          {
            title:'创建时间',
            align:"center",
            dataIndex: 'createTime'
          },
          // {
          //   title:'创建人',
          //   align:"center",
          //   dataIndex: 'createBy'
          // },
          // {
          //   title:'创建时间',
          //   align:"center",
          //   dataIndex: 'createTime'
          // },
          {
            title: '操作',
            dataIndex: 'action',
@@ -169,7 +169,7 @@
          }
        ],
        url: {
          list: "/tms/toolVerificationRecord/list",
          list: "/tms/toolVerificationRecord/queryPageList",
          delete: "/tms/toolVerificationRecord/delete",
          deleteBatch: "/tms/toolVerificationRecord/deleteBatch",
          exportXlsUrl: "/tms/toolVerificationRecord/exportXls",

 src/views/tms/modules/baseTools/BaseToolsListRight.vue

@@ -406,22 +406,23 @@
        this.$bus.$emit('queryTreeData') //刷新左侧树
      },

      onSelectChange(selectedRowKeys) {
      onSelectChange(selectedRowKeys,selectionRows) {
        this.selectedRowKeys = selectedRowKeys;
        this.selectionRows = selectionRows;
        //通过id查询管理参数和参数数据
        getAction(this.url.queryParaByToolCode, { toolCode: this.selectedRowKeys[0],paraTypeFlag:this.paraTypeFlag}).then((res) => {
        getAction(this.url.queryParaByToolCode, { toolCode: this.selectedRowKeys[0],paraTypeFlag:this.selectionRows[0].paraTypeFlag}).then((res) => {
          if (res.success) {
            if(this.paraTypeFlag === "1"){
            if(this.selectionRows[0].paraTypeFlag === "1"){
              this.$refs.paraCommonToolList.getPara(res.result);
            }else if(this.paraTypeFlag === "2"){
            }else if(this.selectionRows[0].paraTypeFlag === "2"){
              this.$refs.paraHoleToolsList.getPara(res.result);
            }else if(this.paraTypeFlag === "3"){
            }else if(this.selectionRows[0].paraTypeFlag === "3"){
              this.$refs.paraThreadingToolList.getPara(res.result);
            }else if(this.paraTypeFlag === "4"){
            }else if(this.selectionRows[0].paraTypeFlag === "4"){
              this.$refs.paraMillToolList.getPara(res.result);
            }else if(this.paraTypeFlag === "5"){
            }else if(this.selectionRows[0].paraTypeFlag === "5"){
              this.$refs.paraTurningToolsList.getPara(res.result);
            }else if(this.paraTypeFlag === "6"){
            }else if(this.selectionRows[0].paraTypeFlag === "6"){
              this.$refs.paraBladeList.getPara(res.result);
            }
          } else {
@@ -519,7 +520,7 @@
      },
      loadData() {
        let params = this.getQueryParams();
        if (this.nodeSelected && this.nodeSelected.key !== '-1') {
        if (this.nodeSelected) {
          // åŠ è½½é€‰ä¸­èŠ‚点的子类
          params.classifyId = this.nodeSelected.key;
          this.loading = true;
@@ -537,10 +538,11 @@
        }else if(this.paraTypeFlag === '6'){
            httpUrl = this.url.paraBladeList
        }else{
          this.dataSource = [];
          this.clearPara()
          this.loading = false;
          return
          //this.dataSource = [];
          // this.clearPara()
          // this.loading = false;
          // return
          httpUrl = this.url.paraCommonToolList
        }
        getAction(httpUrl, params)
          .then((res) => {
@@ -549,7 +551,8 @@
              this.ipagination.total = res.result.total
              //默认选中第一条数据
              this.selectedRowKeys[0] = res.result.records[0].id
              this.onSelectChange(this.selectedRowKeys)
              this.selectionRows[0] = res.result.records[0]
              this.onSelectChange(this.selectedRowKeys,this.selectionRows)
            } else {
              //this.$message.warning("请选择叶子节点进行查询");
              this.ipagination.total = 0

 src/views/tms/modules/baseTools/ParaBladeList.vue

@@ -3,6 +3,9 @@
    <!-- å½“前页面业务部分 -->
    <a-card :bordered="false" :title="title" v-show="visable">
            <a-descriptions title="工具参数详情">
              <a-descriptions-item label="工具简称">{{ this.para == null || this.para.shortCalled == null ? '' : this.para.shortCalled  }}</a-descriptions-item>
              <a-descriptions-item label="集团公司编码">{{ this.para == null || this.para.groupCompanyCode == null ? '' : this.para.groupCompanyCode  }}</a-descriptions-item>
              <a-descriptions-item label="集团公司标记">{{ this.para == null || this.para.groupCompanySign == null ? '' : this.para.groupCompanySign  }}</a-descriptions-item>
              <a-descriptions-item label="刀片形状">{{ this.para == null || this.para.bladeShape == null ? '' : this.para.bladeShape  }}</a-descriptions-item>
              <a-descriptions-item label="刀片长度">{{  this.para == null || this.para.bladeLength == null ? '' : this.para.bladeLength }}</a-descriptions-item>
              <a-descriptions-item label="切削刃数">{{ this.para == null || this.para.cuttingEdgeCount == null ? '' : this.para.cuttingEdgeCount }}</a-descriptions-item>
@@ -11,7 +14,7 @@
              <a-descriptions-item label="刀尖R">{{ this.para == null || this.para.noseAngleR == null ? '' : this.para.noseAngleR }}</a-descriptions-item>
              <a-descriptions-item label="刀片材料">{{ this.para == null || this.para.toolMaterial == null ? '' : this.para.toolMaterial }}</a-descriptions-item>
              <a-descriptions-item label="零件材料">{{ this.para == null || this.para.partMaterial == null ? '' : this.para.partMaterial }}</a-descriptions-item>
              <a-descriptions-item label="是否涂层">{{ this.para == null || this.para.paintcoatFlag == null ? '' : this.para.paintcoatFlag  }}</a-descriptions-item>
              <a-descriptions-item label="是否涂层">{{ this.para == null || this.para.paintcoatFlag == null ? '' : this.para.paintcoatFlag == '1' ? '是' : '否'  }}</a-descriptions-item>
              <a-descriptions-item label="附加技术条件">{{ this.para == null || this.para.technicalConditions == null ? '' : this.para.technicalConditions }}</a-descriptions-item>
              <a-descriptions-item label="附加技术条件说明">{{ this.para == null || this.para.conditionsInfo == null ? '' : this.para.conditionsInfo }}</a-descriptions-item>
              <a-descriptions-item label="品牌">{{ this.para == null || this.para.brand == null ? '' : this.para.brand }}</a-descriptions-item>

 src/views/tms/modules/baseTools/ParaBladeModal.vue

@@ -68,6 +68,7 @@
                    :placeholder="disableSubmit ? '' : '请输入中文名称'"
                    v-model="model.chineseName"
                    :disabled="disableSubmit"
                    @change="e => chineseNameChange(e.target.value)"
                  />
                </a-form-model-item>
              </a-col>
@@ -90,6 +91,7 @@
                    :placeholder="disableSubmit ? '' : '请输入型号/图号'"
                    v-model="model.toolModel"
                    :disabled="disableSubmit"
                    @change="e => toolModelChange(e.target.value)"
                  />
                </a-form-model-item>
              </a-col>
@@ -131,17 +133,6 @@
              </a-col>
            </a-row>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="accuracyClass" label="精度等级">
              <j-dict-select-tag
                type="list"
                v-model="model.accuracyClass"
                :triggerChange="true"
                dictCode="accuracy_class"
                :placeholder="disableSubmit ? '' : '请选择精度等级'"
              />
            </a-form-model-item>
          </a-col>

          <a-col :span="6">
            <a-row>
@@ -162,7 +153,7 @@
          <a-col :span="8">
            <a-form-model-item prop="applicationType" label="工具类型">
              <j-dict-select-tag
                dict-code="equipment_category"
                dict-code="application_type"
                :placeholder="disableSubmit ? '' : '请选择工具类型'"
                v-model="model.applicationType"
                :disabled="disableSubmit"
@@ -204,15 +195,6 @@

        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="storageLocation" label="存储位置">
              <a-input
                :placeholder="disableSubmit ? '' : '请输入存储位置'"
                v-model="model.storageLocation"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="lowerInventory" label="最低库存">
              <a-input
                :placeholder="disableSubmit ? '' : '请输入最低库存'"
@@ -230,9 +212,6 @@
              />
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="auxiliaryUnitFlag" label="是否有计量辅单位">
              <a-radio-group
@@ -245,6 +224,9 @@
              </a-radio-group>
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="mainUnit" label="计量主单位">
              <a-input
@@ -263,9 +245,6 @@
              />
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="supplierId" label="厂家">
              <a-input
@@ -275,6 +254,9 @@
              />
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24"> 
          <a-col :span="8">
            <a-form-model-item prop="price" label="单价">
              <a-input
@@ -297,11 +279,41 @@

        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-model-item label="工具简称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shortCalled">
              <a-input
                v-model="model.shortCalled"
                :placeholder="disableSubmit ? '' : '请输入工具简称'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="集团公司编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupCompanyCode">
              <a-input
                v-model="model.groupCompanyCode"
                :placeholder="disableSubmit ? '' : '请输入集团公司编码'"
                :disabled="disableSubmit"
              ></a-input>
            </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>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <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"
                @change="e => bladeShapeChange(e.target.value)"
              ></a-input>
            </a-form-model-item>
          </a-col>
@@ -311,6 +323,7 @@
                v-model="model.bladeLength"
                :placeholder="disableSubmit ? '' : '请输入刀片长度'"
                :disabled="disableSubmit"
                @change="e => bladeLengthChange(e.target.value)"
              ></a-input>
            </a-form-model-item>
          </a-col>
@@ -320,6 +333,7 @@
                v-model="model.cuttingEdgeCount"
                :placeholder="disableSubmit ? '' : '请输入切削刃数'"
                :disabled="disableSubmit"
                @change="e => cuttingEdgeCountChange(e.target.value)"
              ></a-input>
            </a-form-model-item>
          </a-col>
@@ -350,6 +364,7 @@
                v-model="model.noseAngleR"
                :placeholder="disableSubmit ? '' : '请输入刀尖R'"
                :disabled="disableSubmit"
                @change="e => noseAngleRChange(e.target.value)"
              ></a-input>
            </a-form-model-item>
          </a-col>
@@ -402,8 +417,8 @@
          <a-col :span="6">
            <a-form-model-item
              label="附加技术条件说明"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              :labelCol="{span:12}"
              :wrapperCol="{span:12}"
              prop="conditionsInfo"
            >
              <a-input
@@ -530,8 +545,8 @@
          <a-col :span="6">
            <a-form-model-item
              label="最小加工内螺纹公称直径"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              :labelCol="{span:15}"
              :wrapperCol="{span:9}"
              prop="minInternalThread"
            >
              <a-input
@@ -612,12 +627,19 @@
        toolMaterial: [{ required: true, message: '请输入刀片材料' }],
        paintcoatFlag: [{ required: true, message: '请选择是否涂层' }],
        technicalConditions: [{ required: true, message: '请输入附加技术条件' }],
        shortCalled: [{ required: true, message: '请输入工具简称' }],
      },
      url: {
        add: '/tms/baseTools/add',
        edit: '/tms/baseTools/edit',
      },
      locationCodeOptions: [],
      chineseNameChange1:'',
      toolModelChange1:'',
      bladeShapeChange1:'',
      bladeLengthChange1:'',
      cuttingEdgeCountChange1:'',
      noseAngleRChange1:''
    }
  },
  created() {
@@ -637,7 +659,7 @@
      this.editable = false
      //初始化默认值
      this.model = {
        positionCode: '' 
        positionCode: ''
      };
      this.model.classifyId = nodeSelected.key
      this.model.classifyNum = nodeSelected.entity.classifyId
@@ -654,6 +676,12 @@
      this.$emit('close')
      this.visible = false
      this.$refs.form.clearValidate()
      this.chineseNameChange1 = '',
      this.toolModelChange1 = '',
      this.bladeShapeChange1 = '',
      this.bladeLengthChange1 = '',
      this.cuttingEdgeCountChange1 = '',
      this.noseAngleRChange1 = ''
    },
    positionCodeSearch() {
      let positionCode = []
@@ -727,6 +755,36 @@
        }
      })
    },
    chineseNameChange(chineseNameChange){
      this.chineseNameChange1 = chineseNameChange
      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
    },
    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
    },
    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/ParaCommonToolModal.vue

@@ -123,7 +123,7 @@
           <a-col :span="8">
                <a-form-model-item prop="applicationType"
                                   label="工具类型">
                  <j-dict-select-tag dict-code="equipment_category" :placeholder="disableSubmit?'':'请选择工具类型'"
                  <j-dict-select-tag dict-code="application_type" :placeholder="disableSubmit?'':'请选择工具类型'"
                                     v-model="model.applicationType" :disabled="disableSubmit" />
                </a-form-model-item>
              </a-col>
@@ -156,11 +156,6 @@

        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="storageLocation" label="存储位置">
              <a-input :placeholder="disableSubmit?'':'请输入存储位置'" v-model="model.storageLocation" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="lowerInventory" label="最低库存">
              <a-input :placeholder="disableSubmit?'':'请输入最低库存'" v-model="model.lowerInventory" :disabled="disableSubmit"/>
            </a-form-model-item>
@@ -170,9 +165,6 @@
              <a-input :placeholder="disableSubmit?'':'请输入最高库存'" v-model="model.highestInventory" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="auxiliaryUnitFlag" label="是否有计量辅单位">
              <a-radio-group v-model="model.auxiliaryUnitFlag" :placeholder="disableSubmit?'':'请选择是否有计量辅单位'" :disabled="disableSubmit">
@@ -181,6 +173,9 @@
              </a-radio-group>
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="mainUnit" label="计量主单位">
              <a-input :placeholder="disableSubmit?'':'请输入计量主单位'" v-model="model.mainUnit" :disabled="disableSubmit"/>
@@ -191,14 +186,14 @@
              <a-input :placeholder="disableSubmit?'':'请输入计量辅单位'" v-model="model.auxiliaryUnit" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
        </a-row>

         <a-row :gutter="24">
          <a-col :span="8">
           <a-col :span="8">
            <a-form-model-item prop="supplierId" label="厂家">
              <a-input :placeholder="disableSubmit?'':'请输入厂家'" v-model="model.supplierId" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
        </a-row>

         <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="price" label="单价">
              <a-input :placeholder="disableSubmit?'':'请输入单价'" v-model="model.price" :disabled="disableSubmit"/>

 src/views/tms/modules/baseTools/ParaHoleToolsList.vue

@@ -3,13 +3,16 @@
    <!-- å½“前页面业务部分 -->
    <a-card :bordered="false" :title="title" v-show="visable">
            <a-descriptions title="工具参数详情">
              <a-descriptions-item label="工具简称">{{ this.para == null || this.para.shortCalled == null ? '' : this.para.shortCalled  }}</a-descriptions-item>
              <a-descriptions-item label="集团公司编码">{{ this.para == null || this.para.groupCompanyCode == null ? '' : this.para.groupCompanyCode  }}</a-descriptions-item>
              <a-descriptions-item label="集团公司标记">{{ this.para == null || this.para.groupCompanySign == null ? '' : this.para.groupCompanySign  }}</a-descriptions-item>
              <a-descriptions-item label="直径">{{ this.para == null || this.para.diameter == null ? '' : this.para.diameter  }}</a-descriptions-item>
              <a-descriptions-item label="切削刃锥角">{{  this.para == null || this.para.coneAngle == null ? '' : this.para.coneAngle }}</a-descriptions-item>
              <a-descriptions-item label="切削刃长">{{ this.para == null || this.para.edgeLength == null ? '' : this.para.edgeLength }}</a-descriptions-item>
              <a-descriptions-item label="刀具总长">{{ this.para == null || this.para.totalLength == null ? '' : this.para.totalLength }}</a-descriptions-item>
              <a-descriptions-item label="刀具材料">{{ this.para == null || this.para.toolMaterial == null ? '' : this.para.toolMaterial }}</a-descriptions-item>
              <a-descriptions-item label="零件材料">{{ this.para == null || this.para.partMaterial == null ? '' : this.para.partMaterial }}</a-descriptions-item>
              <a-descriptions-item label="是否涂层">{{ this.para == null || this.para.paintcoatFlag == null ? '' : this.para.paintcoatFlag }}</a-descriptions-item>
              <a-descriptions-item label="是否涂层">{{ this.para == null || this.para.paintcoatFlag == null ? '' : this.para.paintcoatFlag == '1' ? '是' : '否' }}</a-descriptions-item>
              <a-descriptions-item label="刀具型式">{{ this.para == null || this.para.toolPattern == null ? '' : this.para.toolPattern }}</a-descriptions-item>
              <a-descriptions-item label="柄部规格">{{ this.para == null || this.para.handleSpecifications == null ? '' : this.para.handleSpecifications  }}</a-descriptions-item>
              <a-descriptions-item label="冷却方式">{{ this.para == null || this.para.coolingMethod == null ? '' : this.para.coolingMethod }}</a-descriptions-item>

 src/views/tms/modules/baseTools/ParaHoleToolsModal.vue

@@ -59,7 +59,7 @@
                  <a-col :span="24">
                    <a-form-model-item prop="chineseName"
                                      label="中文名称">
                      <a-input :placeholder="disableSubmit?'':'请输入中文名称'" v-model="model.chineseName" :disabled="disableSubmit"/>
                      <a-input :placeholder="disableSubmit?'':'请输入中文名称'" v-model="model.chineseName" :disabled="disableSubmit" @change="e => chineseNameChange(e.target.value)"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
@@ -75,7 +75,7 @@
                  <a-col :span="24">
                    <a-form-model-item prop="toolModel"
                                      label="型号/图号">
                      <a-input :placeholder="disableSubmit?'':'请输入型号/图号'" v-model="model.toolModel" :disabled="disableSubmit" />
                      <a-input :placeholder="disableSubmit?'':'请输入型号/图号'" v-model="model.toolModel" :disabled="disableSubmit" @change="e => toolModelChange(e.target.value)"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
@@ -123,7 +123,7 @@
           <a-col :span="8">
                <a-form-model-item prop="applicationType"
                                   label="工具类型">
                  <j-dict-select-tag dict-code="equipment_category" :placeholder="disableSubmit?'':'请选择工具类型'"
                  <j-dict-select-tag dict-code="application_type" :placeholder="disableSubmit?'':'请选择工具类型'"
                                     v-model="model.applicationType" :disabled="disableSubmit" />
                </a-form-model-item>
              </a-col>
@@ -156,11 +156,6 @@

        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="storageLocation" label="存储位置">
              <a-input :placeholder="disableSubmit?'':'请输入存储位置'" v-model="model.storageLocation" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="lowerInventory" label="最低库存">
              <a-input :placeholder="disableSubmit?'':'请输入最低库存'" v-model="model.lowerInventory" :disabled="disableSubmit"/>
            </a-form-model-item>
@@ -170,10 +165,7 @@
              <a-input :placeholder="disableSubmit?'':'请输入最高库存'" v-model="model.highestInventory" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="8">
           <a-col :span="8">
            <a-form-model-item prop="auxiliaryUnitFlag" label="是否有计量辅单位">
              <a-radio-group v-model="model.auxiliaryUnitFlag" :placeholder="disableSubmit?'':'请选择是否有计量辅单位'" :disabled="disableSubmit">
                <a-radio :value="'1'">是</a-radio>
@@ -181,6 +173,9 @@
              </a-radio-group>
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="mainUnit" label="计量主单位">
              <a-input :placeholder="disableSubmit?'':'请输入计量主单位'" v-model="model.mainUnit" :disabled="disableSubmit"/>
@@ -191,14 +186,14 @@
              <a-input :placeholder="disableSubmit?'':'请输入计量辅单位'" v-model="model.auxiliaryUnit" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
        </a-row>

         <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="supplierId" label="厂家">
              <a-input :placeholder="disableSubmit?'':'请输入厂家'" v-model="model.supplierId" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
        </a-row>

         <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="price" label="单价">
              <a-input :placeholder="disableSubmit?'':'请输入单价'" v-model="model.price" :disabled="disableSubmit"/>
@@ -216,8 +211,37 @@

        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-model-item label="工具简称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shortCalled">
              <a-input
                v-model="model.shortCalled"
                :placeholder="disableSubmit ? '' : '请输入工具简称'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="集团公司编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupCompanyCode">
              <a-input
                v-model="model.groupCompanyCode"
                :placeholder="disableSubmit ? '' : '请输入集团公司编码'"
                :disabled="disableSubmit"
              ></a-input>
            </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>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-model-item label="直径" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="diameter">
              <a-input v-model="model.diameter" :placeholder="disableSubmit?'':'请输入直径'"  :disabled="disableSubmit"></a-input>
              <a-input v-model="model.diameter" :placeholder="disableSubmit?'':'请输入直径'"  :disabled="disableSubmit" @change="e => diameterChange(e.target.value)"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -232,7 +256,7 @@
          </a-col>
           <a-col :span="6">
            <a-form-model-item label="刀具总长" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="totalLength">
              <a-input v-model="model.totalLength" :placeholder="disableSubmit?'':'请输入刀具总长'"  :disabled="disableSubmit"></a-input>
              <a-input v-model="model.totalLength" :placeholder="disableSubmit?'':'请输入刀具总长'"  :disabled="disableSubmit" @change="e => totalLengthChange(e.target.value)"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -279,7 +303,7 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="附加技术条件说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="conditionsInfo">
            <a-form-model-item label="附加技术条件说明" :labelCol="{span:12}" :wrapperCol="{span:12}" prop="conditionsInfo">
              <a-input v-model="model.conditionsInfo" :placeholder="disableSubmit?'':'请输入附加技术条件说明'" :disabled="disableSubmit" ></a-input>
            </a-form-model-item>
          </a-col>
@@ -330,7 +354,7 @@
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item label="适配刀片-刀头-刀杆" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fitterPart">
            <a-form-model-item label="适配刀片-刀头-刀杆" :labelCol="{span:12}" :wrapperCol="{span:12}" prop="fitterPart">
              <a-input v-model="model.fitterPart" :placeholder="disableSubmit?'':'请输入适配刀片-刀头-刀杆'" :disabled="disableSubmit" ></a-input>
            </a-form-model-item>
          </a-col>
@@ -494,7 +518,11 @@
        add: '/tms/baseTools/add',
        edit: '/tms/baseTools/edit',
      },
      locationCodeOptions:[]
      locationCodeOptions:[],
      chineseNameChange1:'',
      toolModelChange1:'',
      diameterChange1:'',
      totalLengthChange1:'',
    }
  },
  created() {
@@ -514,7 +542,7 @@
      this.editable = false;
      //初始化默认值
      this.model = {
        positionCode: '' 
        positionCode: ''
      };
      this.model.classifyId = nodeSelected.key
      this.model.classifyNum = nodeSelected.entity.classifyId
@@ -531,6 +559,10 @@
      this.$emit('close')
      this.visible = false
      this.$refs.form.clearValidate()
      this.chineseNameChange1 = '',
      this.toolModelChange1 = '',
      this.diameterChange1 = '',
      this.totalLengthChange1 = ''
    },
    positionCodeSearch() {
      let positionCode = []
@@ -604,6 +636,22 @@
        }
      })
    },
    chineseNameChange(chineseNameChange){
      this.chineseNameChange1 = chineseNameChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.diameterChange1+this.totalLengthChange1
    },
    toolModelChange(toolModelChange){
      this.toolModelChange1 = toolModelChange == '' ? '' : '-'+toolModelChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.diameterChange1+this.totalLengthChange1
    },
    diameterChange(diameterChange){
      this.diameterChange1 = diameterChange == '' ? '' : '-'+diameterChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.diameterChange1+this.totalLengthChange1
    },
    totalLengthChange(totalLengthChange){
      this.totalLengthChange1 = totalLengthChange == '' ? '' : '-'+totalLengthChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.diameterChange1+this.totalLengthChange1
    }
  }
}
</script>

 src/views/tms/modules/baseTools/ParaMillToolList.vue

@@ -3,6 +3,9 @@
    <!-- å½“前页面业务部分 -->
    <a-card :bordered="false" :title="title" v-show="visable">
            <a-descriptions title="工具参数详情">
              <a-descriptions-item label="工具简称">{{ this.para == null || this.para.shortCalled == null ? '' : this.para.shortCalled  }}</a-descriptions-item>
              <a-descriptions-item label="集团公司编码">{{ this.para == null || this.para.groupCompanyCode == null ? '' : this.para.groupCompanyCode  }}</a-descriptions-item>
              <a-descriptions-item label="集团公司标记">{{ this.para == null || this.para.groupCompanySign == null ? '' : this.para.groupCompanySign  }}</a-descriptions-item>
              <a-descriptions-item label="直径">{{ this.para == null || this.para.diameter == null ? '' : this.para.diameter  }}</a-descriptions-item>
              <a-descriptions-item label="刀尖角R">{{  this.para == null || this.para.noseAngleR == null ? '' : this.para.noseAngleR }}</a-descriptions-item>
              <a-descriptions-item label="齿数">{{ this.para == null || this.para.numberOfTeeth == null ? '' : this.para.numberOfTeeth }}</a-descriptions-item>
@@ -10,7 +13,7 @@
              <a-descriptions-item label="刀具总长">{{ this.para == null || this.para.totalLength == null ? '' : this.para.totalLength }}</a-descriptions-item>
              <a-descriptions-item label="刀具材料">{{ this.para == null || this.para.toolMaterial == null ? '' : this.para.toolMaterial }}</a-descriptions-item>
              <a-descriptions-item label="零件材料">{{ this.para == null || this.para.partMaterial == null ? '' : this.para.partMaterial }}</a-descriptions-item>
              <a-descriptions-item label="是否涂层">{{ this.para == null || this.para.paintcoatFlag == null ? '' : this.para.paintcoatFlag }}</a-descriptions-item>
              <a-descriptions-item label="是否涂层">{{ this.para == null || this.para.paintcoatFlag == null ? '' : this.para.paintcoatFlag == '1' ? '是' : '否' }}</a-descriptions-item>
              <a-descriptions-item label="刀具型式">{{ this.para == null || this.para.toolPattern == null ? '' : this.para.toolPattern }}</a-descriptions-item>
              <a-descriptions-item label="装夹规格">{{ this.para == null || this.para.clampingSpecifications == null ? '' : this.para.clampingSpecifications  }}</a-descriptions-item>
              <a-descriptions-item label="冷却方式">{{ this.para == null || this.para.coolingMethod == null ? '' : this.para.coolingMethod }}</a-descriptions-item>

 src/views/tms/modules/baseTools/ParaMillToolModal.vue

@@ -59,7 +59,7 @@
                  <a-col :span="24">
                    <a-form-model-item prop="chineseName"
                                      label="中文名称">
                      <a-input :placeholder="disableSubmit?'':'请输入中文名称'" v-model="model.chineseName" :disabled="disableSubmit"/>
                      <a-input :placeholder="disableSubmit?'':'请输入中文名称'" v-model="model.chineseName" :disabled="disableSubmit" @change="e => chineseNameChange(e.target.value)"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
@@ -75,7 +75,7 @@
                  <a-col :span="24">
                    <a-form-model-item prop="toolModel"
                                      label="型号/图号">
                      <a-input :placeholder="disableSubmit?'':'请输入型号/图号'" v-model="model.toolModel" :disabled="disableSubmit" />
                      <a-input :placeholder="disableSubmit?'':'请输入型号/图号'" v-model="model.toolModel" :disabled="disableSubmit" @change="e => toolModelChange(e.target.value)"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
@@ -123,7 +123,7 @@
           <a-col :span="8">
                <a-form-model-item prop="applicationType"
                                   label="工具类型">
                  <j-dict-select-tag dict-code="equipment_category" :placeholder="disableSubmit?'':'请选择工具类型'"
                  <j-dict-select-tag dict-code="application_type" :placeholder="disableSubmit?'':'请选择工具类型'"
                                     v-model="model.applicationType" :disabled="disableSubmit" />
                </a-form-model-item>
              </a-col>
@@ -156,11 +156,6 @@

        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="storageLocation" label="存储位置">
              <a-input :placeholder="disableSubmit?'':'请输入存储位置'" v-model="model.storageLocation" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="lowerInventory" label="最低库存">
              <a-input :placeholder="disableSubmit?'':'请输入最低库存'" v-model="model.lowerInventory" :disabled="disableSubmit"/>
            </a-form-model-item>
@@ -170,9 +165,6 @@
              <a-input :placeholder="disableSubmit?'':'请输入最高库存'" v-model="model.highestInventory" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="auxiliaryUnitFlag" label="是否有计量辅单位">
              <a-radio-group v-model="model.auxiliaryUnitFlag" :placeholder="disableSubmit?'':'请选择是否有计量辅单位'" :disabled="disableSubmit">
@@ -181,6 +173,9 @@
              </a-radio-group>
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="mainUnit" label="计量主单位">
              <a-input :placeholder="disableSubmit?'':'请输入计量主单位'" v-model="model.mainUnit" :disabled="disableSubmit"/>
@@ -191,14 +186,14 @@
              <a-input :placeholder="disableSubmit?'':'请输入计量辅单位'" v-model="model.auxiliaryUnit" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
        </a-row>

         <a-row :gutter="24">
          <a-col :span="8">
           <a-col :span="8">
            <a-form-model-item prop="supplierId" label="厂家">
              <a-input :placeholder="disableSubmit?'':'请输入厂家'" v-model="model.supplierId" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
        </a-row>

         <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="price" label="单价">
              <a-input :placeholder="disableSubmit?'':'请输入单价'" v-model="model.price" :disabled="disableSubmit"/>
@@ -216,13 +211,41 @@

        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-model-item label="工具简称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shortCalled">
              <a-input
                v-model="model.shortCalled"
                :placeholder="disableSubmit ? '' : '请输入工具简称'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="集团公司编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupCompanyCode">
              <a-input
                v-model="model.groupCompanyCode"
                :placeholder="disableSubmit ? '' : '请输入集团公司编码'"
                :disabled="disableSubmit"
              ></a-input>
            </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>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-model-item label="直径" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="diameter">
              <a-input v-model="model.diameter" :placeholder="disableSubmit?'':'请输入直径'"  :disabled="disableSubmit"></a-input>
              <a-input v-model="model.diameter" :placeholder="disableSubmit?'':'请输入直径'"  :disabled="disableSubmit" @change="e => diameterChange(e.target.value)"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="刀尖角R" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="noseAngleR">
              <a-input v-model="model.noseAngleR" :placeholder="disableSubmit?'':'请输入刀尖角R'"  :disabled="disableSubmit"></a-input>
              <a-input v-model="model.noseAngleR" :placeholder="disableSubmit?'':'请输入刀尖角R'"  :disabled="disableSubmit" @change="e => noseAngleRChange(e.target.value)"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -232,7 +255,7 @@
          </a-col>
           <a-col :span="6">
            <a-form-model-item label="刀具总长" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="totalLength">
              <a-input v-model="model.totalLength" :placeholder="disableSubmit?'':'请输入刀具总长'"  :disabled="disableSubmit"></a-input>
              <a-input v-model="model.totalLength" :placeholder="disableSubmit?'':'请输入刀具总长'"  :disabled="disableSubmit" @change="e => totalLengthChange(e.target.value)"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -283,8 +306,10 @@
              <a-input v-model="model.technicalConditions" :placeholder="disableSubmit?'':'请输入附加技术条件'" :disabled="disableSubmit" ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="附加技术条件说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="conditionsInfo">
        </a-row>
        <a-row>
          <a-col :span="24">
            <a-form-model-item label="附加技术条件说明" :labelCol="{span:3}" :wrapperCol="{span:21}" prop="conditionsInfo">
              <a-input v-model="model.conditionsInfo" :placeholder="disableSubmit?'':'请输入附加技术条件说明'" :disabled="disableSubmit" ></a-input>
            </a-form-model-item>
          </a-col>
@@ -508,7 +533,12 @@
        add: '/tms/baseTools/add',
        edit: '/tms/baseTools/edit',
      },
      locationCodeOptions:[]
      locationCodeOptions:[],
      chineseNameChange1:'',
      toolModelChange1:'',
      diameterChange1:'',
      totalLengthChange1:'',
      noseAngleRChange1:''
    }
  },
  mounted() {
@@ -528,7 +558,7 @@
      this.editable = false;
      //初始化默认值
      this.model = {
        positionCode: '' 
        positionCode: ''
      };
      this.model.classifyId = nodeSelected.key
      this.model.classifyNum = nodeSelected.entity.classifyId
@@ -545,6 +575,11 @@
      this.$emit('close')
      this.visible = false
      this.$refs.form.clearValidate()
      this.chineseNameChange1 = '',
      this.toolModelChange1 = '',
      this.diameterChange1 = '',
      this.totalLengthChange1 = '',
      this.noseAngleRChange1 = ''
    },
    positionCodeSearch() {
      let positionCode = []
@@ -618,6 +653,26 @@
        }
      })
    },
    chineseNameChange(chineseNameChange){
      this.chineseNameChange1 = chineseNameChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.diameterChange1+this.noseAngleRChange1+this.totalLengthChange1
    },
    toolModelChange(toolModelChange){
      this.toolModelChange1 = toolModelChange == '' ? '' : '-'+toolModelChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.diameterChange1+this.noseAngleRChange1+this.totalLengthChange1
    },
    diameterChange(diameterChange){
      this.diameterChange1 = diameterChange == '' ? '' : '-'+diameterChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.diameterChange1+this.noseAngleRChange1+this.totalLengthChange1
    },
    totalLengthChange(totalLengthChange){
      this.totalLengthChange1 = totalLengthChange == '' ? '' : '-'+totalLengthChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.diameterChange1+this.noseAngleRChange1+this.totalLengthChange1
    },
    noseAngleRChange(noseAngleRChange){
      this.noseAngleRChange1 = noseAngleRChange == '' ? '' : '-'+noseAngleRChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.diameterChange1+this.noseAngleRChange1+this.totalLengthChange1
    }
  }
}
</script>

 src/views/tms/modules/baseTools/ParaThreadingToolList.vue

@@ -3,6 +3,9 @@
    <!-- å½“前页面业务部分 -->
    <a-card :bordered="false" :title="title" v-show="visable">
            <a-descriptions title="工具参数详情">
              <a-descriptions-item label="工具简称">{{ this.para == null || this.para.shortCalled == null ? '' : this.para.shortCalled  }}</a-descriptions-item>
              <a-descriptions-item label="集团公司编码">{{ this.para == null || this.para.groupCompanyCode == null ? '' : this.para.groupCompanyCode  }}</a-descriptions-item>
              <a-descriptions-item label="集团公司标记">{{ this.para == null || this.para.groupCompanySign == null ? '' : this.para.groupCompanySign  }}</a-descriptions-item>
              <a-descriptions-item label="螺纹代号">{{ this.para == null || this.para.threadCode == null ? '' : this.para.threadCode  }}</a-descriptions-item>
              <a-descriptions-item label="螺距">{{  this.para == null || this.para.pitch == null ? '' : this.para.pitch }}</a-descriptions-item>
              <a-descriptions-item label="螺纹旋向">{{  this.para == null || this.para.rotationDirection == null ? '' : this.para.rotationDirection }}</a-descriptions-item>
@@ -11,7 +14,7 @@
              <a-descriptions-item label="刀具总长">{{ this.para == null || this.para.totalLength == null ? '' : this.para.totalLength }}</a-descriptions-item>
              <a-descriptions-item label="刀具材料">{{ this.para == null || this.para.toolMaterial == null ? '' : this.para.toolMaterial }}</a-descriptions-item>
              <a-descriptions-item label="零件材料">{{ this.para == null || this.para.partMaterial == null ? '' : this.para.partMaterial }}</a-descriptions-item>
              <a-descriptions-item label="是否涂层">{{ this.para == null || this.para.paintcoatFlag == null ? '' : this.para.paintcoatFlag }}</a-descriptions-item>
              <a-descriptions-item label="是否涂层">{{ this.para == null || this.para.paintcoatFlag == null ? '' : this.para.paintcoatFlag == '1' ? '是' : '否' }}</a-descriptions-item>
              <a-descriptions-item label="外型尺寸">{{ this.para == null || this.para.externalDimensions == null ? '' : this.para.externalDimensions }}</a-descriptions-item>
              <a-descriptions-item label="柄部规格">{{ this.para == null || this.para.handleSpecifications == null ? '' : this.para.handleSpecifications  }}</a-descriptions-item>
              <a-descriptions-item label="冷却方式">{{ this.para == null || this.para.coolingMethod == null ? '' : this.para.coolingMethod }}</a-descriptions-item>

 src/views/tms/modules/baseTools/ParaThreadingToolModal.vue

@@ -59,7 +59,7 @@
                  <a-col :span="24">
                    <a-form-model-item prop="chineseName"
                                      label="中文名称">
                      <a-input :placeholder="disableSubmit?'':'请输入中文名称'" v-model="model.chineseName" :disabled="disableSubmit"/>
                      <a-input :placeholder="disableSubmit?'':'请输入中文名称'" v-model="model.chineseName" :disabled="disableSubmit" @change="e => chineseNameChange(e.target.value)"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
@@ -75,7 +75,7 @@
                  <a-col :span="24">
                    <a-form-model-item prop="toolModel"
                                      label="型号/图号">
                      <a-input :placeholder="disableSubmit?'':'请输入型号/图号'" v-model="model.toolModel" :disabled="disableSubmit" />
                      <a-input :placeholder="disableSubmit?'':'请输入型号/图号'" v-model="model.toolModel" :disabled="disableSubmit" @change="e => toolModelChange(e.target.value)"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
@@ -123,7 +123,7 @@
           <a-col :span="8">
                <a-form-model-item prop="applicationType"
                                   label="工具类型">
                  <j-dict-select-tag dict-code="equipment_category" :placeholder="disableSubmit?'':'请选择工具类型'"
                  <j-dict-select-tag dict-code="application_type" :placeholder="disableSubmit?'':'请选择工具类型'"
                                     v-model="model.applicationType" :disabled="disableSubmit" />
                </a-form-model-item>
              </a-col>
@@ -156,11 +156,6 @@

        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="storageLocation" label="存储位置">
              <a-input :placeholder="disableSubmit?'':'请输入存储位置'" v-model="model.storageLocation" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="lowerInventory" label="最低库存">
              <a-input :placeholder="disableSubmit?'':'请输入最低库存'" v-model="model.lowerInventory" :disabled="disableSubmit"/>
            </a-form-model-item>
@@ -170,9 +165,6 @@
              <a-input :placeholder="disableSubmit?'':'请输入最高库存'" v-model="model.highestInventory" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="auxiliaryUnitFlag" label="是否有计量辅单位">
              <a-radio-group v-model="model.auxiliaryUnitFlag" :placeholder="disableSubmit?'':'请选择是否有计量辅单位'" :disabled="disableSubmit">
@@ -181,6 +173,9 @@
              </a-radio-group>
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="mainUnit" label="计量主单位">
              <a-input :placeholder="disableSubmit?'':'请输入计量主单位'" v-model="model.mainUnit" :disabled="disableSubmit"/>
@@ -191,14 +186,14 @@
              <a-input :placeholder="disableSubmit?'':'请输入计量辅单位'" v-model="model.auxiliaryUnit" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
        </a-row>

         <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="supplierId" label="厂家">
              <a-input :placeholder="disableSubmit?'':'请输入厂家'" v-model="model.supplierId" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
        </a-row>

         <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="price" label="单价">
              <a-input :placeholder="disableSubmit?'':'请输入单价'" v-model="model.price" :disabled="disableSubmit"/>
@@ -216,13 +211,41 @@

        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-model-item label="工具简称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shortCalled">
              <a-input
                v-model="model.shortCalled"
                :placeholder="disableSubmit ? '' : '请输入工具简称'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="集团公司编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupCompanyCode">
              <a-input
                v-model="model.groupCompanyCode"
                :placeholder="disableSubmit ? '' : '请输入集团公司编码'"
                :disabled="disableSubmit"
              ></a-input>
            </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>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-model-item label="螺纹代号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadCode">
              <a-input v-model="model.threadCode" :placeholder="disableSubmit?'':'请输入螺纹代号'"  :disabled="disableSubmit"></a-input>
              <a-input v-model="model.threadCode" :placeholder="disableSubmit?'':'请输入螺纹代号'"  :disabled="disableSubmit" @change="e => threadCodeChange(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="pitch">
              <a-input v-model="model.pitch" :placeholder="disableSubmit?'':'请输入螺距'"  :disabled="disableSubmit"></a-input>
              <a-input v-model="model.pitch" :placeholder="disableSubmit?'':'请输入螺距'"  :disabled="disableSubmit" @change="e => pitchChange(e.target.value)"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -231,7 +254,7 @@
            </a-form-model-item>
          </a-col>
           <a-col :span="6">
            <a-form-model-item label="螺纹公差带代号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tolerancezoneLevel">
            <a-form-model-item label="螺纹公差带代号" :labelCol="{span:12}" :wrapperCol="{span:12}" prop="tolerancezoneLevel">
              <a-input v-model="model.tolerancezoneLevel" :placeholder="disableSubmit?'':'请输入螺纹公差带代号'"  :disabled="disableSubmit"></a-input>
            </a-form-model-item>
          </a-col>
@@ -283,13 +306,13 @@
              <a-input v-model="model.technicalConditions" :placeholder="disableSubmit?'':'请输入附加技术条件'" :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="conditionsInfo">
            <a-form-model-item label="附加技术条件说明" :labelCol="{span:12}" :wrapperCol="{span:12}" prop="conditionsInfo">
              <a-input v-model="model.conditionsInfo" :placeholder="disableSubmit?'':'请输入附加技术条件说明'" :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="brand">
              <a-input v-model="model.brand" :placeholder="disableSubmit?'':'请输入品牌'" :disabled="disableSubmit" ></a-input>
@@ -305,13 +328,13 @@
              <a-input v-model="model.coolingMethod" :placeholder="disableSubmit?'':'请输入冷却方式'" :disabled="disableSubmit" ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
        </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>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <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>
@@ -327,13 +350,13 @@
              <a-input v-model="model.guidingSize" :placeholder="disableSubmit?'':'请输入导向尺寸'" :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="connectionAperture">
              <a-input v-model="model.connectionAperture" :placeholder="disableSubmit?'':'请输入连接孔径'" :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="connectingKeyway">
              <a-input v-model="model.connectingKeyway" :placeholder="disableSubmit?'':'请输入连接键槽'" :disabled="disableSubmit" ></a-input>
@@ -446,7 +469,11 @@
        add: '/tms/baseTools/add',
        edit: '/tms/baseTools/edit',
      },
      locationCodeOptions:[]
      locationCodeOptions:[],
      chineseNameChange1:'',
      toolModelChange1:'',
      threadCodeChange1:'',
      pitchChange1:'',
    }
  },
  created() {
@@ -466,7 +493,7 @@
      this.editable = false;
      //初始化默认值
     this.model = {
        positionCode: '' 
        positionCode: ''
      };
      this.model.classifyId = nodeSelected.key
      this.model.classifyNum = nodeSelected.entity.classifyId
@@ -483,6 +510,10 @@
      this.$emit('close')
      this.visible = false
      this.$refs.form.clearValidate()
      this.chineseNameChange1 = '',
      this.toolModelChange1 = '',
      this.threadCodeChange1 = '',
      this.pitchChange1 = ''
    },
    positionCodeSearch() {
      let positionCode = []
@@ -556,6 +587,22 @@
        }
      })
    },
    chineseNameChange(chineseNameChange){
      this.chineseNameChange1 = chineseNameChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.threadCodeChange1+this.pitchChange1
    },
    toolModelChange(toolModelChange){
      this.toolModelChange1 = toolModelChange == '' ? '' : '-'+toolModelChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.threadCodeChange1+this.pitchChange1
    },
    threadCodeChange(threadCodeChange){
      this.threadCodeChange1 = threadCodeChange == '' ? '' : '-'+threadCodeChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.threadCodeChange1+this.pitchChange1
    },
    pitchChange(pitchChange){
      this.pitchChange1 = pitchChange == '' ? '' : '-'+pitchChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.threadCodeChange1+this.pitchChange1
    }
  }
}
</script>

 src/views/tms/modules/baseTools/ParaTurningToolsList.vue

@@ -3,6 +3,9 @@
    <!-- å½“前页面业务部分 -->
    <a-card :bordered="false" :title="title" v-show="visable">
            <a-descriptions title="工具参数详情">
              <a-descriptions-item label="工具简称">{{ this.para == null || this.para.shortCalled == null ? '' : this.para.shortCalled  }}</a-descriptions-item>
              <a-descriptions-item label="集团公司编码">{{ this.para == null || this.para.groupCompanyCode == null ? '' : this.para.groupCompanyCode  }}</a-descriptions-item>
              <a-descriptions-item label="集团公司标记">{{ this.para == null || this.para.groupCompanySign == null ? '' : this.para.groupCompanySign  }}</a-descriptions-item>
              <a-descriptions-item label="刀头规格">{{ this.para == null || this.para.headSpecifications == null ? '' : this.para.headSpecifications  }}</a-descriptions-item>
              <a-descriptions-item label="配套刀片号">{{  this.para == null || this.para.matchingNumber == null ? '' : this.para.matchingNumber }}</a-descriptions-item>
              <a-descriptions-item label="主偏角">{{ this.para == null || this.para.leadAngle == null ? '' : this.para.leadAngle }}</a-descriptions-item>
@@ -11,7 +14,7 @@
              <a-descriptions-item label="刀具总长">{{ this.para == null || this.para.totalLength == null ? '' : this.para.totalLength }}</a-descriptions-item>
              <a-descriptions-item label="刀具材料">{{ this.para == null || this.para.toolMaterial == null ? '' : this.para.toolMaterial }}</a-descriptions-item>
              <a-descriptions-item label="零件材料">{{ this.para == null || this.para.partMaterial == null ? '' : this.para.partMaterial }}</a-descriptions-item>
              <a-descriptions-item label="是否涂层">{{ this.para == null || this.para.paintcoatFlag == null ? '' : this.para.paintcoatFlag }}</a-descriptions-item>
              <a-descriptions-item label="是否涂层">{{ this.para == null || this.para.paintcoatFlag == null ? '' : this.para.paintcoatFlag == '1' ? '是' : '否' }}</a-descriptions-item>
              <a-descriptions-item label="刀具型式">{{ this.para == null || this.para.toolPattern == null ? '' : this.para.toolPattern }}</a-descriptions-item>
              <a-descriptions-item label="冷却方式">{{ this.para == null || this.para.coolingMethod == null ? '' : this.para.coolingMethod }}</a-descriptions-item>
              <a-descriptions-item label="附加技术条件">{{ this.para == null || this.para.technicalConditions == null ? '' : this.para.technicalConditions }}</a-descriptions-item>

 src/views/tms/modules/baseTools/ParaTurningToolsModal.vue

@@ -59,7 +59,7 @@
                  <a-col :span="24">
                    <a-form-model-item prop="chineseName"
                                      label="中文名称">
                      <a-input :placeholder="disableSubmit?'':'请输入中文名称'" v-model="model.chineseName" :disabled="disableSubmit"/>
                      <a-input :placeholder="disableSubmit?'':'请输入中文名称'" v-model="model.chineseName" :disabled="disableSubmit" @change="e => chineseNameChange(e.target.value)"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
@@ -75,7 +75,7 @@
                  <a-col :span="24">
                    <a-form-model-item prop="toolModel"
                                      label="型号/图号">
                      <a-input :placeholder="disableSubmit?'':'请输入型号/图号'" v-model="model.toolModel" :disabled="disableSubmit" />
                      <a-input :placeholder="disableSubmit?'':'请输入型号/图号'" v-model="model.toolModel" :disabled="disableSubmit" @change="e => toolModelChange(e.target.value)"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
@@ -124,7 +124,7 @@
           <a-col :span="8">
                <a-form-model-item prop="applicationType"
                                   label="工具类型">
                  <j-dict-select-tag dict-code="equipment_category" :placeholder="disableSubmit?'':'请选择工具类型'"
                  <j-dict-select-tag dict-code="application_type" :placeholder="disableSubmit?'':'请选择工具类型'"
                                     v-model="model.applicationType" :disabled="disableSubmit" />
                </a-form-model-item>
              </a-col>
@@ -157,11 +157,6 @@

        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="storageLocation" label="存储位置">
              <a-input :placeholder="disableSubmit?'':'请输入存储位置'" v-model="model.storageLocation" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="lowerInventory" label="最低库存">
              <a-input :placeholder="disableSubmit?'':'请输入最低库存'" v-model="model.lowerInventory" :disabled="disableSubmit"/>
            </a-form-model-item>
@@ -171,9 +166,6 @@
              <a-input :placeholder="disableSubmit?'':'请输入最高库存'" v-model="model.highestInventory" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="auxiliaryUnitFlag" label="是否有计量辅单位">
              <a-radio-group v-model="model.auxiliaryUnitFlag" :placeholder="disableSubmit?'':'请选择是否有计量辅单位'" :disabled="disableSubmit">
@@ -182,6 +174,9 @@
              </a-radio-group>
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="mainUnit" label="计量主单位">
              <a-input :placeholder="disableSubmit?'':'请输入计量主单位'" v-model="model.mainUnit" :disabled="disableSubmit"/>
@@ -192,14 +187,14 @@
              <a-input :placeholder="disableSubmit?'':'请输入计量辅单位'" v-model="model.auxiliaryUnit" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
        </a-row>

         <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="supplierId" label="厂家">
              <a-input :placeholder="disableSubmit?'':'请输入厂家'" v-model="model.supplierId" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
        </a-row>

         <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="price" label="单价">
              <a-input :placeholder="disableSubmit?'':'请输入单价'" v-model="model.price" :disabled="disableSubmit"/>
@@ -214,11 +209,38 @@

        <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> å‚数信息
        </a-divider>

      <a-row :gutter="24">
          <a-col :span="6">
            <a-form-model-item label="工具简称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shortCalled">
              <a-input
                v-model="model.shortCalled"
                :placeholder="disableSubmit ? '' : '请输入工具简称'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="集团公司编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupCompanyCode">
              <a-input
                v-model="model.groupCompanyCode"
                :placeholder="disableSubmit ? '' : '请输入集团公司编码'"
                :disabled="disableSubmit"
              ></a-input>
            </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>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-model-item label="刀头规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="headSpecifications">
              <a-input v-model="model.headSpecifications" :placeholder="disableSubmit?'':'请输入刀头规格'"  :disabled="disableSubmit"></a-input>
              <a-input v-model="model.headSpecifications" :placeholder="disableSubmit?'':'请输入刀头规格'"  :disabled="disableSubmit" @change="e => headSpecificationsChange(e.target.value)"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -228,7 +250,7 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="主偏角" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leadAngle">
              <a-input v-model="model.leadAngle" :placeholder="disableSubmit?'':'请输入主偏角'"  :disabled="disableSubmit"></a-input>
              <a-input v-model="model.leadAngle" :placeholder="disableSubmit?'':'请输入主偏角'"  :disabled="disableSubmit" @change="e => leadAngleChange(e.target.value)"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -281,7 +303,7 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="附加技术条件说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="conditionsInfo">
            <a-form-model-item label="附加技术条件说明" :labelCol="{span:12}" :wrapperCol="{span:12}" prop="conditionsInfo">
              <a-input v-model="model.conditionsInfo" :placeholder="disableSubmit?'':'请输入附加技术条件说明'" :disabled="disableSubmit" ></a-input>
            </a-form-model-item>
          </a-col>
@@ -524,7 +546,11 @@
        add: '/tms/baseTools/add',
        edit: '/tms/baseTools/edit',
      },
      locationCodeOptions:[]
      locationCodeOptions:[],
      chineseNameChange1:'',
      toolModelChange1:'',
      headSpecificationsChange1:'',
      leadAngleChange1:'',
    }
  },
  mounted() {
@@ -544,7 +570,7 @@
      this.editable = false;
      //初始化默认值
      this.model = {
        positionCode: '' 
        positionCode: ''
      };
      this.model.classifyId = nodeSelected.key
      this.model.classifyNum = nodeSelected.entity.classifyId
@@ -561,6 +587,10 @@
      this.$emit('close')
      this.visible = false
      this.$refs.form.clearValidate()
      this.chineseNameChange1 = '',
      this.toolModelChange1 = '',
      this.headSpecificationsChange1 = '',
      this.leadAngleChange1 = ''
    },
    positionCodeSearch() {
      let positionCode = []
@@ -634,6 +664,22 @@
        }
      })
    },
    chineseNameChange(chineseNameChange){
      this.chineseNameChange1 = chineseNameChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.headSpecificationsChange1+this.leadAngleChange1
    },
    toolModelChange(toolModelChange){
      this.toolModelChange1 = toolModelChange == '' ? '' : '-'+toolModelChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.headSpecificationsChange1+this.leadAngleChange1
    },
    headSpecificationsChange(headSpecificationsChange){
      this.headSpecificationsChange1 = headSpecificationsChange == '' ? '' : '-'+headSpecificationsChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.headSpecificationsChange1+this.leadAngleChange1
    },
    leadAngleChange(leadAngleChange){
      this.leadAngleChange1 = leadAngleChange == '' ? '' : '-'+leadAngleChange
      this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.headSpecificationsChange1+this.leadAngleChange1
    }
  }
}
</script>

 src/views/tms/modules/baseTools/ToolsConfigPropertyList.vue

@@ -3,13 +3,12 @@
    <!-- å½“前页面业务部分 -->
    <a-card :bordered="false" :title="title" v-show="visable">
            <a-descriptions title="工具管理参数详情">
              <a-descriptions-item label="工具类型">{{ this.para == null || this.para.applicationType == null ? '' : this.para.applicationType  }}</a-descriptions-item>
              <a-descriptions-item label="工具类型">{{ this.para == null || this.para.applicationType == null ? '' : this.para.applicationType == '1' ? '通用工具' : '专用工具'  }}</a-descriptions-item>
              <a-descriptions-item label="标准级别">{{  this.para == null || this.para.standardLevel == null ? '' : this.para.standardLevel }}</a-descriptions-item>
              <a-descriptions-item label="标准号">{{ this.para == null || this.para.standardCode == null ? '' : this.para.standardCode }}</a-descriptions-item>
              <a-descriptions-item label="厂家">{{ this.para == null || this.para.supplierId == null ? '' : this.para.supplierId }}</a-descriptions-item>
              <a-descriptions-item label="仓库省份城市">{{ this.para == null || this.para.provinceCity == null ? '' : this.para.provinceCity }}</a-descriptions-item>
              <a-descriptions-item label="库位号">{{ this.para == null || this.para.positionCode == null ? '' : this.para.positionCode }}</a-descriptions-item>
              <a-descriptions-item label="存储位置">{{ this.para == null || this.para.storageLocation == null ? '' : this.para.storageLocation }}</a-descriptions-item>
              <a-descriptions-item label="计量主单位">{{ this.para == null || this.para.mainUnit == null ? '' : this.para.mainUnit }}</a-descriptions-item>
              <a-descriptions-item label="计量辅单位">{{ this.para == null || this.para.auxiliaryUnit == null ? '' : this.para.auxiliaryUnit  }}</a-descriptions-item>
              <a-descriptions-item label="单价">{{ this.para == null || this.para.price == null ? '' : this.para.price }}</a-descriptions-item>

 src/views/tms/modules/baseTools/ToolsConfigPropertyModal.vue

@@ -123,7 +123,7 @@
           <a-col :span="8">
                <a-form-model-item prop="applicationType"
                                   label="工具类型">
                  <j-dict-select-tag dict-code="equipment_category" :placeholder="disableSubmit?'':'请选择工具类型'"
                  <j-dict-select-tag dict-code="application_type" :placeholder="disableSubmit?'':'请选择工具类型'"
                                     v-model="model.applicationType" :disabled="disableSubmit" />
                </a-form-model-item>
              </a-col>
@@ -141,11 +141,6 @@

        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="storageLocation" label="存储位置">
              <a-input :placeholder="disableSubmit?'':'请输入存储位置'" v-model="model.storageLocation" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="lowerInventory" label="最低库存">
              <a-input :placeholder="disableSubmit?'':'请输入最低库存'" v-model="model.lowerInventory" :disabled="disableSubmit"/>
            </a-form-model-item>
@@ -155,9 +150,6 @@
              <a-input :placeholder="disableSubmit?'':'请输入最高库存'" v-model="model.highestInventory" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="auxiliaryUnitFlag" label="是否有计量辅单位">
              <a-radio-group v-model="model.auxiliaryUnitFlag" :placeholder="disableSubmit?'':'请选择是否有计量辅单位'" :disabled="disableSubmit">
@@ -166,6 +158,9 @@
              </a-radio-group>
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="mainUnit" label="计量主单位">
              <a-input :placeholder="disableSubmit?'':'请输入计量主单位'" v-model="model.mainUnit" :disabled="disableSubmit"/>
@@ -176,14 +171,14 @@
              <a-input :placeholder="disableSubmit?'':'请输入计量辅单位'" v-model="model.auxiliaryUnit" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
        </a-row>

         <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="supplierId" label="厂家">
              <a-input :placeholder="disableSubmit?'':'请输入厂家'" v-model="model.supplierId" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
        </a-row>

         <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="price" label="单价">
              <a-input :placeholder="disableSubmit?'':'请输入单价'" v-model="model.price" :disabled="disableSubmit"/>

 src/views/tms/modules/toolLedger/ToolLedgerListRight.vue

@@ -286,11 +286,11 @@
            align:"center",
            dataIndex: 'accuracyClass'
          },
          {
            title:'存储位置',
            align:"center",
            dataIndex: 'storageLocation'
          },
          // {
          //   title:'存储位置',
          //   align:"center",
          //   dataIndex: 'storageLocation'
          // },
          {
            title:'库位号',
            align:"center",

 src/views/tms/modules/toolsClassify/ToolsClassifyForm.vue

@@ -161,12 +161,16 @@
        this.leafFlagShow = false
        if(record.leafFlag == "1"){
          this.paraTypeFlagShow = true
        }else{
          this.validatorRules.paraTypeFlag[0].required = false
          this.paraTypeFlagShow = false
        }
      },
      submitForm () {
        const that = this;
        // è§¦å‘表单验证
        this.$refs.form.validate(valid => {
          console.log("111111",valid)
          if (valid) {
            that.confirmLoading = true;
            let httpurl = '';

 src/views/tms/modules/toolsClassify/ToolsClassifyListLeft.vue

@@ -3,7 +3,6 @@
    :loading="cardLoading"
    :bordered="false"
    title="工具分类"
    style="height: 100%;"
  >
    <a-spin :spinning="loading">
      <a-alert
@@ -20,7 +19,7 @@
          >取消</a>
        </div>
      </a-alert>
      <div class="drawer-bootom-button">
      <!-- <div class="drawer-bootom-button">
        <a-dropdown
          :trigger="['click']"
          placement="bottomCenter"
@@ -43,7 +42,7 @@
            <a-icon type="bars" />
          </a-button>
        </a-dropdown>
      </div>
      </div> -->

      <a-input-search
        @search="handleSearch"
@@ -55,13 +54,12 @@
      />

      <!-- showLine -->
      <div style="flex: 1;overflow:auto;margin-top: 10px;max-height: 500px; min-height: 500px">
      <a-tree
        :checkStrictly="checkStrictly"
        :expandedKeys.sync="expandedKeys"
        :selectedKeys="selectedKeys"
        :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
        :treeData="treeDataSource"
        :autoExpandParent="autoExpandParent"
        :defaultExpandAll="true"
        @select="onSelect"
        @expand="onExpand"
      >
@@ -89,6 +87,7 @@
      
        </template>
      </a-tree>
       </div>
    </a-spin>
  </a-card>
</template>

 src/views/tms/modules/verification/JSelectTools.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,207 @@
<template>
  <a-modal :title="title" :width="1000" :visible="visible" :maskClosable="false" @ok="handleOk" @cancel="handleCancel"
           cancelText="关闭">
    <a-card :bordered="false">
      <!-- æŸ¥è¯¢åŒºåŸŸ -->
      <div class="table-page-search-wrapper">
        <a-form layout="inline" @keyup.enter.native="searchQuery">
          <a-row :gutter="24">
            <a-col :md="7" :sm="7">
              <a-form-item label="唯一编号">
                <a-input placeholder="请输入唯一编号检索" v-model="queryParam.onlyCode"></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="3" :sm="3">
              <a-space>
                <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
                <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
              </a-space>
            </a-col>
          </a-row>
        </a-form>
      </div>

      <!-- table区域-begin -->
      <div>
        <a-table ref="table" size="middle" bordered rowKey="id" :scroll="{  y: 300 }" :columns="columns"
                 :dataSource="dataSource" :pagination="ipagination" :loading="loading"
                 :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}"
                 @change="handleTableChange">
        </a-table>
      </div>
      <!-- table区域-end -->
    </a-card>
  </a-modal>
</template>

<script>
import JDictSelectTag from '@/components/dict/JDictSelectTag'
import { getAction } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JInput from '@/components/jeecg/JInput'
import JEllipsis from '@/components/jeecg/JEllipsis'
import Tooltip from 'ant-design-vue/es/tooltip'
import JDate from '@/components/jeecg/JDate'
import { filterObj } from '@/utils/util'

export default {
  name: 'JSelectTools',
  mixins: [JeecgListMixin],
  components: {
    JDictSelectTag,
    JEllipsis,
    JInput,
    Tooltip,
    JDate
  },
  props: {
    status: {
      type: Number,
      default: 1
    }
  },
  data() {
    return {
      disableSubmit:false,
      title: '',
      visible: false,
      disableMixinCreated: true,
      queryParam: {},
      columns: [
        {
          title: '唯一编号',
          align: 'center',
          dataIndex: 'onlyCode'
        },
        {
          title: '量具编码',
          align: 'center',
          dataIndex: 'toolCode'
        },
        {
          title: '量具名称',
          align: 'center',
          dataIndex: 'toolName'
        },
        {
          title: '型号/图号',
          align: 'center',
          dataIndex: 'toolModel'
        },
      ],
      url: {
        list: '/tms/baseTools/verificationToolsList'
      }

    }
  },
  created() {

  },
  methods: {
    showModals() {
      this.selectedRowKeys = []
      this.visible = true
      this.loadData(1)
    },
    getQueryParams() {
      //获取查询条件
      let sqp = {}
      if (this.superQueryParams) {
        sqp['superQueryParams'] = encodeURI(this.superQueryParams)
        sqp['superQueryMatchType'] = this.superQueryMatchType
      }
      var param = Object.assign(sqp, this.queryParam)
      // param.field = this.getQueryField();
      param.pageNo = this.ipagination.current
      param.pageSize = this.ipagination.pageSize
      return filterObj(param)
    },
    loadData(arg) {
      if (!this.url.list) {
        this.$message.error('请设置url.list属性!')
        return
      }
      //加载数据 è‹¥ä¼ å…¥å‚æ•°1则加载第一页的内容
      if (arg === 1) {
        this.ipagination.current = 1
      }
      var params = this.getQueryParams()//查询条件

      if (!params) {
        return false
      }

      this.loading = true
      getAction(this.url.list, params).then((res) => {
        if (res.success) {

          this.dataSource = res.result.records || res.result
          if (res.result.total) {
            this.ipagination.total = res.result.total
          } else {
            this.ipagination.total = 0
          }

        } else {
          // this.$message.warning(res.message)
          this.$notification.warning({
            message: '消息',
            description: res.message
          })
        }
      }).finally(() => {
        this.loading = false
      })
    },
    getQueryField() {
      //TODO å­—段权限控制
      // var str = "";
      // this.columns.forEach(function (value) {
      //   str +=  value.dataIndex +"," ;
      // });
      // return str;
    },
    modalFormOk(val) {
      // æ–°å¢ž/修改 æˆåŠŸæ—¶ï¼Œé‡è½½åˆ—表
      this.loadData()
      this.selectedRowKeys = [val.id]
    },
    searchQuery() {
      this.loadData()
      this.onClearSelected()
    },
    searchReset() {
      this.queryParam = {}
      this.loadData()
      this.onClearSelected()
    },
    close() {
      this.$emit('close')
      this.visible = false
    },
    handleCancel() {
      this.close()
    },
    handleOk() {
      this.$emit('sendSelectionRows', this.selectionRows[0])
      this.close()
    },
  }
}
</script>
<style>
@import '~@assets/less/common.less';

.frozenRowClass {
  color: #c9c9c9;
}

.success {
  color: green;
}

.error {
  color: red;
}
</style>

 src/views/tms/modules/verification/ToolVerificationRecordForm.vue

ÎļþÒÑɾ³ý

 src/views/tms/modules/verification/ToolVerificationRecordModal.vue

@@ -1,60 +1,212 @@
<template>
  <j-modal
    :title="title"
    :width="width"
    :visible="visible"
    :width="1200"
    :confirmLoading="confirmLoading"
    switchFullscreen
    centered
    :visible="visible"
    :mask-closable="false"
    @ok="handleOk"
    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
    @cancel="handleCancel"
    cancelText="关闭">
    <tool-verification-record-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></tool-verification-record-form>



    <a-spin :spinning="spinning">
      <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item prop="onlyCode" :labelCol="labelCol" :wrapperCol="wrapperCol" label="唯一编码">
              <a-input-search v-model="model.onlyCode" placeholder="请选择唯一编码" :disabled="disableSubmit"
                              @search="selectTools" enter-button
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item prop="toolCode" :labelCol="labelCol" :wrapperCol="wrapperCol" label="量具编号">
              <a-input placeholder="选择唯一编码后自动带出" v-model="model.toolCode" :disabled="true" />
            </a-form-model-item>
          </a-col>

        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item prop="paramaTableName" :labelCol="labelCol" :wrapperCol="wrapperCol" label="量具名称">
              <a-input placeholder="选择唯一编码后自动带出" v-model="model.toolName"
                       :disabled="true" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input placeholder="选择唯一编码后自动带出" v-model="model.toolModel"
                       :disabled="true" />
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item prop="personResponsible" :labelCol="labelCol" :wrapperCol="wrapperCol" label="责任人">
              <j-dict-select-tag type="list" v-model="model.personResponsible" dictCode="sys_user,realname,id"
                                 placeholder="请选择责任人" :disabled="disableSubmit" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="检定报告日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="verificationReportDate">
              <j-date placeholder="请选择检定报告日期" date-format="YYYY-MM-DD" v-model="model.verificationReportDate"
                      style="width: 100%" :disabled="disableSubmit" />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-model-item label="计量号" :labelCol="{span:3}" :wrapperCol="{span:19}">
              <a-input placeholder="请填写计量号" v-model="model.measureNumber" :disabled="disableSubmit" />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-model-item label="检定结果及建议" :labelCol="{span:3}" :wrapperCol="{span:19}" prop="result">
              <a-textarea placeholder="请填写检定结果及建议" v-model="model.result"
                          :disabled="disableSubmit" />
            </a-form-model-item>
          </a-col>
        </a-row>
      </a-form-model>
    </a-spin>
    <template slot="footer">
      <a-button :style="{ marginRight: '8px' }" @click="handleCancel()">
        å…³é—­
      </a-button>

      <a-button @click="handleOk()" :disabled="disableSubmit" type="primary" :loading="confirmLoading">确定</a-button>
    </template>
    <j-select-tools ref="toolListModel"  @sendSelectionRows="getRows"></j-select-tools>


  </j-modal>
</template>

<script>

  import ToolVerificationRecordForm from './ToolVerificationRecordForm'
  export default {
    name: 'ToolVerificationRecordModal',
    components: {
      ToolVerificationRecordForm
    },
    data () {
      return {
        title:'',
        width:800,
        visible: false,
        disableSubmit: false
      }
    },
    methods: {
      add () {
        this.visible=true
        this.$nextTick(()=>{
          this.$refs.realForm.add();
        })
import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
import JSelectTools from './JSelectTools'
import { requestPut, postAction, httpAction } from '@/api/manage'
export default {
  name: 'ToolVerificationRecordModal',
  mixins: [JVxeTableModelMixin],
  components: {
    JSelectTools
  },
  data() {
    return {
      title: '操作',
      visible: false,
      model: {},
      labelCol: {
        xs: { span: 24 },
        sm: { span: 6 }
      },
      edit (record) {
        this.visible=true
        this.$nextTick(()=>{
          this.$refs.realForm.edit(record);
        })
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 15 }
      },
      close () {
        this.$emit('close');
        this.visible = false;
      confirmLoading: false,
      spinning: false,
      disabled: false,
      disableSubmit: false,
      validatorRules: {
        onlyCode: [
          { required: true, message: '请选择唯一编码!' }
        ]
      },
      handleOk () {
        this.$refs.realForm.submitForm();
      },
      submitCallback(){
        this.$emit('ok');
        this.visible = false;
      },
      handleCancel () {
        this.close()
      lastSelectionData: null,
      url: {
        add: '/tms/toolVerificationRecord/add',
        edit: '/tms/toolVerificationRecord/edit'
      }
    }
  },
  created() {
  },

  methods: {
    getRows(item) {
      console.log(item)
      if (item.id) {
        this.$set(this.model, 'onlyCode', item.onlyCode)
        this.$set(this.model, 'toolCode', item.toolCode)
        this.$set(this.model, 'toolName', item.toolName)
        this.$set(this.model, 'toolModel', item.toolModel)
      }
    },

    selectTools: function() {
      this.$refs.toolListModel.showModals()
      this.$refs.toolListModel.title = '选择量具信息'
      this.$refs.toolListModel.disableSubmit = false
    },

    add() {
      this.edit({})
    },
    edit(record) {
      let that = this
      that.visible = true
      that.model = Object.assign({}, record)
    },

    close() {
      this.$emit('close')
      this.visible = false
    },
    handleOk() {
      const that = this
      // è§¦å‘表单验证
      this.$refs.form.validate(valid => {
        if (valid) {
          let formData = Object.assign(this.model)
          that.confirmLoading = true
          let httpurl = ''
          let method = ''
          if (!this.model.id) {
            httpurl += this.url.add
            method = 'post'
          } else {
            httpurl += this.url.edit
            method = 'put'
          }
          httpAction(httpurl, this.model, method,formData).then((res) => {
            if (res.success) {
              that.$message.success(res.message)
              that.$emit('ok')
            } else {
              that.$message.warning(res.message)
            }
          }).finally(() => {
            that.confirmLoading = false
            that.close()
          })
        } else {
          return false
        }
      })
    },

    handleCancel() {
      this.close()
    },


  }
</script>
}
</script>

<style lang="less" scoped>

</style>