From ae3596b2342866acca1af69c77bb4d0d32e371b2 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 08 十二月 2025 18:05:13 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/components/business/OperaWarningRuleWindow.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/admin/src/components/business/OperaWarningRuleWindow.vue b/admin/src/components/business/OperaWarningRuleWindow.vue
index f221c49..d37adf5 100644
--- a/admin/src/components/business/OperaWarningRuleWindow.vue
+++ b/admin/src/components/business/OperaWarningRuleWindow.vue
@@ -11,7 +11,7 @@
2.鍙戠敓鍖哄煙闈炲繀濉紝涓嶅～鍒欒〃绀鸿瑙勫垯涓嬫墍鏈夊尯鍩熺殑鐩稿簲鎶ヨ绫诲瀷鍧囬�氱煡;<br>
</p>
<el-form :model="form" ref="form" :rules="rules">
- <div style="display: flex;" v-for="(item,index) in form.detailList" :key="'region_'+item.random" >
+ <div style="display: flex;" v-for="(item,index) in form.detailList" :key="'warning_'+index" >
<span style="line-height: 32px;font-size: 14px;"><b style="color: #F56C6C;margin-right: 4px;font-size: 11px;">*</b>{{'瑙勫垯'+(index +1)}}</span>
<el-form-item label="" style="display: inline-block;margin-left: 10px; " >
<el-select v-model="item.warningId" filterable placeholder="璇烽�夋嫨鎶ヨ绫诲瀷" >
@@ -80,7 +80,6 @@
import { allList } from '@/api/business/member'
import { allList as allDveiceList } from '@/api/business/device'
import { allList as warningList, regionList } from '@/api/business/warning'
-import { validIdCardNo } from '@/utils/form'
export default {
name: 'OperaWarningRuleWindow',
extends: BaseOpera,
@@ -91,10 +90,9 @@
callback(new Error('璇烽厤缃鍒�'))
return
}
- console.log("1111111111111111111111",this.form.detailList)
for (let i = 0; i < this.form.detailList.length; i++) {
var item = this.form.detailList[i]
- if (!item.warningId || item.warningId == null) {
+ if (!item || item.warningId === undefined || !item.warningId || item.warningId == null) {
callback(new Error('璇锋纭厤缃鍒�'))
return
}
@@ -126,8 +124,8 @@
detailList: [{ required: true, validator: validIdDetals, message: '璇锋纭厤缃鍒�', tigger: 'blur' }],
memberNotice: [{ required: true, message: '璇烽�夋嫨閽夐拤閫氱煡' }],
deviceNotice: [{ required: true, message: '璇烽�夋嫨鏄惁骞挎挱閫氱煡' }],
- deviceIds: [{ required: true, message: '璇烽�夋嫨鎾姤骞挎挱', tigger: 'blur' }],
- memberIds: [{ required: true, message: '璇烽�夋嫨閫氱煡浜哄憳', tigger: 'blur' }],
+ deviceIds: [{ required: true, message: '璇烽�夋嫨鎾姤骞挎挱'}],
+ memberIds: [{ required: true, message: '璇烽�夋嫨閫氱煡浜哄憳'}],
status: [{ required: true, message: '璇烽�夋嫨鐘舵��' }]
}
}
@@ -231,12 +229,16 @@
this.$refs.form.resetFields()
this.form[this.configData['field.id']] = null
})
+
return
}
// 缂栬緫
this.$nextTick(() => {
for (const key in this.form) {
this.form[key] = target[key]
+ this.form.memberNotice = this.form.memberNotice || 0
+ this.form.deviceNotice = this.form.deviceNotice || 0
+ this.form.status = this.form.status || 0
}
if (!this.form.detailList || !this.form.detailList.length) {
this.form.detailList = [{ random: Math.random(), regionId: null, regionName: null, regionCode: null, warningId: null }]
--
Gitblit v1.9.3