src/components/BaseForm/search-form.vue

@@ -120,9 +120,9 @@
           v-if="item.type === 'Daterange'"
           v-model="searchData[item.prop]"
           type="datetimerange"
-          :range-separator="$t('baseForm:daterange:rangeSeparator')"
+          range-separator="至"
-          :start-placeholder="$t('baseForm:daterange:startPlaceholder')"
+          start-placeholder="开始时间"
-          :end-placeholder="$t('baseForm:daterange:startendPlaceholder')"
+          end-placeholder="结束时间"
           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)) {
+              if (eval(process.env.VUE_APP_LOCK_FOR_PERMISSION_MFA)) {
-              //   sendMFAEmail({ UserId: my_userid, MfaType: 1 }).then((res) => {
+                sendMFAEmail({ UserId: my_userid, MfaType: 1 }).then((res) => {
-              //     done();
+                  done();
-              //     Vue.prototype.$MFA({
+                  Vue.prototype.$MFA({
-              //       status: "lock",
+                    status: "lock",
-              //       UserId: my_userid,
+                    UserId: my_userid,
-              //       EMail: res.Result,
+                    EMail: res.Result,
-              //       username: my_username,
+                    username: my_username,
-              //       callBack: () => {
+                    callBack: () => {
-              //         closeLock(_vm)
+                      closeLock(_vm)
-              //       },
+                    },
-              //     })
+                  })
-              //   })
+                })
-              // } else {
+              } else {
-              closeLock(_vm)
+                closeLock(_vm)
-              // }
+              }
 
             } else {
               // console.log(111)

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

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

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

@@ -168,20 +168,9 @@
             <el-input v-model="form.TrialSiteCode" />
           </el-form-item>
           <!-- 中心名称 -->
-          <el-form-item
+          <el-form-item :label="$t('trials:sitesList:table:siteName')" prop="TrialSiteName">
-            :label="$t('trials:sitesList:table:siteName')"
+            <el-autocomplete clearable class="inline-input" style="width: 100%" v-model="form.TrialSiteName"
-            prop="TrialSiteName"
+              :fetch-suggestions="querySearch" @select="handleSelect" placeholder=""></el-autocomplete>
-          >
-            <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">
@@ -428,13 +417,9 @@ export default {
       this.form.TrialSiteName = item.SiteName;
       this.form.TrialSiteAliasName = item.AliasName
         ? item.AliasName
-        : item.SiteName;
+        : this.form.TrialSiteAliasName;
       this.form.SiteId = item.SiteId;
     },
-    handleChange(v) {
-      if (v) return
-      this.form.TrialSiteAliasName = ''
-    },
     querySearch(queryString, cb) {
       var TrialSiteSelectList = this.TrialSiteSelectList;
       var results = queryString
@@ -461,14 +446,8 @@ 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} ${v}`,
+              value: item.SiteName + " " + item.AliasName,
               ...item,
             };
           });

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

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