Merge remote-tracking branch 'origin/master'

lyh

2025-06-05 bf4cb4fdbd57f1785cdd1ddeadfb20a835d5fb6f

 src/views/tms/modules/inboundOrder/JSelectReturnListModal.vue

@@ -60,7 +60,11 @@
export default {
  name: 'JSelectToolingModal',
  components: {},
  props: {},
  props: {
    classifyId:{
        type:String
      }
  },
  data() {
    return {
      queryParam: {},
@@ -84,16 +88,16 @@
        {
          title: '工具编号',
          align: 'center',
          dataIndex: 'toolNum',
          dataIndex: 'onlyCode',
          sorter: true,
        },
        {
          title: '工具名称',
          align: 'center',
          dataIndex: 'toolName',
          dataIndex: 'chineseName',
          sorter: true,
        },
         {
        {
          title: '工具类型',
          align: 'center',
          dataIndex: 'applicationTypeName',
@@ -134,9 +138,10 @@
      loading: false,
      url: {
        // list: '/base/tooling/list',
         list: '/tms/toolLedgerDetail/list',
         list: '/tms/toolLedgerDetail/queryLendTool',
         queryKnifeBom:'/toolingStorage/mesToolingOutbounds/queryKnifeBom'
      },
      classifyId:''
    }
  },
  computed: {
@@ -166,11 +171,12 @@
      let that = this
      this.loading = true
      let params = this.getQueryParams() //查询条件
     params["status"] = "2"
      params.status = "2"
      params.classifyId = this.classifyId
      await getAction(this.url.list, params).then((res) => {
        if (res.success) {
          for (let i = 0; i < res.result.records.length; i++) {
            if (that.oldSlelectRows.indexOf(res.result.records[i].toolingId) > -1) {
            if (that.oldSlelectRows.indexOf(res.result.records[i].id) > -1) {
              res.result.records[i].distable = true
            } else {
              res.result.records[i].distable = false