From 57067e7107abc6d7b921ca9ba1dc46b4b4107c95 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 30 十月 2026 16:50:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/business/productOrder/components/addOrder.vue | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/views/business/productOrder/components/addOrder.vue b/src/views/business/productOrder/components/addOrder.vue
index 17cd750..aeae70a 100644
--- a/src/views/business/productOrder/components/addOrder.vue
+++ b/src/views/business/productOrder/components/addOrder.vue
@@ -136,7 +136,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="閫佹牱鏃ユ湡" prop="sampleDate">
- <el-date-picker v-model="addObj.sampleDate" type="date" value-format="YYYY-MM-DD" :disabled="active>1"
+ <el-date-picker v-model="addObj.sampleDate" type="date" value-format="YYYY-MM-DD" placeholder="璇烽�夋嫨鏈閫佹牱鏃ユ湡" :disabled="active>1"
size="small"/>
</el-form-item>
</el-col>
@@ -1671,6 +1671,11 @@
}
},
saveMethod(sampleList) {
+ if (!this.addObj.sampleDate && !this.isEdit) {
+ this.$refs.newJuOrder?.validateField('sampleDate')
+ this.$message.warning('璇烽�夋嫨鏈閫佹牱鏃ユ湡')
+ return
+ }
if (this.addObj.standardTreeId) {
this.saveData([]);
return;
@@ -1705,6 +1710,11 @@
}
},
saveData(sampleList) {
+ if (!this.addObj.sampleDate && !this.isEdit) {
+ this.$refs.newJuOrder?.validateField('sampleDate')
+ this.$message.warning('璇烽�夋嫨鏈閫佹牱鏃ユ湡')
+ return
+ }
this.saveLoad = true
const insOrder = {
...this.addObj,
@@ -2185,14 +2195,17 @@
},
// 鏌ヨ妯℃澘
selectInsOrderTemplateById(e) {
+ const loadVersion = ++this.orderLoadVersion
selectInsOrderTemplateById({id: e}).then(res => {
+ if (loadVersion !== this.orderLoadVersion || this.template !== e) return
const detail = res.data || {}
let obj = JSON.parse(detail.thing)
//鍒跺崟浜鸿缃负褰撳墠鐧诲綍鐢ㄦ埛
let user = this.nickName
obj.addObj.custom = user.name
obj.addObj.userId = user.userId
- this.addObj = obj.addObj;
+ this.addObj = {...obj.addObj, sampleDate: null};
+ this.$nextTick(() => this.$refs.newJuOrder?.clearValidate('sampleDate'))
this.sampleList = obj.sampleList;
this.selectTree = obj.selectTree
// backend already resolved the bound record templates by standard
--
Gitblit v1.9.3