部分问题修复

src/components/BaseForm/search-form.vue

@@ -15,6 +15,7 @@
           size="mini"
           :style="{ width: item.width }"
           :readonly="item.readonly"
+          clearable
         />
         <!-- 下拉框 -->
         <el-select
@@ -22,6 +23,7 @@
           v-model="searchData[item.prop]"
           :placeholder="item.placeholder"
           size="mini"
+          clearable
           :style="{ width: item.width }"
           @change="item.change && item.change(that, searchData[item.prop])"
         >
@@ -37,6 +39,7 @@
           v-model="searchData[item.prop]"
           :placeholder="item.placeholder"
           size="mini"
+          clearable
           :style="{ width: item.width }"
           @change="item.change && item.change(that, searchData[item.prop])"
         >
@@ -96,6 +99,7 @@
           value-format="yyyy-MM-dd"
           format="yyyy-MM-dd"
           :picker-options="item.pickerOption"
+          clearable
         />
         <!-- 时间 -->
         <el-time-select
@@ -104,6 +108,7 @@
           :placeholder="item.placeholder"
           type=""
           :style="{ width: item.width }"
+          clearable
         />
         <!-- 日期时间 -->
         <el-date-picker
@@ -113,6 +118,7 @@
           type="datetime"
           :disabled="item.disable && item.disable(searchData[item.prop])"
           :style="{ width: item.width }"
+          clearable
         />
         <!-- 日期时间段 -->
         <el-date-picker
@@ -122,6 +128,7 @@
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
+          clearable
         />
         <!-- 滑块 -->
         <!-- <el-slider v-if="item.type==='Slider'" v-model="searchData[item.prop]"></el-slider> -->

src/store/modules/user.js

@@ -163,8 +163,8 @@ const actions = {
     commit('SET_USERNAME', zzSessionStorage.getItem('userName'))
     commit('SET_NEED_SIGN_SYSTEM_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignSystemDocCount')))
     commit('SET_NEED_SIGN_TRIALS_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignTrialDocCount')))
-    console.log( zzSessionStorage.getItem('TotalNeedSignSystemDocCount'))
+    console.log(zzSessionStorage.getItem('TotalNeedSignSystemDocCount'))
-    console.log( zzSessionStorage.getItem('TotalNeedSignTrialDocCount'))
+    console.log(zzSessionStorage.getItem('TotalNeedSignTrialDocCount'))
     zzSessionStorage.setItem('userName', user.name)
     zzSessionStorage.setItem('userId', user.id)
     zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName)

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

@@ -7,6 +7,7 @@
     custom-class="base-dialog-wrapper"
     append-to-body
     :before-close="handleCancel"
+    v-dialogDrag
   >
     <el-form
       ref="editVisitForm"
@@ -18,15 +19,15 @@
       <div class="base-dialog-body">
         <!--AE Title-->
         <el-form-item :label="$t('system:dicom:form:AETitle')" prop="CalledAE">
-          <el-input v-model="form.CalledAE" clearable />
+          <el-input v-model.trim="form.CalledAE" clearable maxlength="16" />
         </el-form-item>
         <!--IP-->
         <el-form-item :label="$t('system:dicom:form:IP')" prop="IP">
-          <el-input v-model="form.IP" clearable />
+          <el-input v-model.trim="form.IP" clearable />
         </el-form-item>
         <!--Port-->
         <el-form-item :label="$t('system:dicom:form:Port')" prop="Port">
-          <el-input v-model="form.Port" type="number" clearable />
+          <el-input v-model.number="form.Port" type="number" clearable />
         </el-form-item>
         <!--Modality-->
         <el-form-item :label="$t('system:dicom:form:Modality')" prop="Modality">
@@ -103,6 +104,17 @@ export default {
             message: this.$t("common:ruleMessage:specify"),
             trigger: "blur",
           },
+          {
+            pattern: /[a-zA-Z]/,
+            message: this.$t("common:ruleMessage:CalledAEPattern"),
+            trigger: "blur",
+          },
+          {
+            min: 1,
+            max: 16,
+            message: this.$t("common:ruleMessage:CalledAEPattern"),
+            trigger: "blur",
+          },
         ],
         IP: [
           {
@@ -110,6 +122,27 @@ export default {
             message: this.$t("common:ruleMessage:specify"),
             trigger: "blur",
           },
+          {
+            validator: (rule, value, callback) => {
+              if (
+                value === "" ||
+                typeof value === "undefined" ||
+                value == null
+              ) {
+                callback(new Error(this.$t("common:ruleMessage:ipPattern")));
+              } else {
+                const reg =
+                  /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/;
+                if (!reg.test(value) && value !== "") {
+                  callback(new Error(this.$t("common:ruleMessage:ipPattern")));
+                } else {
+                  callback();
+                }
+              }
+            },
+            message: this.$t("common:ruleMessage:ipPattern"),
+            trigger: "blur",
+          },
         ],
         Port: [
           {
@@ -117,6 +150,13 @@ export default {
             message: this.$t("common:ruleMessage:specify"),
             trigger: "blur",
           },
+          {
+            type: "number",
+            min: 0,
+            max: 65535,
+            message: this.$t("common:ruleMessage:portPattern"),
+            trigger: "blur",
+          },
         ],
       },
       btnLoading: false,

src/views/system/user/components/Account.vue

@@ -36,6 +36,10 @@ export default {
               message: this.$t("trials:adRules:message:msg7"),
               type: "success",
             });
+            let msg = this.$t("system:userlist:message:ResetPassword2");
+            msg = msg.replace("xxx", params("userName"));
+            msg = msg.replace("yyy", params("email"));
+            this.$alert(decodeURIComponent(msg));
           }
         });
       });

src/views/system/user/components/UserInfo.vue

@@ -339,6 +339,9 @@ export default {
           this.user.BaseUrl = `${location.protocol}//${location.host}/login`;
           this.user.RouteUrl = `${location.protocol}//${location.host}/email-recompose`;
           if (this.user.Id) {
+            if (this.user.IsZhiZhun) {
+              this.user.OrganizationName = THIS.hospitalName;
+            }
             updateUser(this.user)
               .then((res) => {
                 this.isDisabled = false;

src/views/trials/trials-inspection/components/view-study-list.vue

@@ -89,7 +89,7 @@
       <!--Called AE-->
       <el-table-column
         prop="CalledAE"
-        label="Called AE"
+        :label="$t('trials:inspection:table:CalledAE')"
         show-overflow-tooltip
         min-width="140"
       >
@@ -97,7 +97,7 @@
       <!--Calling AE-->
       <el-table-column
         prop="CallingAE"
-        label="Calling AE"
+        :label="$t('trials:inspection:table:CallingAE')"
         show-overflow-tooltip
         min-width="140"
       >

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

@@ -19,7 +19,10 @@
           />
         </el-form-item>
         <!-- Called AE -->
-        <el-form-item class="my_multiple" label="Called AE">
+        <el-form-item
+          class="my_multiple"
+          :label="$t('trials:inspection:search:CalledAE')"
+        >
           <el-select
             v-model="searchData.CalledAEList"
             clearable
@@ -36,7 +39,10 @@
           </el-select>
         </el-form-item>
         <!-- Calling AE -->
-        <el-form-item class="my_multiple" label="Calling AE">
+        <el-form-item
+          class="my_multiple"
+          :label="$t('trials:inspection:search:CallingAE')"
+        >
           <el-select
             v-model="searchData.callingAE"
             clearable
@@ -140,7 +146,7 @@
         <!--Called AE-->
         <el-table-column
           prop="CalledAEList"
-          label="Called AE"
+          :label="$t('trials:inspection:table:CalledAE')"
           show-overflow-tooltip
           min-width="140"
         >
@@ -157,7 +163,7 @@
         <!--Calling AE-->
         <el-table-column
           prop="CallingAEList"
-          label="Calling AE"
+          :label="$t('trials:inspection:table:CallingAE')"
           show-overflow-tooltip
           min-width="140"
         >

src/views/trials/trials-list/components/TrialForm.vue

@@ -44,7 +44,11 @@
         :label="$t('trials:trials-list:form:researchNumber')"
         prop="ResearchProgramNo"
       >
-        <el-input v-model="trialForm.ResearchProgramNo" clearable />
+        <el-input
+          v-model="trialForm.ResearchProgramNo"
+          clearable
+          :disabled="TrialStatusStr === 'Ongoing'"
+        />
       </el-form-item>
       <!-- 研究名称 -->
       <el-form-item

src/views/trials/trials-myinfo/account.vue

@@ -36,7 +36,7 @@
           style="margin-bottom: 5px"
           prop="CheckCode"
         >
-          <!-- <span>{{ user.UserName }}</span> -->
+          <span>{{ user.CheckCode }}</span>
         </el-form-item>
         <el-form-item label="" style="position: relative" prop="CheckCode">
           <el-input

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

@@ -21,6 +21,7 @@
         :user="user"
         :userTypeOptions="userTypeOptions"
         v-if="activeIndex === '1'"
+        @getUserInfo="getUserInfo"
       />
       <account
         :user="user"

src/views/trials/trials-myinfo/mine.vue

@@ -43,6 +43,7 @@
           prop="OrganizationName"
         >
           <el-input
+            :disabled="user.IsZhiZhun"
             v-model="user.OrganizationName"
             :placeholder="$t('trials:trials-myinfo:form:organization')"
           />
@@ -184,7 +185,7 @@ export default {
                 this.$message.success(
                   this.$t("trials:trials-myinfo:message:updateSuccessfully")
                 );
-                this.getUserInfo();
+                this.$emit("getUserInfo");
               })
               .catch(() => {
                 this.isDisabled = false;

src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue

@@ -378,7 +378,6 @@ export default {
           let href = this.OSSclientConfig.basePath + res.Result;
           let fileName =
             res.Result.split("/")[res.Result.split("/").length - 1];
-          a.download = fileName;
           this.fileData = {
             path:href,
             name:fileName

src/views/trials/trials-panel/reading/reading-tracking/index.vue

@@ -29,7 +29,7 @@
         </el-form-item>
         <!-- 患者姓名 -->
         <el-form-item :label="$t('trials:uploadDicomList:table:patientName')">
-          <el-input v-model="searchData.PatientName" style="width: 140px" />
+          <el-input v-model="searchData.SubjectName" style="width: 140px" />
         </el-form-item>
         <!-- 任务创建时间 -->
         <el-form-item :label="$t('trials:reviewTrack:table:createTime')">
@@ -143,7 +143,7 @@
         >
         <!-- 患者姓名 -->
         <el-table-column
-          prop="SubjectShortName"
+          prop="SubjectName"
           :label="$t('trials:researchStaff:table:Name')"
           show-overflow-tooltip
           sortable="custom"
@@ -300,6 +300,7 @@ const defaultSearchData = () => {
     PatientSex: null,
     BeginTaskCreateTime: null,
     EndTaskCreateTime: null,
+    SubjectName: null,
   };
 };
 export default {

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

@@ -18,7 +18,7 @@
           clearable
         />
         <!-- Called AE -->
-        <span>Called AE:</span>
+        <span>{{ $t("trials:subject:table:CalledAE") }}</span>
         <el-select
           v-model="searchData.CalledAEList"
           clearable
@@ -34,7 +34,7 @@
           </el-option>
         </el-select>
         <!-- Calling AE -->
-        <span>Calling AE:</span>
+        <span>{{ $t("trials:subject:table:CallingAE") }}</span>
         <el-select v-model="searchData.callingAE" clearable class="mr">
           <el-option
             v-for="(item, index) of callingAeList"

src/views/trials/trials-panel/trial-summary/trial-information/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="trial-information">
+    <div>
       <el-descriptions :column="2" border style="width: 1200px">
         <!--项目类型-->
         <el-descriptions-item :label="$t('trials:trials-list:form:trialType')">
@@ -39,8 +40,8 @@
         </el-descriptions-item>
         <!--阅片标准-->
         <el-descriptions-item
-        :span="2"
           :label="$t('trials:trials-list:form:criterion')"
+          :span="2"
         >
           {{
             trialInfo.CriterionTypeList
@@ -76,16 +77,19 @@
           {{ trialInfo.ContactPhone }}
         </el-descriptions-item>
         <!--项目周期-->
-      <el-descriptions-item :label="$t('trials:trials-list:form:projectCycle')">
+        <el-descriptions-item
+          :label="$t('trials:trials-list:form:projectCycle')"
+        >
           {{ trialInfo.AuthorizationDuration }}
         </el-descriptions-item>
       </el-descriptions>
+    </div>
     <div
       v-if="otherInfo && otherInfo.TrialId"
       v-hasPermi="['trials:trials-list:activate']"
     >
-      <p>项目授权信息</p>
       <el-descriptions :column="2" border style="width: 1200px">
+        <p slot="title">项目授权信息</p>
         <!--单位名称-->
         <el-descriptions-item
           :label="$t('trials:trials-list:activate:organizationName')"
@@ -124,7 +128,7 @@
         >
           {{ otherInfo.AuthorizationDeadLineDate }}
         </el-descriptions-item>
-      </el-descriptions>
+        <div slot="extra">
           <el-button
             type="primary"
             size="small"
@@ -133,6 +137,8 @@
             >{{ $t("trials:activate:renewalAuthorization") }}</el-button
           >
         </div>
+      </el-descriptions>
+    </div>
     <activate-project
       v-if="activateVisible"
       :visible.sync="activateVisible"
@@ -202,3 +208,8 @@ export default {
   background: #fff;
 }
 </style>
+<style scoped>
+::v-deep .el-descriptions--medium.is-bordered .el-descriptions-item__cell {
+  width: 10%;
+}
+</style>