XCKJ
/
irc_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'uat'
continuous-integration/drone/push Build is passing Details 

# Conflicts:
#	src/api/trials/reading.js
#	src/views/trials/trials-panel/trial-summary/audit-record/index.vue
main
wangxiaoshuang 2025-06-13 14:34:59 +08:00
parent 19896b85e0 b512112d96
commit f848e9a9dd
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/trials/trials-panel/reading/oncology-review/index.vue
View File

@ -30,6 +30,7 @@
type="primary" type="primary"
size="small" size="small"
@click="skipTask" @click="skipTask"
v-if="!isView"
> >
<!-- 跳过 --> <!-- 跳过 -->
{{ $t('trials:readingReport:button:skip') }} {{ $t('trials:readingReport:button:skip') }}
@ -337,6 +338,11 @@ export default {
// } // }
// } // }
// }, // },
computed:{
isView(){
return !this.hasPermi(['role:ir'])
}
},
mounted() { mounted() {
this.getList() this.getList()
if (this.isReadingShowPreviousResults) { if (this.isReadingShowPreviousResults) {

3
src/views/trials/trials-panel/trial-summary/audit-record/index.vue
View File

@ -844,11 +844,10 @@ export default {
return return
} }
if (v.DataType === 'ImageList') { if (v.DataType === 'ImageList') {
// if (obj[v.Code] && obj[v.Code].length > 0) { // if (obj[v.Code] && obj[v.Code].length > 0) {
if (obj[v.Code]) { if (obj[v.Code]) {
obj[v.Code] = obj[v.Code].filter(s => s && s.trim()) obj[v.Code] = obj[v.Code].filter(s => s && s.trim())
// obj[v.Code].forEach((o,i) => { // obj[v.Code].forEach((o,i) => {
// var uo = upObj && upObj.length > 0 ? upObj[v.Code][i] : 0 // var uo = upObj && upObj.length > 0 ? upObj[v.Code][i] : 0
if (row.OptType === 'Add' || row.OptType === 'Init') { if (row.OptType === 'Add' || row.OptType === 'Init') {