From 4b8d330703f833b158566a860b52d81c753c7dd7 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 25 Apr 2024 11:21:28 +0800
Subject: [PATCH] =?UTF-8?q?pm=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E6=96=B0=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../personnel-manage/components/staff.vue | 20 +-
.../components/staffExternalAdd.vue | 246 +++++++++++-------
.../personnel-manage/components/staffForm.vue | 60 +++--
3 files changed, 212 insertions(+), 114 deletions(-)
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
index 3634f83..3c16861 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
@@ -20,7 +20,6 @@
:label="item.UserTypeShortName"
:value="item.Id"
>
- {{ item.UserType }}
@@ -74,14 +73,14 @@
{{ $t('trials:staff:button:addExternalStaff') }}
-->
-
{{ $t("common:button:export") }}
-
+ -->
@@ -241,7 +240,11 @@
-
+
{
- this.userTypeOptions = res.Result;
+ getUserTypeListByUserType(0).then((res) => {
+ this.userTypeOptions = res.Result.map((item) => {
+ if ([4, 5, 8, 9, 12].includes(item.UserTypeEnum)) {
+ return item;
+ }
+ }).filter((item) => item);
});
},
},
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalAdd.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalAdd.vue
index 27562ac..e88dd1e 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalAdd.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalAdd.vue
@@ -9,63 +9,90 @@
size="small"
>
-
+
-
+
-
-
+
+
- {{ item.UserType }}
+
-
+
-
+
-
+
- {{ errorMsg }}
+
+ {{ errorMsg }}
+
-
- {{ $t('common:button:cancel') }}
+
+ {{ $t("common:button:cancel") }}
-
- {{ $t('common:button:save') }}
+
+ {{ $t("common:button:save") }}
-
+
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffForm.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffForm.vue
index c7135c4..b39b01c 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffForm.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffForm.vue
@@ -35,10 +35,10 @@
class="mr"
>
@@ -60,17 +60,26 @@
>
{{ $t("common:button:reset") }}
-
+
+
+ {{ $t("common:button:add") }}
+
+
- {{ $t("common:button:add") }}
+ {{ $t("common:button:confirm") }}
@@ -149,6 +158,11 @@
@pagination="getList"
/>
+