Merge branch 'uat' into uat_us

src/views/blindResumeInfo/info.vue

@@ -1,14 +1,14 @@
 <template>
   <div v-loading="pageLoading" style="height:100%;display:flex;flex-direction: column;">
     <div style="height:50px">
-      <div style="text-align:right;">
+      <!-- <div style="text-align:right;">
         <el-switch
           v-model="isEnglish"
           active-text="EN"
           inactive-text="中文"
           style="margin-right:20px;"
         />
-      </div>
+      </div> -->
       <div style="text-align:center;">
         <h3>{{ title }}</h3>
       </div>

src/views/research/login.vue

@@ -4,7 +4,7 @@
       <h2 style="text-align:center;">
         <!-- 中心调研表 -->
         {{ $t('trials:researchForm:title:question') }}
-        <TopLang style="position: fixed;top: 40px;right: 40px" />
+        <!-- <TopLang style="position: fixed;top: 40px;right: 40px" /> -->
       </h2>
       <el-card shadow="hover">
         <el-form

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

@@ -36,14 +36,14 @@
           </template>
         </el-table-column>
         <!-- Name CN -->
-        <el-table-column
+        <!-- <el-table-column
           prop="ChineseName"
           sortable="custom"
           :label="$t('trials:enrolledReviews:table:nameCN')"
           v-if="!hasPermi(['role:ea'])"
           width="120"
           show-overflow-tooltip
-        />
+        /> -->
         <!-- 用户名 -->
         <el-table-column
           prop="UserName"

src/views/trials/trials-panel/setting/qc-question/components/DefaultQS.vue

@@ -7,23 +7,6 @@
         <el-form-item :label="$t('trials:qcCfg:table:questionName')">
           <el-input v-model="searchData.QuestionName" clearable style="width:120px;" />
         </el-form-item>
-        <!-- 语言类型 -->
-        <el-form-item
-          :label="$t('common:title:languageType')"
-        >
-          <el-select
-            v-model="searchData.LanguageType"
-            style="width:120px;"
-            clearable
-          >
-            <el-option
-              v-for="item of $d.LanguageType"
-              :key="item.value"
-              :value="item.value"
-              :label="item.label"
-            />
-          </el-select>
-        </el-form-item>
         <!-- 类型 -->
         <el-form-item :label="$t('trials:qcCfg:table:type')">
           <el-select v-model="searchData.Type" clearable style="width:120px;">
@@ -70,16 +53,6 @@
         :label="$t('trials:qcCfg:table:questionName')"
         show-overflow-tooltip
       />
-      <!-- 审核问题 -->
-      <el-table-column
-        prop="LanguageType"
-        :label="$t('common:title:languageType')"
-        show-overflow-tooltip
-      >
-        <template slot-scope="scope">
-          {{ $fd('LanguageType', scope.row.LanguageType) }}
-        </template>
-      </el-table-column>
       <!-- 类型 -->
       <el-table-column
         prop="Type"
@@ -140,6 +113,7 @@ import { getQCQuestionConfigureList } from '@/api/dictionary'
 import { batchAddTrialQCQuestionConfigure } from '@/api/trials'
 import BoxContent from '@/components/BoxContent'
 import Pagination from '@/components/Pagination'
+import { mapGetters } from 'vuex'
 
 const searchDataDefault = () => {
   return {
@@ -167,15 +141,23 @@ export default {
       selectArr: []
     }
   },
-  mounted() {
+  computed: {
-    this.trialId = this.$route.query.trialId
+    ...mapGetters(['language'])
-    this.getList()
+  },
+  created(){
+    this.trialId = this.$route.query.trialId;
+    this.getList();
   },
   methods: {
     // 获取受试者列表信息
     getList() {
       this.loading = true
-      this.searchData.TrialId = this.trialId
+      this.searchData.TrialId = this.trialId;
+      if (this.$i18n.locale === 'zh') {
+        this.searchData.LanguageType = 0
+      } else {
+        this.searchData.LanguageType = 1
+      }
       getQCQuestionConfigureList(this.searchData).then(res => {
         this.loading = false
         this.list = res.Result.CurrentPageData
@@ -214,7 +196,7 @@ export default {
     },
     // 重置
     handleReset() {
-      this.searchData = searchDataDefault()
+      this.searchData = searchDataDefault();
       this.getList()
     }
   }