Merge branch 'uat'

# Conflicts:
#	src/views/trials/trials-panel/reading/read-task/index.vue

src/api/trials.js

@@ -357,10 +357,11 @@ export function getSubjectList(param) {
   })
 }
 
-export function getTrialSiteSelect(trialId) {
+export function getTrialSiteSelect(trialId, params) {
   return request({
     url: `/trialMaintenance/getTrialSiteSelect/${trialId}`,
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 

src/views/research/components/BaseInfo.vue

@@ -366,7 +366,7 @@ export default {
     // 初始化
     async initForm(trialInfo, trialSiteSurvey, notShowFieldList) {
       // 获取项目下的site
-      const { Result } = await getTrialSiteSelect(this.$route.query.trialId)
+      const { Result } = await getTrialSiteSelect(this.$route.query.trialId, { IgnoreDisable: true })
       this.siteOptions = Result
       this.form.Id = trialSiteSurvey.Id
       this.form.Sponsor = trialInfo.Sponsor // 申办方

src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue

@@ -482,7 +482,7 @@ export default {
       }
     },
     handleSelectTable(row) {
-      return row.DoctorTrialState !== 1 && row.ResumeStatus === 1 && row.AcceptingNewTrial && !row.IsVirtual && !row.IsVacation && row.CooperateStatus === 1
+      return row.DoctorTrialState !== 1 && row.ResumeStatus === 1 && row.AcceptingNewTrial && ((!row.IsVirtual && this.$store.state.trials.config.TrialType !== 0) || (row.IsVirtual && this.$store.state.trials.config.TrialType === 0)) && !row.IsVacation && row.CooperateStatus === 1
     },
     handleDetail(row) {
       const { href } = this.$router.resolve({

src/views/trials/trials-panel/attachments/reReading-tracking/index.vue

@@ -665,7 +665,7 @@ export default {
     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)}`
+        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.TaskBlindName)}`
         Object.keys(this.form).forEach(key => {
           this.form[key] = null
         })

src/views/trials/trials-panel/reading/reReading-tracking/index.vue

@@ -888,7 +888,7 @@ export default {
     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)}`
+        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.TaskBlindName)}`
         Object.keys(this.form).forEach(key => {
           this.form[key] = null
         })

src/views/trials/trials-panel/reading/read-task/index.vue

@@ -177,9 +177,7 @@
       custom-class="base-dialog-wrapper">
       <el-form ref="reasonForm" :rules="rules" :model="ApplyforReasonForm" class="demo-ruleForm" size="small"
         label-width="380px">
-        <p>{{ $t('trials:readTask:applyReread:title').replace('xxx', rowData.SubjectCode).replace('yyy',
+        <p>{{ $t('trials:readTask:applyReread:title').replace('xxx', rowData.SubjectCode).replace('yyy', rowData.TaskBlindName) }}</p>
-          rowData.TaskName)
-          }}</p>
         <!-- 申请原因 -->
         <el-divider content-position="left">{{ $t('trials:readTask:title:applyReason') }}</el-divider>
         <!-- 申请原因 -->

src/views/trials/trials-panel/reading/reading-tracking/index.vue

@@ -460,7 +460,7 @@
         custom-class="base-dialog-wrapper">
         <el-form ref="reasonForm" :rules="rules" :model="ApplyforReasonForm" class="demo-ruleForm" size="small"
           label-width="180px">
-          <p>{{ $t('trials:reviewTrack:applyReread:title2').replace('xxx', rowData.SubjectCode).replace('yyy', rowData.TaskName) }}</p>
+          <p>{{ $t('trials:reviewTrack:applyReread:title2').replace('xxx', rowData.SubjectCode).replace('yyy', rowData.TaskBlindName) }}</p>
           <!-- 申请原因 -->
           <el-divider content-position="left">
             {{ $t('trials:reviewTrack:applyReread:title:applyReason') }}
@@ -625,7 +625,7 @@
         custom-class="base-dialog-wrapper">
         <el-form ref="backReasonForm" :rules="rules" :model="backforReasonForm" class="demo-ruleForm" size="small"
           label-width="180px">
-          <p>{{ $t('trials:reviewTrack:applyReread:title1').replace('xxx', rowData.SubjectCode).replace('yyy', rowData.TaskName) }}</p>
+          <p>{{ $t('trials:reviewTrack:applyReread:title1').replace('xxx', rowData.SubjectCode).replace('yyy', rowData.TaskBlindName) }}</p>
           <!-- 申请原因 -->
           <el-divider content-position="left">
             {{ $t('trials:reviewTrack:applyReread:title:backReason') }}