50e679f417b1052433964801e4630a8f81c6d711..4051b45c8b7da3c87bdd2051249d0db38e2a605a
2025-08-21 lyh
修改名称展示
4051b4 对比 | 目录
2025-08-21 hyingbo
dnc样式调整
296852 对比 | 目录
2025-08-21 cuijian
工具信息、工具台账、出入库申请增加参数查询
55abd3 对比 | 目录
已重命名1个文件
已修改16个文件
328 ■■■■ 文件已修改
src/views/dashboard/TodoList.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dashboard/dncIndex/DncManagerSignage.vue 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flowable/workflow/FlowCompleted.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/BaseToolsListRight.vue 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaBladeModal.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaBladeSearchModal.vue 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaHoleToolsModal.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaHoleToolsSearchModal.vue 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaMillToolModal.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaMillToolSearchModal.vue 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaThreadingToolModal.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaTurningToolsModal.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/ParaTurningToolsSearchModal.vue 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/inboundOrder/JSelectToolingModal.vue 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/outBound/JSelectBorrowOutboundToolModal.vue 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/toolLedger/ToolLedgerListRight.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dashboard/TodoList.vue
ÎļþÃû´Ó src/views/dashboard/dncIndex/TodoList.vue ÐÞ¸Ä
@@ -617,13 +617,16 @@
}
.todo-title {
  flex: 1;
  margin-right: 15px;
  margin-right: 100px;
  font-size: 14px;
}
.todo-info {
  display: flex;
  flex-direction: column;
  align-items: flex-end;
  min-width: 120px;
  font-size: 12px;
}
.todo-node {
  margin-bottom: 5px;
src/views/dashboard/dncIndex/DncManagerSignage.vue
@@ -2,13 +2,16 @@
  <div class="home-container">
    <div class="left-card">
      <div class="card">
        <h2 class="card-title">我的待办</h2>
        <div class="card-header">
          <h2 class="card-title">我的待办</h2>
          <h2 class="more-btn" @click = "gotoTodoList">更多</h2>
        </div>
        <div class="card-content">
          <!-- åµŒå…¥FlowTodo组件并设置默认分类 -->
          <!-- åµŒå…¥todoList组件并设置默认分类 -->
          <todo-list
            ref="flowTodo"
            ref="todoList"
            class="embedded-flow-todo"
            :defaultCategories="['drApproval','ggApproval','programConfirmApproval']"
            :defaultCategories="['drApproval','ggApproval','programConfirmApproval','ncFileSettingProcessApproval']"
          ></todo-list>
        </div>
      </div>
@@ -32,9 +35,7 @@
</template>
<script>
import signageApi from '@api/signage'
import moment from 'moment'
import TodoList from '@views/dashboard/dncIndex/TodoList.vue'
import TodoList from '@views/dashboard/TodoList.vue'
export default {
  name: 'DncManagerSignage',
@@ -46,15 +47,16 @@
    }
  },
  mounted() {
    // ç¡®ä¿ç»„件加载后使用默认分类查询数据
    this.$nextTick(() => {
      if (this.$refs.flowTodo) {
        this.$refs.flowTodo.loadData(1)
      if (this.$refs.todoList) {
        this.$refs.todoList.loadData(1)
      }
    })
  },
  methods: {
    gotoTodoList() {
      this.$router.push('/flowable/workflow/FlowTodo')
    }
  }
}
</script>
@@ -66,10 +68,10 @@
.home-container {
  display: flex;
  min-height: 100vh;
  padding: 20px;
  padding: 5px;
  box-sizing: border-box;
  gap: 20px;
  background-color: #f5f7fa;
  gap: 16px;
  background-color: #f0f2f7;
}
.left-card {
@@ -82,7 +84,7 @@
  min-width: 0;
  display: flex;
  flex-direction: column;
  gap: 20px;
  gap: 16px;
}
.card {
@@ -94,8 +96,26 @@
  display: flex;
  flex-direction: column;
  overflow: hidden;
  justify-content: flex-start;
}
/* åœ¨åŽŸæœ‰æ ·å¼åŸºç¡€ä¸Šæ·»åŠ  */
.card-header {
  display: flex;
  justify-content: space-between;
  /* åž‚直居中对齐 */
  align-items: center;
  /* å¯ä»¥æ ¹æ®éœ€è¦è®¾ç½®é«˜åº¦ï¼Œè¿™é‡Œå‡è®¾è®¾ç½®ä¸º 40px,也可根据实际情况调整 */
  height: 40px;
}
.more-btn {
  margin: 0;
  color: #00bfff;
  font-size: 14px;
  border: none;
  cursor: pointer;
}
.top-card {
  flex: 1;
}
@@ -105,12 +125,11 @@
}
.card-title {
  margin: 0 0 15px 0;
  color: #333;
  font-size: 18px;
  margin: 0;
  padding-bottom: 0;
  color: #000000;
  font-size: 16px;
  font-weight: 600;
  padding-bottom: 10px;
  border-bottom: 1px solid #eee;
}
.card-content {
@@ -128,7 +147,7 @@
  }
  .left-card {
    margin-bottom: 20px;
    margin-bottom: 16px;
  }
}
</style>
src/views/flowable/workflow/FlowCompleted.vue
@@ -279,7 +279,7 @@
        {
          title: '流程发起人名称',
          align: 'center',
          dataIndex: 'startUserName',
          dataIndex: 'proposer_dictText',
          width: 250
        },
        {
src/views/tms/modules/baseTools/BaseToolsListRight.vue
@@ -525,27 +525,27 @@
    },
    //编辑
    handleEdit(record) {
      if (record.paramaTableName === '1') {
      if (record.paraTypeFlag === '1') {
        this.$refs.paraCommonToolModal.edit(record)
        this.$refs.paraCommonToolModal.title = '编辑'
        this.$refs.paraCommonToolModal.disableSubmit = false
      } else if (record.paramaTableName === '2') {
      } else if (record.paraTypeFlag === '2') {
        this.$refs.paraHoleToolsModal.edit(record)
        this.$refs.paraHoleToolsModal.title = '编辑'
        this.$refs.paraHoleToolsModal.disableSubmit = false
      } else if (record.paramaTableName === '3') {
      } else if (record.paraTypeFlag === '3') {
        this.$refs.paraThreadingToolModal.edit(record)
        this.$refs.paraThreadingToolModal.title = '编辑'
        this.$refs.paraThreadingToolModal.disableSubmit = false
      } else if (record.paramaTableName === '4') {
      } else if (record.paraTypeFlag === '4') {
        this.$refs.paraMillToolModal.edit(record)
        this.$refs.paraMillToolModal.title = '编辑'
        this.$refs.paraMillToolModal.disableSubmit = false
      } else if (record.paramaTableName === '5') {
      } else if (record.paraTypeFlag === '5') {
        this.$refs.paraTurningToolsModal.edit(record)
        this.$refs.paraTurningToolsModal.title = '编辑'
        this.$refs.paraTurningToolsModal.disableSubmit = false
      } else if (record.paramaTableName === '6') {
      } else if (record.paraTypeFlag === '6') {
        this.$refs.paraBladeModal.edit(record)
        this.$refs.paraBladeModal.title = '编辑'
        this.$refs.paraBladeModal.disableSubmit = false
@@ -553,27 +553,27 @@
    },
    //详情
    handleDetail: function (record) {
      if (record.paramaTableName === '1') {
      if (record.paraTypeFlag === '1') {
        this.$refs.paraCommonToolModal.edit(record)
        this.$refs.paraCommonToolModal.title = '详情'
        this.$refs.paraCommonToolModal.disableSubmit = true
      } else if (record.paramaTableName === '2') {
      } else if (record.paraTypeFlag === '2') {
        this.$refs.paraHoleToolsModal.edit(record)
        this.$refs.paraHoleToolsModal.title = '详情'
        this.$refs.paraHoleToolsModal.disableSubmit = true
      } else if (record.paramaTableName === '3') {
      } else if (record.paraTypeFlag === '3') {
        this.$refs.paraThreadingToolModal.edit(record)
        this.$refs.paraThreadingToolModal.title = '详情'
        this.$refs.paraThreadingToolModal.disableSubmit = true
      } else if (record.paramaTableName === '4') {
      } else if (record.paraTypeFlag === '4') {
        this.$refs.paraMillToolModal.edit(record)
        this.$refs.paraMillToolModal.title = '详情'
        this.$refs.paraMillToolModal.disableSubmit = true
      } else if (record.paramaTableName === '5') {
      } else if (record.paraTypeFlag === '5') {
        this.$refs.paraTurningToolsModal.edit(record)
        this.$refs.paraTurningToolsModal.title = '详情'
        this.$refs.paraTurningToolsModal.disableSubmit = true
      } else if (record.paramaTableName === '6') {
      } else if (record.paraTypeFlag === '6') {
        this.$refs.paraBladeModal.edit(record)
        this.$refs.paraBladeModal.title = '详情'
        this.$refs.paraBladeModal.disableSubmit = true
@@ -727,6 +727,8 @@
      this.queryParam.technicalConditions = data.technicalConditions
      this.queryParam.conditionsInfo = data.conditionsInfo
      this.queryParam.toolModel = data.toolModel
      this.queryParam.shortCalled = data.shortCalled
      this.queryParam.groupCompanyCode = data.groupCompanyCode
      this.loadData()
    },
    paraBladeOk(data) {
@@ -746,6 +748,8 @@
      this.queryParam.technicalConditions = data.technicalConditions
      this.queryParam.conditionsInfo = data.conditionsInfo
      this.queryParam.toolModel = data.toolModel
      this.queryParam.shortCalled = data.shortCalled
      this.queryParam.groupCompanyCode = data.groupCompanyCode
      this.loadData()
    },
    paraThreadingToolOk(data) {
@@ -765,6 +769,8 @@
      this.queryParam.technicalConditions = data.technicalConditions
      this.queryParam.conditionsInfo = data.conditionsInfo
      this.queryParam.toolModel = data.toolModel
      this.queryParam.shortCalled = data.shortCalled
      this.queryParam.groupCompanyCode = data.groupCompanyCode
      this.loadData()
    },
    paraMillToolOk(data) {
@@ -786,6 +792,8 @@
      this.queryParam.technicalConditions = data.technicalConditions
      this.queryParam.conditionsInfo = data.conditionsInfo
      this.queryParam.toolModel = data.toolModel
      this.queryParam.shortCalled = data.shortCalled
      this.queryParam.groupCompanyCode = data.groupCompanyCode
      this.loadData()
    },
    paraTurningToolsOk(data) {
@@ -807,6 +815,8 @@
      this.queryParam.technicalConditions = data.technicalConditions
      this.queryParam.conditionsInfo = data.conditionsInfo
      this.queryParam.toolModel = data.toolModel
      this.queryParam.shortCalled = data.shortCalled
      this.queryParam.groupCompanyCode = data.groupCompanyCode
      this.loadData()
    },
  },
src/views/tms/modules/baseTools/ParaBladeModal.vue
@@ -632,6 +632,7 @@
      url: {
        add: '/tms/baseTools/add',
        edit: '/tms/baseTools/edit',
        queryParaByToolCode: '/tms/baseTools/queryByToolCode',
      },
      locationCodeOptions: [],
      chineseNameChange1:'',
@@ -670,6 +671,15 @@
    edit(record) {
      this.editable = true
      this.model = Object.assign({}, record)
      //通过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() {
src/views/tms/modules/baseTools/ParaBladeSearchModal.vue
@@ -31,6 +31,24 @@
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item prop="shortCalled" label="工具简称">
              <a-input
                :placeholder="'请输入工具简称'"
                v-model="model.shortCalled"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item prop="groupCompanyCode" label="集团公司编码">
              <a-input
                :placeholder="'请输入集团公司编码'"
                v-model="model.groupCompanyCode"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item prop="standardLevel" label="标准级别">
              <a-input
                :placeholder="'请输入标准级别'"
@@ -189,7 +207,7 @@
  name: 'ParaHoleToolsSearchModal',
  data() {
    return {
      title: '工具信息-高级搜索',
      title: '工具信息-高级查询',
      visible: false,
      confirmLoading: false,
      model: {},
@@ -238,6 +256,8 @@
      this.searchParams.technicalConditions = this.model.technicalConditions
      this.searchParams.conditionsInfo = this.model.conditionsInfo
      this.searchParams.toolModel = this.model.toolModel
      this.searchParams.shortCalled = this.model.shortCalled
      this.searchParams.groupCompanyCode = this.model.groupCompanyCode
      this.close()
      this.$emit('searchParams',this.searchParams)
    },
src/views/tms/modules/baseTools/ParaHoleToolsModal.vue
@@ -529,6 +529,7 @@
      url: {
        add: '/tms/baseTools/add',
        edit: '/tms/baseTools/edit',
        queryParaByToolCode: '/tms/baseTools/queryByToolCode',
      },
      locationCodeOptions:[],
      chineseNameChange1:'',
@@ -565,6 +566,15 @@
    edit(record) {
      this.editable = true;
      this.model = Object.assign({}, record)
      //通过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() {
src/views/tms/modules/baseTools/ParaHoleToolsSearchModal.vue
@@ -29,6 +29,24 @@
            </a-form-model-item>
          </a-col>
        </a-row>
         <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item prop="shortCalled" label="工具简称">
              <a-input
                :placeholder="'请输入工具简称'"
                v-model="model.shortCalled"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item prop="groupCompanyCode" label="集团公司编码">
              <a-input
                :placeholder="'请输入集团公司编码'"
                v-model="model.groupCompanyCode"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item prop="standardLevel" label="标准级别">
@@ -207,7 +225,7 @@
  name: 'ParaHoleToolsSearchModal',
  data() {
    return {
      title: '工具信息-高级搜索',
      title: '工具信息-高级查询',
      visible: false,
      confirmLoading: false,
      model: {},
@@ -258,6 +276,8 @@
      this.searchParams.technicalConditions = this.model.technicalConditions
      this.searchParams.conditionsInfo = this.model.conditionsInfo
      this.searchParams.toolModel = this.model.toolModel
      this.searchParams.shortCalled = this.model.shortCalled
      this.searchParams.groupCompanyCode = this.model.groupCompanyCode
      this.close()
      this.$emit('searchParams',this.searchParams)
    },
src/views/tms/modules/baseTools/ParaMillToolModal.vue
@@ -532,6 +532,7 @@
      url: {
        add: '/tms/baseTools/add',
        edit: '/tms/baseTools/edit',
        queryParaByToolCode: '/tms/baseTools/queryByToolCode',
      },
      locationCodeOptions:[],
      chineseNameChange1:'',
@@ -569,6 +570,15 @@
    edit(record) {
      this.editable = true;
      this.model = Object.assign({}, record)
      //通过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() {
src/views/tms/modules/baseTools/ParaMillToolSearchModal.vue
@@ -31,6 +31,24 @@
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item prop="shortCalled" label="工具简称">
              <a-input
                :placeholder="'请输入工具简称'"
                v-model="model.shortCalled"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item prop="groupCompanyCode" label="集团公司编码">
              <a-input
                :placeholder="'请输入集团公司编码'"
                v-model="model.groupCompanyCode"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item prop="standardLevel" label="标准级别">
              <a-input
                :placeholder="'请输入标准级别'"
@@ -207,7 +225,7 @@
  name: 'ParaHoleToolsSearchModal',
  data() {
    return {
      title: '工具信息-高级搜索',
      title: '工具信息-高级查询',
      visible: false,
      confirmLoading: false,
      model: {},
@@ -258,6 +276,8 @@
      this.searchParams.technicalConditions = this.model.technicalConditions
      this.searchParams.conditionsInfo = this.model.conditionsInfo
      this.searchParams.toolModel = this.model.toolModel
      this.searchParams.shortCalled = this.model.shortCalled
      this.searchParams.groupCompanyCode = this.model.groupCompanyCode
      this.close()
      this.$emit('searchParams',this.searchParams)
    },
src/views/tms/modules/baseTools/ParaThreadingToolModal.vue
@@ -468,6 +468,7 @@
      url: {
        add: '/tms/baseTools/add',
        edit: '/tms/baseTools/edit',
        queryParaByToolCode: '/tms/baseTools/queryByToolCode',
      },
      locationCodeOptions:[],
      chineseNameChange1:'',
@@ -504,6 +505,15 @@
    edit(record) {
      this.editable = true;
      this.model = Object.assign({}, record)
       //通过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() {
src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue
@@ -25,6 +25,24 @@
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item prop="shortCalled" label="工具简称">
              <a-input
                :placeholder="'请输入工具简称'"
                v-model="model.shortCalled"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item prop="groupCompanyCode" label="集团公司编码">
              <a-input
                :placeholder="'请输入集团公司编码'"
                v-model="model.groupCompanyCode"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item prop="standardLevel" label="标准级别">
              <a-input :placeholder="'请输入标准级别'" v-model="model.standardLevel" />
            </a-form-model-item>
@@ -157,7 +175,7 @@
  name: 'ParaHoleToolsSearchModal',
  data() {
    return {
      title: '工具信息-高级搜索',
      title: '工具信息-高级查询',
      visible: false,
      confirmLoading: false,
      model: {},
@@ -203,6 +221,8 @@
      this.searchParams.technicalConditions = this.model.technicalConditions
      this.searchParams.conditionsInfo = this.model.conditionsInfo
      this.searchParams.toolModel = this.model.toolModel
      this.searchParams.shortCalled = this.model.shortCalled
      this.searchParams.groupCompanyCode = this.model.groupCompanyCode
      this.close()
      this.$emit('searchParams', this.searchParams)
    },
src/views/tms/modules/baseTools/ParaTurningToolsModal.vue
@@ -545,6 +545,7 @@
      url: {
        add: '/tms/baseTools/add',
        edit: '/tms/baseTools/edit',
        queryParaByToolCode: '/tms/baseTools/queryByToolCode',
      },
      locationCodeOptions:[],
      chineseNameChange1:'',
@@ -581,6 +582,15 @@
    edit(record) {
      this.editable = true;
      this.model = Object.assign({}, record)
       //通过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() {
src/views/tms/modules/baseTools/ParaTurningToolsSearchModal.vue
@@ -31,6 +31,24 @@
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item prop="shortCalled" label="工具简称">
              <a-input
                :placeholder="'请输入工具简称'"
                v-model="model.shortCalled"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item prop="groupCompanyCode" label="集团公司编码">
              <a-input
                :placeholder="'请输入集团公司编码'"
                v-model="model.groupCompanyCode"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item prop="standardLevel" label="标准级别">
              <a-input
                :placeholder="'请输入标准级别'"
@@ -207,7 +225,7 @@
  name: 'ParaHoleToolsSearchModal',
  data() {
    return {
      title: '工具信息-高级搜索',
      title: '工具信息-高级查询',
      visible: false,
      confirmLoading: false,
      model: {},
@@ -258,6 +276,8 @@
      this.searchParams.technicalConditions = this.model.technicalConditions
      this.searchParams.conditionsInfo = this.model.conditionsInfo
      this.searchParams.toolModel = this.model.toolModel
      this.searchParams.shortCalled = this.model.shortCalled
      this.searchParams.groupCompanyCode = this.model.groupCompanyCode
      this.close()
      this.$emit('searchParams',this.searchParams)
    },
src/views/tms/modules/inboundOrder/JSelectToolingModal.vue
@@ -20,13 +20,13 @@
              </a-form-item>
            </a-col>
            <a-col :xl="6" :lg="7" :md="8" :sm="24">
              <a-form-item label="中文名称">
                <a-input placeholder="请输入中文名称,支持模糊查询" v-model="queryParam.chineseName"></a-input>
              <a-form-item label="标记">
                <a-input placeholder="请输入标记,支持模糊查询" v-model="queryParam.groupCompanySign"></a-input>
              </a-form-item>
            </a-col>
            <a-col :xl="6" :lg="7" :md="8" :sm="24">
              <a-form-item label="型号/图号">
                <a-input placeholder="请输入规格型号,支持模糊查询" v-model="queryParam.toolModel"></a-input>
              <a-form-item label="工具简称">
                <a-input placeholder="请输入工具简称" v-model="queryParam.shortCalled"></a-input>
              </a-form-item>
            </a-col>
@@ -90,6 +90,16 @@
          dataIndex: 'chineseName',
        },
        {
          title: '工具简称',
          align: 'center',
          dataIndex: 'shortCalled',
        },
        {
          title: '标记',
          align: 'center',
          dataIndex: 'groupCompanySign',
        },
        {
          title: '库位号',
          align: 'center',
          dataIndex: 'positionCode',
@@ -132,7 +142,7 @@
      loading: false,
      url: {
        // list: '/base/tooling/list',
         list: '/tms/baseTools/paraCommonToolList',
         list: '/tms/baseTools/selectToolList',
      },
    }
  },
src/views/tms/modules/outBound/JSelectBorrowOutboundToolModal.vue
@@ -19,6 +19,16 @@
                <a-input placeholder="请输入工具编码,支持模糊查询" v-model="queryParam.toolCode"></a-input>
              </a-form-item>
            </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
              <a-form-item label="标记">
                <a-input placeholder="请输入标记,支持模糊查询" v-model="queryParam.groupCompanySign"></a-input>
              </a-form-item>
            </a-col>
            <a-col :xl="6" :lg="7" :md="8" :sm="24">
              <a-form-item label="工具简称">
                <a-input placeholder="请输入工具简称" v-model="queryParam.shortCalled"></a-input>
              </a-form-item>
            </a-col>
            <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-row>
@@ -74,15 +84,31 @@
          dataIndex: 'toolId'
        },
        {
          title:'可用库存数量',
          title:'型号/图号',
          align:"center",
          dataIndex: 'quantity'
          dataIndex: 'toolModel'
        },
        {
          title:'所在仓库',
          title:'工具简称',
          align:"center",
          dataIndex: 'warehouseName'
          dataIndex: 'shortCalled'
        },
        {
          title:'标记',
          align:"center",
          dataIndex: 'groupCompanySign'
        },
        // {
        //   title:'可用库存数量',
        //   align:"center",
        //   dataIndex: 'quantity'
        // },
        // {
        //   title:'所在仓库',
        //   align:"center",
        //   dataIndex: 'warehouseName'
        // },
        {
          title:'所在库位号',
          align:"center",
@@ -127,7 +153,7 @@
      loading: false,
      prepareKnifeDetailList:[],
      url: {
        list: '/tms/outboundOrder/selectBorrowOutboundToolPageList'
        list: '/tms/outboundOrder/selectBorrowToolPageList'
      },
    }
  },
src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
@@ -615,6 +615,8 @@
      this.queryParam.technicalConditions = data.technicalConditions
      this.queryParam.conditionsInfo = data.conditionsInfo
      this.queryParam.toolModel = data.toolModel
      this.queryParam.shortCalled = data.shortCalled
      this.queryParam.groupCompanyCode = data.groupCompanyCode
      this.loadData(1)
    },
    paraBladeOk(data) {
@@ -634,6 +636,8 @@
      this.queryParam.technicalConditions = data.technicalConditions
      this.queryParam.conditionsInfo = data.conditionsInfo
      this.queryParam.toolModel = data.toolModel
      this.queryParam.shortCalled = data.shortCalled
      this.queryParam.groupCompanyCode = data.groupCompanyCode
      this.loadData(1)
    },
    paraThreadingToolOk(data) {
@@ -653,6 +657,8 @@
      this.queryParam.technicalConditions = data.technicalConditions
      this.queryParam.conditionsInfo = data.conditionsInfo
      this.queryParam.toolModel = data.toolModel
      this.queryParam.shortCalled = data.shortCalled
      this.queryParam.groupCompanyCode = data.groupCompanyCode
      this.loadData(1)
    },
    paraMillToolOk(data) {
@@ -674,6 +680,8 @@
      this.queryParam.technicalConditions = data.technicalConditions
      this.queryParam.conditionsInfo = data.conditionsInfo
      this.queryParam.toolModel = data.toolModel
      this.queryParam.shortCalled = data.shortCalled
      this.queryParam.groupCompanyCode = data.groupCompanyCode
      this.loadData(1)
    },
    paraTurningToolsOk(data) {
@@ -695,6 +703,8 @@
      this.queryParam.technicalConditions = data.technicalConditions
      this.queryParam.conditionsInfo = data.conditionsInfo
      this.queryParam.toolModel = data.toolModel
      this.queryParam.shortCalled = data.shortCalled
      this.queryParam.groupCompanyCode = data.groupCompanyCode
      this.loadData(1)
    },
    },