Merge remote-tracking branch 'origin/master'

cuilei

2025-06-13 1e653db94c24389cc7615fd4a7ef1d63b00af534

 src/views/tms/requirement/modules/ToolsModal.vue

@@ -70,18 +70,18 @@
      columns: [{
        title: '工具编码',
        align: 'center',
        dataIndex: 'toolCode'
        dataIndex: 'toolId'
      },
        {
          title: '工具类型',
          align: 'center',
          dataIndex: 'applicationType_dictText'
        },
        {
          title: '工具编号',
          align: 'center',
          dataIndex: 'toolId'
        },
        // {
        //   title: '工具编号',
        //   align: 'center',
        //   dataIndex: 'toolId'
        // },
        {
          title: '中文名称',
          align: 'center',
@@ -90,7 +90,7 @@
        {
          title: '工具参数标识',
          align: 'center',
          dataIndex: 'paramaTableName'
          dataIndex: 'paramaTableName_dictText'
        },
        {
          title: '型号/图号',
@@ -198,7 +198,7 @@
      this.close()
    },
    handleOk() {
      this.$bus.$emit('selectionRows', this.selectionRows)
      this.$emit('sendSelectionRows', this.selectionRows[0])
      this.close()
    },
  }