部分问题修复

src/views/trials/trials-panel/reading/pending-review/index.vue

@@ -142,6 +142,7 @@
               v-loading="loading"
               :data="list"
               ref="reviewTable"
+              height="100%"
               stripe
               @sort-change="handleSortChange"
             >
@@ -406,29 +407,35 @@
                 </template>
               </el-table-column>
               <el-table-column
-                prop="item.QuestionId"
+                :label="$t('trials:globalReview:table:evaluationRes')"
-                :label="item.QuestionName"
+                align="center"
-                min-width="140"
+                v-if="QuestionList.length > 0"
-                v-for="(item, index) of QuestionList"
-                :key="'QuestionId1' + index"
-                show-overflow-tooltip
               >
-                <template slot-scope="scope">
+                <el-table-column
-                  {{
+                  prop="item.QuestionId"
-                    item.DictionaryCode
+                  :label="item.QuestionName"
-                      ? $fd(
+                  min-width="140"
-                          item.DictionaryCode,
+                  v-for="(item, index) of QuestionList"
-                          parseInt(
+                  :key="'QuestionId1' + index"
-                            scope.row.PIReadingResultList.find(
+                  show-overflow-tooltip
-                              (v) => v.QuestionId === item.QuestionId
+                >
-                            ).Answer
+                  <template slot-scope="scope">
+                    {{
+                      item.DictionaryCode
+                        ? $fd(
+                            item.DictionaryCode,
+                            parseInt(
+                              scope.row.PIReadingResultList.find(
+                                (v) => v.QuestionId === item.QuestionId
+                              ).Answer
+                            )
                           )
-                        )
+                        : scope.row.PIReadingResultList.find(
-                      : scope.row.PIReadingResultList.find(
+                            (v) => v.QuestionId === item.QuestionId
-                          (v) => v.QuestionId === item.QuestionId
+                          ).Answer
-                        ).Answer
+                    }}
-                  }}
+                  </template>
-                </template>
+                </el-table-column>
               </el-table-column>
               <!-- 是否入组 -->
               <el-table-column
@@ -687,6 +694,7 @@ export default {
       otherInfo: {},
       openWindow: null,
       TrialReadingCriterionId: "0",
+      QuestionList: [],
     };
   },
   watch: {
@@ -715,11 +723,11 @@ export default {
           this.list = res.Result.CurrentPageData;
           this.total = res.Result.TotalCount;
           this.otherInfo = res.OtherInfo;
-          this.$nextTick(() => {
+          // this.$nextTick(() => {
-            if (this.$refs.reviewTable) {
+          //   if (this.$refs.reviewTable) {
-              this.$refs.reviewTable[0].doLayout();
+          //     this.$refs.reviewTable[0].doLayout();
-            }
+          //   }
-          });
+          // });
         })
         .catch(() => {
           this.loading = false;

src/views/trials/trials-panel/reading/reading-tracking/index.vue

@@ -169,7 +169,7 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            <span>{{ scope.row.DoctorUser.UserName }}</span>
+            <span>{{ (scope.row.DoctorUser || {}).UserName }}</span>
           </template>
         </el-table-column>
         <!-- 阅片状态 -->
@@ -181,12 +181,10 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.ReadingTaskState === 2" type="primary">{{
+            <el-tag
-              $fd("ReadingTaskState", scope.row.ReadingTaskState)
+              :type="scope.row.ReadingTaskState === 2 ? 'primary' : 'danger'"
-            }}</el-tag>
+              >{{ $fd("ReadingTaskState", scope.row.ReadingTaskState) }}</el-tag
-            <el-tag v-else type="danger">{{
+            >
-              $fd("ReadingTaskState", scope.row.ReadingTaskState)
-            }}</el-tag>
           </template>
         </el-table-column>
         <!-- 阅片标准 -->

src/views/trials/trials-panel/subject/subject-list/components/add-subject.vue

@@ -53,6 +53,14 @@
           >
             {{ $t("trials:addRP:button:confirmAddPR") }}
           </el-button>
+          <!-- <el-button
+            type="primary"
+            @click="remove"
+            :loading="btnLoading"
+            v-else
+          >
+            {{ $t("common:button:remove") }}
+          </el-button> -->
         </div>
         <div>
           <el-form-item :label="$t('trials:study:tabpane:bindPatient')">
@@ -234,6 +242,35 @@ export default {
         console.log(err);
       }
     },
+    // 移除项目
+    async remove() {
+      try {
+        let confirm = await this.$confirm(
+          this.$t("trials:sitesList:message:removeSite"),
+          {
+            type: "warning",
+            distinguishCancelAndClose: true,
+            confirmButtonText: this.$t("common:button:confirm"),
+            cancelButtonText: this.$t("recompose:button:cancel"),
+          }
+        );
+        if (confirm !== "confirm") return;
+        let params = {
+          PatientId: this.Patient.PatientId,
+          SubjectId: this.submitMessage.SubjectId,
+        };
+        this.loading = true;
+        let res = await deleteSubjectPatientBinding(params);
+        this.loading = false;
+        if (res.IsSuccess) {
+          this.getList();
+          this.$message.success(this.$t("common:message:removedSuccessfully"));
+          this.$emit("getList");
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
     // 获取受试者列表
     async getTrialSubejctSelectList(id) {
       let data = {