部分问题修复

src/views/system/notice/index.vue

@@ -287,9 +287,11 @@
           min-width="200"
           show-overflow-tooltip
           v-if="
-            hasPermi(['system:notice:edit']) ||
+            hasPermi([
-            hasPermi(['system:notice:publish']) ||
+              'system:notice:edit',
-            hasPermi(['system:notice:back'])
+              'system:notice:publish',
+              'system:notice:back',
+            ])
           "
         >
           <template slot-scope="scope">

src/views/trials/trials-list/components/activate-page.vue

@@ -75,7 +75,7 @@
       </el-form-item>
       <!-- 激活码 -->
       <el-form-item label="激活码">
-        <span>{{ form.code }}</span>
+        <el-input v-model="form.code" />
       </el-form-item>
     </div>
     <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">

src/views/trials/trials-list/components/activate-project.vue

@@ -15,7 +15,7 @@
       label-width="120px"
     >
       <div class="base-dialog-body">
-        <p>授权申请信息</p>
+        <p>{{ $t("trials:activate:ApplyMessage") }}</p>
         <!-- 单位名称 -->
         <el-form-item
           :label="$t('trials:trials-list:activate:organizationName')"
@@ -71,13 +71,6 @@
           prop="Activate"
         >
           <el-input v-model="form.Activate" :disabled="isActivate" />
-          <span
-            v-if="form.Activate"
-            class="copy"
-            @click.stop="getActivationCodeInfo"
-            style="margin-left: 10px"
-            >{{ $t("trials:reviewTrack:impactList:save") }}</span
-          >
           <input
             type="file"
             id="uploadFileInp"
@@ -91,9 +84,16 @@
             v-if="!isActivate"
             >{{ $t("trials:activate:button:upload") }}</label
           >
+          <span
+            v-if="form.Activate"
+            class="copy"
+            @click.stop="getActivationCodeInfo"
+            style="margin-left: 10px"
+            >{{ $t("trials:reviewTrack:impactList:save") }}</span
+          >
         </el-form-item>
         <div v-if="isActivate">
-          <p>授权信息</p>
+            <p>{{ $t("trials:activate:Message") }}</p>
           <!-- 单位名称 -->
           <el-form-item
             :label="$t('trials:trials-list:activate:organizationName')"

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

@@ -99,6 +99,7 @@
         stripe
         height="100"
         @sort-change="handleSortChange"
+        @row-click="handleDetail"
       >
         <!-- <el-table-column type="selection" align="left" width="45" /> -->
         <el-table-column width="40">
@@ -166,12 +167,6 @@
           show-overflow-tooltip
           sortable="custom"
         />
-        <!--是否授权-->
-        <!-- <el-table-column
-          prop="Sponsor"
-          :label="$t('trials:trials-list:table:isAccredit')"
-          show-overflow-tooltip
-        /> -->
         <el-table-column
           prop="TrialStatusStr"
           :label="$t('trials:trials-list:table:status')"
@@ -201,27 +196,41 @@
             >
           </template>
         </el-table-column>
+        <!--阅片标准-->
+        <el-table-column
+          prop="CriterionTypeList"
+          :label="$t('trials:trials-list:table:CriterionTypeList')"
+          show-overflow-tooltip
+          v-if="hasPermi(['role:pm', 'role:pi', 'role:sr'])"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.CriterionTypeList.map((item) =>
+                $fd("CriterionType", Number(item))
+              ).join(",")
+            }}</span>
+          </template>
+        </el-table-column>
+        <!--待提交访视数量-->
+        <el-table-column
+          prop="UnSubmitCount"
+          :label="$t('trials:trials-list:table:UnSubmitCount')"
+          show-overflow-tooltip
+          v-if="hasPermi(['role:pm'])"
+        />
+        <!--待阅片数量-->
+        <el-table-column
+          prop="UnReadCount"
+          :label="$t('trials:trials-list:table:UnReadCount')"
+          show-overflow-tooltip
+          v-if="hasPermi(['role:pm', 'role:pi', 'role:sr'])"
+        />
         <el-table-column
           prop="CreateTime"
           :label="$t('trials:trials-list:table:createDate')"
           show-overflow-tooltip
           sortable="custom"
         />
-        <!--授权日期-->
-        <!-- <el-table-column
-          prop="AuthorizationDate"
-          :label="$t('trials:trials-list:table:dateAuthorized')"
-          show-overflow-tooltip
-          sortable="custom"
-        >
-          <template slot-scope="scope">
-            <span>{{
-              scope.row.AuthorizationDate
-                ? moment(scope.row.AuthorizationDate)
-                : ""
-            }}</span>
-          </template>
-        </el-table-column> -->
         <!--授权时长-->
         <el-table-column
           prop="AuthorizationDuration"
@@ -238,7 +247,7 @@
               icon="el-icon-info"
               :disabled="scope.row.IsDeleted"
               :title="$t('trials:trials-list:action:panel')"
-              @click="handleDetail(scope.row)"
+              @click.stop="handleDetail(scope.row)"
             />
             <!-- 编辑项目基本信息 -->
             <el-button
@@ -247,7 +256,7 @@
               icon="el-icon-edit-outline"
               :disabled="scope.row.IsDeleted"
               :title="$t('trials:trials-list:action:edit')"
-              @click="handleEdit(scope.row)"
+              @click.stop="handleEdit(scope.row)"
             />
             <!-- 修改项目状态 -->
             <el-button
@@ -256,7 +265,7 @@
               icon="el-icon-edit"
               :disabled="scope.row.IsDeleted"
               :title="$t('trials:trials-list:action:status')"
-              @click="handleStatus(scope.row)"
+              @click.stop="handleStatus(scope.row)"
             />
             <!-- 废除项目 -->
             <el-button
@@ -268,7 +277,7 @@
                 scope.row.TrialStatusStr !== 'Initializing'
               "
               :title="$t('trials:trials-list:action:abolition')"
-              @click="handleAbandon(scope.row)"
+              @click.stop="handleAbandon(scope.row)"
             />
             <!-- 激活 -->
             <el-button
@@ -277,7 +286,7 @@
               circle
               icon="el-icon-key"
               :title="$t('trials:trials-list:action:activate')"
-              @click="handleActivate(scope.row)"
+              @click.stop="handleActivate(scope.row)"
             />
           </template>
         </el-table-column>

src/views/trials/trials-panel/hirVisit/index.vue

@@ -343,6 +343,10 @@ export default {
     };
   },
   created() {
+    if (zzSessionStorage.getItem("SubjectCode")) {
+      this.searchData.SubjectCode = zzSessionStorage.getItem("SubjectCode");
+      zzSessionStorage.removeItem("SubjectCode");
+    }
     this.getList();
   },
   methods: {

src/views/trials/trials-panel/subject/subject-list/index.vue

@@ -162,7 +162,18 @@
           :label="$t('trials:subject:table:totalVisitCount')"
           show-overflow-tooltip
           sortable="custom"
-        />
+        >
+          <template slot-scope="scope">
+            <el-button
+              v-if="scope.row.VisitCount >= 1"
+              type="text"
+              @click="gotoVisit(scope.row)"
+            >
+              <span>{{ scope.row.VisitCount }}</span>
+            </el-button>
+            <span v-else>{{ scope.row.VisitCount }}</span>
+          </template>
+        </el-table-column>
         <!-- 最新检查访视 -->
         <el-table-column
           prop="LatestVisitName"
@@ -360,6 +371,15 @@ export default {
     this.getList();
   },
   methods: {
+    // 跳转至访视页
+    gotoVisit(item) {
+      let query = this.$route.query;
+      this.$router.push({
+        path: "/trials/trials-panel/hir-visit",
+        query,
+      });
+      zzSessionStorage.setItem("SubjectCode", item.Code);
+    },
     handleExport() {
       getSubjectList_Export(this.searchData)
         .then((res) => {})