From 38f5b52938c88e5509b9d710fbdadf4b1aa9f16a Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 8 Aug 2024 16:26:10 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/personnel-manage/components/site.vue  | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
index ace89353..911a32c1 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
@@ -281,6 +281,7 @@
               :fetch-suggestions="querySearch"
               @select="handleSelect"
               placeholder=""
+              @change="handleChange"
             ></el-autocomplete>
           </el-form-item>
           <!-- 中心别称 -->
@@ -614,9 +615,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
@@ -643,8 +648,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,
             };
           });

From de313e9b52ca54ef71ea1da089701b3d65565715 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Fri, 9 Aug 2024 11:44:32 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=94=81=E5=B1=8F?=
 =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main.js b/src/main.js
index 762ef18e..aacc85f9 100644
--- a/src/main.js
+++ b/src/main.js
@@ -440,22 +440,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: () => {
-                      closeLock(_vm)
-                    },
-                  })
-                })
-              } else {
-                closeLock(_vm)
-              }
+              // 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 {
               // console.log(111)

From 67d995d18087548d4559477b6601d7f9cf4cf485 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 9 Aug 2024 13:04:47 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E9=98=85=E7=89=87=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enrolled-reviewers/list/index.vue         | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
index 82736cab..681469d5 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
@@ -272,20 +272,22 @@
         </el-select>
       </template>
       <template slot="dialog-footer">
-        <el-button
+        <div style="margin-top:30px;">
+          <el-button
           :disabled="readingCategory_model.btnLoading"
           type="primary"
           @click="readingCategory_model.visible = false"
-        >
-          {{ $t('common:button:cancel') }}
-        </el-button>
-        <el-button
-          type="primary"
-          :loading="readingCategory_model.btnLoading"
-          @click="handleUpdateReadingCategory"
-        >
-          {{ $t('common:button:save') }}
-        </el-button>
+          >
+            {{ $t('common:button:cancel') }}
+          </el-button>
+          <el-button
+            type="primary"
+            :loading="readingCategory_model.btnLoading"
+            @click="handleUpdateReadingCategory"
+          >
+            {{ $t('common:button:save') }}
+          </el-button>
+        </div>
       </template>
     </base-model>
     <!-- 修改医生状态 -->

From 08710d78d160cf5e7920785875762773d87c80a1 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Fri, 9 Aug 2024 13:08:52 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/trial-config/components/clinicalDataForm.vue    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/trial-config/components/clinicalDataForm.vue b/src/views/trials/trials-panel/setting/trial-config/components/clinicalDataForm.vue
index 53c17d04..2482885e 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/clinicalDataForm.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/clinicalDataForm.vue
@@ -16,10 +16,12 @@
         <el-input
           v-model="form.ClinicalDataSetEnName"
           :disabled="data.IsFromSystemData === true"
+          @input="form.ClinicalDataSetName = form.ClinicalDataSetEnName"
+          @blur="form.ClinicalDataSetName = form.ClinicalDataSetEnName"
         />
       </el-form-item>
       <!-- 临床数据名称 -->
-      <el-form-item
+      <!-- <el-form-item
         :label="$t('trials:processCfg:title:clinicalDataName')+ '（CN）'"
         prop="ClinicalDataSetName"
       >
@@ -27,7 +29,7 @@
           v-model="form.ClinicalDataSetName"
           :disabled="data.IsFromSystemData === true"
         />
-      </el-form-item>
+      </el-form-item> -->
       <!-- 上传人 -->
       <el-form-item
         :label="$t('trials:processCfg:title:uploader')"

From 8bd46c150b8754d0695e4e4f8a3963ca2e845781 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 9 Aug 2024 13:41:35 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enrolled-reviewers/list/index.vue         | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
index 681469d5..6e0ce792 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
+++ b/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,16 +96,15 @@
           <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">
-                <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>
-                <el-tag v-if="item === 5" type="warning">{{ $fd('ReadingCategory', item) }}</el-tag>
-              </span>
-              <el-button
+                <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>
+                  <el-tag v-if="item === 5" type="warning">{{ $fd('ReadingCategory', item) }}</el-tag>
+                </span>
+                <el-button
                 v-hasPermi="['trials:trials-panel:enrolled-reviewers:list:edit']"
                 type="text"
                 @click="openSetEnrollReadingCategory(scope.row, ite.TrialReadingCriterionId)"
@@ -248,7 +247,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>
@@ -258,7 +257,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)" /> 
@@ -433,7 +432,7 @@ export default {
         visible: false,
         title: this.$t('trials:enrolledReviews:dialogTitle:changeReadingType'),
         showClose: true,
-        width: '500px',
+        width: '600px',
         btnLoading: false
       },
       reviewerStatus_model: {
@@ -823,10 +822,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>

From fe7d4f7877ab7523d3516a4d48c4a3a19a5df440 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Mon, 12 Aug 2024 13:42:04 +0800
Subject: [PATCH 6/8] =?UTF-8?q?qc=E9=97=AE=E9=A2=98=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../medical-audit/components/QSForm.vue       | 15 -----------
 .../setting/medical-audit/index.vue           | 25 ++++++++++++++++---
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/medical-audit/components/QSForm.vue b/src/views/trials/trials-panel/setting/medical-audit/components/QSForm.vue
index c68c9e40..08c52ce3 100644
--- a/src/views/trials/trials-panel/setting/medical-audit/components/QSForm.vue
+++ b/src/views/trials/trials-panel/setting/medical-audit/components/QSForm.vue
@@ -17,21 +17,6 @@
           v-model="form.QuestionName"
         />
       </el-form-item>
-      <el-form-item
-        :label="$t('common:title:languageType')"
-        prop="LanguageType"
-      >
-        <el-select
-          v-model="form.LanguageType"
-        >
-          <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')"
diff --git a/src/views/trials/trials-panel/setting/medical-audit/index.vue b/src/views/trials/trials-panel/setting/medical-audit/index.vue
index 0b51316d..19a12d90 100644
--- a/src/views/trials/trials-panel/setting/medical-audit/index.vue
+++ b/src/views/trials/trials-panel/setting/medical-audit/index.vue
@@ -326,7 +326,7 @@
   </box-content>
 </template>
 <script>
-import { batchDeteteCriterionMedicineQuestion, getReadingMedicineTrialQuestionList, deleteReadingMedicineTrialQuestion, confirmReadingMedicineQuestion, verifyReadingMedicineQuestion, verifyIsCanConfirm } from '@/api/trials'
+import { addDefaultQuestions , batchDeteteCriterionMedicineQuestion, getReadingMedicineTrialQuestionList, deleteReadingMedicineTrialQuestion, confirmReadingMedicineQuestion, verifyReadingMedicineQuestion, verifyIsCanConfirm } from '@/api/trials'
 import { getTrialCriterionList } from '@/api/trials/reading'
 import BoxContent from '@/components/BoxContent'
 import DefaultQS from './components/DefaultQsLang'
@@ -334,7 +334,7 @@ import QSForm from './components/QSForm'
 import Pagination from '@/components/Pagination'
 import QuestionsPreview from './components/QuestionsPreview'
 import SignForm from '@/views/trials/components/newSignForm'
-import const_ from '@/const/sign-code'
+import const_ from '@/const/sign-code';
 const searchDataDefault = () => {
   return {
     QuestionName: '',
@@ -382,7 +382,6 @@ export default {
       this.CurrentCriterionType = this.trialCriterionList.find(v => {
         return v.TrialReadingCriterionId === this.trialReadingCriterionId
       }).CriterionType
-      console.log(this.CurrentCriterionType)
     }
   },
   mounted() {
@@ -390,6 +389,23 @@ export default {
     this.getTrialCriterionList()
   },
   methods: {
+    // 添加默认问题
+    addDefaultQuestions(){
+      let data = {
+        TrialId: this.$route.query.trialId,
+        TrialReadingCriterionId: this.trialReadingCriterionId,
+        LanguageType: 0
+      }
+      if( this.otherInfo.LanguageType === null ){
+        data.LanguageType = this.$i18n.locale === 'zh' ? 0 : 1
+      } else {
+        data.LanguageType = this.otherInfo.LanguageType
+      }
+      addDefaultQuestions(data).then(res => {
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
+        this.getList();
+      })
+    },
     handleSelectionChange(value) {
       this.selectedList = value
     },
@@ -433,7 +449,8 @@ export default {
     },
     // 打开系统模板配置项
     handleAdd() {
-      this.addVisible = true
+      // this.addVisible = true
+      this.addDefaultQuestions();
     },
     handleEdit(row) {
       this.currentRow = { ...row }

From a84084a15fe7a5a5c5a3f8728d8407ea101a5c05 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Mon, 12 Aug 2024 13:42:26 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=BA=AB=E4=BD=93?=
 =?UTF-8?q?=E9=83=A8=E4=BD=8D=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/trial-config/components/logicalConfig.vue         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
index 85e36f25..fb586242 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
@@ -1272,7 +1272,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) => {

From 0189f6e9890b4e2bcf1a4435fb4b81b56157c567 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Mon, 12 Aug 2024 14:39:02 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BaseForm/search-form.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/BaseForm/search-form.vue b/src/components/BaseForm/search-form.vue
index 303307d6..378bec3a 100644
--- a/src/components/BaseForm/search-form.vue
+++ b/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 }"