Merge remote-tracking branch 'origin/master'

zhaowei

2025-06-03 e27722cc75b3090ed3eca54fc5651fa636b40453

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

@@ -78,43 +78,37 @@
        {
          title: '工具编码',
          align: 'center',
          dataIndex: 'toolingNum',
          dataIndex: 'toolCode',
          sorter: true,
        },
        {
          title: '工具编号',
          align: 'center',
          dataIndex: 'toolNum',
          sorter: true,
        },
        {
          title: '工具名称',
          align: 'center',
          dataIndex: 'toolingName',
          dataIndex: 'toolName',
          sorter: true,
        },
         {
          title: '唯一编码',
          title: '工具类型',
          align: 'center',
          dataIndex: 'onlyCode',
          dataIndex: 'applicationTypeName',
          sorter: true,
        },
        {
          title: '入库数量',
          title: '型号/图号',
          align: 'center',
          dataIndex: 'inStorageQuantity',
          dataIndex: 'toolModel',
          sorter: true,
        },
        {
          title: '工具分类',
         {
          title: '数量',
          align: 'center',
          dataIndex: 'toolingCategoryName',
          sorter: true,
        },
        {
          title: '规格型号',
          align: 'center',
          dataIndex: 'model',
          sorter: true,
        },
        {
          title: '单位',
          align: 'center',
          dataIndex: 'unitName',
          dataIndex: 'quantity',
          sorter: true,
        },
      ],
@@ -135,16 +129,12 @@
        showSizeChanger: true,
        total: 0,
      },
      isorter: {
        column: 'num',
        order: 'desc',
      },
      departTree: [],
      visible: false,
      loading: false,
      url: {
        // list: '/base/tooling/list',
         list: '/tms/baseTools/list',
         list: '/tms/toolLedgerDetail/list',
         queryKnifeBom:'/toolingStorage/mesToolingOutbounds/queryKnifeBom'
      },
    }
@@ -176,6 +166,7 @@
      let that = this
      this.loading = true
      let params = this.getQueryParams() //查询条件
     params["status"] = "2"
      await getAction(this.url.list, params).then((res) => {
        if (res.success) {
          for (let i = 0; i < res.result.records.length; i++) {
@@ -200,7 +191,7 @@
      this.loadData(1)
    },
    getQueryParams() {
      let param = Object.assign({}, this.queryParam, this.isorter)
      let param = Object.assign({}, this.queryParam)
      param.field = this.getQueryField()
      param.pageNo = this.ipagination.current
      param.pageSize = this.ipagination.pageSize
@@ -228,34 +219,17 @@
    },
    handleTableChange(pagination, filters, sorter) {
      //TODO 筛选
      if (Object.keys(sorter).length > 0) {
        this.isorter.column = sorter.field
        this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc'
      }
      // if (Object.keys(sorter).length > 0) {
      //   this.isorter.column = sorter.field
      //   this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc'
      // }
      this.ipagination = pagination
      this.loadData()
    },
    handleSubmit() {
      if (this.selectionRows.length > 0) {
         let params = this.getQueryParams() //查询条件
          params['onlyCode'] = this.selectionRows[0].onlyCode;
        getAction(this.url.queryKnifeBom, params).then((res) => {
        if (res.success) {
          this.prepareKnifeDetailList = res.result
          this.$bus.$emit('selectionRows', this.prepareKnifeDetailList)
        }
         
        if (res.code === 510) {
          this.$message.warning(res.message)
        }
        this.loading = false
        
      })
        this.searchReset(0)
        this.close()
      } else {
        this.$message.warning('请选择一条数据')
      }
      this.$bus.$emit('selectionRows', this.selectionRows)
      this.searchReset(0)
      this.close()
    },
    onSelectChange(selectionRows) {
      this.selectionRows = selectionRows