From 91678e5bf6c81ab5da30e8c2cb713b6e57ee229f Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 13 六月 2025 15:48:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/tms/stocktakingBound/modules/ToolsStocktakingBoundModal.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/views/tms/stocktakingBound/modules/ToolsStocktakingBoundModal.vue b/src/views/tms/stocktakingBound/modules/ToolsStocktakingBoundModal.vue
index d0d4230..c07bfe8 100644
--- a/src/views/tms/stocktakingBound/modules/ToolsStocktakingBoundModal.vue
+++ b/src/views/tms/stocktakingBound/modules/ToolsStocktakingBoundModal.vue
@@ -169,14 +169,14 @@
},
{
title: '鍒�鍏风紪鍙�',
- dataIndex: 'toolCode',
+ dataIndex: 'toolId',
align: 'center',
- width: 150
+ width: 180
},
{
title: '宸ュ叿绫诲瀷',
- dataIndex: 'applicationType',
+ dataIndex: 'applicationType_dictText',
align: 'center',
width: 150
},
@@ -327,11 +327,12 @@
this.$bus.$on('selectionRows', (data) => {
for (let i = 0; i < data.length; i++) {
this.dataSource.push({
- toolId: data[i].id,
+ toolId: data[i].toolId,
toolCode: data[i].toolCode,
classifyId: data[i].classifyId,
- applicationType: data[i].applicationType_dictText,
+ applicationType_dictText: data[i].applicationType_dictText,
chineseName: data[i].chineseName,
+ availableQuantity:data[i].availableCount,
toolModel: data[i].toolModel,
material: data[i].material,
toolMaterial: data[i].toolMaterial,
--
Gitblit v1.9.3