From bf4cb4fdbd57f1785cdd1ddeadfb20a835d5fb6f Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 05 六月 2025 15:18:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/tms/modules/inboundOrder/JSelectReturnListModal.vue | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/views/tms/modules/inboundOrder/JSelectReturnListModal.vue b/src/views/tms/modules/inboundOrder/JSelectReturnListModal.vue
index 56cbcf2..fc45e74 100644
--- a/src/views/tms/modules/inboundOrder/JSelectReturnListModal.vue
+++ b/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
--
Gitblit v1.9.3