Compare commits

..

No commits in common. "c4a498d953fe9fe5a4cbb7acf54ed05846ce5a61" and "1696fb6294ff0bea9103ea3dec457737a6db0a43" have entirely different histories.

3 changed files with 6 additions and 43 deletions

View File

@ -29,9 +29,7 @@
/> />
<div class="info"> <div class="info">
<p class="user-info"> <p class="user-info">
<span style="font-weight: 700" <span style="font-weight: 700">{{ record.CreateUserFullName || record.CreateUserName }} </span>
>{{ record.CreateUserFullName || record.CreateUserName }}
</span>
<span>({{ record.CreateTime }}) </span> <span>({{ record.CreateTime }}) </span>
</p> </p>
<div <div
@ -44,9 +42,7 @@
<div v-else class="word-my"> <div v-else class="word-my">
<div class="info"> <div class="info">
<p class="user-info"> <p class="user-info">
<span style="font-weight: 700" <span style="font-weight: 700">{{ record.CreateUserFullName || record.CreateUserName }} </span>
>{{ record.CreateUserFullName || record.CreateUserName }}
</span>
<span>({{ record.CreateTime }}) </span> <span>({{ record.CreateTime }}) </span>
</p> </p>
<div <div
@ -243,7 +239,6 @@
ref="signForm" ref="signForm"
:sign-code-enum="signCode" :sign-code-enum="signCode"
:subject-visit-id="data.SubjectVisitId" :subject-visit-id="data.SubjectVisitId"
:sign-replace-text="signReplaceText"
@closeDialog="closeReuploadFinishedDialog" @closeDialog="closeReuploadFinishedDialog"
/> />
</el-dialog> </el-dialog>
@ -255,7 +250,6 @@ import {
addQCChallengeReply, addQCChallengeReply,
cRCRequestReUpload, cRCRequestReUpload,
verifyReuploadIsCanJump, verifyReuploadIsCanJump,
getVisitClinicalDataName,
} from '@/api/trials' } from '@/api/trials'
import { setReuploadFinished } from '@/api/trials/visit' import { setReuploadFinished } from '@/api/trials/visit'
import adminAvatar from '@/assets/Admin.png' import adminAvatar from '@/assets/Admin.png'
@ -328,7 +322,6 @@ export default {
ReuploadEnum: 0, ReuploadEnum: 0,
trialId: '', trialId: '',
uploadBtnLoading: false, uploadBtnLoading: false,
signReplaceText: null,
} }
}, },
mounted() { mounted() {
@ -551,16 +544,9 @@ export default {
handleSetUploadFinished() { handleSetUploadFinished() {
// //
if (this.clinicalEnum > 0 && this.data.IsBaseLine) { if (this.clinicalEnum > 0 && this.data.IsBaseLine) {
getVisitClinicalDataName({ id: this.data.Id }) const { ClinicalDataConfirmation } = const_.processSignature
.then((res) => { this.signCode = ClinicalDataConfirmation
this.signReplaceText = res.Result.ClinicalDataName this.signVisible = true
const { ClinicalDataConfirmation } = const_.processSignature
this.signCode = ClinicalDataConfirmation
this.signVisible = true
})
.catch((err) => {
console.log(err)
})
} else { } else {
this.$confirm(this.$t('trials:crcQuestion:message:reuploadConfirm'), { this.$confirm(this.$t('trials:crcQuestion:message:reuploadConfirm'), {
type: 'warning', type: 'warning',

View File

@ -127,6 +127,7 @@
<el-table-column <el-table-column
:label="$t('common:action:action')" :label="$t('common:action:action')"
min-width="100" min-width="100"
fixed="right"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 预览 --> <!-- 预览 -->

View File

@ -27,7 +27,6 @@
:data="nonDicomStudyList" :data="nonDicomStudyList"
style="width: 100%" style="width: 100%"
:default-sort="{ prop: 'CreateTime', order: 'ascending' }" :default-sort="{ prop: 'CreateTime', order: 'ascending' }"
:row-class-name="tableRowClassName"
> >
<!-- 检查编号 --> <!-- 检查编号 -->
<el-table-column <el-table-column
@ -69,14 +68,12 @@
v-if="scope.row.FileCount" v-if="scope.row.FileCount"
trigger="click" trigger="click"
placement="bottom" placement="bottom"
popper-class="imgTable"
> >
<el-table <el-table
v-loading="filesLoading" v-loading="filesLoading"
:data="nonDicomfilesList" :data="nonDicomfilesList"
height="300" height="300"
size="small" size="small"
:row-class-name="tableRowClassName"
> >
<!-- 文件名称 --> <!-- 文件名称 -->
<el-table-column <el-table-column
@ -210,7 +207,6 @@
v-if="allowAddOrEdit" v-if="allowAddOrEdit"
icon="el-icon-upload2" icon="el-icon-upload2"
circle circle
:disabled="scope.row.IsDeleted"
:title="$t('trials:uploadNonDicoms:action:upload')" :title="$t('trials:uploadNonDicoms:action:upload')"
@click.native.prevent="handleUpload(scope.row)" @click.native.prevent="handleUpload(scope.row)"
/> />
@ -1312,14 +1308,6 @@ export default {
}) })
return newArr.join(' | ') return newArr.join(' | ')
}, },
//
tableRowClassName({ row, rowIndex }) {
if (row.IsDeleted) {
return 'delete-row'
} else {
return ''
}
},
}, },
} }
</script> </script>
@ -1363,16 +1351,4 @@ export default {
pointer-events: none; //pointer-events:none穿 pointer-events: none; //pointer-events:none穿
} }
} }
.non-dicom-wrapper {
::v-deep .delete-row {
text-decoration-line: line-through;
color: #c0c4cc;
}
}
</style>
<style>
.imgTable .delete-row {
text-decoration-line: line-through;
color: #c0c4cc;
}
</style> </style>