From f979c8991929e0e8372f86b34537172d77c3739e Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期三, 14 十二月 2022 14:36:11 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui --- src/views/operate/management/myIndex/components/examine/index.vue | 82 +++++++++++++++------------------------- 1 files changed, 31 insertions(+), 51 deletions(-) diff --git a/src/views/operate/management/myIndex/components/examine/index.vue b/src/views/operate/management/myIndex/components/examine/index.vue index ae20c85..f41c9b4 100644 --- a/src/views/operate/management/myIndex/components/examine/index.vue +++ b/src/views/operate/management/myIndex/components/examine/index.vue @@ -15,33 +15,28 @@ <span class="data-detail">{{baseCase.category === 1 ? '杩濊' : '杩濆缓'}}</span> </el-form-item> <el-form-item label="澶х被鍚嶇О:"> - <span class="data-detail">xxxxxx</span> + <span class="data-detail">{{baseCase.violationsVO.categoryText}}</span> </el-form-item> </div> <div class="data-item"> <el-form-item label="灏忕被鍚嶇О:"> - <span class="data-detail">xxxxxx</span> + <span class="data-detail">{{baseCase.violationsVO.typeText}}</span> </el-form-item> <el-form-item label="浜嬩欢绛夌骇:"> - <span class="data-detail">xxxxxx</span> + <span class="data-detail">{{baseCase.violationsVO.gradeText}}</span> </el-form-item> </div> <div class="data-item"> <el-form-item label="妗堢敱:"> - <span class="data-detail">xxxxx</span> + <span class="data-detail">{{baseCase.violationsVO.actionCause}}</span> </el-form-item> </div> <div class="data-item"> - <el-form-item label="鎵�灞炲尯鍘�:"> - <span class="data-detail">xxxx</span> - </el-form-item> <el-form-item label="鎵�灞炶閬�:"> - <span class="data-detail">{{baseCase.streetId}}</span> + <span class="data-detail">{{baseCase.streetText}}</span> </el-form-item> - </div> - <div class="data-item"> <el-form-item label="鎵�灞炵ぞ鍖�:"> - <span class="data-detail">{{baseCase.communityId}}</span> + <span class="data-detail">{{baseCase.communityText}}</span> </el-form-item> </div> <div class="data-item"> @@ -51,17 +46,7 @@ </div> <div class="data-item"> <el-form-item label="闂鎻忚堪:"> - <span class="data-detail">xxxxxx</span> - </el-form-item> - </div> - <div class="data-item"> - <el-form-item label="澶勭疆鏂瑰紡:"> - <span class="data-detail">xxxxxxx</span> - </el-form-item> - </div> - <div class="data-item"> - <el-form-item label="澶勭疆鎵嬫:"> - <span class="data-detail">xxxxxxx</span> + <span class="data-detail">{{baseCase.violationsVO.description}}</span> </el-form-item> </div> <!-- 瀹℃牳鎰忚 --> @@ -84,10 +69,10 @@ </div> <div class="show-item"> <div class="show-wrap"> - <MyProcess v-if="activeIndex === 1" :handlePassVo="handlePassVo"></MyProcess> - <MyFilePicture v-else-if="activeIndex === 2" :filesPictureVo="filesPictureVo"></MyFilePicture> - <MySovleProblem v-else-if="activeIndex === 3" :problemProVo="problemProVo"></MySovleProblem> - <MyScene v-else :currentSitVo="currentSitVo"></MyScene> + <MyProcess v-if="activeIndex === 1" :handlePassVo="handlePassVo" :baseCase="baseCase"></MyProcess> + <MyFilePicture v-else-if="activeIndex === 2" :filesPictureVo="filesPictureVo" ></MyFilePicture> + <MySovleProblem v-else-if="activeIndex === 3" :handlePassVo="handlePassVo" :baseCase="baseCase"></MySovleProblem> + <MyScene v-else :currentSitVo="currentSitVo" :baseCase="baseCase"></MyScene> </div> </div> </div> @@ -142,12 +127,11 @@ handlePassVo: {}, currentSitVo: {}, problemProVo: {}, - filesPictureVo: {} - + filesPictureVo: {}, } }, created() { - const { info } = this; + const { info} = this; this.baseCase = info.baseCase; this.handlePassVo = info.handlePassVo; this.currentSitVo = info.currentSitVo; @@ -159,9 +143,8 @@ this.activeIndex = index; }, // 鎻愪氦瀹℃牳鎰忚 - handleSubmit(mystatus) { - // this.getUserLoginInfo(); - const {baseCase} = this; + handleSubmit(index) { + const { baseCase } = this; this.$refs.viewForm.validate((valid) => { if (valid) { this.$axios({ @@ -170,23 +153,21 @@ data: { baseCaseId: baseCase.id, checkOpinion: baseCase.auditOpinion, - currentUser: baseCase.createUser, - status: mystatus, + result:index === 0 ? '椹冲洖':'閫氳繃', } }) - .then(res=>{ - console.log(res); - if(res.code===200){ - this.$message({ - type:'success', - message:mystatus === 0 ? '椹冲洖鎴愬姛' : '瀹℃牳閫氳繃' - }) - this.$emit('closeDialog',{flag:false}); - } - - }) - .catch(err=>{console.log(err)}); - } else { + .then(res => { + if (res.code === 200) { + this.$message({ + type: 'success', + message: index === 0 ? '椹冲洖鎴愬姛' : '瀹℃牳閫氳繃' + }) + this.$emit('closeDialog', { flag: false }); + } + + }) + .catch(err => { }); + }else{ return false; } }) @@ -203,11 +184,10 @@ } }) .then(res => { - console.log(res); }) - } + }, }, - props: ['info','closeDialog'] + props: ['info', 'closeDialog'] } </script> <style lang="scss" scoped> @@ -277,7 +257,7 @@ position: relative; .show-wrap { - overflow: scroll; + overflow: auto; height: 600px; } } -- Gitblit v1.8.0