From ad993672246bf5e93ca3e9f7a79714401c592f1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 8 Mar 2024 16:42:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/components/UserInfo.vue  |  4 +++-
 .../attachments/SPMEnrollment/index.vue        |  6 +++---
 .../attachments/enrollment/index.vue           |  6 +++---
 .../setting/medical-audit/index.vue            | 18 +-----------------
 .../components/staffExternalForm.vue           |  2 +-
 .../qc-check/components/qualityAssurance.vue   |  2 ++
 .../trials-panel/visit/qc-check/index.vue      |  4 ++--
 7 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index af0286b4..ac899317 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -41,7 +41,9 @@
         <el-switch v-model="user.Status" :active-value="1" :inactive-value="0" />
       </el-form-item>
       <el-form-item :label="$t('system:userlist:table:IsTestUser')">
-        <el-switch v-model="user.IsTestUser" />
+        <el-radio-group v-model="user.IsTestUser">
+          <el-radio v-for="item of $d.NoOrYes" :label="item.value">{{ item.label }}</el-radio>
+        </el-radio-group>
       </el-form-item>
       <el-form-item :label="$t('system:userlist:table:UserType')" prop="UserTypeId">
         <el-select ref="userType" v-model="user.UserTypeId" size="small" placeholder="Please select" style="width:100%;" :disabled="user.CanEditUserType === false">
diff --git a/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue b/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue
index bdf3da96..5f92e8f6 100644
--- a/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue
+++ b/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue
@@ -12,11 +12,11 @@
             <span>{{$fd('Indication', trialInfo.IndicationEnum)}}{{trialInfo.Indication ? '-' + trialInfo.Indication : '' }}</span>
           </div>
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:criterion') }}</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:criterion:') }}</label>
             <span>{{ (trialInfo.CriterionList && trialInfo.CriterionList.length>0)? trialInfo.CriterionList.join(', '): '' }}</span>
           </div>
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:modality') }}</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:modality:') }}</label>
             <el-tooltip
               class="item"
               :content="trialInfo.Modalitys"
@@ -34,7 +34,7 @@
           <!--            <span>{{ $fd('ReadingMethod', trialInfo.ReadingType) }}</span>-->
           <!--          </div>-->
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:totalReviewers') }}</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:totalReviewers:') }}</label>
             <span>{{ trialInfo.TotalReviewers }}</span>
           </div>
           <div class="div-col">
diff --git a/src/views/trials/trials-panel/attachments/enrollment/index.vue b/src/views/trials/trials-panel/attachments/enrollment/index.vue
index 534ad4f7..3269b96a 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/index.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/index.vue
@@ -12,11 +12,11 @@
             <span>{{$fd('Indication', trialInfo.IndicationEnum)}}{{trialInfo.Indication ? '-' + trialInfo.Indication : '' }}</span>
           </div>
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:criterion') }}</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:criterion:') }}</label>
             <span>{{ (trialInfo.CriterionList && trialInfo.CriterionList.length>0)? trialInfo.CriterionList.join(', '): '' }}</span>
           </div>
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:modality') }}</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:modality:') }}</label>
             <el-tooltip
               class="item"
               :content="trialInfo.Modalitys"
@@ -34,7 +34,7 @@
 <!--            <span>{{ $fd('ReadingMethod', trialInfo.ReadingType) }}</span>-->
 <!--          </div>-->
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:totalReviewers') }}</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:totalReviewers:') }}</label>
             <span>{{ trialInfo.TotalReviewers }}</span>
           </div>
           <div class="div-col">
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 eed30070..f031f933 100644
--- a/src/views/trials/trials-panel/setting/medical-audit/index.vue
+++ b/src/views/trials/trials-panel/setting/medical-audit/index.vue
@@ -18,22 +18,6 @@
                 style="width:120px;"
               />
             </el-form-item>
-            <!-- 语言类型 -->
-<!--            <el-form-item-->
-<!--              :label="$t('common:title:languageType')"-->
-<!--            >-->
-<!--              <el-select-->
-<!--                v-model="searchData.LanguageType"-->
-<!--                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:medicalFeedbackCfg:title:taskType')"
@@ -80,7 +64,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item style="margin-top: 10px">
+            <el-form-item>
               <el-button
                 type="primary"
                 icon="el-icon-search"
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
index fa211bf4..280eac3c 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
@@ -53,7 +53,7 @@
             sortable="custom"
             min-width="100"
           >
-            <template slot-scope="scope">{{ scope.row.LastName + '/' + scope.row.FirstName }}</template>
+            <template slot-scope="scope">{{ scope.row.LastName + ' / ' + scope.row.FirstName }}</template>
           </el-table-column>
           <el-table-column
             prop="UserType"
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index 49ca0b3c..b8418ee0 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -176,6 +176,7 @@
                     :disabled="scope.row.IsDeleted || isAudit"
                     @change="changeReadingStatus($event, scope.row)"
                   />
+                  <span>{{$fd('YesOrNo', scope.row.IsReading)}}</span>
                 </template>
               </el-table-column>
               <!-- 是否删除  复审时删除的序列不可再次编辑 -->
@@ -189,6 +190,7 @@
                     :disabled="isAudit"
                     @change="changeDeleteStatus($event, scope.row)"
                   />
+                  <span>{{$fd('YesOrNo', scope.row.IsDeleted)}}</span>
                 </template>
               </el-table-column>
               <el-table-column
diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue
index 4d091d30..c5ac6174 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -229,9 +229,9 @@
           <template slot-scope="scope">
             <el-tooltip placement="bottom">
               <div slot="content">
-                <span>{{ $t('trials:crcUpload:label:dicom') }}: {{ scope.row.DicomStudyCount }},</span>
+                <span>{{ $t('trials:crcUpload:label:dicom') }}: {{ scope.row.DicomStudyCount }}, </span>
                 <span v-if="scope.row.IsBaseLine && OtherInfo.ClinicalInformationTransmissionEnum > 0">
-                  <span>{{ $t('trials:crcUpload:label:noneDicom') }}: {{ scope.row.NoneDicomStudyCount }},</span>
+                  <span>{{ $t('trials:crcUpload:label:noneDicom') }}: {{ scope.row.NoneDicomStudyCount }}, </span>
                   <span>{{ $t('trials:crcUpload:label:clinicalData') }}: {{ scope.row.IsHaveClinicalData?'w/':'w/o' }}</span>
                 </span>
                 <span v-else>{{ $t('trials:crcUpload:label:noneDicom') }}: {{ scope.row.NoneDicomStudyCount }}</span>