From e14ed882d12df3b48e59390eba364442cdff70bd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 28 五月 2025 15:46:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/tms/modules/outBound/OutboundOrderModal.vue | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/views/tms/modules/outBound/OutboundOrderModal.vue b/src/views/tms/modules/outBound/OutboundOrderModal.vue
index ec09ece..e098380 100644
--- a/src/views/tms/modules/outBound/OutboundOrderModal.vue
+++ b/src/views/tms/modules/outBound/OutboundOrderModal.vue
@@ -54,7 +54,7 @@
</a-col>
<a-col :span="12">
<a-form-model-item v-if="addShow" label="瀹℃牳鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="auditDate">
- <j-date placeholder="璇烽�夋嫨瀹℃牳鏃堕棿" v-model="model.auditDate" style="width: 100%" disabled/>
+ <j-date placeholder="璇烽�夋嫨瀹℃牳鏃堕棿" :show-time="true" dateFormat="YYYY-MM-DD HH:mm" v-model="model.auditDate" style="width: 100%" disabled/>
</a-form-model-item>
</a-col>
</a-row>
@@ -218,10 +218,16 @@
confirmLoading: false,
validatorRules: {
outStorehouseType: [
- { required: true, message: '璇疯緭鍏ュ嚭搴撶被鍨�!'},
+ { required: true, message: '璇烽�夋嫨鍑哄簱绫诲瀷!'},
],
subjectMatter: [
{ required: true, message: '璇疯緭鍏ラ鐢ㄤ簨鐢�!'},
+ ],
+ reviewer: [
+ { required: true, message: '璇烽�夋嫨瀹℃牳浜�!'},
+ ],
+ outboundTime: [
+ { required: true, message: '璇烽�夋嫨鍑哄簱鏃堕棿!'},
],
},
url: {
@@ -299,7 +305,7 @@
if (this.title === '缂栬緫') {
ids = this.dataSource.map(item => item.toolLedgerDetailId).join(',')
}
- this.$refs.selectOutBoundToolModal.showModal(ids)
+ this.$refs.selectOutBoundToolModal.showOrderModal(ids)
},
add () {
this.addShow = false
@@ -349,6 +355,10 @@
// 瑙﹀彂琛ㄥ崟楠岃瘉
this.$refs.form.validate(valid => {
if (valid) {
+ if (this.dataSource == null || this.dataSource.length === 0) {
+ this.$message.warning('璇烽�夋嫨鍑哄簱宸ュ叿!');
+ return
+ }
this.model.outboundDetailList = this.dataSource
that.confirmLoading = true;
let httpurl = '';
--
Gitblit v1.9.3