From 1c1000a93a88b5af5eabbf410aa264b0911dbee4 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期二, 29 七月 2025 14:18:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/tms/modules/outBound/OutboundOrderSelectList.vue | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/views/tms/modules/outBound/OutboundOrderSelectList.vue b/src/views/tms/modules/outBound/OutboundOrderSelectList.vue
index 00e1f3e..4358e5e 100644
--- a/src/views/tms/modules/outBound/OutboundOrderSelectList.vue
+++ b/src/views/tms/modules/outBound/OutboundOrderSelectList.vue
@@ -171,7 +171,7 @@
],
url: {
list: "/tms/outboundOrder/list",
- outbound: "/tms/outboundOrder/outBound",
+ outbound: "/tms/outboundOrder/outBoundByApply",
delete: "/tms/outboundOrder/delete",
submit: "/tms/outboundOrder/submit",
deleteBatch: "/tms/outboundOrder/deleteBatch",
@@ -252,11 +252,31 @@
this.$message.warning("璇烽�夋嫨鏄庣粏鍚庡啀鍑哄簱锛�")
return
}
+ // 鍏堥獙璇佹墍鏈夐�変腑椤�
+ const validationErrors = [];
+ for (let i = 0; i < this.selectionRows.length; i++) {
+ const item = this.selectionRows[i];
+ // 妫�鏌ュ繀濉瓧娈�
+ if (item.accuracyClass === '1') { // 鍙湁鍦ㄤ笉绂佺敤鐘舵�佷笅鎵嶉渶瑕佹牎楠屽繀濉�
+ if (this.$refs.outboundDetailSelectList.isFieldEmpty(item.ratedLife)) {
+ validationErrors.push(`鏄庣粏绗�${i+1}琛岋細棰濆畾瀵垮懡涓哄繀濉」`);
+ }
+ if (this.$refs.outboundDetailSelectList.isFieldEmpty(item.useLife)) {
+ validationErrors.push(`鏄庣粏绗�${i+1}琛岋細浣跨敤瀵垮懡涓哄繀濉」`);
+ }
+ }
+ }
+ if (validationErrors.length > 0) {
+ this.$message.error(validationErrors.join('锛�'));
+ return;
+ }
const params = this.selectionRows.map((item) => {
return {
outBoundOrderId: this.selectedMainId,
outboundDetailId: item.id,
- outboundQuantity: item.outboundQuantity
+ outboundQuantity: item.outboundQuantity,
+ ratedLife:item.ratedLife,
+ useLife:item.useLife
}
})
postAction(this.url.outbound, params).then(res=>{
@@ -292,7 +312,7 @@
}
this.onClearSelected()
this.queryParam.orderStatus = '3'
- this.queryParam.outStatus = '1'
+ this.queryParam.outStatus = ['1','2'].join(',')
var params = this.getQueryParams();//鏌ヨ鏉′欢
this.loading = true;
getAction(this.url.list, params).then((res) => {
--
Gitblit v1.9.3