From c5d6ccdcdad3837bf84313549e61410721533bf3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 19 六月 2024 09:35:13 +0800
Subject: [PATCH] 提交一把
---
company/src/components/enterprise/importEmployees.vue | 6 +
company/.env.developmentCom | 5 -
company/src/components/common/upload.vue | 131 +++++++++++++++++++++++--------------------
server/company/src/main/java/com/doumee/api/business/MemberController.java | 2
company/public/template/personnel_add.xlsx | 0
5 files changed, 76 insertions(+), 68 deletions(-)
diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index 7cd8616..89f0353 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -8,7 +8,6 @@
VUE_APP_COOKIE_NAME='doumee-auth-token'
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
-#VUE_APP_API = 'http://localhost:10031/'
-VUE_APP_API = 'http://192.168.0.135:10031/'
-
+VUE_APP_API = 'http://localhost:10031/'
+#VUE_APP_API = 'http://192.168.0.135:10031/'
#VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
diff --git a/company/public/template/personnel_add.xlsx b/company/public/template/personnel_add.xlsx
new file mode 100644
index 0000000..003d1b8
--- /dev/null
+++ b/company/public/template/personnel_add.xlsx
Binary files differ
diff --git a/company/src/components/common/upload.vue b/company/src/components/common/upload.vue
index 22d22f9..b15d398 100644
--- a/company/src/components/common/upload.vue
+++ b/company/src/components/common/upload.vue
@@ -17,74 +17,82 @@
</template>
<script>
- import axios from 'axios';
- export default {
- props: {
- width: {
- type: String,
- default: '90px'
- },
- height: {
- type: String,
- default: '90px'
- },
- list: {
- type: Array,
- default: []
- },
- accept: {
- type: String,
- default: ''
- },
- folder: {
- type: String,
- default: ''
- }
- },
- data() {
- return {
- uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/upload'
- }
- },
-
- methods: {
- fileType(url) {
- if (url.indexOf('.mp4') !== -1) {
- return 'video'
- } else {
- return 'img'
- }
- },
- getFile(e) {
- if (e.target && e.target.files.length > 0) {
- this.$emit('loading')
- const formdate = new FormData()
- formdate.append('file', e.target.files[0])
- formdate.append('folder', this.folder)
- axios.post(this.uploadImgUrl, formdate)
- .then(res => {
- this.$emit('success', res.data.data)
- })
- .catch(e => {
- this.$message.error(e)
- })
- .finally(() => {
- this.$refs.file.value = null
- })
- }
- },
- deleItem(index) {
- this.$emit('dele', index)
- }
- }
+import axios from 'axios'
+export default {
+ props: {
+ width: {
+ type: String,
+ default: '90px'
+ },
+ height: {
+ type: String,
+ default: '90px'
+ },
+ list: {
+ type: Array,
+ default: []
+ },
+ accept: {
+ type: String,
+ default: ''
+ },
+ folder: {
+ type: String,
+ default: ''
}
+ },
+ data () {
+ return {
+ uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/upload'
+ }
+ },
+
+ methods: {
+ fileType (url) {
+ if (url.indexOf('.mp4') !== -1) {
+ return 'video'
+ } else {
+ return 'img'
+ }
+ },
+ getFile (e) {
+ if (e.target && e.target.files.length > 0) {
+ this.$emit('loading')
+ const formdate = new FormData()
+ formdate.append('file', e.target.files[0])
+ formdate.append('folder', this.folder)
+ axios.post(this.uploadImgUrl, formdate)
+ .then(res => {
+ this.$emit('success', res.data.data)
+ })
+ .catch(e => {
+ this.$message.error(e)
+ })
+ .finally(() => {
+ this.$refs.file.value = null
+ })
+ }
+ },
+ deleItem (index) {
+ this.$emit('dele', index)
+ }
+ }
+}
</script>
<style lang="scss" scoped>
.file {
/*width: 100%;*/
/*height: 90px;*/
- margin: 10px 0;
+ padding: 10px;
+ box-sizing: border-box;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ position: relative;
+ margin-bottom: 10px;
+ /* margin-right: 20px; */
+ /* margin: 10px 0;*/
input {
opacity: 0;
}
@@ -138,4 +146,3 @@
}
}
</style>
-
diff --git a/company/src/components/enterprise/importEmployees.vue b/company/src/components/enterprise/importEmployees.vue
index c19bb3d..9aa8d16 100644
--- a/company/src/components/enterprise/importEmployees.vue
+++ b/company/src/components/enterprise/importEmployees.vue
@@ -60,9 +60,11 @@
exportTemplate () {
// 鎶曚繚鐢宠
if (this.type === 1) {
- window.open(process.env.VUE_APP_MEMBER1_URL)
+ window.open('/template/personnel_add.xlsx')
+ // window.open(process.env.VUE_APP_MEMBER1_URL)
} else {
- window.open(process.env.VUE_APP_MEMBER_URL)
+ window.open('/template/personnel_add.xlsx')
+ // window.open(process.env.VUE_APP_MEMBER_URL)
}
},
clickRef () {
diff --git a/server/company/src/main/java/com/doumee/api/business/MemberController.java b/server/company/src/main/java/com/doumee/api/business/MemberController.java
index cceaae3..e617ad0 100644
--- a/server/company/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/company/src/main/java/com/doumee/api/business/MemberController.java
@@ -120,7 +120,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
})
- @RequiresPermissions("business:worktype:create")
+ @RequiresPermissions("business:member:importExcel")
public ApiResponse<List<MemberImport>> importExcel (@ApiParam(value = "file") MultipartFile file,Integer solutionId) {
return ApiResponse.success(memberService.importBatch(file,solutionId));
}
--
Gitblit v1.9.3