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/OutboundOrderModal.vue | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/views/tms/modules/outBound/OutboundOrderModal.vue b/src/views/tms/modules/outBound/OutboundOrderModal.vue
index 0562028..8171597 100644
--- a/src/views/tms/modules/outBound/OutboundOrderModal.vue
+++ b/src/views/tms/modules/outBound/OutboundOrderModal.vue
@@ -142,7 +142,22 @@
<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.quantity > 1"
+ :value="text"
+ @change="(e) => handleChange(e, record.key, col, index)"
+ :min="1"
+ />
+ <a-input-number
+ v-if="col.dataIndex === 'useLife'"
+ :disabled="record.quantity > 1"
:value="text"
@change="(e) => handleChange(e, record.key, col, index)"
:min="1"
@@ -254,6 +269,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",
@@ -307,7 +334,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
--
Gitblit v1.9.3