Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

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,8 +275,12 @@ export default {
               this.$emit('refreshPage')
             }
             // this.$message.success(this.$t('common: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

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>

src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue

@@ -29,7 +29,7 @@
       </el-form-item>
       <!-- 虚拟中心编号 -->
       <el-form-item  :label="$t('trials:consistencyAnalysisRule:table:siteCode')" prop="BlindTrialSiteCode">
-        <el-input v-model="form.BlindTrialSiteCode" style="width: 140px;" disabled />
+        <el-input v-model="form.BlindTrialSiteCode" style="width: 140px;" :disabled="!!Result.BlindTrialSiteCode || !!OtherInfo.VitrualSiteCode" @input="(v)=>(form.BlindTrialSiteCode = v.replace(/[^\a-\z\A-\Z0-9]/g, ''))"/>
       </el-form-item>
       <!-- 虚拟受试者位数 -->
       <el-form-item  :label="$t('trials:consistencyAnalysisRule:table:subjectNum')" prop="BlindSubjectNumberOfPlaces">
@@ -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