diff --git a/src/views/research/form.vue b/src/views/research/form.vue
index 26e4199e..daa58125 100644
--- a/src/views/research/form.vue
+++ b/src/views/research/form.vue
@@ -14,7 +14,7 @@
v-if="(state === 0 && userTypeEnumInt === 0)"
type="primary"
size="small"
- @click="handleSubmit"
+ @click="handleSubmit('submit')"
>
{{ $t('trials:researchForm:button:submit') }}
@@ -23,7 +23,7 @@
v-if="(state === 1 && hasPermi(['role:spm','role:cpm']))"
type="primary"
size="small"
- @click="handleSubmit"
+ @click="handleSubmit('approve')"
>
{{ $t('trials:researchForm:button:auditPasses') }}
@@ -243,17 +243,17 @@ export default {
}).catch(() => { this.loading = false })
},
// 提交
- handleSubmit() {
+ handleSubmit(type) {
if (this.userTypeEnumInt === 0) {
this.loading = true
this.$refs['baseResearchInfo'].handleSave(true).then(res => {
this.loading = false
if (res) {
- this.submit()
+ this.submit(type)
}
}).catch(() => { this.loading = false })
} else {
- this.submit()
+ this.submit(type)
}
},
submit() {
@@ -275,7 +275,11 @@ export default {
this.$emit('refreshPage')
}
// this.$message.success(this.$t('common:message:savedSuccessfully'))
- this.$message.success(this.$t('trials:researchForm:message:savedSuccessfully'))
+ if(type === 'approve'){
+ this.$message.success(this.$t('common:message:approvedSuccessfully'))
+ }else{
+ this.$message.success(this.$t('trials:researchForm:message:savedSuccessfully'))
+ }
}
}).catch(() => { this.loading = false })
}).catch(() => {})
@@ -308,7 +312,7 @@ export default {
if (res.IsSuccess) {
this.initPage()
this.$emit('refreshPage')
- this.$message.success(this.$t('common:message:savedSuccessfully'))
+ this.$message.success(this.$t('common:message:approvedSuccessfully'))
}
}).catch(() => {
this.loading = false
diff --git a/src/views/reviewers/components/Employment.vue b/src/views/reviewers/components/Employment.vue
index 0ad731c8..24bbeea7 100644
--- a/src/views/reviewers/components/Employment.vue
+++ b/src/views/reviewers/components/Employment.vue
@@ -45,7 +45,6 @@
v-model="UniversityAffiliated"
type="textarea"
autosize
- disabled
size="small"
/>
@@ -54,21 +53,21 @@
-
+
-
+
-
+
diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue
index 4c429e70..013d54ef 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue
@@ -29,7 +29,7 @@
-
+ (form.BlindTrialSiteCode = v.replace(/[^\a-\z\A-\Z0-9]/g, ''))"/>
@@ -125,6 +125,7 @@ export default {
IsEnable: true,
Note: ''
},
+ Result:{}, // 接口返回弹窗数据,用于虚拟中心可编辑校验
rules: {
IsHaveReadingPeriod: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
IsGenerateGlobalTask: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
@@ -145,6 +146,13 @@ export default {
// }
this.getFrom()
},
+ watch:{
+ "OtherInfo.VitrualSiteCode":{
+ handler(){
+ this.form.BlindTrialSiteCode = this.OtherInfo.VitrualSiteCode;
+ }
+ }
+ },
methods: {
getFrom() {
getConsistentRule({
@@ -153,7 +161,8 @@ export default {
TrialReadingCriterionId: this.TrialReadingCriterionId
}).then(res => {
if (res.Result) {
- this.form = res.Result
+ this.form = res.Result;
+ this.Result = JSON.parse(JSON.stringify(res.Result));
} else {
let o = this.trialCriterionList.find(v => {
return v.TrialReadingCriterionId === this.TrialReadingCriterionId