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
commit f848e9a9dd
2 changed files with 7 additions and 2 deletions

View File

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

View File

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