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

src/views/forgetpassword/index.vue

@@ -65,11 +65,38 @@
             </el-form-item>
           </el-col>
           <el-col :span="6" style="text-align: right">
+            <i
+              :title="
+                isVerify === null
+                  ? $t('passwordReset:button:verify')
+                  : isVerify
+                  ? $t('passwordReset:button:verifySuccess')
+                  : $t('passwordReset:button:Failed')
+              "
+              :class="
+                isVerify === null
+                  ? 'el-icon-question'
+                  : isVerify
+                  ? 'el-icon-success'
+                  : 'el-icon-error'
+              "
+              :style="{
+                marginRight: '5px',
+                color:
+                  isVerify === null
+                    ? '#909399'
+                    : isVerify
+                    ? '#67c23a'
+                    : '#f56c6c',
+              }"
+            ></i>
             <!-- 校验 -->
             <el-button
               size="small"
               type="primary"
-              style="width: 80%"
+              :style="{
+                width: '80%',
+              }"
               :disabled="
                 form.VerificationCode === '' || form.EmailOrPhone === ''
               "
@@ -200,6 +227,7 @@ export default {
         UserId: "",
         UserType: "",
       },
+      isVerify: null,
       users: [],
       CheckPass: "",
       rules: {
@@ -307,9 +335,12 @@ export default {
         .then((res) => {
           this.formLoading = false;
           this.users = res.Result;
+          this.isVerify = true;
+          this.$message.success(this.$t("passwordReset:button:verifySuccess"));
         })
         .catch(() => {
           this.formLoading = false;
+          this.isVerify = false;
         });
     },
     handleEmailChange() {

src/views/recompose/index.vue

@@ -133,7 +133,7 @@ export default {
         CheckCode: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
+            message: this.$t("recompose:tip:inputCheckCode"),
             trigger: "blur",
           },
         ],

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

@@ -105,7 +105,7 @@ export default {
             trigger: "blur",
           },
           {
-            pattern: /[a-zA-Z]/,
+            pattern: /[a-zA-Z0-9]/,
             message: this.$t("common:ruleMessage:CalledAEPattern"),
             trigger: "blur",
           },

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

@@ -404,9 +404,10 @@ export default {
         this.loading = true;
         let res = await getVisitPatientStudyList(data);
         this.loading = false;
+        console.log(res);
         if (res.IsSuccess) {
-          this.list = res.Result.CurrentPageData;
-          this.total = res.Result.TotalCount;
+          this.list = res.Result;
+          // this.total = res.Result.TotalCount;
           if (flag) {
             this.$nextTick(() => {
               this.handleAllSelect();

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

@@ -216,10 +216,12 @@
           min-width="100"
           fixed="right"
           v-if="
-            hasPermi(['trials:trials-panel:hirVisit:edit']) ||
-            hasPermi(['trials:trials-panel:hirVisit:submit']) ||
-            hasPermi(['trials:trials-panel:hirVisit:remove']) ||
-            hasPermi(['trials:trials-panel:hirVisit:downlaod'])
+            hasPermi([
+              'trials:trials-panel:hirVisit:edit',
+              'trials:trials-panel:hirVisit:submit',
+              'trials:trials-panel:hirVisit:remove',
+              'trials:trials-panel:hirVisit:downlaod',
+            ])
           "
         >
           <template slot-scope="scope">
@@ -250,7 +252,7 @@
               icon="el-icon-delete"
               v-hasPermi="['trials:trials-panel:hirVisit:remove']"
               @click.stop="remove(scope.row)"
-              :disabled="Number(scope.row.SubmitState) > 0"
+              :disabled="Number(scope.row.SubmitState) > 1"
               :title="$t('common:button:delete')"
             />
             <!--下载报告-->

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

@@ -124,7 +124,6 @@
             label="Called AE"
             show-overflow-tooltip
             min-width="140"
-            sortable="custom"
           >
             <template slot-scope="scope">
               <span
@@ -144,7 +143,6 @@
             label="Calling AE"
             show-overflow-tooltip
             min-width="140"
-            sortable="custom"
           >
             <template slot-scope="scope">
               <span