tanghuan/mediate-manage-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into 'stg'

Browse Source 
修改bug

See merge request cloud-mediate/mediate-manage-web!94
This commit is contained in:
刘翕 2025-02-26 11:14:44 +00:00
commit 74f2a521bb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/mediation-page/components/MediationRoom.vue
View File

@ -604,7 +604,7 @@ export default {
this.handleBeforeUnload() this.handleBeforeUnload()
setTimeout(() => { setTimeout(() => {
this.$router.push('/mediation-management') this.$router.push('/mediation-management')
}, 1000); }, 500);
// this.$route.query.sourcePage == 'mediationManagement' // this.$route.query.sourcePage == 'mediationManagement'
// this.$router.push('/mediation-management') // this.$router.push('/mediation-management')
}, },

2
src/pages/mediation-page/components/singleofficeWritPopover.vue
View File

@ -14,7 +14,7 @@
<el-col :span="24"> <el-col :span="24">
<div class="mb-24 officelist"> <div class="mb-24 officelist">
<el-checkbox-group v-model="ObjectInfo.fileTypes"> <el-checkbox-group v-model="ObjectInfo.fileTypes">
<el-checkbox border v-for="(item,index) in officeOptions" :label="item.type" :key="index" :disabled="item.documentStaus.code != 2 ? true : false">{{ item.documentType.desc }}</el-checkbox> <el-checkbox border v-for="(item,index) in officeOptions" :label="item.type" :key="index" :disabled="item.documentStaus.code == 2 ? ((item.signStatus != null && (item.signStatus.code == 0 ||item.signStatus.code == 2 || item.signStatus.code == 3)) ? true :false) : true">{{ item.documentType.desc }}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</div> </div>
<!-- :disabled="item.documentStaus.code != 2 ? true : false" --> <!-- :disabled="item.documentStaus.code != 2 ? true : false" -->