From c587a53af67c0cb7e0f4cfb215106ff1066733b5 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Tue, 21 Jan 2025 16:50:36 +0800
Subject: [PATCH] =?UTF-8?q?2025.01.20=20=E7=BB=A9=E6=95=88&=E9=80=81?=
=?UTF-8?q?=E8=B4=A7=E8=AE=A1=E5=88=92=20=E7=AC=AC=E4=BA=8C=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../externalSupplierDeliverySchedule.vue | 32 ++--
.../supplierDeliverySchedule.vue | 137 ++++++++++--------
2 files changed, 94 insertions(+), 75 deletions(-)
diff --git a/src/views/modules/deliverySchedule/externalSupplierDeliverySchedule.vue b/src/views/modules/deliverySchedule/externalSupplierDeliverySchedule.vue
index f05cdf6..e9c2d3c 100644
--- a/src/views/modules/deliverySchedule/externalSupplierDeliverySchedule.vue
+++ b/src/views/modules/deliverySchedule/externalSupplierDeliverySchedule.vue
@@ -28,13 +28,6 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -59,15 +68,6 @@
-
-
-
- 供应商编码
-
-
-
-
-
diff --git a/src/views/modules/deliverySchedule/supplierDeliverySchedule.vue b/src/views/modules/deliverySchedule/supplierDeliverySchedule.vue
index dc2c76d..94ddfb8 100644
--- a/src/views/modules/deliverySchedule/supplierDeliverySchedule.vue
+++ b/src/views/modules/deliverySchedule/supplierDeliverySchedule.vue
@@ -74,6 +74,13 @@
+
+
+
+
+
+
+
查询
自动预留
@@ -166,8 +173,8 @@
-
-
+
+
@@ -311,6 +318,60 @@ export default {
deliveryQty: '',
},
columnList: [
+ {
+ userId: this.$store.state.user.name,
+ functionId: 109001,
+ serialNumber: '109001TablePendingQty',
+ tableId: "109001Table",
+ tableName: "供应商送货计划表",
+ columnWidth: 120,
+ columnProp: 'pendingQty',
+ headerAlign: 'center',
+ align: "right",
+ columnLabel: '待发货数量',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 109001,
+ serialNumber: '109001TableDelNotifyQty',
+ tableId: "109001Table",
+ tableName: "供应商送货计划表",
+ columnWidth: 120,
+ columnProp: 'delNotifyQty',
+ headerAlign: 'center',
+ align: "right",
+ columnLabel: '已发货数量',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 109001,
+ serialNumber: '109001TableDeliveryQty',
+ tableId: "109001Table",
+ tableName: "供应商送货计划表",
+ columnWidth: 120,
+ columnProp: 'deliveryQty',
+ headerAlign: 'center',
+ align: "right",
+ columnLabel: '此次送货数量',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ },
{
userId: this.$store.state.user.name,
functionId: 109001,
@@ -545,60 +606,6 @@ export default {
status: true,
fixed: '',
},
- {
- userId: this.$store.state.user.name,
- functionId: 109001,
- serialNumber: '109001TablePendingQty',
- tableId: "109001Table",
- tableName: "供应商送货计划表",
- columnWidth: 120,
- columnProp: 'pendingQty',
- headerAlign: 'center',
- align: "right",
- columnLabel: '待发货数量',
- columnHidden: false,
- columnImage: false,
- columnSortable: false,
- sortLv: 0,
- status: true,
- fixed: '',
- },
- {
- userId: this.$store.state.user.name,
- functionId: 109001,
- serialNumber: '109001TableDelNotifyQty',
- tableId: "109001Table",
- tableName: "供应商送货计划表",
- columnWidth: 120,
- columnProp: 'delNotifyQty',
- headerAlign: 'center',
- align: "right",
- columnLabel: '已发货数量',
- columnHidden: false,
- columnImage: false,
- columnSortable: false,
- sortLv: 0,
- status: true,
- fixed: '',
- },
- {
- userId: this.$store.state.user.name,
- functionId: 109001,
- serialNumber: '109001TableDeliveryQty',
- tableId: "109001Table",
- tableName: "供应商送货计划表",
- columnWidth: 120,
- columnProp: 'deliveryQty',
- headerAlign: 'center',
- align: "right",
- columnLabel: '此次送货数量',
- columnHidden: false,
- columnImage: false,
- columnSortable: false,
- sortLv: 0,
- status: true,
- fixed: '',
- },
{
userId: this.$store.state.user.name,
functionId: 109001,
@@ -656,13 +663,13 @@ export default {
],
rules: {
wantedDelDate: [
- { required: true, message: '要求送货日期不能为空', trigger: 'blur' }
+ { required: true, message: '要求送货日期不能为空', trigger: ['blur','change'] }
],
delPoint: [
- { required: true, message: '送货地点不能为空', trigger: 'blur' }
+ { required: true, message: '送货地点不能为空', trigger: ['blur','change'] }
],
allotmentQty: [
- { required: true, message: '此次分配的送货数量不能为空', trigger: 'blur' }
+ { required: true, message: ' ', trigger: ['blur','change'] }
],
},
pageIndex: 1,
@@ -860,6 +867,18 @@ export default {
allotmentQty : this.autoReservationData.allotmentQty,
autoReservationDataList : this.dataList
}
+ if (inData.allotmentQty === '' || inData.allotmentQty == null){
+ this.$message.error('总订单数量不能为空')
+ return
+ }
+ if (inData.allotmentQty <= 0){
+ this.$message.error('总订单数量不能小于等于0')
+ return
+ }
+ if (inData.autoReservationDataList.length === 0){
+ this.$message.error('没有订单数据无法自动预留，请检查查询条件是否正确！')
+ return
+ }
autoReservationInitiateHandler(inData).then(({data}) => {
if (data.code === 0) {
this.getDataList()