From 31cb9747ac44c92203d3f17c7f2bb24449e9d285 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期五, 09 十二月 2022 11:33:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/intelligentPatrol/studyJudge/index.vue | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/views/intelligentPatrol/studyJudge/index.vue b/src/views/intelligentPatrol/studyJudge/index.vue
index 5872fd5..54ec2f1 100644
--- a/src/views/intelligentPatrol/studyJudge/index.vue
+++ b/src/views/intelligentPatrol/studyJudge/index.vue
@@ -87,7 +87,7 @@
</div>
</div>
<el-dialog :visible="isShowDialog" title="璋冨害淇℃伅">
- <MyDispatch v-if="isShowDialog" :mytype="1" @confirmInspection="handleConfirm" :isGetData="true" @changeDialog="closeDialog"></MyDispatch>
+ <MyDispatch v-if="isShowDialog" :mytype="1" @getDispatchData="confirmInspection" :isGetData="true" @changeDialog="closeDialog"></MyDispatch>
</el-dialog>
</div>
</template>
@@ -172,17 +172,17 @@
rules:{
state:[
{
- required: true, trigger:['blur', 'change'], message: '澶勭悊鎰忚涓嶈兘涓虹┖'
+ required: true, trigger:['blur'], message: '澶勭悊鎰忚涓嶈兘涓虹┖'
},
],
categoryId:[
{
- required: true, trigger:['blur', 'change'], message: '澶х被鍚嶇О涓嶈兘涓虹┖'
+ required: true, trigger:['blur'], message: '澶х被鍚嶇О涓嶈兘涓虹┖'
}
],
typeId:[
{
- required: true, trigger:['blur', 'change'], message: '灏忕被鍚嶇О涓嶈兘涓虹┖'
+ required: true, trigger:['blur'], message: '灏忕被鍚嶇О涓嶈兘涓虹┖'
}
],
carNumber:[{ trigger:['blur', 'change'], validator: validateCarNumber }]
@@ -262,9 +262,6 @@
},
confirmInspection(data) {
- if (data) {
- data.baseCaseId = data.id;
- }
const eventParams = Object.assign({}, this.eventInfoData);
delete eventParams.store;
basecase.confirmInspection({ ...eventParams, ...data })
--
Gitblit v1.8.0