From 3524e7730c0975d6c4218b5b536c93e6e043f683 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 19 Mar 2024 12:14:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/research/form.vue                   | 18 +++++++++++-------
 src/views/reviewers/components/Employment.vue |  7 +++----
 2 files changed, 14 insertions(+), 11 deletions(-)

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') }}
           </el-button>
@@ -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') }}
           </el-button>
@@ -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"
                 />
               </el-form-item>
@@ -54,21 +53,21 @@
           <el-row>
             <el-col :span="14">
               <el-form-item :label="$t('system:reviewer:label:City')">
-                <el-input  :disabled="$route.query.ReviewStatus === '1'" v-model="City" disabled size="small" />
+                <el-input  :disabled="$route.query.ReviewStatus === '1'" v-model="City"  size="small" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="14">
               <el-form-item :label="$t('system:reviewer:label:State/Province')">
-                <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="Province" disabled size="small" />
+                <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="Province"  size="small" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="14">
               <el-form-item :label="$t('system:reviewer:label:Country')">
-                <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="Country" disabled size="small" />
+                <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="Country"  size="small" />
               </el-form-item>
             </el-col>
           </el-row>