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

src/api/inspection.js

@@ -134,4 +134,13 @@ export function deletePatientStudy(params) {
         method: 'delete',
         params
     })
+}
+
+// 校验受试者是否存在
+export function verifyTrialSubject(data) {
+    return request({
+        url: '/Patient/verifyTrialSubject',
+        method: 'post',
+        data
+    })
 }

src/components/visitSelect/index.vue

@@ -121,7 +121,7 @@ export default {
             this.$t("trials:uploadDicomList:label:prompt"),
             {
               type: "warning",
-              showCancelButton: false,
+              // showCancelButton: false,
             }
           )
             .then(() => {
@@ -133,7 +133,7 @@ export default {
               this.$emit("putVisit", data);
             })
             .catch((err) => {
-              this.visit = this.modelData; 
+              this.visit = this.modelData;
             });
           return false;
         }

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

@@ -53,7 +53,7 @@
                   :label="
                     item.ShortName || item.Sex
                       ? `${item.SubjectCode}（${item.ShortName}，${
-                          item.Sex ? $fd('sex',item.Sex) : ''
+                          item.Sex ? $fd('sex', item.Sex) : ''
                         }）`
                       : item.SubjectCode
                   "
@@ -136,7 +136,9 @@
                   ''
                 )
               "
+              @focus="errMessage = null"
             ></el-input>
+            <span class="errTip" v-if="errMessage">{{ errMessage }}</span>
           </el-form-item>
         </el-form>
       </template>
@@ -161,6 +163,7 @@ import {
   getTrialSubejctSelectList,
   addSubjectPatientBinding,
   deleteSubjectPatientBinding,
+  verifyTrialSubject,
 } from "@/api/inspection.js";
 export default {
   name: "addTrialsList",
@@ -242,6 +245,7 @@ export default {
           },
         ],
       },
+      errMessage: null,
     };
   },
   computed: {
@@ -286,17 +290,30 @@ export default {
     // 新增受试者(前端操作未同步后端)
     async addSubject() {
       try {
+        this.errMessage = null;
         let validate = await this.$refs.addSubjectForm.validate();
         if (!validate) return;
-        let subject = {
+        let data = {
+          TrialId: this.submitMessage.TrialId,
           SubjectCode: this.addSubjectForm.SubjectCode,
-          SubejctId: this.addSubjectForm.SubjectCode,
         };
-        this.subjectIdList.unshift(subject);
+        let res = await verifyTrialSubject(data);
-        this.submitMessage.SubjectId = this.addSubjectForm.SubjectCode;
+        if (res.IsSuccess) {
-        this.addSubject_model.visible = false;
+          let subject = {
+            SubjectCode: this.addSubjectForm.SubjectCode,
+            SubejctId: this.addSubjectForm.SubjectCode,
+          };
+          this.subjectIdList.unshift(subject);
+          this.submitMessage.SubjectId = this.addSubjectForm.SubjectCode;
+          this.addSubject_model.visible = false;
+        }
       } catch (err) {
         console.log(err);
+        if (err.Code === 5) {
+          this.getTrialSubejctSelectList(this.submitMessage.TrialId, null);
+          this.$emit("getList");
+          this.errMessage = err.ErrorMessage;
+        }
       }
     },
     // 获取受试者列表
@@ -360,6 +377,7 @@ export default {
           this.$emit("getList");
         }
       } catch (err) {
+        this.btnLoading = false;
         console.log(err);
       }
     },
@@ -393,6 +411,7 @@ export default {
           this.$refs.confirmVisit.changeVisitStatus(true);
         }
       } catch (err) {
+        this.btnLoading = false;
         console.log(err);
       }
     },
@@ -413,6 +432,15 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.errTip {
+  color: #f56c6c;
+  font-size: 12px;
+  line-height: 1;
+  padding-top: 4px;
+  position: absolute;
+  top: 100%;
+  left: 0;
+}
 .top {
   padding-top: 20px;
   display: flex;

src/views/trials/trials-panel/hirVisit/components/edit-study-list.vue

@@ -117,7 +117,7 @@
         <el-form :inline="true" class="base-search-form">
           <!-- 患者编号 -->
           <el-form-item :label="$t('trials:uploadDicomList:table:pId')">
-            <el-input v-model="searchData.PatientIdStr" style="width: 100px" />
+            <el-input v-model="searchData.PatientIdStr" style="width: 100px"  clearable/>
           </el-form-item>
           <!-- 检查日期 -->
           <el-form-item :label="$t('trials:uploadedDicoms:table:studyDate')">
@@ -128,6 +128,7 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               :default-time="['00:00:00', '23:59:59']"
+              clearable
             >
             </el-date-picker>
           </el-form-item>

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

@@ -21,8 +21,8 @@
         <el-input v-model="form.ShortName" clearable />
       </el-form-item>
       <!-- 年龄 -->
-      <el-form-item :label="$t('trials:subject:table:age')">
+      <el-form-item :label="$t('trials:subject:table:age')" prop="Age">
-        <el-input v-model="form.Age" type="number" clearable />
+        <el-input v-model.number="form.Age" type="number" clearable />
       </el-form-item>
       <!-- 性别 -->
       <el-form-item :label="$t('trials:subject:table:gender')">
@@ -113,6 +113,20 @@ export default {
           },
           { max: 50, message: `${this.$t("common:ruleMessage:maxLength")} 50` },
         ],
+        Age: [
+          {
+            pattern: /^[1-9]\d*$/,
+            message: this.$t("trials:subject:formRule:checkAge"),
+            trigger: "blur",
+          },
+          {
+            type: "number",
+            min: 1,
+            max: 200,
+            message: this.$t("trials:subject:formRule:numberAge"),
+            trigger: "blur",
+          },
+        ],
       },
       btnLoading: false,
       siteOptions: [],

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

@@ -147,7 +147,9 @@
                 addSubjectForm2.SubjectCode =
                   addSubjectForm2.SubjectCode.replace(/[^0-9a-zA-Z]/g, '')
               "
+              @focus="errMessage = null"
             ></el-input>
+            <span class="errTip" v-if="errMessage">{{ errMessage }}</span>
           </el-form-item>
         </el-form>
       </template>
@@ -170,6 +172,7 @@ import Pagination from "@/components/Pagination";
 import {
   getTrialSubejctSelectList,
   addSubjectPatientBinding,
+  verifyTrialSubject,
 } from "@/api/inspection.js";
 const defaultSearchData = () => {
   return {
@@ -259,6 +262,7 @@ export default {
           },
         ],
       },
+      errMessage: null,
     };
   },
   computed: {
@@ -295,17 +299,30 @@ export default {
     // 新增受试者(前端操作未同步后端)
     async addSubject() {
       try {
+        this.errMessage = null;
         let validate = await this.$refs.addSubjectForm2.validate();
         if (!validate) return;
-        let subject = {
+        let data = {
+          TrialId: this.$route.query.trialId,
           SubjectCode: this.addSubjectForm2.SubjectCode,
-          SubejctId: this.addSubjectForm2.SubjectCode,
         };
-        this.subjectIdList.unshift(subject);
+        let res = await verifyTrialSubject(data);
-        this.submitMessage.SubjectId = this.addSubjectForm2.SubjectCode;
+        if (res.IsSuccess) {
-        this.addSubject_model.visible = false;
+          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);
+        if (err.Code === 5) {
+          this.getTrialSubejctSelectList(this.$route.query.trialId);
+          this.$emit("getList");
+          this.errMessage = err.ErrorMessage;
+        }
       }
     },
     // 删除选中患者
@@ -425,6 +442,15 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.errTip {
+  color: #f56c6c;
+  font-size: 12px;
+  line-height: 1;
+  padding-top: 4px;
+  position: absolute;
+  top: 100%;
+  left: 0;
+}
 .top {
   padding-top: 20px;
   display: flex;

src/views/trials/trials-panel/trial-summary/audit-record/index.vue

@@ -877,7 +877,9 @@
             <!-- OptType === 'Add' ? '值' : OptType === 'Delete' ? '删除前' : '修改前' -->
             <el-table-column
               v-if="
-                OptType !== 'Add' && OptType !== 'Upload' && OptType !== 'Init'
+                OptType2 !== 'Add' &&
+                OptType2 !== 'Upload' &&
+                OptType2 !== 'Init'
               "
               prop="oldValue"
               :label="
@@ -974,7 +976,7 @@
             <el-table-column
               prop="newValue"
               :label="
-                OptType === 'Add' || OptType === 'Init'
+                OptType2 === 'Add' || OptType2 === 'Init'
                   ? $t('trials:auditRecord:title:fieldValue')
                   : OptType === 'Delete'
                   ? $t('trials:auditRecord:title:afterDeletion')
@@ -1181,14 +1183,17 @@
             </el-table-column>
           </el-table>
           <div
-            v-if="otherData.length > 0"
+            v-if="otherData2.length > 0"
             style="margin-top: 20px; margin-bottom: 10px"
           >
             <!-- 签名信息: -->
             {{ $t("trials:auditRecord:title:signInfo") }}
           </div>
-          <div v-if="otherData.length > 0" style="color: #f66; font-size: 12px">
+          <div
-            {{ otherData[0].Value }}
+            v-if="otherData2.length > 0"
+            style="color: #f66; font-size: 12px"
+          >
+            {{ otherData2[0].Value }}
           </div>
         </template>
         <template slot="dialog-footer">
@@ -1238,7 +1243,6 @@ import BaseContainer from "@/components/BaseContainer";
 import BaseModel from "@/components/BaseModel";
 import { getToken } from "@/utils/auth";
 import { getUserTypeListByUserType } from "@/api/admin";
-
 export default {
   components: { BaseContainer, Pagination, BaseModel },
   dicts: ["OptType", "ModuleType", "ChildrenType"],
@@ -1318,6 +1322,7 @@ export default {
       siteOptions: [],
       visitPlanOptions: [],
       OptType: null,
+      OptType2: null,
       trialId: this.$route.query.trialId,
       configList2: [],
       otherData2: [],
@@ -1867,6 +1872,7 @@ export default {
         });
     },
     async lookDetails2(row) {
+      this.OptType2 = row.OptType;
       var Json = await this.getJSON(row);
       var JsonDetail = Json[0] ? JSON.parse(Json[0]) : null;
       var ParentJson = Json[1] ? JSON.parse(Json[1]) : null;
@@ -1948,6 +1954,9 @@ export default {
         OpByUserName: null,
         BatchId: null,
         UserTypeId: null,
+        TrialReadingCriterionId: null,
+        VisitName: null,
+        SubjectCode: null,
       });
       this.timeList = [];
       this.getList();