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

src/components/BaseModel/index.vue

@@ -2,7 +2,7 @@
   <div class="base-model-wrapper">
     <el-dialog
       v-if="config.visible"
-      :v-dialogDrag="!config.dialogDrag"
+      v-dialogDrag
       :title="config.title"
       :append-to-body="config.appendToBody"
       :visible.sync="config.visible"
@@ -35,7 +35,6 @@ export default {
           appendToBody: false,
           width: "100px",
           fullscreen: false,
-          dialogDrag: false,
         };
       },
     },

src/components/uploadImage/index.vue

@@ -34,7 +34,7 @@
               scope.row.OrginalStudyList.length >= 1
             "
             type="text"
-            @click="handleOpenDialog(scope.row, 'study')"
+            @click="handleOpenDialog(scope.row, 'OrginalStudyList')"
           >
             <span>{{ scope.row.OrginalStudyList.length }}</span>
           </el-button>
@@ -293,10 +293,68 @@
         </template> -->
       </el-table-column>
     </el-table>
+    <base-model :config="model_cfg">
+      <div slot="dialog-body">
+        <el-table :data="modelList" style="width: 100%" height="300">
+          <!--检查编号-->
+          <el-table-column
+            prop="StudyCode"
+            :label="$t('trials:uploadImage:table:StudyCode')"
+          />
+          <!--检查类型-->
+          <el-table-column
+            prop="ModalityForEdit"
+            :label="$t('trials:uploadImage:table:ModalityForEdit')"
+          />
+          <!--检查模态-->
+          <el-table-column
+            prop="Modalities"
+            :label="$t('trials:uploadImage:table:Modalities')"
+          />
+          <!--检查部位-->
+          <el-table-column
+            prop="BodyPartForEdit"
+            :label="$t('trials:uploadImage:table:BodyPartForEdit')"
+          />
+          <!--序列数量-->
+          <el-table-column
+            prop="SeriesCount"
+            :label="$t('trials:uploadImage:table:SeriesCount')"
+          />
+          <!--图像数量-->
+          <el-table-column
+            prop="InstanceCount"
+            :label="$t('trials:uploadImage:table:InstanceCount')"
+          />
+          <!--检查时间-->
+          <el-table-column
+            prop="StudyTime"
+            :label="$t('trials:uploadImage:table:StudyTime')"
+            min-width="130"
+          />
+          <el-table-column
+            :label="$t('common:action:action')"
+            fixed="right"
+            width="80"
+          >
+            <template slot-scope="scope">
+              <!--预览--->
+              <el-button
+                circle
+                icon="el-icon-view"
+                :title="$t('trials:uploadImage:button:download')"
+                @click.stop="preview(scope.row)"
+              />
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </base-model>
   </el-dialog>
 </template>
 <script>
 import baseModel from "@/components/BaseModel";
+import { getToken } from "@/utils/auth";
 import {
   getSubjectImageUploadList,
   preArchiveDicomStudy,
@@ -336,6 +394,16 @@ export default {
       uploadList: [], // 待上传文件列表
       dicomList: [], // 上传的文件列表
       requestNum: 6,
+
+      // 检查数弹框
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: "1000px",
+        title: "",
+        appendToBody: true,
+      },
+      modelList: [],
     };
   },
   created() {
@@ -415,6 +483,20 @@ export default {
         console.log(err);
       }
     },
+    // 打开弹窗
+    handleOpenDialog(item, list) {
+      this.model_cfg.title = `${item.SubejctCode || ""}>${item.TaskBlindName}`;
+      this.modelList = item[list];
+      this.model_cfg.visible = true;
+    },
+    // 预览
+    preview(row) {
+      var token = getToken();
+      const routeData = this.$router.resolve({
+        path: `/showdicom?studyId=${row.Id}&TokenKey=${token}&type=Study`,
+      });
+      window.open(routeData.href, "_blank");
+    },
     // 打包下载
     async downloadImage(item) {
       try {

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

@@ -70,7 +70,8 @@
                   "
                   :label="item.value"
                   v-if="
-                    JudgyInfo.ArbitrationRule === 1 ||
+                    (JudgyInfo.ArbitrationRule === 1 &&
+                      QuestionList[index].Type === 'number') ||
                     (item.value !== 4 && item.value !== 5)
                   "
                   >{{ item.label }}</el-radio
@@ -327,6 +328,7 @@
               <el-select
                 v-model="QuestionList[index].JudgeDifferenceType"
                 placeholder="请选择"
+                :disabled="OtherInfo.IsSign"
               >
                 <el-option
                   v-for="item of $d.JudgeDifferenceType"