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

@@ -1,238 +1,144 @@
 <template>
-  <div class="setting">
-    <div class="title">
-      <span>{{ $t('curriculumVitae:setting:title') }}</span>
-      <el-button
-        type="text"
-        class="editBtn"
-        :disabled="!reviewerId"
-        @click.stop="openEdit"
+  <el-dialog
+    :title="$t('system:Setting:title:Blinded Setting')"
+    :visible.sync="visible"
+    width="50%"
+    :close-on-click-modal="false"
+    :before-close="closeDialog"
+    top="8vh"
+    append-to-body
+  >
+    <div class="base-modal-body">
+      <el-form
+        ref="settingFrom"
+        v-loading="loading"
+        :model="form"
+        :rules="rules"
+        label-width="120px"
+        size="small"
       >
-        {{ $t('common:button:edit') }}
-      </el-button>
-    </div>
-    <div class="message">
-      <el-form :inline="true" class="demo-form-inline">
+        <div class="form_title">
+          {{ $t('system:Setting:title:Blinded information') }}
+        </div>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item
+              :label="$t('system:Setting:label:Blind Name')"
+              prop="BlindName"
+            >
+              <el-input
+                v-model="form.BlindName"
+                clearable
+                :maxlength="400"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              :label="$t('system:Setting:label:Blind NameCN')"
+              prop="BlindNameCN"
+            >
+              <el-input
+                v-model="form.BlindNameCN"
+                clearable
+                :maxlength="400"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-form-item
-          :label="$t('system:Setting:label:Blind Name')"
-          style="width: 45%"
+          :label="$t('system:Setting:label:Blind Publications')"
+          prop="BlindPublications"
         >
-          {{ DATA.BlindName }}
+          <el-input
+            v-model="form.BlindPublications"
+            type="textarea"
+            rows="8"
+            size="small"
+            :maxlength="4000"
+          />
         </el-form-item>
-        <el-form-item
-          :label="$t('system:Setting:label:Blind NameCN')"
-          style="width: 45%"
-        >
-          {{ DATA.BlindNameCN }}
-        </el-form-item>
-        <div style="display: flex; font-size: 14px; margin-bottom: 22px">
-          <span style="display: inline-block; width: 120px; color: #606266">{{
-            $t('system:Setting:label:Blind Publications')
-          }}</span>
-          <span
-            class="break-word"
-            style="white-space: pre-wrap; width: calc(100% - 120px)"
-            v-html="DATA.BlindPublications"
-          ></span>
+        <div class="form_title">
+          {{ $t('system:Setting:title:Blinded Setting') }}
         </div>
         <el-form-item
           :label="$t('system:Setting:label:Information Confirmed?')"
-          style="width: 24%"
         >
-          {{
-            DATA.ReviewStatus === 1
-              ? $t('system:Setting:label:Information Confirmed?:Yes')
-              : $t('system:Setting:label:Information Confirmed?:No')
-          }}
+          <el-radio-group v-model="form.ReviewStatus" @change="handleChange">
+            <el-radio :label="1">{{
+              $t('system:Setting:label:Information Confirmed?:Yes')
+            }}</el-radio>
+            <el-radio :label="2">{{
+              $t('system:Setting:label:Information Confirmed?:No')
+            }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item :label="$t('system:Setting:label:Contractor Status?')">
+          <el-radio-group v-model="form.CooperateStatus" @change="handleChange">
+            <el-radio :label="1">{{
+              $t('system:Setting:label:Information Confirmed?:Yes')
+            }}</el-radio>
+            <el-radio :label="2">{{
+              $t('system:Setting:label:Information Confirmed?:No')
+            }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+        <el-form-item :label="$t('system:Setting:label:Accepting New Trials?')">
+          <el-radio-group
+            v-model="form.AcceptingNewTrial"
+            :disabled="radioDisabled"
+          >
+            <el-radio :label="true">{{
+              $t('system:Setting:label:Information Confirmed?:Yes')
+            }}</el-radio>
+            <el-radio :label="false">{{
+              $t('system:Setting:label:Information Confirmed?:No')
+            }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+        <el-form-item :label="$t('system:Setting:label:Actively Reading?')">
+          <el-radio-group
+            v-model="form.ActivelyReading"
+            :disabled="radioDisabled"
+          >
+            <el-radio :label="true">{{
+              $t('system:Setting:label:Information Confirmed?:Yes')
+            }}</el-radio>
+            <el-radio :label="false">{{
+              $t('system:Setting:label:Information Confirmed?:No')
+            }}</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item
-          :label="$t('system:Setting:label:Contractor Status?')"
-          style="width: 24%"
+          :label="$t('system:Setting:label:Comment:')"
+          prop="AdminComment"
         >
-          {{
-            DATA.CooperateStatus === 1
-              ? $t('system:Setting:label:Information Confirmed?:Yes')
-              : $t('system:Setting:label:Information Confirmed?:No')
-          }}
+          <el-input
+            v-model="form.AdminComment"
+            type="textarea"
+            rows="8"
+            :maxlength="4000"
+          />
         </el-form-item>
-        <el-form-item
-          :label="$t('system:Setting:label:Accepting New Trials?')"
-          style="width: 24%"
-        >
-          {{
-            DATA.AcceptingNewTrial
-              ? $t('system:Setting:label:Information Confirmed?:Yes')
-              : $t('system:Setting:label:Information Confirmed?:No')
-          }}
-        </el-form-item>
-        <el-form-item
-          :label="$t('system:Setting:label:Actively Reading?')"
-          style="width: 24%"
-        >
-          {{
-            DATA.ActivelyReading
-              ? $t('system:Setting:label:Information Confirmed?:Yes')
-              : $t('system:Setting:label:Information Confirmed?:No')
-          }}
-        </el-form-item>
-        <div style="display: flex; font-size: 14px; margin-bottom: 22px">
-          <span style="display: inline-block; width: 80px; color: #606266">{{
-            $t('system:Setting:label:Comment:')
-          }}</span>
-          <span
-            class="break-word"
-            style="white-space: pre-wrap; width: calc(100% - 80px)"
-            v-html="DATA.AdminComment"
-          ></span>
-        </div>
       </el-form>
     </div>
-    <el-dialog
-      :title="$t('system:Setting:title:Blinded Setting')"
-      :visible.sync="visible"
-      width="50%"
-      :close-on-click-modal="false"
-      :before-close="closeDialog"
-      top="8vh"
-      append-to-body
-    >
-      <div class="base-modal-body">
-        <el-form
-          ref="settingFrom"
-          v-loading="loading"
-          :model="form"
-          :rules="rules"
-          label-width="120px"
-          size="small"
-        >
-          <div class="form_title">
-            {{ $t('system:Setting:title:Blinded information') }}
-          </div>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item
-                :label="$t('system:Setting:label:Blind Name')"
-                prop="BlindName"
-              >
-                <el-input
-                  v-model="form.BlindName"
-                  clearable
-                  :maxlength="400"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item
-                :label="$t('system:Setting:label:Blind NameCN')"
-                prop="BlindNameCN"
-              >
-                <el-input
-                  v-model="form.BlindNameCN"
-                  clearable
-                  :maxlength="400"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-form-item
-            :label="$t('system:Setting:label:Blind Publications')"
-            prop="BlindPublications"
-          >
-            <el-input
-              v-model="form.BlindPublications"
-              type="textarea"
-              rows="8"
-              size="small"
-              :maxlength="4000"
-            />
-          </el-form-item>
-          <div class="form_title">
-            {{ $t('system:Setting:title:Blinded Setting') }}
-          </div>
-          <el-form-item
-            :label="$t('system:Setting:label:Information Confirmed?')"
-          >
-            <el-radio-group v-model="form.ReviewStatus" @change="handleChange">
-              <el-radio :label="1">{{
-                $t('system:Setting:label:Information Confirmed?:Yes')
-              }}</el-radio>
-              <el-radio :label="2">{{
-                $t('system:Setting:label:Information Confirmed?:No')
-              }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item :label="$t('system:Setting:label:Contractor Status?')">
-            <el-radio-group
-              v-model="form.CooperateStatus"
-              @change="handleChange"
-            >
-              <el-radio :label="1">{{
-                $t('system:Setting:label:Information Confirmed?:Yes')
-              }}</el-radio>
-              <el-radio :label="2">{{
-                $t('system:Setting:label:Information Confirmed?:No')
-              }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
 
-          <el-form-item
-            :label="$t('system:Setting:label:Accepting New Trials?')"
-          >
-            <el-radio-group
-              v-model="form.AcceptingNewTrial"
-              :disabled="radioDisabled"
-            >
-              <el-radio :label="true">{{
-                $t('system:Setting:label:Information Confirmed?:Yes')
-              }}</el-radio>
-              <el-radio :label="false">{{
-                $t('system:Setting:label:Information Confirmed?:No')
-              }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-
-          <el-form-item :label="$t('system:Setting:label:Actively Reading?')">
-            <el-radio-group
-              v-model="form.ActivelyReading"
-              :disabled="radioDisabled"
-            >
-              <el-radio :label="true">{{
-                $t('system:Setting:label:Information Confirmed?:Yes')
-              }}</el-radio>
-              <el-radio :label="false">{{
-                $t('system:Setting:label:Information Confirmed?:No')
-              }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item
-            :label="$t('system:Setting:label:Comment:')"
-            prop="AdminComment"
-          >
-            <el-input
-              v-model="form.AdminComment"
-              type="textarea"
-              rows="8"
-              :maxlength="4000"
-            />
-          </el-form-item>
-        </el-form>
-      </div>
-
-      <span slot="footer" class="dialog-footer">
-        <el-button size="small" type="primary" @click="closeDialog">
-          {{ $t('common:button:cancel') }}
-        </el-button>
-        <el-button
-          size="small"
-          type="primary"
-          @click="handleSave"
-          :loading="loading"
-        >
-          {{ $t('common:button:save') }}
-        </el-button>
-      </span>
-    </el-dialog>
-  </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button size="small" type="primary" @click="closeDialog">
+        {{ $t('common:button:cancel') }}
+      </el-button>
+      <el-button
+        size="small"
+        type="primary"
+        @click="handleSave"
+        :loading="loading"
+      >
+        {{ $t('common:button:save') }}
+      </el-button>
+    </span>
+  </el-dialog>
 </template>
 <script>
 import { getAuditState, updateAuditResume } from '@/api/reviewers'
@@ -254,6 +160,10 @@ const defaultForm = () => {
 export default {
   name: 'setting',
   props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
     reviewerId: {
       type: String,
       default: '',
@@ -261,7 +171,6 @@ export default {
   },
   data() {
     return {
-      DATA: defaultForm(),
       form: defaultForm(),
       loading: false,
       rules: {
@@ -300,24 +209,13 @@ export default {
         ],
       },
       radioDisabled: false,
-      visible: false,
     }
   },
   created() {
-    // this.getData()
+    this.getData()
     this.handleChange()
   },
-  watch: {
-    reviewerId() {
-      if (this.reviewerId) {
-        this.getData()
-      }
-    },
-  },
   methods: {
-    openEdit() {
-      this.visible = true
-    },
     handleChange() {
       if (this.form.ReviewStatus === 2 || this.form.CooperateStatus === 2) {
         this.form.ActivelyReading = false
@@ -328,7 +226,7 @@ export default {
       }
     },
     closeDialog() {
-      this.visible = false
+      this.$emit('update:visible', false)
     },
     async handleSave() {
       try {
@@ -343,7 +241,6 @@ export default {
         if (res.IsSuccess) {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
           this.closeDialog()
-          this.getData()
         }
       } catch (err) {
         this.loading = false
@@ -357,9 +254,6 @@ export default {
           Object.keys(this.form).forEach((key) => {
             this.form[key] = res.Result[key]
           })
-          Object.keys(this.DATA).forEach((key) => {
-            this.DATA[key] = res.Result[key]
-          })
           if (res.Result.Id) {
             this.form.Id = res.Result.Id
           }
@@ -397,22 +291,4 @@ export default {
     flex: 1;
   }
 }
-.setting {
-  min-height: 100px;
-  .title {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-bottom: 10px;
-    font-weight: bold;
-  }
-  .message {
-    margin: auto;
-    min-height: 100px;
-    background-color: #eee;
-    padding: 10px;
-    line-height: 30px;
-    border-radius: 5px;
-  }
-}
 </style>

src/views/reviewers/curriculumVitae/index.vue

@@ -40,9 +40,6 @@
         <el-menu-item index="pay">{{
           $t('curriculumVitae:menu:pay')
         }}</el-menu-item>
-        <el-menu-item index="setting" v-if="isPM">{{
-          $t('curriculumVitae:button:seeting')
-        }}</el-menu-item>
       </el-menu>
     </div>
     <div class="main" id="main">
@@ -50,9 +47,9 @@
         <div class="title">
           <div>{{ $t('curriculumVitae:content:title') }}</div>
           <div class="btnBox">
-            <!-- <el-button type="text" @click.stop="openSetting" v-if="isPM">
+            <el-button type="text" @click.stop="openSetting" v-if="isPM">
               {{ $t('curriculumVitae:button:seeting') }}
-            </el-button> -->
+            </el-button>
             <el-button type="text" @click.stop="openHoliday">
               {{ $t('curriculumVitae:button:holiday') }}
             </el-button>
@@ -158,9 +155,6 @@
             @getInfo="getDetail"
           />
         </div>
-        <div class="box" id="setting" v-if="isPM">
-          <setting :isEN="isEN" :reviewerId.sync="reviewerId" />
-        </div>
       </div>
       <div class="rightFile">
         <!--简历附件-->
@@ -197,11 +191,11 @@
       :reviewerId.sync="reviewerId"
       :visible.sync="holidayVisible"
     />
-    <!-- <setting
+    <setting
       v-if="settingVisible"
       :reviewerId.sync="reviewerId"
       :visible.sync="settingVisible"
-    /> -->
+    />
   </div>
 </template>
 <script>
@@ -270,7 +264,7 @@ export default {
 
       holidayVisible: false,
 
-      // settingVisible: false,
+      settingVisible: false,
 
       IndicationList: [],
     }
@@ -386,9 +380,9 @@ export default {
       this.holidayVisible = true
     },
     // 设置
-    // openSetting() {
-    //   this.settingVisible = true
-    // },
+    openSetting() {
+      this.settingVisible = true
+    },
   },
 }
 </script>

src/views/reviewers/curriculumVitae/preview.vue

@@ -80,15 +80,16 @@
           }}</span>
         </div>
       </div>
-      <div class="message break-word">
+      <div
+        class="message break-word"
+        v-if="mainSummarize.SummarizeEn || mainSummarize.Summarize"
+      >
         <div class="title">{{ $t('curriculumVitae:summarize:title') }}</div>
         <span
           class=""
           style="white-space: pre-wrap"
           v-html="isEN ? mainSummarize.SummarizeEn : mainSummarize.Summarize"
-          v-if="mainSummarize.SummarizeEn || mainSummarize.Summarize"
         ></span>
-        <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
       </div>
       <div class="message" v-if="isAll">
         <el-form class="demo-form-inline">
@@ -453,7 +454,13 @@
           </el-table>
         </template>
         <!--其他相关经历-->
-        <div class="title">
+        <div
+          class="title"
+          v-if="
+            reviewerData.TrialExperienceView.OtherClinicalExperience ||
+            reviewerData.TrialExperienceView.OtherClinicalExperienceCN
+          "
+        >
           {{ $t('curriculumVitae:clinicalTrials:otherTitle') }}
         </div>
         <template
@@ -472,33 +479,41 @@
             "
           ></div>
         </template>
-        <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
       </div>
       <template v-if="isAll">
-        <div class="message">
+        <div
+          class="message"
+          v-if="reviewerData.ResearchPublicationView.Publications"
+        >
           <div class="title">{{ $t('curriculumVitae:treatise:title') }}</div>
           <div
             class="message break-word"
             style="white-space: pre-wrap"
             v-html="reviewerData.ResearchPublicationView.Publications"
-            v-if="reviewerData.ResearchPublicationView.Publications"
           ></div>
-          <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
         </div>
       </template>
       <template v-else>
-        <div class="message">
+        <div
+          class="message"
+          v-if="reviewerData.BasicInfoView.BlindPublications"
+        >
           <div class="title">{{ $t('curriculumVitae:treatise:title') }}</div>
           <div
             class="message break-word"
             style="white-space: pre-wrap"
             v-html="reviewerData.BasicInfoView.BlindPublications"
-            v-if="reviewerData.BasicInfoView.BlindPublications"
           ></div>
-          <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
         </div>
       </template>
-      <div class="message break-word" v-if="isAll">
+      <div
+        class="message break-word"
+        v-if="
+          (reviewerData.ResearchPublicationView.AwardsHonors ||
+            reviewerData.ResearchPublicationView.AwardsHonorsCN) &&
+          isAll
+        "
+      >
         <div class="title">{{ $t('curriculumVitae:other:AH') }}</div>
         <div class="message">
           <span
@@ -508,12 +523,7 @@
                 ? reviewerData.ResearchPublicationView.AwardsHonors
                 : reviewerData.ResearchPublicationView.AwardsHonorsCN
             "
-            v-if="
-              reviewerData.ResearchPublicationView.AwardsHonors ||
-              reviewerData.ResearchPublicationView.AwardsHonorsCN
-            "
           ></span>
-          <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
         </div>
       </div>
       <div class="message" v-if="isAll">
@@ -1127,8 +1137,4 @@ break-word {
   width: 100%;
   word-wrap: break-word;
 }
-.noData {
-  color: #909399;
-  text-align: center;
-}
 </style>

src/views/trials/trials-panel/visit/crc-question/index.vue

@@ -214,6 +214,7 @@
           :label="$t('trials:crcQuestion:table:isOverTime')"
           show-overflow-tooltip
           width="140"
+          sortable="custom"
         >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.IsOverTime" type="danger">{{

src/views/trials/trials-panel/visit/qc-question/index.vue

@@ -272,6 +272,7 @@
           :label="$t('trials:qcQuality:table:qsDuration')"
           show-overflow-tooltip
           width="120"
+          sortable="custom"
         />
         <!-- 是否超限 -->
         <el-table-column
@@ -279,6 +280,7 @@
           :label="$t('trials:qcQuality:table:isOverTime')"
           show-overflow-tooltip
           width="100"
+          sortable="custom"
         >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.IsOverTime" type="danger">{{