oa页面国际化

src/App.vue

@@ -103,7 +103,8 @@ export default {
     };
   },
   mounted() {
-    this.show = process.env.VUE_APP_OSS_PATH === "/hir_test/dist";
+    // this.show = process.env.VUE_APP_OSS_PATH === "/hir_test/dist";
+    this.show = true;
   },
   methods: {
     changeValue(target, attr, e) {

src/components/BaseForm/search-form.vue

@@ -2,18 +2,28 @@
 <template>
   <div class="base-search-form">
     <el-form :size="size" :inline="true" :label-width="labelWidth">
-      <el-form-item v-for="item in searchForm" :key="item.prop" :label="item.label">
+      <el-form-item
+        v-for="item in searchForm"
+        :key="item.prop"
+        :label="item.label"
+      >
         <!-- 输入框 -->
-        <el-input v-if="item.type==='Input'" v-model="searchData[item.prop]" :placeholder="item.placeholder" size="mini" :style="{width:item.width}" :readonly="item.readonly" />
+        <el-input
-        <!-- 下拉框 -->
+          v-if="item.type === 'Input'"
-        <el-select
-          v-if="item.type==='Select'"
           v-model="searchData[item.prop]"
           :placeholder="item.placeholder"
           size="mini"
-          :style="{width:item.width}"
+          :style="{ width: item.width }"
-
+          :readonly="item.readonly"
-          @change="item.change && item.change(that,searchData[item.prop])"
+        />
+        <!-- 下拉框 -->
+        <el-select
+          v-if="item.type === 'Select'"
+          v-model="searchData[item.prop]"
+          :placeholder="item.placeholder"
+          size="mini"
+          :style="{ width: item.width }"
+          @change="item.change && item.change(that, searchData[item.prop])"
         >
           <el-option
             v-for="op in item.options"
@@ -23,49 +33,117 @@
           />
         </el-select>
         <el-select
-          v-if="item.type==='Select2'"
+          v-if="item.type === 'Select2'"
           v-model="searchData[item.prop]"
           :placeholder="item.placeholder"
           size="mini"
-          :style="{width:item.width}"
+          :style="{ width: item.width }"
-
+          @change="item.change && item.change(that, searchData[item.prop])"
-          @change="item.change && item.change(that,searchData[item.prop])"
         >
           <el-option
-            v-for="(key,value) of item.options"
+            v-for="(key, value) of item.options"
             :key="key"
             :label="key"
             :value="value"
           />
         </el-select>
         <!-- 单选 -->
-        <el-radio-group v-if="item.type==='Radio'" v-model="searchData[item.prop]" :style="{width:item.width}">
+        <el-radio-group
-          <el-radio v-for="ra in item.radios" :key="ra.value" :label="ra.value">{{ ra.label }}</el-radio>
+          v-if="item.type === 'Radio'"
+          v-model="searchData[item.prop]"
+          :style="{ width: item.width }"
+        >
+          <el-radio
+            v-for="ra in item.radios"
+            :key="ra.value"
+            :label="ra.value"
+            >{{ ra.label }}</el-radio
+          >
         </el-radio-group>
         <!-- 单选按钮 -->
-        <el-radio-group v-if="item.type==='RadioButton'" v-model="searchData[item.prop]" :style="{width:item.width}" @change="item.change && item.change(searchData[item.prop])">
+        <el-radio-group
-          <el-radio-button v-for="ra in item.radios" :key="ra.value" :label="ra.value">{{ ra.label }}</el-radio-button>
+          v-if="item.type === 'RadioButton'"
+          v-model="searchData[item.prop]"
+          :style="{ width: item.width }"
+          @change="item.change && item.change(searchData[item.prop])"
+        >
+          <el-radio-button
+            v-for="ra in item.radios"
+            :key="ra.value"
+            :label="ra.value"
+            >{{ ra.label }}</el-radio-button
+          >
         </el-radio-group>
         <!-- 复选框 -->
-        <el-checkbox-group v-if="item.type==='Checkbox'" v-model="searchData[item.prop]" :style="{width:item.width}">
+        <el-checkbox-group
-          <el-checkbox v-for="ch in item.checkboxs" :key="ch.value" :label="ch.value">{{ ch.label }}</el-checkbox>
+          v-if="item.type === 'Checkbox'"
+          v-model="searchData[item.prop]"
+          :style="{ width: item.width }"
+        >
+          <el-checkbox
+            v-for="ch in item.checkboxs"
+            :key="ch.value"
+            :label="ch.value"
+            >{{ ch.label }}</el-checkbox
+          >
         </el-checkbox-group>
         <!-- 日期 -->
-        <el-date-picker v-if="item.type==='Date'" v-model="searchData[item.prop]" :placeholder="item.placeholder" :style="{width:item.width}" value-format="yyyy-MM-dd" format="yyyy-MM-dd" :picker-options="item.pickerOption" />
+        <el-date-picker
+          v-if="item.type === 'Date'"
+          v-model="searchData[item.prop]"
+          :placeholder="item.placeholder"
+          :style="{ width: item.width }"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          :picker-options="item.pickerOption"
+        />
         <!-- 时间 -->
-        <el-time-select v-if="item.type==='Time'" v-model="searchData[item.prop]" :placeholder="item.placeholder" type="" :style="{width:item.width}" />
+        <el-time-select
+          v-if="item.type === 'Time'"
+          v-model="searchData[item.prop]"
+          :placeholder="item.placeholder"
+          type=""
+          :style="{ width: item.width }"
+        />
         <!-- 日期时间 -->
-        <el-date-picker v-if="item.type==='DateTime'" v-model="searchData[item.prop]" :placeholder="item.placeholder" type="datetime" :disabled="item.disable && item.disable(searchData[item.prop])" :style="{width:item.width}" />
+        <el-date-picker
+          v-if="item.type === 'DateTime'"
+          v-model="searchData[item.prop]"
+          :placeholder="item.placeholder"
+          type="datetime"
+          :disabled="item.disable && item.disable(searchData[item.prop])"
+          :style="{ width: item.width }"
+        />
+        <!-- 日期时间段 -->
+        <el-date-picker
+          v-if="item.type === 'Daterange'"
+          v-model="searchData[item.prop]"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
         <!-- 滑块 -->
         <!-- <el-slider v-if="item.type==='Slider'" v-model="searchData[item.prop]"></el-slider> -->
         <!-- 开关 -->
-        <el-switch v-if="item.type==='Switch'" v-model="searchData[item.prop]" :style="{width:item.width}" />
+        <el-switch
+          v-if="item.type === 'Switch'"
+          v-model="searchData[item.prop]"
+          :style="{ width: item.width }"
+        />
         <!-- 具名slot -->
-        <slot v-if="item.type==='Custom'" :name="item.slot" />
+        <slot v-if="item.type === 'Custom'" :name="item.slot" />
       </el-form-item>
       <el-form-item v-for="item in searchHandle" :key="item.label">
         <slot v-if="item.slot" :name="item.slot" />
-        <el-button v-else :type="item.type" :size="item.size || size" :icon="item.icon || ''" @click="handleClick(item.emitKey)">{{ item.label }}</el-button>
+        <el-button
+          v-else
+          :type="item.type"
+          :size="item.size || size"
+          :icon="item.icon || ''"
+          @click="handleClick(item.emitKey)"
+          >{{ item.label }}</el-button
+        >
       </el-form-item>
     </el-form>
   </div>
@@ -76,47 +154,45 @@ export default {
   props: {
     that: {
       type: Object,
-      default: this
+      default: this,
     },
     isHandle: {
       type: Boolean,
-      default: true
+      default: true,
     },
     labelWidth: {
       type: String,
-      default: ''
+      default: "",
     },
     size: {
       type: String,
-      default: 'mini'
+      default: "mini",
     },
     searchForm: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     searchHandle: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     searchData: {
       type: Object,
-      default: () => {}
+      default: () => {},
-    }
+    },
   },
   methods: {
     handleClick(emitKey) {
       // emit事件
-      this.$emit(`${emitKey}`)
+      this.$emit(`${emitKey}`);
-    }
+    },
-  }
+  },
-
+};
-}
-
 </script>
 <style lang="scss">
-  .base-search-form{
+.base-search-form {
-    .el-form-item{
+  .el-form-item {
-      margin-bottom: 0px;
+    margin-bottom: 0px;
-    }
   }
+}
 </style>

src/layout/components/Sidebar/SidebarItem.vue

@@ -3,14 +3,14 @@
     <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
       <app-link v-if="!onlyOneChild.hidden" :to="resolvePath(onlyOneChild.path)">
         <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}" @click="handleClick(onlyOneChild.meta.title)">
-          <item :icon="onlyOneChild.meta ? (onlyOneChild.meta.icon||(item.meta&&item.meta.icon)) : null" :title="onlyOneChild.meta ? onlyOneChild.meta.title : null" />
+          <item :icon="onlyOneChild.meta ? (onlyOneChild.meta.icon||(item.meta&&item.meta.icon)) : null" :title="onlyOneChild.meta ? $t(`trials:system:menu:${onlyOneChild.meta.title}`) : null" />
         </el-menu-item>
       </app-link>
     </template>
 
     <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
       <template slot="title">
-        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
+        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="$t(`trials:system:menu:${item.meta.title}`)" />
       </template>
       <sidebar-item
         v-for="child in item.children"

src/utils/uploadZip.js

@@ -16,6 +16,7 @@ export const downloadImage = async (id, id2) => {
             await setfolder(item);
         }
     } catch (err) {
+        flag = false;
         console.log(err);
     }
 };
@@ -81,7 +82,7 @@ const setfolder = async (item) => {
                     zipObj = null;
                 });
         })
-        .catch((reason) => { });
+        .catch((reason) => { flag = false; });
 };
 const handleBatchDown = async (item, zip) => {
     return new Promise((resolve) => {

src/views/recompose/index.vue

@@ -175,6 +175,7 @@ export default {
             NewUserName: this.password.NewUserName,
             NewPassWord: md5(this.password.NewPassWord),
             OldPassWord: md5(this.password.OldPassWord),
+            CheckCode: this.password.CheckCode,
           };
           this.loading = true;
           modifyPassword(param)

src/views/system/hospital/index.vue

@@ -13,7 +13,10 @@
           <el-input v-model="hospital.HospitalName" :disabled="disabled" />
         </el-form-item>
         <el-form-item label="医院编码: " prop="HospitalCode">
-          <el-input v-model="hospital.HospitalCode" :disabled="disabled" />
+          <el-input
+            v-model="hospital.HospitalCode"
+            :disabled="disabled || hasPermi(['role:oa'])"
+          />
         </el-form-item>
 
         <el-form-item label="医院别称: " prop="HospitalAliasName">
@@ -38,7 +41,7 @@
         <el-form-item label="未激活项目数: " prop="TrialKeepCount">
           <el-input
             v-model="hospital.TrialKeepCount"
-            :disabled="disabled"
+            :disabled="disabled || hasPermi(['role:oa'])"
             type="number"
           />
         </el-form-item>
@@ -53,7 +56,7 @@
           >
           </el-switch>
         </el-form-item>
-        <el-form-item label="logo: " prop="HospitalLogoPath">
+        <el-form-item label="LOGO: " prop="HospitalLogoPath">
           <upload-logo
             :path.sync="hospital.HospitalLogoPath"
             :disabled="disabled"

src/views/system/user/list/index.vue

@@ -76,6 +76,9 @@ const searchDataDefault = () => {
     Asc: true,
     RealName: "",
     SortField: "",
+    CreateTimeArr: [],
+    BeginCreateTime: null,
+    EndCreateTime: null,
   };
 };
 export default {
@@ -162,10 +165,17 @@ export default {
           sortable: "custom",
           showOverflowTooltip: true,
         },
+        {
+          prop: "CreateTime",
+          label: this.$t("system:userlist:table:createTime"),
+          minWidth: 200,
+          sortable: "custom",
+          showOverflowTooltip: true,
+        },
         {
           type: "operate",
           label: this.$t("common:action:action"),
-          minWidth: 200,
+          minWidth: 100,
           operates: [
             {
               name: this.$t("common:button:edit"),
@@ -257,6 +267,13 @@ export default {
           props: { label: "UserType", value: "Id" }, // 下拉选项配置信息，必填
           placeholder: "",
         },
+        {
+          type: "Daterange",
+          label: this.$t("system:userlist:label:CreateTime"),
+          prop: "CreateTimeArr",
+          width: "100px",
+          placeholder: "",
+        },
       ],
       searchHandle: [
         {
@@ -289,6 +306,18 @@ export default {
     // 获取用户信息
     getList() {
       this.loading = true;
+      if (
+        this.searchData.CreateTimeArr[0] &&
+        this.searchData.CreateTimeArr[1]
+      ) {
+        this.searchData.BeginCreateTime =
+          this.searchData.CreateTimeArr[0].toISOString();
+        this.searchData.EndCreateTime =
+          this.searchData.CreateTimeArr[1].toISOString();
+      } else {
+        this.searchData.BeginCreateTime = null;
+        this.searchData.EndCreateTime = null;
+      }
       getUserList(this.searchData)
         .then((res) => {
           this.loading = false;

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

@@ -208,7 +208,7 @@
           sortable="custom"
         />
         <!--授权日期-->
-        <el-table-column
+        <!-- <el-table-column
           prop="AuthorizationDate"
           :label="$t('trials:trials-list:table:dateAuthorized')"
           show-overflow-tooltip
@@ -221,7 +221,7 @@
                 : ""
             }}</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <!--授权时长-->
         <el-table-column
           prop="AuthorizationDuration"

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

@@ -13,7 +13,7 @@
             @change="handleShowDetail"
           />
           <!--评估报告-->
-          <el-button v-if="readingTaskState>=2" type="primary" size="small" @click="showReport">{{$t('trials:dicoms:button:evaluationReport')}}</el-button>
+          <el-button :loading="reportBtnLoading" v-if="readingTaskState>=2" type="primary" size="small" @click="showReport">{{$t('trials:dicoms:button:evaluationReport')}}</el-button>
           <el-button
             v-if="readingTaskState<2"
             type="primary"
@@ -322,6 +322,7 @@ export default {
       // 评估报告
       previewFileVisible: false,
       fileData: {},
+      reportBtnLoading:false
     }
   },
   computed: {
@@ -364,10 +365,12 @@ export default {
   methods: {
     // 评估报告
     async showReport(){
+      if(this.reportBtnLoading) return;
       let data = {
         VisitTaskId: this.visitTaskId,
       };
       try {
+        this.reportBtnLoading = true;
         let res = await showReadReport(data);
         let urlPdf  = window.URL.createObjectURL(new Blob([res]))
         this.viewVisible = true
@@ -375,8 +378,10 @@ export default {
           path: encodeURIComponent(urlPdf),
           name:'评估报告.pdf'
         };
+        this.reportBtnLoading = false;
         this.previewFileVisible = true;
       } catch (err) {
+        this.reportBtnLoading = false;
         console.log(err);
       }
     },

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

@@ -277,7 +277,7 @@ import Pagination from "@/components/Pagination";
 import { getPatientVisitTaskList } from "@/api/readManagenent.js";
 import { getToken } from "@/utils/auth";
 // import { getSystemConfirmedCreiterionList } from "@/api/trials";
-import { getTrialCriterionList } from '@/api/trials/reading'
+import { getTrialCriterionList } from "@/api/trials/reading";
 import { downLoadReadReport } from "@/api/export";
 import { downloadImage } from "@/utils/uploadZip.js";
 const defaultSearchData = () => {
@@ -317,6 +317,7 @@ export default {
       loading: false,
       total: 0,
       // 修改检查
+      reportBtnLoading: false,
     };
   },
   created() {
@@ -330,12 +331,16 @@ export default {
     },
     // 评估报告
     async showReport(item) {
+      if (this.reportBtnLoading) return;
       let data = {
         VisitTaskId: item.Id,
       };
       try {
+        this.reportBtnLoading = true;
         let res = await downLoadReadReport(data);
+        this.reportBtnLoading = false;
       } catch (err) {
+        this.reportBtnLoading = false;
         console.log(err);
       }
     },

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

@@ -1,48 +1,33 @@
 <template>
   <div class="trial-information">
-    <el-descriptions :column="2" border style="width: 1000px">
+    <el-descriptions :column="2" border style="width: 1200px">
-      <!--项目编号-->
-      <el-descriptions-item :label="$t('trials:trials-list:form:trialId')">
-        {{ trialInfo.TrialCode }}
-        <el-tag
-          v-show="trialInfo.TrialStatusStr"
-          size="small"
-          style="margin-left: 10px"
-        >
-          ( {{ $fd("TrialStatusEnum", trialInfo.TrialStatusStr) }} )
-        </el-tag>
-      </el-descriptions-item>
       <!--项目类型-->
       <el-descriptions-item :label="$t('trials:trials-list:form:trialType')">
         {{ $fd("TrialType", trialInfo.TrialType) }}
       </el-descriptions-item>
-      <!--试验名称-->
-      <el-descriptions-item
-        :label="$t('trials:trials-list:form:experimentName')"
-      >
-        {{ trialInfo.ExperimentName }}
-      </el-descriptions-item>
       <!--研究方案号-->
       <el-descriptions-item
         :label="$t('trials:trials-list:form:researchNumber')"
       >
         {{ trialInfo.ResearchProgramNo }}
       </el-descriptions-item>
-      <!--主要研究者-->
+      <!--试验名称-->
-      <el-descriptions-item :label="$t('trials:trials-list:form:pi')">
+      <el-descriptions-item
-        {{ trialInfo.HeadPI }}
+        :label="$t('trials:trials-list:form:experimentName')"
+      >
+        {{ trialInfo.ExperimentName }}
+      </el-descriptions-item>
+      <!--药物/器械名称-->
+      <el-descriptions-item :label="$t('trials:trials-list:message:D/Dname')">
+        {{ trialInfo.MedicineName }}
       </el-descriptions-item>
       <!--申办方-->
       <el-descriptions-item :label="$t('trials:trials-list:form:sponsor')">
         {{ trialInfo.Sponsor }}
       </el-descriptions-item>
-      <!--CRO-->
+      <!--主要研究者-->
-      <el-descriptions-item :label="$t('trials:trials-list:form:cro')">
+      <el-descriptions-item :label="$t('trials:trials-list:form:pi')">
-        {{ trialInfo.CRO }}
+        {{ trialInfo.HeadPI }}
-      </el-descriptions-item>
-      <!--药物/器械名称-->
-      <el-descriptions-item :label="$t('trials:trials-list:message:D/Dname')">
-        {{ trialInfo.MedicineName }}
       </el-descriptions-item>
       <!--临床分期-->
       <el-descriptions-item :label="$t('trials:trials-list:form:phase')">
@@ -52,16 +37,6 @@
       <el-descriptions-item :label="$t('trials:trials-list:form:indication')">
         {{ trialInfo.Indication }}
       </el-descriptions-item>
-      <!--检查技术-->
-      <el-descriptions-item :label="$t('trials:trials-list:form:modality')">
-        {{
-          trialInfo.ModalityIds
-            ? trialInfo.ModalityIds.map((item) =>
-                $fd("Modality", item, "id")
-              ).join(", ")
-            : ""
-        }}
-      </el-descriptions-item>
       <!--阅片标准-->
       <el-descriptions-item
         :span="2"
@@ -75,6 +50,21 @@
             : ""
         }}
       </el-descriptions-item>
+      <!--CRO-->
+      <el-descriptions-item :label="$t('trials:trials-list:form:cro')">
+        {{ trialInfo.CRO }}
+      </el-descriptions-item>
+      <!--项目编号-->
+      <!-- <el-descriptions-item :label="$t('trials:trials-list:form:trialId')">
+        {{ trialInfo.TrialCode }}
+        <el-tag
+          v-show="trialInfo.TrialStatusStr"
+          size="small"
+          style="margin-left: 10px"
+        >
+          ( {{ $fd("TrialStatusEnum", trialInfo.TrialStatusStr) }} )
+        </el-tag>
+      </el-descriptions-item> -->
       <!--联系人-->
       <el-descriptions-item
         :label="$t('trials:researchRecord:table:contactor')"
@@ -89,19 +79,13 @@
       <el-descriptions-item :label="$t('trials:trials-list:form:projectCycle')">
         {{ trialInfo.AuthorizationDuration }}
       </el-descriptions-item>
-      <!--授权日期-->
-      <el-descriptions-item
-        :label="$t('trials:trials-list:table:dateAuthorized')"
-      >
-        {{ trialInfo.AuthorizationDate }}
-      </el-descriptions-item>
     </el-descriptions>
     <div
       v-if="otherInfo && otherInfo.TrialId"
       v-hasPermi="['trials:trials-list:activate']"
     >
       <p>项目授权信息</p>
-      <el-descriptions :column="2" border style="width: 1000px">
+      <el-descriptions :column="2" border style="width: 1200px">
         <!--单位名称-->
         <el-descriptions-item
           :label="$t('trials:trials-list:activate:organizationName')"
@@ -128,6 +112,18 @@
         >
           {{ otherInfo.PurchaseDuration }}
         </el-descriptions-item>
+        <!--激活日期-->
+        <el-descriptions-item
+          :label="$t('trials:trial-information:title:activationDate')"
+        >
+          {{ trialInfo.AuthorizationDate }}
+        </el-descriptions-item>
+        <!--授权日期-->
+        <el-descriptions-item
+          :label="$t('trials:trials-list:table:dateAuthorized')"
+        >
+          {{ trialInfo.AuthorizationDate }}
+        </el-descriptions-item>
       </el-descriptions>
       <el-button
         type="primary"