部分问题修复

src/api/inspection.js

@@ -117,3 +117,12 @@ export function submitVisitStudyBinding(data) {
         data
     })
 }
+
+// 清除数据
+export function DeletePatientStudyAllData(params) {
+    return request({
+        url: '/Patient/DeletePatientStudyAllData',
+        method: 'delete',
+        params
+    })
+}

src/views/system/dicomAE/components/edit-dicom.vue

@@ -13,27 +13,30 @@
       :model="form"
       :rules="rules"
       size="small"
-      label-width="150px"
+      label-width="100px"
     >
       <div class="base-dialog-body">
         <!--AE Title-->
-        <el-form-item label="AE Title" prop="CalledAE">
+        <el-form-item :label="$t('system:dicom:form:AETitle')" prop="CalledAE">
           <el-input v-model="form.CalledAE" clearable />
         </el-form-item>
         <!--IP-->
-        <el-form-item label="IP" prop="IP">
+        <el-form-item :label="$t('system:dicom:form:IP')" prop="IP">
           <el-input v-model="form.IP" clearable />
         </el-form-item>
         <!--Port-->
-        <el-form-item label="Port" prop="Port">
+        <el-form-item :label="$t('system:dicom:form:Port')" prop="Port">
           <el-input v-model="form.Port" type="number" clearable />
         </el-form-item>
         <!--Modality-->
-        <el-form-item label="Modality" prop="Modality">
+        <el-form-item :label="$t('system:dicom:form:Modality')" prop="Modality">
           <el-input v-model="form.Modality" clearable />
         </el-form-item>
         <!--Description-->
-        <el-form-item label="Description" prop="Description">
+        <el-form-item
+          :label="$t('system:dicom:form:Description')"
+          prop="Description"
+        >
           <el-input v-model="form.Description" clearable />
         </el-form-item>
       </div>
@@ -95,10 +98,26 @@ export default {
       },
       rules: {
         CalledAE: [
-          { required: true, message: "请输入AE Title", trigger: "blur" },
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+        IP: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+        Port: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
         ],
-        IP: [{ required: true, message: "请输入IP", trigger: "blur" }],
-        Port: [{ required: true, message: "请输入pORT", trigger: "blur" }],
       },
       btnLoading: false,
     };

src/views/system/dicomAE/index.vue

@@ -22,16 +22,18 @@
           <el-input v-model="searchData.Port" style="width: 140px" clearable />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" size="mini" @click="getList"
+          <el-button type="primary" size="mini" @click="getList">{{
-            >搜索</el-button
+            $t("system:dicom:search:search")
-          >
+          }}</el-button>
-          <el-button type="primary" size="mini" @click="reset">重置</el-button>
+          <el-button type="primary" size="mini" @click="reset">{{
+            $t("system:dicom:search:reset")
+          }}</el-button>
           <el-button
             type="primary"
             size="mini"
             v-hasPermi="['system:dicom:add']"
             @click="openDialog('add')"
-            >新增</el-button
+            >{{ $t("system:dicom:search:add") }}</el-button
           >
         </el-form-item>
       </el-form>
@@ -77,6 +79,26 @@
           min-width="120"
           show-overflow-tooltip
         />
+        <!--测试状态-->
+        <el-table-column
+          :label="$t('system:dicom:table:IsTestOK')"
+          prop="IsTestOK"
+          min-width="120"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-tag :type="scope.row.IsTestOK ? 'success' : 'danger'">{{
+              $fd("IsTestOK", String(scope.row.IsTestOK))
+            }}</el-tag>
+          </template>
+        </el-table-column>
+        <!--最后测试时间-->
+        <el-table-column
+          :label="$t('system:dicom:table:LatestTestTime')"
+          prop="LatestTestTime"
+          min-width="120"
+          show-overflow-tooltip
+        />
         <el-table-column
           :label="$t('system:dicom:table:action')"
           fixed="right"
@@ -89,18 +111,18 @@
               type="text"
               v-hasPermi="['system:dicom:edit']"
               @click="openDialog('edit', scope.row)"
-              >{{ $t("system:dicom:table:edit") }}</el-button
+              >{{ $t("system:dicom:action:edit") }}</el-button
             >
             <el-button
               size="mini"
               type="text"
               v-hasPermi="['system:dicom:del']"
               @click="delAE(scope.row)"
-              >删除</el-button
+              >{{ $t("system:dicom:action:remove") }}</el-button
-            >
-            <el-button size="mini" type="text" @click="test(scope.row)"
-              >测试</el-button
             >
+            <el-button size="mini" type="text" @click="test(scope.row)">{{
+              $t("system:dicom:action:test")
+            }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -144,7 +166,7 @@ export default {
       list: [],
       // 弹窗
       editDicomVisible: false,
-      editDicomTitle: "添加",
+      editDicomTitle: "",
       DICOM: {},
     };
   },
@@ -182,9 +204,9 @@ export default {
     // 打开弹框
     openDialog(key, item = {}) {
       this.editDicomVisible = true;
-      this.editDicomTitle = "编辑";
+      this.editDicomTitle = this.$t("system:dicom:action:edit");
       if (key === "add") {
-        this.editDicomTitle = "添加";
+        this.editDicomTitle = this.$t("system:dicom:search:add");
       }
       this.DICOM = JSON.parse(JSON.stringify(item));
     },
@@ -222,6 +244,7 @@ export default {
       } else {
         this.$message.error(this.$t("system:dicomAE:connect:error"));
       }
+      this.getList();
     },
   },
 };

src/views/trials/trials-inspection/components/research-trials-list.vue

@@ -53,10 +53,10 @@
         show-overflow-tooltip
         min-width="140"
       ></el-table-column>
-      <!--受试者编号-->
+      <!--匹配受试者编号-->
       <el-table-column
         prop="Code"
-        :label="$t('trials:uploadMonitor:table:subjectId')"
+        :label="$t('trials:inspectionTrials:table:subjectId')"
         show-overflow-tooltip
         min-width="140"
       ></el-table-column>
@@ -82,7 +82,7 @@
         min-width="140"
       >
         <template slot-scope="scope">
-          <span>{{ $fd("sex", Number(scope.row.Sex)) }}</span>
+          <span>{{ $fd("sex", scope.row.Sex) }}</span>
         </template>
       </el-table-column>
       <!--状态-->

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

@@ -132,7 +132,11 @@
           show-overflow-tooltip
           min-width="140"
           sortable="custom"
-        ></el-table-column>
+        >
+          <template slot-scope="scope">
+            <span>{{ $fd("sex", scope.row.PatientSex) }}</span>
+          </template>
+        </el-table-column>
         <!--Called AE-->
         <el-table-column
           prop="CalledAEList"
@@ -228,6 +232,12 @@
               :title="$t('trials:inspection:button:addTrials')"
               @click.stop="handleOpenDialog(scope.row, 'add')"
             />
+            <el-button
+              circle
+              icon="el-icon-delete"
+              :title="$t('trials:inspection:button:delete')"
+              @click.stop="DeletePatientStudyAllData(scope.row)"
+            />
           </template>
         </el-table-column>
       </el-table>
@@ -272,7 +282,7 @@ import Pagination from "@/components/Pagination";
 import researchTrialsList from "./components/research-trials-list";
 import addTrialsList from "./components/add-trials-list";
 import viewStudyList from "./components/view-study-list";
-import { getPatientList } from "@/api/inspection.js";
+import { getPatientList, DeletePatientStudyAllData } from "@/api/inspection.js";
 import { getDicomCalledAEList, getDicomCallingAEList } from "@/api/dicomAE.js";
 
 const defaultSearchData = () => {
@@ -326,6 +336,31 @@ export default {
     this.getList();
   },
   methods: {
+    // 清除数据
+    async DeletePatientStudyAllData(item) {
+      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: item.PatientId,
+        };
+        let res = await DeletePatientStudyAllData(params);
+        if (res.IsSuccess) {
+          this.getList();
+          this.$message.success(this.$t("common:message:removedSuccessfully"));
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
     // 获取calledAE列表
     async getDicomCalledAEList() {
       try {

src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalAdd.vue

@@ -242,12 +242,11 @@ export default {
           if (["PM", "PI", "SR", "OA"].includes(name)) {
             this.form.IsZhiZhun = true;
             this.form.OrganizationName = this.hospitalName;
-            return (this.IsZhiZhunDisabled = true);
+            return;
           }
         }
         this.form.IsZhiZhun = false;
         this.form.OrganizationName = null;
-        this.IsZhiZhunDisabled = false;
       },
       deep: true,
       immediate: true,

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

@@ -24,7 +24,7 @@
         <div>
           <!--受试者编号-->
           <el-form-item
-            :label="$t('trials:crcQuestion:table:subjectId')"
+            :label="$t('trials:addSubject:search:subjectId')"
             prop="SubjectId"
             class="SubjectId"
           >
@@ -52,9 +52,17 @@
               </el-option>
             </el-select>
           </el-form-item>
+          <!--添加受试者-->
+          <el-button
+            type="primary"
+            v-if="status === 'trial'"
+            @click="addSubject_model.visible = true"
+          >
+            {{ $t("trials:selectSubject:button:add") }}
+          </el-button>
           <!--患者-->
           <el-form-item
-            :label="$t('trials:subject:messge:patient')"
+            :label="$t('trials:addSubject:search:patient')"
             label-width="100px"
           >
             <el-input
@@ -69,7 +77,7 @@
             v-if="status === 'trial'"
             :disabled="!submitMessage.SubjectId"
           >
-            {{ $t("common:button:add") }}
+            {{ $t("common:button:check") }}
           </el-button>
           <div class="btnBox">
             <el-button
@@ -118,6 +126,37 @@
         />
       </template>
     </base-model>
+    <base-model v-if="addSubject_model.visible" :config="addSubject_model">
+      <template slot="dialog-body">
+        <el-form
+          ref="addSubjectForm2"
+          :inline="true"
+          :model="addSubjectForm2"
+          class="demo-form-inline"
+          :rules="addSubjectrules"
+        >
+          <!--受试者编号-->
+          <el-form-item
+            :label="$t('trials:addSuject:form:subjectCode')"
+            prop="SubjectCode"
+            label-width="150px"
+          >
+            <el-input
+              v-model="addSubjectForm2.SubjectCode"
+              clearable
+            ></el-input>
+          </el-form-item>
+        </el-form>
+      </template>
+      <template slot="dialog-footer">
+        <el-button type="primary" @click="addSubject">
+          {{ $t("common:button:confirm") }}
+        </el-button>
+        <el-button @click="addSubject_model.visible = false">
+          {{ $t("common:button:cancel") }}
+        </el-button>
+      </template>
+    </base-model>
   </el-dialog>
 </template>
 <script>
@@ -182,6 +221,25 @@ export default {
           },
         ],
       },
+      // 新增受试者
+      addSubject_model: {
+        visible: false,
+        title: this.$t("trials:selectSubject:button:add"),
+        width: "500px",
+        appendToBody: true,
+      },
+      addSubjectForm2: {
+        SubjectCode: null,
+      },
+      addSubjectrules: {
+        SubjectCode: [
+          {
+            required: true,
+            message: this.$t("trials:subject:format:notSubject"),
+            trigger: ["blur", "change"],
+          },
+        ],
+      },
     };
   },
   computed: {
@@ -206,6 +264,29 @@ export default {
     this.getTrialSubejctSelectList(this.$route.query.trialId);
   },
   methods: {
+    // 新增受试者(前端操作未同步后端)
+    async addSubject() {
+      try {
+        let validate = await this.$refs.addSubjectForm2.validate();
+        if (!validate) return;
+        let flag = this.subjectIdList.some(
+          (item) => item.SubjectCode === this.addSubjectForm2.SubjectCode
+        );
+        if (flag)
+          return this.$message.warning(
+            this.$t("trials:addSubject:format:hasSubject")
+          );
+        let subject = {
+          SubjectCode: this.addSubjectForm2.SubjectCode,
+          SubejctId: this.addSubjectForm2.SubjectCode,
+        };
+        this.subjectIdList.unshift(subject);
+        this.submitMessage.SubjectId = this.addSubjectForm2.SubjectCode;
+        this.addSubject_model.visible = false;
+      } catch (err) {
+        console.log(err);
+      }
+    },
     // 删除选中患者
     delPatient(index) {
       this.selectPatient.splice(index, 1);

src/views/trials/trials-panel/subject/subject-list/components/patient-study-list.vue

@@ -45,7 +45,11 @@
         show-overflow-tooltip
         min-width="140"
         sortable="custom"
-      ></el-table-column>
+      >
+        <template slot-scope="scope">
+          <span>{{ $fd("sex", scope.row.PatientSex) }}</span>
+        </template>
+      </el-table-column>
       <!--操作-->
       <el-table-column :label="$t('common:action:action')" width="80">
         <template slot-scope="scope">

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

@@ -139,7 +139,7 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <span>{{ $fd("sex", Number(scope.row.Sex)) }}</span>
+            <span>{{ $fd("sex", scope.row.Sex) }}</span>
           </template>
         </el-table-column>
         <!-- 出生日期 -->