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

src/views/reviewers/components/Pay.vue

@@ -126,10 +126,7 @@ export default {
         BankPhoneNum: [
           {
             validator: (rule, value, callback) => {
-              let reg = new RegExp(
+              let reg = new RegExp(/^\d{11}$/, 'i')
-                /^1(3[0-9]|4[01456879]|5[0-3,5-9]|6[2567]|7[0-8]|8[0-9]|9[0-3,5-9])d{8}$/,
-                'ig'
-              )
               if (value && !reg.test(value)) {
                 callback(new Error(this.$t('common:ruleMessage:pattern')))
               } else {

src/views/reviewers/curriculumVitae/components/info/pay.vue

@@ -198,10 +198,7 @@ export default {
         BankPhoneNum: [
           {
             validator: (rule, value, callback) => {
-              let reg = new RegExp(
+              let reg = new RegExp(/^\d{11}$/, 'i')
-                /^1(3[0-9]|4[01456879]|5[0-3,5-9]|6[2567]|7[0-8]|8[0-9]|9[0-3,5-9])d{8}$/,
-                'ig'
-              )
               if (value && !reg.test(value)) {
                 callback(new Error(this.$t('common:ruleMessage:pattern')))
               } else {

src/views/reviewers/curriculumVitae/preview.vue

@@ -177,7 +177,7 @@
           {{ $t('curriculumVitae:EducationalExperience:title') }}
         </div>
         <el-table
-          :data="reviewerData.EducationList"
+          :data="[...reviewerData.EducationList]"
           v-loading="loading"
           style="width: 100%"
           :header-cell-style="{ background: '#eee', color: '#606266' }"
@@ -193,8 +193,9 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="date"
+            prop="Major"
             :label="$t('curriculumVitae:EducationalExperience:table:specialy')"
+            v-if="true"
           >
             <template slot-scope="scope">
               <span>
@@ -260,6 +261,7 @@
           <el-table-column
             prop="Training"
             :label="$t('curriculumVitae:continuingTraining:table:type')"
+            v-if="true"
           >
             <template slot-scope="scope">
               <span>{{ $fd('Training', Number(scope.row.Training)) }}</span>
@@ -268,6 +270,7 @@
           <el-table-column
             prop="Major"
             :label="$t('curriculumVitae:continuingTraining:table:direction')"
+            v-if="true"
           >
             <template slot-scope="scope">
               <span>{{ isEN ? scope.row.Major : scope.row.MajorCN }}</span>
@@ -276,6 +279,7 @@
           <el-table-column
             prop="school"
             :label="$t('curriculumVitae:continuingTraining:table:school')"
+            v-if="true"
           >
             <template slot-scope="scope">
               <span>{{ isEN ? scope.row.School : scope.row.SchoolCN }}</span>
@@ -284,6 +288,7 @@
           <el-table-column
             prop="City"
             :label="$t('curriculumVitae:continuingTraining:table:city')"
+            v-if="true"
           >
             <template slot-scope="scope">
               <span>{{ isEN ? scope.row.City : scope.row.CityCN }}</span>
@@ -333,6 +338,7 @@
           <el-table-column
             prop="Phase"
             :label="$t('curriculumVitae:clinicalTrials:table:byStages')"
+            v-if="true"
           >
             <template slot-scope="scope">
               {{
@@ -343,6 +349,7 @@
           <el-table-column
             prop="EvaluationCriteriaList"
             :label="$t('curriculumVitae:clinicalTrials:table:criterion')"
+            v-if="true"
           >
             <template slot-scope="scope">
               {{
@@ -362,6 +369,7 @@
           <el-table-column
             prop="EvaluationContent"
             :label="$t('curriculumVitae:clinicalTrials:table:indication')"
+            v-if="true"
           >
           </el-table-column>
           <el-table-column
@@ -373,6 +381,7 @@
           <el-table-column
             prop="date"
             :label="$t('curriculumVitae:clinicalTrials:table:year')"
+            v-if="true"
           >
             <template slot-scope="scope">
               <span v-if="scope.row.StartTime"
@@ -395,6 +404,7 @@
           <el-table-column
             prop="GCP"
             :label="$t('curriculumVitae:clinicalTrials:table:hasCertificate')"
+            v-if="true"
           >
             <template slot-scope="scope">
               <span>{{ $fd('hasOrNo', scope.row.GCP) }}</span>
@@ -403,10 +413,12 @@
           <el-table-column
             prop="GCPTime"
             :label="$t('curriculumVitae:clinicalTrials:table:certificateTime')"
+            v-if="true"
           >
           </el-table-column>
           <el-table-column
             prop="GCPAgencies"
+            v-if="true"
             :label="
               $t('curriculumVitae:clinicalTrials:table:certificateHospital')
             "
@@ -861,7 +873,11 @@ export default {
         let res = await getDetail(id, this.trialId)
         this.loading = false
         if (res.IsSuccess) {
-          this.reviewerData = res.Result
+          Object.keys(this.reviewerData).forEach((key) => {
+            if (res.Result[key]) {
+              this.reviewerData[key] = res.Result[key]
+            }
+          })
         }
       } catch (err) {
         this.loading = false