- {{ $fd('RequestReReadingType', scope.row.RequestReReadingType) }}
+ {{ $fd('RequestReReadingType',
+ scope.row.RequestReReadingType) }}
{{ $fd('RequestReReadingType', scope.row.RequestReReadingType) }}
-
+
-
-
+
-
+
{{ scope.row.TaskName }}
-
+
- {{ $fd('TaskState', scope.row.TaskState) }}
- {{ $fd('TaskState', scope.row.TaskState) }}
- {{ $fd('TaskState', scope.row.TaskState) }}
- {{ $fd('TaskState', scope.row.TaskState) }}
- {{ $fd('TaskState', scope.row.TaskState) }}
+ {{ $fd('TaskState', scope.row.TaskState)
+ }}
+ {{ $fd('TaskState', scope.row.TaskState)
+ }}
+ {{ $fd('TaskState', scope.row.TaskState)
+ }}
+ {{ $fd('TaskState', scope.row.TaskState)
+ }}
+ {{ $fd('TaskState', scope.row.TaskState)
+ }}
-
+
- {{ $fd('ReadingCategory', scope.row.ReadingCategory) }}
- {{ $fd('ReadingCategory', scope.row.ReadingCategory) }}
- {{ $fd('ReadingCategory', scope.row.ReadingCategory) }}
- {{ $fd('ReadingCategory', scope.row.ReadingCategory) }}
+ {{ $fd('ReadingCategory',
+ scope.row.ReadingCategory) }}
+ {{ $fd('ReadingCategory',
+ scope.row.ReadingCategory) }}
+ {{ $fd('ReadingCategory',
+ scope.row.ReadingCategory) }}
+ {{ $fd('ReadingCategory',
+ scope.row.ReadingCategory) }}
-
+
- {{ $fd('ReadingTaskState', scope.row.ReadingTaskState) }}
+ {{ $fd('ReadingTaskState',
+ scope.row.ReadingTaskState) }}
{{ $fd('ReadingTaskState', scope.row.ReadingTaskState) }}
-
+
- {{ $fd('ReReadingOrBackOptType', scope.row.OptType) }}
- {{ $fd('ReReadingOrBackOptType', scope.row.OptType) }}
- {{ $fd('ReReadingOrBackOptType', scope.row.OptType) }}
+ {{ $fd('ReReadingOrBackOptType',
+ scope.row.OptType) }}
+ {{ $fd('ReReadingOrBackOptType', scope.row.OptType)
+ }}
+ {{ $fd('ReReadingOrBackOptType',
+ scope.row.OptType) }}
-
+
{{ scope.row.DoctorUser.UserName }}({{ scope.row.DoctorUser.FullName }})
-
+
-
+
@@ -518,7 +527,7 @@ import { getToken } from '@/utils/auth'
import { changeURLStatic } from '@/utils/history.js'
import const_ from '@/const/sign-code'
import SignForm from '@/views/trials/components/newSignForm'
-
+import baseModel from '@/components/BaseModel'
const searchDataDefault = () => {
return {
PageIndex: 1,
@@ -542,7 +551,7 @@ const searchDataDefault = () => {
}
export default {
name: 'TrialsNotice',
- components: { BaseContainer, Pagination, SignForm },
+ components: { BaseContainer, Pagination, SignForm, baseModel },
data() {
return {
searchData: searchDataDefault(),
@@ -593,9 +602,40 @@ export default {
readVisible: false,
TaskOptType: null,
OtherInfo: null,
- ReadingType: null
+ ReadingType: null,
+ config: {
+ visible: false,
+ title: this.$t("trials:spmAudit:confirmMessage:imageBack"),
+ width: '1000px',
+ appendToBody: true,
+ },
+ form: {
+ RequestReReadingResultEnum: null,
+ RequestReReadingRejectReason: null
+ },
+ rules: {
+ RequestReReadingResultEnum: [
+ {
+ required: true,
+ message: this.$t('common:ruleMessage:select'),
+ trigger: ['blur', 'change'],
+ },
+ ],
+ RequestReReadingRejectReason: [
+ {
+ required: true,
+ message: this.$t('common:ruleMessage:specify'),
+ trigger: ['blur', 'change'],
+ },
+ ]
+ }
}
},
+ computed: {
+ isEN() {
+ return this.$i18n.locale !== 'zh'
+ },
+ },
mounted() {
if (this.$route.query.SiteId) {
this.searchData.TrialSiteId = this.$route.query.SiteId
@@ -612,6 +652,39 @@ export default {
this.getDoctorUserSelectList()
},
methods: {
+ async auditImageBack() {
+ try {
+ console.log(this.form)
+ let validate = await this.$refs.imageBackform.validate()
+ if (!validate) return false
+ this.confirmSign(this.form.RequestReReadingResultEnum)
+ } catch (err) {
+ console.log(err)
+ }
+ },
+ async audit(row) {
+ try {
+ this.rowData = Object.assign({}, row)
+ this.rowData.title = `${row.ApplicantName} (${this.$fd('RequestReReadingType', row.RequestReReadingType)}) ${this.$t('trials:spmAudit:title:imageBack').replace('xxx', row.OriginalReReadingTask.SubjectCode).replace('yyy', row.OriginalReReadingTask.TaskName)}`
+ Object.keys(this.form).forEach(key => {
+ this.form[key] = null
+ })
+ this.loading = true
+ let res = await getReReadingOrBackInfluenceTaskList(
+ row.OriginalReReadingTaskId,
+ true,
+ row.Id
+ )
+ if (res.IsSuccess) {
+ this.InfluenceTaskList = res.Result
+ this.config.visible = true
+ this.loading = false
+ }
+ } catch (err) {
+ this.loading = false
+ console.log(err)
+ }
+ },
getInfluencedTaskList(row) {
this.loading = true
this.opentype = 'look'
@@ -663,7 +736,7 @@ export default {
return
}
if (type === 2) {
- this.$refs.reasonForm.validate((valid) => {
+ this.$refs.imageBackform.validate((valid) => {
if (!valid) return
var params = {
data: {
@@ -675,7 +748,7 @@ export default {
NewReReadingTaskId: row.NewReReadingTaskId
}
],
- RequestReReadingRejectReason: this.ConfirmReReadingForm.RequestReReadingRejectReason,
+ RequestReReadingRejectReason: this.form.RequestReReadingRejectReason,
TrialId: this.$route.query.trialId,
RequestReReadingResultEnum: type
},
@@ -688,7 +761,7 @@ export default {
this.btnLoading = false
this.$message.success(`${type === 1 ? this.$t('trials:spmAudit:title:title4') : this.$t('trials:spmAudit:title:title5')}`)
this.getList()
- this.ConfirmReReadingVisible = false
+ this.config.visible = false
this.$refs['signForm'].btnLoading = false
this.signVisible = false
}).catch(() => {
@@ -720,7 +793,7 @@ export default {
this.loading = false
this.btnLoading = false
this.$message.success(`${type === 1 ? this.$t('trials:spmAudit:title:title4') : this.$t('trials:spmAudit:title:title5')}`)
- this.ReReadingOrBackVisible = false
+ this.config.visible = false
this.$refs['signForm'].btnLoading = false
this.signVisible = false
this.getList()
@@ -787,22 +860,25 @@ export default {
}
diff --git a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue
index 87628c1d..5c076abc 100644
--- a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue
+++ b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue
@@ -4,37 +4,16 @@
-
-
-
+
+
-
-
+
@@ -42,104 +21,43 @@
-
-
+
-
-
-
+
+
-
-
-
+
+
-
-
-
+
+
-
-
-
+
+
-
-
-
+
+
@@ -165,111 +83,58 @@
/>
-->
-
-
-
+
+
-
-
+
{{ $t('common:button:search') }}
-
+
{{ $t('common:button:reset') }}
-
+
{{ $t('common:button:export') }}
-
+
-
+
- {{
- $fd('YesOrNo', scope.row.OriginalReReadingTask.IsUrgent)
- }}
+ {{
+ $fd('YesOrNo', scope.row.OriginalReReadingTask.IsUrgent)
+ }}
{{
$fd('YesOrNo', scope.row.OriginalReReadingTask.IsUrgent)
}}
-
+
-
+
{{
`${scope.row.OriginalReReadingTask.SubjectCode}/${scope.row.OriginalReReadingTask.MedicalNo}`
}}
@@ -280,21 +145,14 @@
-
+
-
+
{{
`${scope.row.OriginalReReadingTask.TaskName}/${scope.row.OriginalReReadingTask.TaskBlindName}`
}}
@@ -335,64 +193,38 @@
-->
-
+
- {{
- $fd(
- 'ReadingCategory',
- scope.row.OriginalReReadingTask.ReadingCategory
- )
- }}
- {{
- $fd(
- 'ReadingCategory',
- scope.row.OriginalReReadingTask.ReadingCategory
- )
- }}
- {{
- $fd(
- 'ReadingCategory',
- scope.row.OriginalReReadingTask.ReadingCategory
- )
- }}
- {{
- $fd(
- 'ReadingCategory',
- scope.row.OriginalReReadingTask.ReadingCategory
- )
- }}
+ {{
+ $fd(
+ 'ReadingCategory',
+ scope.row.OriginalReReadingTask.ReadingCategory
+ )
+ }}
+ {{
+ $fd(
+ 'ReadingCategory',
+ scope.row.OriginalReReadingTask.ReadingCategory
+ )
+ }}
+ {{
+ $fd(
+ 'ReadingCategory',
+ scope.row.OriginalReReadingTask.ReadingCategory
+ )
+ }}
+ {{
+ $fd(
+ 'ReadingCategory',
+ scope.row.OriginalReReadingTask.ReadingCategory
+ )
+ }}
-
+
{{ scope.row.OriginalReReadingTask.UserName }}({{
scope.row.OriginalReReadingTask.FullName
@@ -400,85 +232,41 @@
-
+
- {{
- $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum)
- }}
- {{
- $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum)
- }}
- {{
- $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum)
- }}
- {{
- $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum)
- }}
- {{
- $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum)
- }}
+ {{
+ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum)
+ }}
+ {{
+ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum)
+ }}
+ {{
+ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum)
+ }}
+ {{
+ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum)
+ }}
+ {{
+ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum)
+ }}
-
+
{{ $t('common:dialogTitle:sign') }}
- {{ `(${$t('common:label:sign')}${ currentUser })` }}
+ {{ `(${$t('common:label:sign')}${currentUser})` }}
- {{
- $fd('RequestReReadingType', scope.row.RequestReReadingType)
- }}
+ {{
+ $fd('RequestReReadingType', scope.row.RequestReReadingType)
+ }}
{{
$fd('RequestReReadingType', scope.row.RequestReReadingType)
}}
@@ -486,42 +274,20 @@
-
+
-
-
+
-
-
+
-
-
+
-
-
+
@@ -84,20 +67,17 @@
-
-
+
-
-
+
+
-
+
@@ -105,77 +85,42 @@
-
-
+
+
- {{ $t('common:button:search') }}
- {{ $t('common:button:reset') }}
+ {{ $t('common:button:search')
+ }}
+ {{ $t('common:button:reset')
+ }}
-
+
+
{{ `${scope.row.TaskName}/${scope.row.BlindName}` }}
- {{scope.row.TaskName}}
+ {{ scope.row.TaskName }}
@@ -188,53 +133,28 @@
sortable="custom"
/> -->
-
+
- {{$fd('ModuleType', scope.row.ModuleTypeId, 'id')}}
+ {{ $fd('ModuleType', scope.row.ModuleTypeId, 'id') }}
-
+
- {{$i18n.locale === 'zh' ? scope.row.DescriptionCN : scope.row.Description}}
+ {{ $i18n.locale === 'zh' ? scope.row.DescriptionCN : scope.row.Description }}
-
+
@@ -248,13 +168,8 @@
-
+
-
+
- {{$t('trials:auditRecord:action:detail')}}
+ {{ $t('trials:auditRecord:action:detail') }}
-
-
-
+
+
+ show-overflow-tooltip>
-
+
-
- {{$t('common:button:download')}}
+
+ {{ $t('common:button:download') }}
-
- {{$t('trials:auditRecord:title:viewDetail')}}
+
+ {{ $t('trials:auditRecord:title:viewDetail') }}
-
+
- {{$t('trials:auditRecord:title:viewImage')}}{{scope.row.oldValue instanceof Array ? `(${scope.row.oldValue.length})` : ''}}
-
- ![]()
-
- ![]()
-
-
+ {{
+ $t('trials:auditRecord:title:viewImage') }}{{ scope.row.oldValue
+ instanceof Array ? `(${scope.row.oldValue.length})` : '' }}
+
+ ![]()
+
+ ![]()
+
+
{{ scope.row.oldValue }}
-
+
-
+ show-overflow-tooltip>
-
- {{$t('common:button:download')}}
+
+ {{ $t('common:button:download') }}
-
- {{$t('trials:auditRecord:title:viewDetail')}}
+
+ {{ $t('trials:auditRecord:title:viewDetail') }}
-
+
- {{$t('trials:auditRecord:title:viewImage')}}{{scope.row.newValue instanceof Array ? `(${scope.row.newValue.length})` : ''}}
-
- ![]()
-
- ![]()
-
-
-
+ {{
+ $t('trials:auditRecord:title:viewImage') }}{{ scope.row.newValue
+ instanceof Array ? `(${scope.row.newValue.length})` : '' }}
+
+ ![]()
+
+ ![]()
+
+
+
{{ scope.row.newValue }}
-
-
+
+
- {{$t('trials:auditRecord:title:viewImage')}}
- ![]()
+ {{
+ $t('trials:auditRecord:title:viewImage') }}
+ ![]()
- {{scope.row[item.ColumnValue]}}
+ {{ scope.row[item.ColumnValue] }}
-
+
-
+
-
- {{$t('trials:auditRecord:title:viewImage')}}
+
+ {{ $t('trials:auditRecord:title:viewImage') }}
- ![]()
+ ![]()
- {{scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]}}
+ {{ scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index :
+ ite.ColumnValue] }}
@@ -441,150 +328,92 @@
- {{$t('common:button:close')}}
+ {{ $t('common:button:close') }}
-
-
-
-
-
- {{ `${scope.row.TaskName}/${scope.row.BlindName}` }}
-
- {{scope.row.TaskName}}
-
-
-
-
+
+
+
+ {{ `${scope.row.TaskName}/${scope.row.BlindName}` }}
+
+ {{ scope.row.TaskName }}
+
+
+
+
-
-
-
- {{$i18n.locale === 'zh' ? scope.row.ModuleTypeNameCN : scope.row.ModuleTypeName}}
-
-
-
-
-
- {{$i18n.locale === 'zh' ? scope.row.DescriptionCN : scope.row.Description}}
-
-
-
-
-
-
-
-
+
+
+
+ {{ $i18n.locale === 'zh' ? scope.row.ModuleTypeNameCN : scope.row.ModuleTypeName }}
+
+
+
+
+
+ {{ $i18n.locale === 'zh' ? scope.row.DescriptionCN : scope.row.Description }}
+
+
+
+
+
+
+
+
-
-
-
-
- {{$t('trials:auditRecord:action:detail')}}
-
-
-
-
+
+
+
+
+ {{ $t('trials:auditRecord:action:detail') }}
+
+
+
+
-
-
-
+
+
+ show-overflow-tooltip>
-
+
-
- {{$t('common:button:download')}}
+
+ {{ $t('common:button:download') }}
-
- {{$t('trials:auditRecord:title:viewDetail')}}
+
+ {{ $t('trials:auditRecord:title:viewDetail') }}
-
+
- {{$t('trials:auditRecord:title:viewImage')}}{{scope.row.oldValue instanceof Array ? `(${scope.row.oldValue.length})` : ''}}
-
- ![]()
-
- ![]()
-
+ {{
+ $t('trials:auditRecord:title:viewImage') }}{{ scope.row.oldValue
+ instanceof Array ? `(${scope.row.oldValue.length})` : '' }}
+
+ ![]()
+
+ ![]()
+
{{ scope.row.oldValue }}
@@ -690,11 +493,9 @@
-
+ show-overflow-tooltip>
-
- {{$t('common:button:download')}}
+
+ {{ $t('common:button:download') }}
-
- {{$t('trials:auditRecord:title:viewDetail')}}
+
+ {{ $t('trials:auditRecord:title:viewDetail') }}
-
+
- {{$t('trials:auditRecord:title:viewImage')}}{{scope.row.newValue instanceof Array ? `(${scope.row.newValue.length})` : ''}}
-
- ![]()
-
- ![]()
-
-
-
+ {{
+ $t('trials:auditRecord:title:viewImage') }}{{ scope.row.newValue
+ instanceof Array ? `(${scope.row.newValue.length})` : '' }}
+
+ ![]()
+
+ ![]()
+
+
+
{{ scope.row.newValue }}
-
-
+
+
-
+
-
-
- {{$t('trials:auditRecord:title:viewImage')}}
- ![]()
-
- {{scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]}}
+
+
+ {{
+ $t('trials:auditRecord:title:viewImage') }}
+ ![]()
+
+ {{ scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index :
+ ite.ColumnValue] }}
@@ -767,44 +568,47 @@
-
+
- {{$t('trials:auditRecord:title:viewImage')}}
- ![]()
-
- {{scope.row[item.ColumnValue]}}
+ {{
+ $t('trials:auditRecord:title:viewImage') }}
+ ![]()
+
+ {{ scope.row[item.ColumnValue] }}
- {{$t('common:button:close')}}
+ {{ $t('common:button:close') }}
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -816,7 +620,7 @@ import {
getTrialCriterionList
} from '@/api/trials'
import { getInspectionList, getInspectionJsonDataList } from '@/api/trials/inspection'
-import { getFrontAuditConfigList, getAuditConfigChildList, getModuleTypeDescriptionList, setInspectionEnumValue } from '@/api/dictionary/checkConfig'
+import { getFrontAuditConfigList, getAuditConfigChildList, getModuleTypeDescriptionList, setInspectionEnumValue, getModuleTypeList } from '@/api/dictionary/checkConfig'
import Pagination from '@/components/Pagination'
import BaseContainer from '@/components/BaseContainer'
import BaseModel from '@/components/BaseModel'
@@ -845,7 +649,7 @@ const searchDataDefault = () => {
OpByUserName: null,
BatchId: null,
TrialReadingCriterionId: null,
- RoleName:null,
+ RoleName: null,
TaskName: '',
CreateUserRealName: ''
}
@@ -854,10 +658,10 @@ export default {
components: { BaseContainer, Pagination, BaseModel },
dicts: ['OptType', 'ModuleType', 'ChildrenType'],
data() {
-
+
return {
isViewer: true,
- otherData:[],
+ otherData: [],
model_cfg: { visible: false, showClose: true, width: '600px', title: '', appendToBody: true },
model_cfg2: { visible: false, showClose: true, width: '1000px', title: this.$t('trials:auditRecord:title:viewRelationOperations'), appendToBody: true },//'查看关联操作'
model_cfg3: { visible: false, showClose: true, width: '600px', title: '', appendToBody: true },
@@ -886,7 +690,8 @@ export default {
trialCriterionList: [],
openImageUrl: null,
$viewer: null,
- imagesList: []
+ imagesList: [],
+ moduleTypeList: []
}
},
mounted() {
@@ -895,12 +700,13 @@ export default {
this.getVisitPlanOptions()
this.getTrialCriterionList()
this.getList()
+ this.getModuleTypeList()
},
methods: {
openImage(url, type) {
console.log(url)
-
- this.$nextTick(()=>{
+
+ this.$nextTick(() => {
if (url instanceof Array) {
this.imagesList = url.map(v => this.OSSclientConfig.basePath + v)
let refName = type ? `${url[0]}_${type}` : url[0]
@@ -908,9 +714,9 @@ export default {
} else {
this.imagesList = [this.OSSclientConfig.basePath + url]
let refName = type ? `${url}_${type}` : url
- if(this.$refs[refName] instanceof Array){
+ if (this.$refs[refName] instanceof Array) {
this.$refs[refName][0].$viewer.show()
- }else{
+ } else {
this.$refs[refName].$viewer.show()
}
}
@@ -919,7 +725,7 @@ export default {
getTrialCriterionList() {
getTrialCriterionList(this.trialId, false).then(res => {
this.trialCriterionList = res.Result
- }).catch(() => {})
+ }).catch(() => { })
},
handleSortChange(column) {
if (column.order === 'ascending') {
@@ -941,9 +747,26 @@ export default {
}
},
+ async getModuleTypeList() {
+ try {
+ let data = {
+ trialId: this.$route.query.trialId
+ }
+ let res = await getModuleTypeList(data)
+ if (res.IsSuccess) {
+ this.moduleTypeList = res.Result
+ }
+ } catch (err) {
+ console.log(err)
+ }
+ },
getModuleTypeDescriptionList(v) {
this.searchData.Description = null
- getModuleTypeDescriptionList( v ).then(res => {
+ let params = {
+ moduleTypeId: v,
+ trialId: this.$route.query.trialId
+ }
+ getModuleTypeDescriptionList(params).then(res => {
this.DescriptionOptions = res.Result
})
},
@@ -982,7 +805,7 @@ export default {
this[auditData] = []
config.forEach(v => {
v.Code = this.$i18n.locale === 'zh' ? v.Code : v.CodeEn ? v.CodeEn : v.Code
-
+
var item
if (!v.IsEnable) return
if (v.IsShowByTrialConfig) {
@@ -1045,7 +868,7 @@ export default {
}
item.DataType = v.DataType
this[auditData].push(item)
- // })
+ // })
}
return
}
@@ -1082,22 +905,22 @@ export default {
}
if (v.DataType === 'Router') {
item = {
- oldValue: v.UrlConfig.IsHaveParameters ? v.UrlConfig.RoutePath + '?' +
+ oldValue: v.UrlConfig.IsHaveParameters ? v.UrlConfig.RoutePath + '?' +
v.UrlConfig.ParameterList.map((v) => {
let a = obj[v.UrlParameterValueName] ? obj[v.UrlParameterValueName] : parentRow[v.UrlParameterValueName]
if (v.UrlParameterValueName === 'token') {
a = getToken()
}
return v.UrlParameterName + '=' + a + '&'
- }).toString().replaceAll(',', '')+'&'+'lang='+this.$i18n.locale +'&'+ 'zh='+this.$i18n.locale : v.UrlConfig.RoutePath,
- newValue: v.UrlConfig.IsHaveParameters ? v.UrlConfig.RoutePath + '?' +
+ }).toString().replaceAll(',', '') + '&' + 'lang=' + this.$i18n.locale + '&' + 'zh=' + this.$i18n.locale : v.UrlConfig.RoutePath,
+ newValue: v.UrlConfig.IsHaveParameters ? v.UrlConfig.RoutePath + '?' +
v.UrlConfig.ParameterList.map((v) => {
let a = obj[v.UrlParameterValueName] ? obj[v.UrlParameterValueName] : parentRow[v.UrlParameterValueName]
if (v.UrlParameterValueName === 'token') {
a = getToken()
}
return v.UrlParameterName + '=' + a + '&'
- }).toString().replaceAll(',', '')+'&'+'lang='+this.$i18n.locale +'&'+ 'zh='+this.$i18n.locale : v.UrlConfig.RoutePath
+ }).toString().replaceAll(',', '') + '&' + 'lang=' + this.$i18n.locale + '&' + 'zh=' + this.$i18n.locale : v.UrlConfig.RoutePath
}
console.log(item)
item.IsTableFiled = v.IsTableFiled
@@ -1112,14 +935,14 @@ export default {
var body = []
v.TableConfigList.forEach((j, i) => {
if (j.IsFixedColumn) {
- head.push({IsPicture: j.IsPicture, headName: this.$i18n.locale === 'zh' ? j.FixedColumnName : j.FixedColumnEnName, IsMerge: j.IsMerge, ColumnName: j.ColumnName, ColumnValue: j.ColumnValue, ListName: j.ListName, MergeColumnName: j.IsMerge ? this.$i18n.locale === 'zh' ? j.MergeColumnName : j.MergeColumnEnName : null, ChildrenList: []})
+ head.push({ IsPicture: j.IsPicture, headName: this.$i18n.locale === 'zh' ? j.FixedColumnName : j.FixedColumnEnName, IsMerge: j.IsMerge, ColumnName: j.ColumnName, ColumnValue: j.ColumnValue, ListName: j.ListName, MergeColumnName: j.IsMerge ? this.$i18n.locale === 'zh' ? j.MergeColumnName : j.MergeColumnEnName : null, ChildrenList: [] })
} else {
if (j.ListName) {
obj[v.Code][0][j.ListName].forEach((x, o) => {
- head.push({IsPicture: j.IsPicture, headName: x[this.$i18n.locale === 'zh' ? j.ColumnName : j.ColumnEnName ? j.ColumnEnName : j.ColumnName], IsMerge: j.IsMerge, ColumnName: j.ColumnName, ColumnValue: j.ColumnValue, ListName: j.ListName, MergeColumnName: j.IsMerge ? this.$i18n.locale === 'zh' ? j.MergeColumnName : j.MergeColumnEnName : null, ChildrenList: []})
+ head.push({ IsPicture: j.IsPicture, headName: x[this.$i18n.locale === 'zh' ? j.ColumnName : j.ColumnEnName ? j.ColumnEnName : j.ColumnName], IsMerge: j.IsMerge, ColumnName: j.ColumnName, ColumnValue: j.ColumnValue, ListName: j.ListName, MergeColumnName: j.IsMerge ? this.$i18n.locale === 'zh' ? j.MergeColumnName : j.MergeColumnEnName : null, ChildrenList: [] })
})
} else {
- head.push({IsPicture: j.IsPicture, headName: this.$i18n.locale === 'zh' ? j.ColumnName : j.ColumnEnName ? j.ColumnEnName : j.ColumnName, IsMerge: j.IsMerge, ColumnName: j.ColumnName, ColumnValue: j.ColumnValue, ListName: j.ListName, MergeColumnName: j.IsMerge ? this.$i18n.locale === 'zh' ? j.MergeColumnName : j.MergeColumnEnName : null, ChildrenList: []})
+ head.push({ IsPicture: j.IsPicture, headName: this.$i18n.locale === 'zh' ? j.ColumnName : j.ColumnEnName ? j.ColumnEnName : j.ColumnName, IsMerge: j.IsMerge, ColumnName: j.ColumnName, ColumnValue: j.ColumnValue, ListName: j.ListName, MergeColumnName: j.IsMerge ? this.$i18n.locale === 'zh' ? j.MergeColumnName : j.MergeColumnEnName : null, ChildrenList: [] })
}
}
})
@@ -1225,7 +1048,7 @@ export default {
item.Enum = this.$i18n.locale === 'zh' ? v.ValueCN : v.Value
this[auditData].push(item)
})
- console.log(this[auditData],this.tableListData,this.tableList)
+ console.log(this[auditData], this.tableListData, this.tableList)
},
getJSON(row) {
return new Promise(resolve => {
@@ -1280,7 +1103,7 @@ export default {
})
},
async lookDetails(row) {
- this.currentRow = {...row}
+ this.currentRow = { ...row }
this.OptType = row.OptType
var Json = await this.getJSON(row)
var JsonDetail = Json[0] ? JSON.parse(Json[0]) : null
@@ -1330,4 +1153,3 @@ export default {
}
}
-
+
- {{
- $fd(
- 'RequestReReadingResult',
- scope.row.RequestReReadingResultEnum
- )
- }}
- {{
- $fd(
- 'RequestReReadingResult',
- scope.row.RequestReReadingResultEnum
- )
- }}
+ {{
+ $fd(
+ 'RequestReReadingResult',
+ scope.row.RequestReReadingResultEnum
+ )
+ }}
+ {{
+ $fd(
+ 'RequestReReadingResult',
+ scope.row.RequestReReadingResultEnum
+ )
+ }}
{{
$fd(
'RequestReReadingResult',
@@ -569,196 +327,263 @@
sortable="custom"
show-overflow-tooltip
/> -->
-
+
-
-
-
+
+
+
+
+ {{ rowData.title }}
+
+
+ {{ rowData.RequestReReadingReason }}
+
+
+
+ {{ $t('trials:rereadTrack:button:auditYes') }}
+ {{ $t('trials:rereadTrack:button:auditNo') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ `${scope.row.SubjectCode}/${scope.row.BlindSubjectCode}` }}
+
+ {{ scope.row.SubjectCode }}
+
+
+
+
+
+
+ {{ `${scope.row.TaskName}/${scope.row.TaskBlindName}` }}
+
+ {{ scope.row.TaskName }}
+
+
+
+
+
+
+
+ {{
+ $fd('TaskState', scope.row.TaskState)
+ }}
+ {{
+ $fd('TaskState', scope.row.TaskState)
+ }}
+ {{
+ $fd('TaskState', scope.row.TaskState)
+ }}
+ {{
+ $fd('TaskState', scope.row.TaskState)
+ }}
+ {{
+ $fd('TaskState', scope.row.TaskState)
+ }}
+
+
+
+
+
+ {{
+ $fd('ReadingCategory', scope.row.ReadingCategory)
+ }}
+ {{
+ $fd('ReadingCategory', scope.row.ReadingCategory)
+ }}
+ {{
+ $fd('ReadingCategory', scope.row.ReadingCategory)
+ }}
+ {{
+ $fd('ReadingCategory', scope.row.ReadingCategory)
+ }}
+
+
+
+
+
+ {{
+ $fd('ReadingTaskState', scope.row.ReadingTaskState)
+ }}
+ {{
+ $fd('ReadingTaskState', scope.row.ReadingTaskState)
+ }}
+
+
+
+
+
+ {{
+ $fd('ReReadingOrBackOptType', scope.row.OptType)
+ }}
+ {{
+ $fd('ReReadingOrBackOptType', scope.row.OptType)
+ }}
+ {{
+ $fd('ReReadingOrBackOptType', scope.row.OptType)
+ }}
+
+
+
+
+
+ {{ scope.row.DoctorUser.UserName }}({{
+ scope.row.DoctorUser.FullName
+ }})
+
+
+
+
+
+
+
+ {{ $t('common:button:confirm') }}
+
+
+ {{ $t('common:button:cancel') }}
+
+
+
+
+
+
+
-
+
-
+
@@ -956,6 +730,7 @@ import { getToken } from '@/utils/auth'
import const_ from '@/const/sign-code'
import { changeURLStatic } from '@/utils/history.js'
import SignForm from '@/views/trials/components/newSignForm'
+import baseModel from '@/components/BaseModel'
const searchDataDefault = () => {
return {
@@ -989,7 +764,7 @@ const searchDataDefault = () => {
}
export default {
name: 'TrialsNotice',
- components: { BaseContainer, Pagination, SignForm },
+ components: { BaseContainer, Pagination, SignForm, baseModel },
data() {
return {
searchData: searchDataDefault(),
@@ -1048,8 +823,39 @@ export default {
OtherInfo: null,
ReadingType: null,
trialCriterionList: [],
+ config: {
+ visible: false,
+ title: this.$t("trials:rereadTrack:confirmMessage:imageBack"),
+ width: '1000px',
+ appendToBody: true,
+ },
+ form: {
+ RequestReReadingResultEnum: null,
+ RequestReReadingRejectReason: null
+ },
+ rules: {
+ RequestReReadingResultEnum: [
+ {
+ required: true,
+ message: this.$t('common:ruleMessage:select'),
+ trigger: ['blur', 'change'],
+ },
+ ],
+ RequestReReadingRejectReason: [
+ {
+ required: true,
+ message: this.$t('common:ruleMessage:specify'),
+ trigger: ['blur', 'change'],
+ },
+ ]
+ }
}
},
+ computed: {
+ isEN() {
+ return this.$i18n.locale !== 'zh'
+ },
+ },
mounted() {
if (this.$route.query.TrialSiteId) {
this.searchData.TrialSiteId = this.$route.query.TrialSiteId
@@ -1067,9 +873,42 @@ export default {
this.getTrialCriterionList()
},
methods: {
+ async auditImageBack() {
+ try {
+ console.log(this.form)
+ let validate = await this.$refs.imageBackform.validate()
+ if (!validate) return false
+ this.confirmSign(this.form.RequestReReadingResultEnum)
+ } catch (err) {
+ console.log(err)
+ }
+ },
+ async audit(row) {
+ try {
+ this.rowData = Object.assign({}, row)
+ this.rowData.title = `${row.ApplicantName} (${this.$fd('RequestReReadingType', row.RequestReReadingType)}) ${this.$t('trials:rereadTrack:title:imageBack').replace('xxx', row.OriginalReReadingTask.SubjectCode).replace('yyy', row.OriginalReReadingTask.TaskName)}`
+ Object.keys(this.form).forEach(key => {
+ this.form[key] = null
+ })
+ this.loading = true
+ let res = await getReReadingOrBackInfluenceTaskList(
+ row.OriginalReReadingTaskId,
+ true,
+ row.Id
+ )
+ if (res.IsSuccess) {
+ this.InfluenceTaskList = res.Result
+ this.config.visible = true
+ this.loading = false
+ }
+ } catch (err) {
+ this.loading = false
+ console.log(err)
+ }
+ },
handleExport() {
getReReadingTaskList_Export(this.searchData)
- .then((res) => {})
+ .then((res) => { })
.catch(() => {
this.loading = false
})
@@ -1079,7 +918,7 @@ export default {
.then((res) => {
this.trialCriterionList = res.Result
})
- .catch(() => {})
+ .catch(() => { })
},
getInfluencedTaskList(row) {
this.loading = true
@@ -1152,7 +991,7 @@ export default {
const { HeavyReadingApproval } = const_.processSignature
this.type = type
if (type === 2) {
- return this.$refs.reasonForm.validate((validate) => {
+ return this.$refs.imageBackform.validate((validate) => {
if (validate) {
this.signCode = HeavyReadingApproval
this.signVisible = true
@@ -1179,7 +1018,7 @@ export default {
return
}
if (type === 2) {
- let valid = await this.$refs.reasonForm.validate()
+ let valid = await this.$refs.imageBackform.validate()
if (!valid) return
var params = {
data: {
@@ -1192,7 +1031,7 @@ export default {
},
],
RequestReReadingRejectReason:
- this.ConfirmReReadingForm.RequestReReadingRejectReason,
+ this.form.RequestReReadingRejectReason,
TrialId: this.$route.query.trialId,
RequestReReadingResultEnum: type,
},
@@ -1213,7 +1052,7 @@ export default {
// this.$refs['signForm'].btnLoading = false
this.signVisible = false
this.getList()
- this.ConfirmReReadingVisible = false
+ this.config.visible = false
} catch (e) {
console.log(e)
this.loading = false
@@ -1247,7 +1086,7 @@ export default {
if (res.ErrorMessage) {
let alert = await this.$alert(res.ErrorMessage)
if (alert !== 'confirm') return
- this.ReReadingOrBackVisible = false
+ this.config.visible = false
this.signVisible = false
this.getList()
} else {
@@ -1257,7 +1096,7 @@ export default {
? this.$t('trials:rereadTrack:message:msg3')
: this.$t('trials:rereadTrack:message:msg4')
this.$message.success(message)
- this.ReReadingOrBackVisible = false
+ this.config.visible = false
this.signVisible = false
this.getList()
}
@@ -1655,6 +1494,7 @@ export default {
::v-deep .hidden-row {
display: none;
}
+
::v-deep .el-dialog__body {
padding: 15px 20px;
}
@@ -1664,9 +1504,11 @@ export default {
border-color: none !important;
// color: #fff!important;
}
+
::v-deep #TaskAllocationRuleList thead .el-checkbox__inner {
display: none;
}
+
::v-deep .el-descriptions-item__label.has-colon:after {
display: none;
}
From b5b67cc5e37cd4ac6421b06c2c9de6e60c2a54ea Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 4 Jun 2025 13:34:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E6=90=9C=E7=B4=A2?=
=?UTF-8?q?=E6=A1=86=E5=86=85=E5=AE=B9=E6=8E=A5=E5=8F=A3=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/dictionary/checkConfig.js | 15 +-
.../trial-summary/audit-record/index.vue | 918 +++++++-----------
2 files changed, 382 insertions(+), 551 deletions(-)
diff --git a/src/api/dictionary/checkConfig.js b/src/api/dictionary/checkConfig.js
index 771ca57e..ace6ad1c 100644
--- a/src/api/dictionary/checkConfig.js
+++ b/src/api/dictionary/checkConfig.js
@@ -45,10 +45,19 @@ export function changeFrontAuditSort(param) {
})
}
-export function getModuleTypeDescriptionList(param) {
+export function getModuleTypeDescriptionList(params) {
return request({
- url: `${param === '' ? '/FrontAuditConfig/getModuleTypeDescriptionList' : '/FrontAuditConfig/getModuleTypeDescriptionList?moduleTypeId=' + param}`,
- method: 'get'
+ url: `/FrontAuditConfig/getModuleTypeDescriptionList`,
+ method: 'get',
+ params
+ })
+}
+
+export function getModuleTypeList(data) {
+ return request({
+ url: `/FrontAuditConfig/getModuleTypeList`,
+ method: 'post',
+ data
})
}
diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
index 85063181..9f8c3284 100644
--- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
@@ -11,12 +11,8 @@
-
@@ -25,22 +21,10 @@
-
-
+
@@ -50,32 +34,31 @@
-
{{ scope.row.RequestReReadingRejectReason }}
@@ -532,26 +298,18 @@
)
}}
-
+ " v-if="ConfirmReReadingVisible">
+
-
-
+
-
+
-
+
-
+
{{ `${scope.row.SubjectCode}/${scope.row.BlindSubjectCode}` }}
{{ scope.row.SubjectCode }}
-
+
-
+
{{ `${scope.row.TaskName}/${scope.row.TaskBlindName}` }}
{{ scope.row.TaskName }}
@@ -772,19 +597,11 @@
show-overflow-tooltip
/> -->
-
+
{{
$fd('TaskState', scope.row.TaskState)
@@ -804,12 +621,8 @@
-
+
{{
$fd('ReadingCategory', scope.row.ReadingCategory)
@@ -826,34 +639,20 @@
-
+
- {{
- $fd('ReadingTaskState', scope.row.ReadingTaskState)
- }}
+ {{
+ $fd('ReadingTaskState', scope.row.ReadingTaskState)
+ }}
{{
$fd('ReadingTaskState', scope.row.ReadingTaskState)
}}
-
+
{{
$fd('ReReadingOrBackOptType', scope.row.OptType)
@@ -867,12 +666,8 @@
-
+
{{ scope.row.DoctorUser.UserName }}({{
scope.row.DoctorUser.FullName
@@ -883,35 +678,18 @@
{{
$t('common:dialogTitle:sign')
@@ -920,11 +698,7 @@
`(${$t('common:label:sign')}${currentUser})`
}}
-
- {{$t('trials:auditRecord:title:historicalOperations')}}
+ {{
+ $t('trials:auditRecord:title:historicalOperations') }}
- {{$t('trials:auditRecord:title:relationOperations')}}
+ {{
+ $t('trials:auditRecord:title:relationOperations') }}
-
- {{$t('trials:auditRecord:title:signInfo')}}
+ {{ $t('trials:auditRecord:title:signInfo') }}
- {{otherData[0].Value}}
+ {{ otherData[0].Value }}
-
- {{ $fd('YesOrNo', scope.row.IsSign) }}
-
- {{ $fd('YesOrNo', scope.row.IsSign) }}
-
-
-
- {{ scope.row.SignText }}
-
-
+
+ {{ $fd('YesOrNo', scope.row.IsSign) }}
+
+ {{ $fd('YesOrNo', scope.row.IsSign) }}
+
+
+
+ {{ scope.row.SignText }}
+
+
- {{$t('trials:auditRecord:title:signInfo')}}
+ {{ $t('trials:auditRecord:title:signInfo') }}
- {{otherData[0].Value}}
+ {{ otherData[0].Value }}