diff --git a/ruoyi-ui/src/components/ImportResultDialog.vue b/ruoyi-ui/src/components/ImportResultDialog.vue
new file mode 100644
index 0000000..b465e85
--- /dev/null
+++ b/ruoyi-ui/src/components/ImportResultDialog.vue
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui/src/views/ccdiEmployee/index.vue b/ruoyi-ui/src/views/ccdiEmployee/index.vue
index 26f9b24..7f64769 100644
--- a/ruoyi-ui/src/views/ccdiEmployee/index.vue
+++ b/ruoyi-ui/src/views/ccdiEmployee/index.vue
@@ -249,18 +249,12 @@
-
-
-
-
+
@@ -270,6 +264,7 @@ import {deptTreeSelect} from "@/api/system/user";
import {getToken} from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import ImportResultDialog from "@/components/ImportResultDialog.vue";
// 身份证号校验正则
const idCardPattern = /^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/;
@@ -278,7 +273,7 @@ const phonePattern = /^1[3|4|5|6|7|8|9][0-9]\d{8}$/;
export default {
name: "Employee",
- components: { Treeselect },
+ components: { Treeselect, ImportResultDialog },
data() {
return {
// 遮罩层
@@ -362,11 +357,8 @@ export default {
url: process.env.VUE_APP_BASE_API + "/ccdi/employee/importData"
},
// 导入结果弹窗
- importResult: {
- open: false,
- title: "导入结果",
- content: ""
- }
+ importResultVisible: false,
+ importResultContent: ""
};
},
created() {
@@ -522,8 +514,13 @@ export default {
this.upload.open = false;
this.getList();
// 显示导入结果弹窗
- this.importResult.content = response.msg;
- this.importResult.open = true;
+ this.importResultContent = response.msg;
+ this.importResultVisible = true;
+ },
+ // 导入结果弹窗关闭
+ handleImportResultClose() {
+ this.importResultVisible = false;
+ this.importResultContent = "";
},
// 提交上传文件
submitFileForm() {
@@ -651,42 +648,6 @@ export default {
font-size: 13px;
margin-right: 8px;
}
-
-/* 导入结果弹窗样式 */
-.import-result-dialog-wrapper .import-result-content {
- max-height: 60vh;
- overflow-y: auto;
- overflow-x: hidden;
- padding: 10px 0;
- line-height: 1.8;
- font-size: 14px;
- color: #606266;
-}
-
-/* 滚动条美化 */
-.import-result-dialog-wrapper .import-result-content::-webkit-scrollbar {
- width: 6px;
-}
-
-.import-result-dialog-wrapper .import-result-content::-webkit-scrollbar-track {
- background: #f5f7fa;
- border-radius: 3px;
-}
-
-.import-result-dialog-wrapper .import-result-content::-webkit-scrollbar-thumb {
- background: #c0c4cc;
- border-radius: 3px;
-}
-
-.import-result-dialog-wrapper .import-result-content::-webkit-scrollbar-thumb:hover {
- background: #909399;
-}
-
-/* Firefox滚动条 */
-.import-result-dialog-wrapper .import-result-content {
- scrollbar-width: thin;
- scrollbar-color: #c0c4cc #f5f7fa;
-}
-
+
diff --git a/ruoyi-ui/src/views/ccdiIntermediary/components/ImportDialog.vue b/ruoyi-ui/src/views/ccdiIntermediary/components/ImportDialog.vue
index c0ac7d7..06972f4 100644
--- a/ruoyi-ui/src/views/ccdiIntermediary/components/ImportDialog.vue
+++ b/ruoyi-ui/src/views/ccdiIntermediary/components/ImportDialog.vue
@@ -85,13 +85,23 @@
+
+
+