Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

src/views/system/user/components/Account.vue

@@ -28,7 +28,7 @@ export default {
               let msg = this.$t('system:userlist:message:ResetPassword2')
               msg = msg.replace('xxx', params('userName'))
               msg = msg.replace('yyy', params('email'))
-              this.$alert(msg)
+              this.$alert(decodeURIComponent(msg))
             }
           })
         })

src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue

@@ -164,6 +164,11 @@ export default {
       this.loading = true
       this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId
       getGroupConsistentRuleSubjectList(this.searchData).then(res => {
+        if (res.OtherInfo) {
+          this.$emit('setReaderRulesFormVisible', false)
+        } else {
+          this.$emit('setReaderRulesFormVisible', true)
+        }
         this.loading = false
         this.list = res.Result.CurrentPageData
         this.total = res.Result.TotalCount

src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue

@@ -17,7 +17,7 @@
       </el-form-item>
       <!-- 虚拟中心编号 -->
       <el-form-item  :label="$t('trials:consistencyAnalysisRule:table:siteCode')" prop="VirtualSiteCode">
-        <el-input v-model="form.VirtualSiteCode" style="width: 140px;" />
+        <el-input v-model="form.VirtualSiteCode" style="width: 140px;" @input="(v)=>(form.VirtualSiteCode = v.replace(/[^\a-\z\A-\Z0-9]/g, ''))"/>
       </el-form-item>
     </div>
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">

src/views/trials/trials-panel/reading/consistency-analysis/index.vue

@@ -525,7 +525,7 @@
               <!-- 配置组间一致性分析规则 -->
               {{$t('trials:grouptConsistencyAnalysis:button:config')}}
             </el-button>
-            <GroupConsistentRuleSubjectTable v-if="TrialReadingCriterionId === item.TrialReadingCriterionId" :TrialReadingCriterionId="item.TrialReadingCriterionId"
+            <GroupConsistentRuleSubjectTable @setReaderRulesFormVisible="(v) => {ReaderRulesFormVisible = v}" v-if="TrialReadingCriterionId === item.TrialReadingCriterionId" :TrialReadingCriterionId="item.TrialReadingCriterionId"
             :ref="`GroupConsistentRuleSubjectTable${item.TrialReadingCriterionId}`" style="margin-top: 40px" :IsSelfAnalysis="IsSelfAnalysis" :changeNum="changeNum" @close="() => {ReaderRulesVisible2 = false; ; rowData = {}}" @getList="getList()" />
           </el-tab-pane>
         </el-tabs>
@@ -536,6 +536,7 @@
         :visible.sync="ReaderRulesFormVisible"
         width="480px"
         :close-on-click-modal="false"
+        append-to-body
       >
         <ReaderRulesForm :other-info="OtherInfo" :isDisable="isDisable" :trial-criterion-list="trialCriterionList" :TrialReadingCriterionId="TrialReadingCriterionId" :data="rowData" :select-list="SelectList" :doctor-user-list="DoctorUserList" :is-self-analysis="IsSelfAnalysis" @close="() => {ReaderRulesFormVisible = false; rowData = {}}" @getList="openTaskConsistentRule(IsSelfAnalysis)" />
       </el-dialog>

src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue

@@ -23,6 +23,27 @@
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
+      <!-- 项目编号 -->
+      <el-table-column
+        :label="$t('trials:workbench:table:trialId')"
+        prop="TrialCode"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <!-- 试验名称 -->
+      <el-table-column
+        :label="$t('trials:workbench:table:experimentName')"
+        prop="ExperimentName"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <!-- 研究方案号 -->
+      <el-table-column
+        :label="$t('trials:workbench:table:researchNo')"
+        prop="ResearchProgramNo"
+        show-overflow-tooltip
+        sortable="custom"
+      />
       <el-table-column
         :label="$t('trials:sysDocBeSigned:table:fileType')"
         prop="FileType"
@@ -34,8 +55,8 @@
         show-overflow-tooltip
       />
       <el-table-column
-        :label="$t('trials:sysDocBeSigned:table:uploadTime')"
+        :label="$t('trials:sysDocBeSigned:table:ConfirmTime')"
-        prop="UpdateTime"
+        prop="ConfirmTime"
         show-overflow-tooltip
       />
       <el-table-column
@@ -44,10 +65,10 @@
       >
         <template slot-scope="scope">
           <el-button
-            icon="el-icon-edit-outline"
+            icon="el-icon-view"
             circle
-            :title="$t('trials:workbench:action:sign')"
+            :title="$t('trials:self-attachment:action:preview')"
-            @click="handleSign(scope.row)"
+            @click="handlePreview(scope.row)"
           />
         </template>
       </el-table-column>
@@ -147,6 +168,17 @@ export default {
     }
   },
   methods: {
+    // 预览
+    handlePreview(row) {
+      this.currentRow = { ...row }
+      const { Name, FullFilePath, SignViewMinimumMinutes } = row
+      this.currentPath = FullFilePath
+      this.currentType = row.Name ? Name.substring(Name.lastIndexOf('.') + 1).toLocaleLowerCase() : ''
+      this.currentMinMinutes = SignViewMinimumMinutes
+      this.currentIsConfirm = true
+      this.title = Name
+      this.previewVisible = true
+    },
     getList() {
       getTrialSignDocumentList(this.listQuery).then(res => {
         this.listLoading = false

src/views/trials/trials-workbench/index.vue

@@ -80,13 +80,13 @@
                 </div>
               </div>
             </div>
-            <div class="thy-divider" style="border-top: 1px solid #eee;margin: 0;"></div>
+<!--            <div class="thy-divider" style="border-top: 1px solid #eee;margin: 0;"></div>-->
-            <div class="my_select_box" @click="$router.push('/trials/trials-list')">
+<!--            <div class="my_select_box" @click="$router.push('/trials/trials-list')">-->
-              <div class="my_select_box_content">
+<!--              <div class="my_select_box_content">-->
-                <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+<!--                <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>-->
-                <span>{{ $t('trials:tab:trials') }}</span>
+<!--                <span>{{ $t('trials:tab:trials') }}</span>-->
-              </div>
+<!--              </div>-->
-            </div>
+<!--            </div>-->
             <div class="thy-divider" style="border-top: 1px solid #eee;margin: 0;"></div>
             <div class="my_select_title">{{ $t('trials:workbench:title:padding') }}</div>
             <div class="my_select">