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

src/views/email-recompose/index.vue

@@ -1,11 +1,29 @@
 <template>
-  <div style="display: flex;justify-content: center">
+  <div style="display: flex; justify-content: center">
-    <div style="width: 600px;text-align: center;border: 1px solid #e6e6e6;margin-top:40px;padding:10px;">
+    <div
-      <div class="trial-myinfo-head" style="font-size: 30px;line-height: 120px;">
+      style="
+        width: 600px;
+        text-align: center;
+        border: 1px solid #e6e6e6;
+        margin-top: 40px;
+        padding: 10px;
+      "
+    >
+      <div
+        class="trial-myinfo-head"
+        style="font-size: 30px; line-height: 120px"
+      >
         <!-- 首次登录修改密码 -->
         {{ $t('recompose:title:init') }}
       </div>
-      <el-form ref="passwordForm" v-loading="loading" label-position="right" :model="password" :rules="passwordFormRules" label-width="200px">
+      <el-form
+        ref="passwordForm"
+        v-loading="loading"
+        label-position="right"
+        :model="password"
+        :rules="passwordFormRules"
+        :label-width="$i18n.locale == 'zh' ? '100px' : '200px'"
+      >
         <!-- 邮箱 -->
         <el-form-item :label="$t('recompose:form:email')" prop="Email">
           <el-input v-model="password.Email" disabled />
@@ -19,70 +37,106 @@
           <el-input v-model="password.NewUserName" />
         </el-form-item>
         <!-- 新密码 -->
-        <el-form-item :label="$t('recompose:form:newPassword')" prop="NewPassWord">
+        <el-form-item
-          <el-input v-model="password.NewPassWord" type="password" show-password auto-complete="new-password" />
+          :label="$t('recompose:form:newPassword')"
+          prop="NewPassWord"
+        >
+          <el-input
+            v-model="password.NewPassWord"
+            type="password"
+            show-password
+            auto-complete="new-password"
+          />
         </el-form-item>
         <!-- 确认密码 -->
-        <el-form-item :label="$t('recompose:form:confirmPassword')" prop="ConfirmPassWord">
+        <el-form-item
-          <el-input v-model="password.ConfirmPassWord" type="password" show-password auto-complete="new-password" />
+          :label="$t('recompose:form:confirmPassword')"
+          prop="ConfirmPassWord"
+        >
+          <el-input
+            v-model="password.ConfirmPassWord"
+            type="password"
+            show-password
+            auto-complete="new-password"
+          />
         </el-form-item>
-        <el-form-item style="text-align:right">
+        <el-form-item style="text-align: right">
           <!-- 取消 -->
-          <el-button
+          <el-button size="small" @click="cancel">
-            size="small"
-            @click="cancel"
-          >
             {{ $t('recompose:button:cancel') }}
           </el-button>
           <!-- 保存 -->
-          <el-button
+          <el-button type="primary" size="small" @click="save">
-            type="primary"
-            size="small"
-            @click="save"
-          >
             {{ $t('recompose:button:save') }}
           </el-button>
         </el-form-item>
       </el-form>
-
     </div>
   </div>
 </template>
 <script>
 import { initSetUserNameAndPwd } from '@/api/admin.js'
 import md5 from 'js-md5'
-import {mapGetters, mapMutations} from "vuex";
+import { mapGetters, mapMutations } from 'vuex'
 export default {
   data() {
     return {
       password: {
         NewUserName: null,
-        UserId: null
+        UserId: null,
       },
       passwordFormRules: {
-        NewUserName: [{ required: true, validator: (rule, value, callback) => {!value ? callback(new Error(this.$t('trials:researchForm:formRule:specify'))) : callback()}, trigger: 'blur' }],
+        NewUserName: [
+          {
+            required: true,
+            validator: (rule, value, callback) => {
+              !value
+                ? callback(
+                    new Error(this.$t('trials:researchForm:formRule:specify'))
+                  )
+                : callback()
+            },
+            trigger: 'blur',
+          },
+        ],
         NewPassWord: [
-          { required: true, validator: (rule, value, callback) => {!value ? callback(new Error(this.$t('trials:researchForm:formRule:specify'))) : callback()}, trigger: 'blur' },
+          {
+            required: true,
+            validator: (rule, value, callback) => {
+              !value
+                ? callback(
+                    new Error(this.$t('trials:researchForm:formRule:specify'))
+                  )
+                : callback()
+            },
+            trigger: 'blur',
+          },
           {
             required: true,
             trigger: 'blur',
-            validator: this.$validatePassword
+            validator: this.$validatePassword,
           },
         ],
         ConfirmPassWord: [
-          { required: true, validator: (rule, value, callback) => {!value ? callback(new Error(this.$t('trials:researchForm:formRule:specify'))) : callback()}, trigger: 'blur' }
+          {
-        ]
+            required: true,
+            validator: (rule, value, callback) => {
+              !value
+                ? callback(
+                    new Error(this.$t('trials:researchForm:formRule:specify'))
+                  )
+                : callback()
+            },
+            trigger: 'blur',
+          },
+        ],
       },
       userId: null,
-      loading: false
+      loading: false,
     }
   },
   computed: {
-    ...mapGetters([
+    ...mapGetters(['asyncRoutes', 'routes', 'language']),
-      'asyncRoutes',
-      'routes',
-      'language'
-    ])
   },
   mounted() {
     this.password.UserId = this.$route.query.UserId
@@ -112,7 +166,7 @@ export default {
       this.$updateDictionary()
     },
     save() {
-      this.$refs.passwordForm.validate(valid => {
+      this.$refs.passwordForm.validate((valid) => {
         if (valid) {
           if (this.password.NewPassWord !== this.password.ConfirmPassWord) {
             // 两次密码输入不一致
@@ -123,26 +177,32 @@ export default {
             NewUserName: this.password.NewUserName,
             UserId: this.password.UserId,
             NewPwd: md5(this.password.NewPassWord),
-            access_token: this.password.access_token
+            access_token: this.password.access_token,
           }
           this.loading = true
-          initSetUserNameAndPwd(param).then(res => {
+          initSetUserNameAndPwd(param)
-            this.loading = false
+            .then((res) => {
-            if (res.IsSuccess) {
+              this.loading = false
-              // 修改成功,请重新登录账号
+              if (res.IsSuccess) {
-              this.$message.success(this.$t('recompose:message:updatedSuccessfully'))
+                // 修改成功,请重新登录账号
-              setTimeout(() => {
+                this.$message.success(
-                this.logout()
+                  this.$t('recompose:message:updatedSuccessfully')
-              }, 500)
+                )
-            }
+                setTimeout(() => {
-          }).catch(() => { this.loading = false })
+                  this.logout()
+                }, 500)
+              }
+            })
+            .catch(() => {
+              this.loading = false
+            })
         }
       })
     },
     cancel() {
       this.$refs['passwordForm'].resetFields()
-    }
+    },
-  }
+  },
 }
 </script>
 <style>
@@ -165,13 +225,16 @@ export default {
 <style scoped>
 input:-webkit-autofill {
   -webkit-text-fill-color: #ededed !important;
-  box-shadow: 0 0 0px 1000px transparent  inset !important;
+  box-shadow: 0 0 0px 1000px transparent inset !important;
-  background-color:transparent;
+  background-color: transparent;
   background-image: none;
   transition: background-color 50000s ease-in-out 0s;
 }
 input {
-  background-color:transparent;
+  background-color: transparent;
   caret-color: #fff;
 }
+.el-form-item {
+  margin-bottom: 30px;
+}
 </style>

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

@@ -8,7 +8,7 @@
         style="float: right"
         v-if="status === 'add'"
       >
-        {{ $t("common:button:add") }}
+        {{ $t('common:button:add') }}
       </el-button>
       <el-table v-loading="loading" :data="list" stripe>
         <!-- AE 名称 -->
@@ -44,6 +44,9 @@
           prop="action"
           :label="$t('trials:sitesList:dicomAEList:table:action')"
           min-width="120"
+          v-if="
+            hasPermi(['trials:trials-panel:setting:personnel-manage:edit-site'])
+          "
         >
           <template slot-scope="scope">
             <el-button
@@ -67,9 +70,9 @@
   </base-model>
 </template>
 <script>
-import BaseModel from "@/components/BaseModel";
+import BaseModel from '@/components/BaseModel'
-import dicomForm from "./dicomForm.vue";
+import dicomForm from './dicomForm.vue'
-import { getTrialSiteDicomAEList, deleteTrialSiteDicomAE } from "@/api/trials";
+import { getTrialSiteDicomAEList, deleteTrialSiteDicomAE } from '@/api/trials'
 const defaultSearchData = () => {
   return {
     TrialSiteId: null,
@@ -77,88 +80,93 @@ const defaultSearchData = () => {
     Ip: null,
     Port: null,
     Description: null,
-  };
+  }
-};
+}
 export default {
-  name: "dicomAE",
+  name: 'dicomAE',
   components: { BaseModel, dicomForm },
   data() {
     return {
       config: {
         visible: false,
         title: null,
-        width: "800px",
+        width: '800px',
         appendToBody: true,
       },
-      status: "add",
+      status: 'add',
       TrialSiteId: null,
       loading: false,
       list: [],
       searchData: defaultSearchData(),
       siteData: {},
-    };
+    }
   },
   methods: {
-    open(row, status = "add") {
+    open(row, status = 'add') {
-      this.status = status;
+      this.status = status
-      this.TrialSiteId = row.TrialSiteId;
+      this.TrialSiteId = row.TrialSiteId
       this.config.title = this.$t(
-        "trials:trials-panel:setting:personnel-manage:dicomAETitle"
+        'trials:trials-panel:setting:personnel-manage:dicomAETitle'
-      ).replace("xxx", `${row.TrialSiteCode}、${row.TrialSiteAliasName}`);
+      ).replace('xxx', `${row.TrialSiteCode}、${row.TrialSiteAliasName}`)
-      this.siteData = row;
+      this.siteData = row
-      this.config.visible = true;
+      this.config.visible = true
-      this.getList();
+      this.getList()
+      console.log(
+        this.hasPermi([
+          'trials:trials-panel:setting:personnel-manage:edit-site',
+        ])
+      )
     },
     // 获取dicomAE列表
     async getList() {
       try {
-        this.searchData.TrialSiteId = this.TrialSiteId;
+        this.searchData.TrialSiteId = this.TrialSiteId
-        this.loading = true;
+        this.loading = true
-        let res = await getTrialSiteDicomAEList(this.searchData);
+        let res = await getTrialSiteDicomAEList(this.searchData)
-        this.loading = false;
+        this.loading = false
         if (res.IsSuccess) {
-          this.list = res.Result;
+          this.list = res.Result
         }
       } catch (err) {
-        console.log(err);
+        console.log(err)
-        this.loading = false;
+        this.loading = false
       }
     },
     // 新增
     openAdd() {
-      this.$refs.dicomForm.open(this.siteData, null, "add");
+      this.$refs.dicomForm.open(this.siteData, null, 'add')
     },
     save() {
-      this.$emit("getList");
+      this.$emit('getList')
     },
     // 修改dicom
     editDicom(row) {
-      this.$refs.dicomForm.open(this.siteData, row, "edit");
+      this.$refs.dicomForm.open(this.siteData, row, 'edit')
-    },  
+    },
     // 删除dicom
     async delDicom(row) {
       try {
         let confirm = await this.$confirm(
-          this.$t("trials:sitesList:dicomAEList:confirm:delMessage"),
+          this.$t('trials:sitesList:dicomAEList:confirm:delMessage'),
           {
-            type: "warning",
+            type: 'warning',
             distinguishCancelAndClose: true,
-            confirmButtonText: this.$t("common:button:confirm"),
+            confirmButtonText: this.$t('common:button:confirm'),
-            cancelButtonText: this.$t("common:button:cancel"),
+            cancelButtonText: this.$t('common:button:cancel'),
           }
-        );
+        )
-        if (confirm !== "confirm") return;
+        if (confirm !== 'confirm') return
-        let res = await deleteTrialSiteDicomAE(row.Id);
+        let res = await deleteTrialSiteDicomAE(row.Id)
         if (res.IsSuccess) {
-          this.getList();
+          this.getList()
-          this.save();
+          this.save()
-          this.$t("common:message:deletedSuccessfully");
+          this.$t('common:message:deletedSuccessfully')
         }
       } catch (err) {
-        console.log(err);
+        console.log(err)
       }
     },
   },
-};
+}
 </script>
 <style lang="scss" scoped></style>