From 4f3f263ef886cce62e9d733cb8f503b61764b474 Mon Sep 17 00:00:00 2001
From: YIyiyi <yousong_yi@foxmail>
Date: Wed, 1 Feb 2023 15:24:03 +0800
Subject: [PATCH] =?UTF-8?q?pref:=E4=BF=AE=E6=94=B9=E5=B7=A5=E4=BD=9C?=
=?UTF-8?q?=E4=BA=BA=E5=91=98=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/src/pages/basicset/dept/department.vue | 3 +--
.../admin/src/pages/basicset/workman/personnel.vue | 11 +++++++----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/base-manager-ui/admin/src/pages/basicset/dept/department.vue b/base-manager-ui/admin/src/pages/basicset/dept/department.vue
index 1e95d9a8..f219337b 100644
--- a/base-manager-ui/admin/src/pages/basicset/dept/department.vue
+++ b/base-manager-ui/admin/src/pages/basicset/dept/department.vue
@@ -1,6 +1,5 @@
<template>
<div class="department">
- <!-- 鍙宠竟 -->
<div class="department_tab ff">
<!-- 閮ㄩ棬绠＄悊 -->
<div class="department_left">
@@ -788,4 +787,4 @@ export default {
background: #f0f2f5;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/base-manager-ui/admin/src/pages/basicset/workman/personnel.vue b/base-manager-ui/admin/src/pages/basicset/workman/personnel.vue
index 0692d8a4..e0ec0923 100644
--- a/base-manager-ui/admin/src/pages/basicset/workman/personnel.vue
+++ b/base-manager-ui/admin/src/pages/basicset/workman/personnel.vue
@@ -92,12 +92,12 @@
@change="handleWindowSearch"
>
<a-radio
- :data-name="v.name"
+ :data-name="v.name + '-' + v.fromnum"
v-for="v in windowData"
:key="v.id"
:value="v.id"
>
- {{ v.name }}
+ {{ v.name + "-" + v.fromnum }}
</a-radio>
</a-radio-group>
</div>
@@ -581,7 +581,10 @@ export default {
filePath: url,
});
if (res.data.code == 1) {
- this.$message.success("瀵煎叆鎴愬姛");
+ this.$notification.success({
+ message: "瀵煎叆缁撴灉",
+ description: res.data.msg,
+ });
this.getWorkmanData();
// this.spinning = false;
}
@@ -791,4 +794,4 @@ export default {
grid-gap: 10px;
}
}
-</style>
\ No newline at end of file
+</style>
--
2.24.3