Merge branch 'uat'

# Conflicts:
#	src/views/trials/trials-panel/setting/personnel-manage/components/site.vue

src/components/BaseForm/search-form.vue

@@ -120,9 +120,9 @@
           v-if="item.type === 'Daterange'"
           v-model="searchData[item.prop]"
           type="datetimerange"
-          range-separator="至"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间"
+          :range-separator="$t('baseForm:daterange:rangeSeparator')"
+          :start-placeholder="$t('baseForm:daterange:startPlaceholder')"
+          :end-placeholder="$t('baseForm:daterange:startendPlaceholder')"
           value-format="yyyy-MM-dd HH:mm:ss"
           format="yyyy-MM-dd HH:mm:ss"
           :style="{ width: item.width }"

src/main.js

@@ -451,22 +451,22 @@ async function VueInit() {
                   done()
                 }, 500)
               }
-              if (eval(process.env.VUE_APP_LOCK_FOR_PERMISSION_MFA)) {
-                sendMFAEmail({ UserId: my_userid, MfaType: 1 }).then((res) => {
-                  done();
-                  Vue.prototype.$MFA({
-                    status: "lock",
-                    UserId: my_userid,
-                    EMail: res.Result,
-                    username: my_username,
-                    callBack: () => {
+              // if (eval(process.env.VUE_APP_LOCK_FOR_PERMISSION_MFA)) {
+              //   sendMFAEmail({ UserId: my_userid, MfaType: 1 }).then((res) => {
+              //     done();
+              //     Vue.prototype.$MFA({
+              //       status: "lock",
+              //       UserId: my_userid,
+              //       EMail: res.Result,
+              //       username: my_username,
+              //       callBack: () => {
+              //         closeLock(_vm)
+              //       },
+              //     })
+              //   })
+              // } else {
               closeLock(_vm)
-                    },
-                  })
-                })
-              } else {
-                closeLock(_vm)
-              }
+              // }
 
             } else {
               // console.log(111)

src/views/trials/trials-panel/enrolled-reviewers/list/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <BaseContainer>
+  <BaseContainer class="enroll-list">
     <!-- <template slot="search-container">
       <el-button
         v-hasPermi="['trials:trials-panel:enrolled-reviewers:list:enroll']"
@@ -96,10 +96,9 @@
           <el-table-column
             :label="$t('trials:enrolledReviews:table:readingType')"
             width="300"
-            show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <span v-for="item of scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}) ? scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).ReadingCategorys : []" :key="item.TrialReadingCriterionId">
+                <span v-for="item of scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}) ? scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).ReadingCategorys : []" :key="item.TrialReadingCriterionId" style="margin:5px 5px 5px 0;">
                   <el-tag v-if="item === 1" type="primary">{{ $fd('ReadingCategory', item) + ' & ' + $fd('ReadingCategory', 2) }}</el-tag>
                   <!--              <el-tag v-if="item === 2" type="info">{{ $fd('ReadingCategory', item) }}</el-tag>-->
                   <el-tag v-if="item === 4" type="danger">{{ $fd('ReadingCategory', item) }}</el-tag>
@@ -249,7 +248,7 @@
       </template>
     </base-model>
     <!-- 修改 readingCategory -->
-    <base-model :config="readingCategory_model">
+    <base-model :config="readingCategory_model" class="readingCategory_model">
       <template slot="dialog-body">
         <!-- Reading Type -->
         <label>{{ $t('trials:enrolledReviews:table:readingType') }}: </label>
@@ -259,7 +258,7 @@
           allow-create
           multiple
           default-first-option
-          style="width: 70%"
+          style="width: 50%;"
         >
           <template v-for="item of $d.ReadingCategory">
             <el-option  v-if="item.value === 1" :key="item.id" :value="1" :label="$fd('ReadingCategory', 1) + ' & ' + $fd('ReadingCategory', 2)" /> 
@@ -273,6 +272,7 @@
         </el-select>
       </template>
       <template slot="dialog-footer">
+        <div style="margin-top:30px;">
           <el-button
           :disabled="readingCategory_model.btnLoading"
           type="primary"
@@ -287,6 +287,7 @@
           >
             {{ $t('common:button:save') }}
           </el-button>
+        </div>
       </template>
     </base-model>
     <!-- 修改医生状态 -->
@@ -432,7 +433,7 @@ export default {
         visible: false,
         title: this.$t('trials:enrolledReviews:dialogTitle:changeReadingType'),
         showClose: true,
-        width: '500px',
+        width: '600px',
         btnLoading: false
       },
       reviewerStatus_model: {
@@ -833,10 +834,11 @@ export default {
 <style lang="scss">
   .enroll-list {
     height: 100%;
-    .filter-box {
-      display: flex;
-      align-items: center;
-      padding: 5px 0px;
+    .readingCategory_model{
+      .base-modal-body{
+        min-height: 150px;
+        padding-bottom: 30px !important;
+      }
     }
   }
 </style>

src/views/trials/trials-panel/setting/personnel-manage/components/site.vue

@@ -168,9 +168,20 @@
             <el-input v-model="form.TrialSiteCode" />
           </el-form-item>
           <!-- 中心名称 -->
-          <el-form-item :label="$t('trials:sitesList:table:siteName')" prop="TrialSiteName">
-            <el-autocomplete clearable class="inline-input" style="width: 100%" v-model="form.TrialSiteName"
-              :fetch-suggestions="querySearch" @select="handleSelect" placeholder=""></el-autocomplete>
+          <el-form-item
+            :label="$t('trials:sitesList:table:siteName')"
+            prop="TrialSiteName"
+          >
+            <el-autocomplete
+              clearable
+              class="inline-input"
+              style="width: 100%"
+              v-model="form.TrialSiteName"
+              :fetch-suggestions="querySearch"
+              @select="handleSelect"
+              placeholder=""
+              @change="handleChange"
+            ></el-autocomplete>
           </el-form-item>
           <!-- 中心别称 -->
           <el-form-item :label="$t('trials:sitesList:table:siteAliasName')" prop="TrialSiteAliasName">
@@ -417,9 +428,13 @@ export default {
       this.form.TrialSiteName = item.SiteName;
       this.form.TrialSiteAliasName = item.AliasName
         ? item.AliasName
-        : this.form.TrialSiteAliasName;
+        : item.SiteName;
       this.form.SiteId = item.SiteId;
     },
+    handleChange(v) {
+      if (v) return
+      this.form.TrialSiteAliasName = ''
+    },
     querySearch(queryString, cb) {
       var TrialSiteSelectList = this.TrialSiteSelectList;
       var results = queryString
@@ -446,8 +461,14 @@ export default {
         let res = await getTrialSiteSelectList();
         if (res.IsSuccess) {
           this.TrialSiteSelectList = res.Result.map((item) => {
+            let v = ''
+            if (this.$i18n.locale === 'zh' && item.AliasName) {
+              v = `（${item.AliasName}）`
+            } else if (this.$i18n.locale === 'en' && item.AliasName) {
+              v = `( ${item.AliasName} )`
+            }
             return {
-              value: item.SiteName + " " + item.AliasName,
+              value: `${item.SiteName} ${v}`,
               ...item,
             };
           });

src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue

@@ -1311,7 +1311,9 @@ export default {
       //   ",",
       //   " | "
       // );
-      this.form.BodyPartTypeList = this.form.BodyPartTypes.split("|");
+      let BodyPartTypes = res.BodyPartTypes;
+      this.form.BodyPartTypes = "";
+      this.form.BodyPartTypeList = BodyPartTypes.split("|");
       let r = await this.getTrialBodyPartList();
       if (r) {
         var bodyPartTypes = this.form.BodyPartTypeList.map((i) => {