From 23d9b34d5364e8bb389ee4cee2412054e8a54409 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 08 七月 2024 13:44:54 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b1-ins-order/add.vue | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 38d8c5f..1af6f2a 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -834,6 +834,7 @@
</div>
</div>
<span slot="footer" class="dialog-footer">
+ <el-button @click="cleanSpliceData">鍙栨秷</el-button>
<el-button type="primary" @click="spliceData">淇濆瓨</el-button>
</span>
</el-dialog>
@@ -1170,17 +1171,33 @@
console.log('tell---', tell)
this.circulateShow = false
},
+ cleanSpliceData () {
+ this.circulateForm.entrustNum = null
+ this.circulateForm.entrustTime = null
+ this.circulateForm.entrustPoint = null
+ this.opticalProjectList = []
+ this.$refs.multipleTable.clearSelection()
+ this.temperatureData = []
+ this.circulateShow = false
+ },
beforeCirculateShowClose () {
- if (!this.circulateForm.entrustNum || !this.circulateForm.entrustTime || !this.circulateForm.entrustPoint || this.opticalProjectList.length === 0 || this.temperatureData.length === 0) {
- this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
- return
- }
- let temperaturePoint1 = JSON.parse(JSON.stringify(this.temperatureData))
- temperaturePoint1.forEach(t => {
- if (!t.temperaturePoint || !t.askSymbol || !t.askNum) {
- throw this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
+ if (!this.circulateForm.entrustNum || !this.circulateForm.entrustTime || !this.circulateForm.entrustPoint || this.opticalProjectList.length === 0 || this.temperatureData.length === 0) {
+ this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
+ return
}
- })
+ // 鎷兼帴瑕佹眰鍊糰sk
+ const opticalProjectList = JSON.parse(JSON.stringify(this.opticalProjectList))
+ opticalProjectList.forEach(o => {
+ o.temperatureData.forEach(t => {
+ if (!t.temperaturePoint || !t.askSymbol || !t.askNum) {
+ throw this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
+ }
+ })
+ if (!o.temperatureData.some(item => item.temperaturePoint == '20')) {
+ throw this.$message.error(`${o.value + '娉㈤暱娌℃湁閰嶇疆20鈩冩俯搴︾偣'}`)
+ }
+ })
+ this.spliceData()
},
handleSelectionChange(val) {
this.opticalProjectList = val;
--
Gitblit v1.9.3