From 8ab31157536e116dba27e942a05a20e3caaa4812 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 28 八月 2024 09:22:52 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/components/business/OperaCarUseBookWindow.vue | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/admin/src/components/business/OperaCarUseBookWindow.vue b/admin/src/components/business/OperaCarUseBookWindow.vue
index 972dd87..8321ae4 100644
--- a/admin/src/components/business/OperaCarUseBookWindow.vue
+++ b/admin/src/components/business/OperaCarUseBookWindow.vue
@@ -111,7 +111,7 @@
<!-- -->
<template v-slot:footer>
<el-button @click="agreeOpen" type="primary" v-if="model.approveDateVO!=null&& model.approveDateVO.canBeApproved!=null &&model.approveDateVO.canBeApproved ==1 " class="status-red">鍚屾剰</el-button>
- <el-button @click="isBackProblem=true" type="danger" v-if="model.approveDateVO!=null&& model.approveDateVO.canBeApproved!=null &&model.approveDateVO.canBeApproved ==1 " >鎷掔粷</el-button>
+ <el-button @click="jectOpen" type="danger" v-if="model.approveDateVO!=null&& model.approveDateVO.canBeApproved!=null &&model.approveDateVO.canBeApproved ==1 " >鎷掔粷</el-button>
<el-button @click="visible=false">杩斿洖</el-button>
</template>
<el-dialog
@@ -122,9 +122,9 @@
:visible.sync="isShowProblem"
width="480px"
>
- <el-form :model="dealForm" ref="dealForm" >
+ <el-form :model="dealForm" :rules="rules" ref="dealForm" >
<!-- <el-form-item label="娲捐溅鍙告満" prop="driverId" required v-if="model.approveDateVO!=null && model.approveDateVO.driverParam === 1"> -->
- <el-form-item label="娲捐溅鍙告満" prop="driverId" required v-if="model.approveDateVO!=null && model.approveDateVO.driverParam == 1">
+ <el-form-item label="娲捐溅鍙告満" prop="driverId" v-if="model.approveDateVO!=null && model.approveDateVO.driverParam == 1">
<el-select v-model="dealForm.driverId" style="width: 300px" filterable clearable placeholder="璇烽�夋嫨娲鹃仯鍙告満">
<el-option
v-for="item in memberList"
@@ -200,6 +200,9 @@
},
backForm: {
checkInfo: null
+ },
+ rules: {
+ driverId: [{ required: true, message: '璇烽�夋嫨娲鹃仯鍙告満', trigger: 'blur' }]
}
}
},
@@ -241,7 +244,14 @@
},
agreeOpen () {
this.isShowProblem = true
+ this.$set(this.dealForm, 'checkInfo', '')
this.loadMemberList()
+ },
+ jectOpen () {
+ this.isBackProblem = true
+ this.backForm = {
+ checkInfo: null
+ }
},
backDo () {
this.$refs.backForm.validate((valid) => {
@@ -252,7 +262,7 @@
objId: this.dataId,
objType: this.model.type == 1 ? 4 : 3,
status: 3,
- checkInfo: this.dealForm.checkInfo
+ checkInfo: this.backForm.checkInfo
}).then(res => {
this.$tip.apiSuccess('閫�鍥炴垚鍔�')
this.getDetail()
@@ -361,6 +371,7 @@
}
.value {
+ flex: 1;
color: #111111;
}
}
--
Gitblit v1.9.3