部分问题修复

.gitignore

@@ -14,5 +14,5 @@ tests/**/coverage/
 *.ntvs*
 *.njsproj
 *.sln
-# .eslintignore
+.eslintignore
-# /.eslintignore
+/.eslintignore

src/views/dictionary/template/components/ClinicalQuestionConfig.vue

@@ -242,7 +242,9 @@ export default {
   watch: {
     list() {
       this.$nextTick(() => {
-        this.$refs.criterionQSList.doLayout()
+        if(this.$refs.criterionQSList){
+          this.$refs.criterionQSList.doLayout()
+        }
       })
     }
   },

src/views/dictionary/template/components/CriterionsConfig.vue

@@ -295,7 +295,9 @@ export default {
   watch: {
     list() {
       this.$nextTick(() => {
-        this.$refs.criterionQSList.doLayout()
+        if(this.$refs.criterionQSList){
+          this.$refs.criterionQSList.doLayout()
+        }
       })
     }
   },

src/views/dictionary/template/components/EfficacyAssessment.vue

@@ -83,7 +83,8 @@
         <el-table-column type="index" min-width="90" />
         <el-table-column
           :prop="item.ColumnKey"
-          v-for="item of headList"
+          v-for="(item,index) of headList"
+          :key="'DictionaryKey'+index"
           :label="item.ColumnName"
           show-overflow-tooltip
           sortable="custom"
@@ -186,7 +187,9 @@ export default {
   watch: {
     list() {
       this.$nextTick(() => {
-        this.$refs.organList.doLayout()
+        if(this.$refs.organList){
+          this.$refs.organList.doLayout()
+        }
       })
     }
   },

src/views/dictionary/template/components/OrgansTbl.vue

@@ -357,7 +357,9 @@ export default {
   watch: {
     list() {
       this.$nextTick(() => {
-        this.$refs.organList.doLayout()
+        if(this.$refs.organList){
+          this.$refs.organList.doLayout()
+        }
       })
     }
   },

src/views/financials/revenues/index.vue

@@ -259,10 +259,14 @@ export default {
       this.listQuery.PageIndex = 1
       this.listQuery.Asc = true
       this.listQuery.SortField = ''
-      this.$refs.revenusList.doLayout()
+      if(this.$refs.revenusList){
+        this.$refs.revenusList.doLayout()
+      }
       this.arrID = []
       this.getList()
-      this.$refs.revenusList.doLayout()
+      if(this.$refs.revenusList){
+        this.$refs.revenusList.doLayout()
+      }
     },
     handleVerify() {
       this.dialogLoading = true

src/views/statistics/components/EnrollmentsStatsByReviewer.vue

@@ -252,7 +252,9 @@ export default {
     // 合计行
     getSummaries(param) {
       this.$nextTick(() => {
-        this.$refs.enrollmentStats.doLayout()
+        if(this.$refs.enrollmentStats){
+          this.$refs.enrollmentStats.doLayout()
+        }
       })
       const { columns, data } = param
       const sums = []

src/views/statistics/components/TrialEnrollmentsStats.vue

@@ -248,7 +248,9 @@ export default {
     // 合计行
     getSummaries(param) {
       this.$nextTick(() => {
-        this.$refs.trialStats.doLayout()
+        if(this.$refs.trialStats){
+          this.$refs.trialStats.doLayout()
+        }
       })
       const { columns, data } = param
       const sums = []

src/views/statistics/components/WorkloadStats.vue

@@ -254,7 +254,9 @@ export default {
     // 统计
     getSummaries(param) {
       this.$nextTick(() => {
-        this.$refs.workloadStats.doLayout()
+        if(this.$refs.workloadStats){
+          this.$refs.workloadStats.doLayout()
+        }
       })
       const { columns, data } = param
       const sums = []

src/views/trials/trials-inspection/components/confirm-visit-list.vue

@@ -319,6 +319,7 @@ export default {
           }
         }
       } catch (err) {
+        this.loading = false;
         console.log(err);
       }
     },

src/views/trials/trials-panel/enrolled-reviewers/list/index.vue

@@ -90,7 +90,8 @@
           </template>
         </el-table-column>
         <el-table-column
-          v-for="ite of TrialReadingCriterionList"
+          v-for="(ite,ind) of TrialReadingCriterionList"
+          :key="'TrialReadingCriterionName'+ind"
           :label="ite.TrialReadingCriterionName"
           width="360"
           header-align="center"
@@ -102,7 +103,7 @@
             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 : []">
+              <span :key="item" 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 : []">
                 <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>
@@ -244,10 +245,12 @@
           default-first-option
           style="width: 70%"
         >
-          <el-option v-for="item of $d.ReadingCategory" v-if="item.value === 1" :key="item.id" :value="1" :label="$fd('ReadingCategory', 1) + ' & ' + $fd('ReadingCategory', 2)" />
+          <template v-for="item of $d.ReadingCategory">
-          <el-option v-for="item of $d.ReadingCategory" v-if="item.value === 4 && IsArbitrationReading" :key="item.id" :value="item.value" :label="$fd('ReadingCategory', 4)" />
+            <el-option  v-if="item.value === 1" :key="item.id" :value="1" :label="$fd('ReadingCategory', 1) + ' & ' + $fd('ReadingCategory', 2)" />
-          <el-option v-for="item of $d.ReadingCategory" v-if="item.value === 5 && IsOncologyReading" :key="item.id" :value="item.value" :label="$fd('ReadingCategory', 5)" />
+            <el-option  v-if="item.value === 4 && IsArbitrationReading" :key="item.id" :value="item.value" :label="$fd('ReadingCategory', 4)" />
-        </el-select>
+            <el-option  v-if="item.value === 5 && IsOncologyReading" :key="item.id" :value="item.value" :label="$fd('ReadingCategory', 5)" />
+          </template>
+      </el-select>
       </template>
       <template slot="dialog-footer">
         <el-button

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

@@ -234,6 +234,7 @@
             <el-button
               type="text"
               v-hasPermi="['trials:trials-panel:hirVisit:submit']"
+              v-if="scope.row.SubmitState == 1"
               @click.stop="submit(scope.row)"
               >{{ $t("common:button:submit") }}</el-button
             >
@@ -242,7 +243,7 @@
               type="text"
               v-hasPermi="['trials:trials-panel:hirVisit:remove']"
               @click.stop="remove(scope.row)"
-              disabled
+              :disabled="scope.row.SubmitState > 0"
               >{{ $t("common:button:delete") }}</el-button
             >
             <!--评估结果-->
@@ -258,6 +259,7 @@
               type="text"
               v-hasPermi="['trials:trials-panel:hirVisit:download']"
               @click.stop="downloadImage(scope.row)"
+              v-if="scope.row.SubmitState > 0"
               >{{ $t("trials:reading:button:uploadImages") }}</el-button
             >
             <!--下载医疗报告-->
@@ -301,6 +303,7 @@ import BaseContainer from "@/components/BaseContainer";
 import Pagination from "@/components/Pagination";
 import editStudyList from "./components/edit-study-list.vue";
 import visitInfo from "./components/visit-info.vue";
+import { deleteSubjectVisit } from "@/api/trials";
 import {
   getPatientSubejctVisitList,
   getSubjectImageZipInfo,
@@ -423,7 +426,30 @@ export default {
       }
     },
     // 删除
-    remove() {},
+    async remove(row) {
+      try {
+        let confirm = await this.$confirm(
+          this.$t("trials:crcUpload:message:deleteVisit"),
+          {
+            type: "warning",
+            distinguishCancelAndClose: true,
+          }
+        );
+        if (confirm !== "confirm") return;
+        let res = await deleteSubjectVisit(
+          this.$route.query.trialId,
+          row.SubjectVisitId
+        );
+        if (res.IsSuccess) {
+          this.getList();
+          this.$message.success(
+            this.$t("trials:crcUpload:message:deleteVisitSuccessfully")
+          );
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
     // 评估结果
     result() {},
     // 下载报告

src/views/trials/trials-panel/reading/audit-records/index.vue

@@ -455,7 +455,9 @@ export default {
   },
   beforeUpdate() {
     this.$nextTick(() => {
-      this.$refs.myTable.doLayout();
+      if(this.$refs.myTable){
+        this.$refs.myTable.doLayout();
+      }
     });
   },
   mounted() {
@@ -478,7 +480,9 @@ export default {
               this.list = res.Result.CurrentPageData;
             }, 100);
             this.total = res.Result.TotalCount;
-            this.$refs.myTable.doLayout();
+            if(this.$refs.myTable){
+              this.$refs.myTable.doLayout();
+            }
           });
         })
         .catch(() => {

src/views/trials/trials-panel/reading/mim-medical-audit/index.vue

@@ -537,7 +537,9 @@ export default {
     },
     list() {
       this.$nextTick(() => {
-        this.$refs.mimMedicalAudit[0].doLayout()
+        if(this.$refs.mimMedicalAudit){
+          this.$refs.mimMedicalAudit[0].doLayout()
+        }
       })
     }
   },

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

@@ -46,24 +46,6 @@
                   />
                 </el-select>
               </el-form-item>
-              <!-- 是否加急 -->
-              <el-form-item
-                style="margin-bottom: 10px"
-                :label="$t('trials:reviewTrack:table:isUrgent')"
-              >
-                <el-select
-                  v-model="searchData.IsUrgent"
-                  clearable
-                  style="width: 120px"
-                >
-                  <el-option
-                    v-for="item of $d.YesOrNo"
-                    :key="'IsUrgent' + item.label"
-                    :value="item.value"
-                    :label="item.label"
-                  />
-                </el-select>
-              </el-form-item>
               <!-- 任务状态 -->
               <el-form-item
                 style="margin-bottom: 10px"
@@ -736,7 +718,9 @@ export default {
             }, 100);
             this.total = res.Result.TotalCount;
             this.otherInfo = res.OtherInfo;
-            this.$refs.myTable.doLayout();
+            if(this.$refs.myTable){
+              this.$refs.myTable.doLayout();
+            }
           });
         })
         .catch(() => {

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

@@ -321,7 +321,9 @@ export default {
             this.list = res.Result.CurrentPageData
           }, 100)
           this.total = res.Result.TotalCount
-          this.$refs.myTable.doLayout()
+          if(this.$refs.myTable){
+            this.$refs.myTable.doLayout()
+          }
         })
       }).catch(() => { this.loading = false })
     },

src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue

@@ -325,7 +325,7 @@ export default {
   watch: {
     list() {
       this.$nextTick(() => {
-        this.$refs.emailList.doLayout()
+       this.$refs.emailList&& this.$refs.emailList.doLayout()
       })
     }
   },

src/views/trials/trials-panel/setting/reading-unit/components/DefaultOrgans.vue

@@ -107,7 +107,7 @@ export default {
   watch: {
     list() {
       this.$nextTick(() => {
-        this.$refs.organList.doLayout()
+       this.$refs.organList && this.$refs.organList.doLayout()
       })
     }
   },

src/views/trials/trials-panel/setting/reading-unit/components/OrgansTbl.vue

@@ -278,7 +278,7 @@ export default {
   watch: {
     list() {
       this.$nextTick(() => {
-        this.$refs.organList.doLayout()
+        this.$refs.organList&&this.$refs.organList.doLayout()
       })
     }
   },

src/views/trials/trials-panel/setting/trial-config/components/ClinicalQuestionConfig.vue

@@ -247,7 +247,7 @@ export default {
   watch: {
     list() {
       this.$nextTick(() => {
-        this.$refs.criterionQSList.doLayout()
+        this.$refs.criterionQSList&&this.$refs.criterionQSList.doLayout()
       })
     }
   },

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

@@ -125,7 +125,7 @@ export default {
   watch: {
     list() {
       this.$nextTick(() => {
-        this.$refs.emailList.doLayout()
+        this.$refs.emailList&&this.$refs.emailList.doLayout()
       })
     }
   },

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

@@ -31,7 +31,7 @@
             v-for="item of $d.sex"
             :key="item.id"
             :label="item.label"
-            :value="item.value"
+            :value="String(item.value)"
           />
         </el-select>
       </el-form-item>
@@ -153,7 +153,7 @@ export default {
         Object.keys(this.form).forEach((key) => {
           data[key] = this.form[key];
         });
-        data.BirthDate = data.BirthDate.toISOString();
+        data.BirthDate = data.BirthDate ? data.BirthDate.toISOString() : null;
         delete data.PatientId;
         delete data.PatientList;
         addOrUpdateSubjectHir(data)

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

@@ -216,6 +216,9 @@ export default {
           this.$message.success(this.$t("common:message:addedSuccessfully"));
           this.$emit("getList");
           this.status = "visit";
+          if(data.SubjectCode){
+            this.getTrialSubejctSelectList(this.$route.query.trialId);
+          }
           this.$nextTick(() => {
             this.$refs.confirmVisit.getList();
             this.$refs.confirmVisit.getSubjectVisitSelectList();

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

@@ -333,7 +333,7 @@ export default {
   watch: {
     list() {
       this.$nextTick(() => {
-        this.$refs.subjectList.doLayout();
+        this.$refs.subjectList&&this.$refs.subjectList.doLayout();
       });
     },
   },

src/views/trials/trials-panel/visit/crc-upload/index.vue

@@ -1108,7 +1108,7 @@ export default {
   watch: {
     list() {
       this.$nextTick(() => {
-        this.$refs.visitList.doLayout()
+        this.$refs.visitList&&this.$refs.visitList.doLayout()
       })
     },
     TrialReadingCriterionId(v, old) {

src/views/trials/trials-panel/visit/qc-check/index.vue

@@ -697,7 +697,7 @@ export default {
     doLayout() {
       const scope = this
       this.$nextTick(() => {
-        scope.$refs.qcCheckList.doLayout()
+        scope.$refs.qcCheckList&&scope.$refs.qcCheckList.doLayout()
       })
     },
     // 领取任务