From 1b8b8bafca4fe4c3556bda5e66e3ff6252bd7acc Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 16 六月 2025 14:27:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/tms/modules/outBound/OutboundModal.vue | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/src/views/tms/modules/outBound/OutboundModal.vue b/src/views/tms/modules/outBound/OutboundModal.vue
index a0e748a..8312da4 100644
--- a/src/views/tms/modules/outBound/OutboundModal.vue
+++ b/src/views/tms/modules/outBound/OutboundModal.vue
@@ -51,7 +51,21 @@
<div :key="col.dataIndex">
<a-input-number
v-if="col.dataIndex === 'outboundQuantity'"
- :disabled="record.quantity <= 1"
+ :disabled="record.accuracyClass === '1'"
+ :value="text"
+ @change="(e) => handleChange(e, record.key, col, index)"
+ :min="1"
+ />
+ <a-input-number
+ v-if="col.dataIndex === 'ratedLife'"
+ :disabled="record.accuracyClass != '1'"
+ :value="text"
+ @change="(e) => handleChange(e, record.key, col, index)"
+ :min="1"
+ />
+ <a-input-number
+ v-if="col.dataIndex === 'useLife'"
+ :disabled="record.accuracyClass != '1'"
:value="text"
@change="(e) => handleChange(e, record.key, col, index)"
:min="1"
@@ -162,6 +176,18 @@
align:"center",
dataIndex: 'outboundLocation'
},
+ {
+ title:'棰濆畾瀵垮懡',
+ align:"center",
+ dataIndex: 'ratedLife',
+ scopedSlots: { customRender: 'ratedLife' },
+ },
+ {
+ title:'浣跨敤瀵垮懡',
+ align:"center",
+ dataIndex: 'useLife',
+ scopedSlots: { customRender: 'useLife' },
+ },
// {
// title:'鍑哄簱鐘舵��;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚',
// align:"center",
@@ -208,7 +234,8 @@
outboundQuantity: data[i].quantity,
storageLocation: data[i].warehouseId,
warehouseName: data[i].warehouseName,
- outboundLocation: data[i].positionCode
+ outboundLocation: data[i].positionCode,
+ accuracyClass:data[i].accuracyClass
})
}
this.ipagination.total = this.dataSource.length
@@ -302,7 +329,9 @@
toolId: item.toolId,
outboundQuantity: item.outboundQuantity,
outStorehouseType: this.model.outStorehouseType,
- storageLocation: item.storageLocation
+ storageLocation: item.storageLocation,
+ ratedLife:item.ratedLife,
+ useLife:item.useLife
}
})
this.confirmLoading = true;
--
Gitblit v1.9.3