非dicom阅片单元配置

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

@@ -657,7 +657,7 @@ export default {
           this.$emit('setGlobalReading', res.Result.IsGlobalReading)
           this.$emit('setOncologyReading', res.Result.IsOncologyReading)
           this.$emit('setDigitPlaces', res.Result.DigitPlaces)
-          this.$emit('setReadingTools', res.Result.ReadingToolList)
+          this.$emit('setReadingTools', { readingTools: res.Result.ReadingToolList, isNoneDicom: this.form.ReadingTool === 1 })
 
           if (res.Result.ReadingType === 1) {
             this.$emit('setArbitrationReading', false)

src/views/trials/trials-panel/setting/reading-unit/index.vue

@@ -3,99 +3,51 @@
     <div v-if="isShow" class="content">
       <el-tabs v-model="TrialReadingCriterionId" type="border-card">
         <template v-for="item of trialCriterionList">
-          <el-tab-pane
+          <el-tab-pane :key="item.TrialReadingCriterionId" :label="item.TrialReadingCriterionName"
-            :key="item.TrialReadingCriterionId"
+            :name="item.TrialReadingCriterionId">
-            :label="item.TrialReadingCriterionName"
+            <div style="text-align: right; padding: 5px 0px" v-if="!hasPermi(['role:admin', 'role:qa', 'role:ea'])">
-            :name="item.TrialReadingCriterionId"
-          >
-            <div style="text-align: right; padding: 5px 0px" v-if="!hasPermi(['role:admin','role:qa','role:ea'])">
               <!-- 同步当前标准 -->
-              <el-button
+              <el-button type="primary" icon="el-icon-refresh-left" :loading="loading" size="mini" @click="syncSign">
-                type="primary"
-                icon="el-icon-refresh-left"
-                :loading="loading"
-                size="mini"
-                
-                @click="syncSign"
-              >
                 {{ $t("trials:readingUnit:button:sync") }}
               </el-button>
             </div>
-            <el-collapse
+            <el-collapse v-model="activeCollapse" class="setting-config" v-if="
-              v-model="activeCollapse"
+              item.isPaneShow &&
-              class="setting-config"
+              item.TrialReadingCriterionId === TrialReadingCriterionId
-              v-if="
+            ">
-                item.isPaneShow &&
-                item.TrialReadingCriterionId === TrialReadingCriterionId
-              "
-            >
               <!-- 阅片规则 -->
-              <el-collapse-item
+              <el-collapse-item :title="$t('trials:readingUnit:readingRules')" name="1">
-                :title="$t('trials:readingUnit:readingRules')"
+                <ReadingRules :ref="`readingRules${item.TrialReadingCriterionId}`"
-                name="1"
+                  :trial-reading-criterion-id="TrialReadingCriterionId" :CriterionType="item.CriterionType"
-              >
+                  @setConfirm="setConfirm" @reloadArbitrationRules="reloadArbitrationRules"
-                <ReadingRules
+                  @setArbitrationReading="setArbitrationReading" @setAdditionalAssessment="setAdditionalAssessment"
-                  :ref="`readingRules${item.TrialReadingCriterionId}`"
+                  @setIsClinicalReading="setIsClinicalReading" @setGlobalReading="setGlobalReading"
-                  :trial-reading-criterion-id="TrialReadingCriterionId"
+                  @setOncologyReading="setOncologyReading" @setDigitPlaces="setDigitPlaces"
-                  :CriterionType="item.CriterionType"
+                  @setReadingTools="setReadingTools" />
-                  @setConfirm="setConfirm"
-                  @reloadArbitrationRules="reloadArbitrationRules"
-                  @setArbitrationReading="setArbitrationReading"
-                  @setAdditionalAssessment="setAdditionalAssessment"
-                  @setIsClinicalReading="setIsClinicalReading"
-                  @setGlobalReading="setGlobalReading"
-                  @setOncologyReading="setOncologyReading"
-                  @setDigitPlaces="setDigitPlaces"
-                  @setReadingTools="setReadingTools"
-                />
               </el-collapse-item>
               <!-- 阅片标准 -->
-              <el-collapse-item
+              <el-collapse-item :title="$t('trials:readingUnit:readingCriterion')" name="2">
-                :title="$t('trials:readingUnit:readingCriterion')"
+                <ReadingCriterions :ref="`readingCriterions${item.TrialReadingCriterionId}`"
-                name="2"
+                  :trial-reading-criterion-id="TrialReadingCriterionId" :digit-places="digitPlaces"
-              >
+                  :readingTools="readingTools" :is-additional-assessment="isAdditionalAssessment"
-                <ReadingCriterions
+                  @reloadArbitrationRules="reloadArbitrationRules" />
-                  :ref="`readingCriterions${item.TrialReadingCriterionId}`"
-                  :trial-reading-criterion-id="TrialReadingCriterionId"
-                  :digit-places="digitPlaces"
-                  :readingTools="readingTools"
-                  :is-additional-assessment="isAdditionalAssessment"
-                  @reloadArbitrationRules="reloadArbitrationRules"
-                />
               </el-collapse-item>
               <!-- 全局阅片 -->
-              <el-collapse-item
+              <el-collapse-item v-if="isGlobalReading && CriterionType !== 10"
-                v-if="isGlobalReading && CriterionType !== 10"
+                :title="$t('trials:readingUnit:GlobalReading')" name="5">
-                :title="$t('trials:readingUnit:GlobalReading')"
+                <GlobalReading :ref="`globalReading${item.TrialReadingCriterionId}`"
-                name="5"
+                  :trial-reading-criterion-id="TrialReadingCriterionId" />
-              >
-                <GlobalReading
-                  :ref="`globalReading${item.TrialReadingCriterionId}`"
-                  :trial-reading-criterion-id="TrialReadingCriterionId"
-                />
               </el-collapse-item>
               <!-- 仲裁规则 -->
-              <el-collapse-item
+              <el-collapse-item v-if="isArbitrationReading" :title="$t('trials:readingUnit:adRules')" name="3">
-                v-if="isArbitrationReading"
+                <ArbitrationRules :ref="`arbitrationRules${item.TrialReadingCriterionId}`"
-                :title="$t('trials:readingUnit:adRules')"
+                  :trial-reading-criterion-id="TrialReadingCriterionId" />
-                name="3"
-              >
-                <ArbitrationRules
-                  :ref="`arbitrationRules${item.TrialReadingCriterionId}`"
-                  :trial-reading-criterion-id="TrialReadingCriterionId"
-                />
               </el-collapse-item>
               <!-- 肿瘤学阅片配置 -->
               <!-- v-if="isClinicalReading" -->
-              <el-collapse-item
+              <el-collapse-item v-if="isOncologyReading" :title="$t('trials:readingUnit:oncologyReading')" name="4">
-                v-if="isOncologyReading"
+                <OncologyForm :ref="`oncologyForm${item.TrialReadingCriterionId}`"
-                :title="$t('trials:readingUnit:oncologyReading')"
+                  :trial-reading-criterion-id="TrialReadingCriterionId" />
-                name="4"
-              >
-                <OncologyForm
-                  :ref="`oncologyForm${item.TrialReadingCriterionId}`"
-                  :trial-reading-criterion-id="TrialReadingCriterionId"
-                />
               </el-collapse-item>
             </el-collapse>
           </el-tab-pane>
@@ -103,13 +55,10 @@
       </el-tabs>
     </div>
 
-    <div
+    <div v-if="
-      v-if="
+      !isConfirm &&
-        !isConfirm &&
+      hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-        hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+    " class="bottom">
-      "
-      class="bottom"
-    >
       <!-- 确认 -->
       <el-button type="danger" @click="handleConfirm">
         {{ $t("trials:readingUnit:button:confirm") }}
@@ -117,44 +66,26 @@
     </div>
 
     <!--签名框 -->
-    <el-dialog
+    <el-dialog v-if="signVisible" :visible.sync="signVisible" :close-on-click-modal="false" width="600px"
-      v-if="signVisible"
+      custom-class="base-dialog-wrapper">
-      :visible.sync="signVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-    >
       <div slot="title">
         <span style="font-size: 18px">{{ $t("common:dialogTitle:sign") }}</span>
         <span style="font-size: 12px; margin-left: 5px">{{
           `(${$t("common:label:sign")}${currentUser})`
         }}</span>
       </div>
-      <SignForm
+      <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
-        ref="signForm"
-        :sign-code-enum="signCode"
-        @closeDialog="closeSignDialog"
-      />
     </el-dialog>
     <!--签名框 -->
-    <el-dialog
+    <el-dialog v-if="signVisible2" :visible.sync="signVisible2" :close-on-click-modal="false" width="600px"
-      v-if="signVisible2"
+      custom-class="base-dialog-wrapper">
-      :visible.sync="signVisible2"
-      :close-on-click-modal="false"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-    >
       <div slot="title">
         <span style="font-size: 18px">{{ $t("common:dialogTitle:sign") }}</span>
         <span style="font-size: 12px; margin-left: 5px">{{
           `(${$t("common:label:sign")}${currentUser})`
         }}</span>
       </div>
-      <SignForm
+      <SignForm ref="signForm2" :sign-code-enum="signCode2" @closeDialog="closeSignDialog2" />
-        ref="signForm2"
-        :sign-code-enum="signCode2"
-        @closeDialog="closeSignDialog2"
-      />
     </el-dialog>
   </div>
 </template>
@@ -176,7 +107,7 @@ import GlobalReading from "./components/GlobalReading";
 import OncologyForm from "./components/OncologyForm";
 import SignForm from "@/views/trials/components/newSignForm";
 import const_ from "@/const/sign-code";
-import { getCustomizeStandardsTools } from '@/views/trials/trials-panel/reading/dicoms3D/components/toolConfig'
+import { getCustomizeStandardsTools, getCustomizeStandardsNoneDicomTools } from '@/views/trials/trials-panel/reading/dicoms3D/components/toolConfig'
 export default {
   name: "ReadingUnit",
   components: {
@@ -290,7 +221,7 @@ export default {
             this.trialCriterionList[0].TrialReadingCriterionId;
           this.isShow = true;
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     setConfirm(isConfirm) {
       this.isConfirm = isConfirm;
@@ -298,8 +229,14 @@ export default {
     setDigitPlaces(digitPlaces) {
       this.digitPlaces = digitPlaces;
     },
-    setReadingTools(readingTools) {
+    setReadingTools(data) {
-      this.readingTools = getCustomizeStandardsTools(readingTools)
+      let { readingTools, isNoneDicom } = data
+      if (isNoneDicom) {
+        this.readingTools = getCustomizeStandardsNoneDicomTools(readingTools)
+      } else {
+        this.readingTools = getCustomizeStandardsTools(readingTools)
+      }
+
     },
     setIsClinicalReading(isClinicalReading) {
       this.isClinicalReading = isClinicalReading;
@@ -324,11 +261,9 @@ export default {
       })
         .then((res) => {
           this.$router.push({
-            path: `/trials/trials-panel/setting/reading-unit?trialId=${
+            path: `/trials/trials-panel/setting/reading-unit?trialId=${this.$route.query.trialId
-              this.$route.query.trialId
+              }&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo
-            }&trialCode=${this.$route.query.trialCode}&researchProgramNo=${
+              }&t=${new Date().getTime()}`,
-              this.$route.query.researchProgramNo
-            }&t=${new Date().getTime()}`,
           });
           this.loading = false;
         })
@@ -352,7 +287,7 @@ export default {
               .then(() => {
                 this.updateCriterions();
               })
-              .catch((action) => {});
+              .catch((action) => { });
           } else {
             try {
               var isCheckList = [];
@@ -468,27 +403,27 @@ export default {
                 this.$refs[
                   "readingRules" + this.TrialReadingCriterionId
                 ][0].initPage();
-              } catch (e) {}
+              } catch (e) { }
               try {
                 this.$refs[
                   "readingCriterions" + this.TrialReadingCriterionId
                 ][0].initPage();
-              } catch (e) {}
+              } catch (e) { }
               try {
                 this.$refs[
                   "arbitrationRules" + this.TrialReadingCriterionId
                 ][0].getList();
-              } catch (e) {}
+              } catch (e) { }
               try {
                 this.$refs[
                   "globalReading" + this.TrialReadingCriterionId
                 ][0].initForm();
-              } catch (e) {}
+              } catch (e) { }
               try {
                 this.$refs[
                   "oncologyForm" + this.TrialReadingCriterionId
                 ][0].initForm();
-              } catch (e) {}
+              } catch (e) { }
               this.$refs["signForm"].btnLoading = false;
               this.signVisible = false;
             } catch (e) {
@@ -523,20 +458,25 @@ export default {
   background-color: #fff;
   display: flex;
   flex-direction: column;
+
   .content {
     flex: 1;
     overflow-y: auto;
   }
+
   ::v-deep .el-collapse-item__header {
     background: #e5ecef;
     padding-left: 10px;
   }
+
   ::v-deep .el-tabs--border-card>.el-tabs__content {
     padding: 0px 15px;
   }
+
   ::v-deep .el-collapse-item__content {
     padding: 10px;
   }
+
   .bottom {
     height: 50px;
     display: flex;