From 97a8556b99ed6f7d58feeba57714fa2b05919d41 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Thu, 14 Nov 2024 15:52:02 +0800
Subject: [PATCH] 1
---
src/components/OnlineFile/index.vue | 4 +-
src/utils/formBuilder.js | 32 ++++----
.../components/AddVehicleCertificate.vue | 4 +
src/views/attendance/statistics.vue | 3 +-
src/views/document/components/AddDocument.vue | 8 ++
src/views/flow/create.vue | 4 +-
src/views/meeting/components/AddMeeting.vue | 52 +++++++++++-
src/views/meeting/index.vue | 81 ++++++++++++++-----
src/views/notice/components/AddNotice.vue | 8 ++
src/views/vehicle/components/AddVehicle.vue | 4 +
10 files changed, 156 insertions(+), 44 deletions(-)
diff --git a/src/components/OnlineFile/index.vue b/src/components/OnlineFile/index.vue
index 9f16ec7..9b37603 100644
--- a/src/components/OnlineFile/index.vue
+++ b/src/components/OnlineFile/index.vue
@@ -34,9 +34,7 @@ export default {
},
methods: {
open(url) {
- this.codeUri = `${process.env.VUE_APP_PREVIEW}?url=${encodeURIComponent(
- new Buffer(url).toString("base64")
- )}`;
+ this.codeUri = `${window.location.origin}/admin/#/preview?url=${url}`;
this.showModal = true;
}
},
diff --git a/src/utils/formBuilder.js b/src/utils/formBuilder.js
index 8acc4c0..c6cbd85 100644
--- a/src/utils/formBuilder.js
+++ b/src/utils/formBuilder.js
@@ -345,17 +345,17 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
h(
"a",
{
- attrs: {
- href: file.url,
- download: file.name,
- target: '_blank'
- },
class: {
"uploaded-a": file.status === "success",
},
style: {
padding: "0 4px",
},
+ on: {
+ click: _ => {
+ this.$bus.$emit('online-file', file.url)
+ }
+ }
},
file.name
),
@@ -832,17 +832,17 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
h(
"a",
{
- attrs: {
- href: file.url,
- download: file.name,
- target: '_blank'
- },
class: {
"uploaded-a": file.status === "success",
},
style: {
padding: "0 4px",
},
+ on: {
+ click: _ => {
+ this.$bus.$emit('online-file', file.url)
+ }
+ }
},
file.name
),
@@ -1132,16 +1132,17 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
h(
"a",
{
- attrs: {
- href: file.url,
- download: file.name,
- },
class: {
"uploaded-a": file.status === "success",
},
style: {
padding: "0 4px",
},
+ on: {
+ click: _ => {
+ this.$bus.$emit('online-file', file.url)
+ }
+ }
},
file.name
),
@@ -1384,9 +1385,6 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
h(
"a",
{
- attrs: {
- download: file.name,
- },
class: {
"uploaded-a": file.status === "success",
},
diff --git a/src/views/VehicleCertificate/components/AddVehicleCertificate.vue b/src/views/VehicleCertificate/components/AddVehicleCertificate.vue
index 432e9d5..fabae8c 100644
--- a/src/views/VehicleCertificate/components/AddVehicleCertificate.vue
+++ b/src/views/VehicleCertificate/components/AddVehicleCertificate.vue
@@ -105,6 +105,10 @@ export default {
this.form.renewed_id = ''
},
uploadSuccess(response, file, fileList) {
+ if (response.code) {
+ fileList.splice(fileList.indexOf(file), 1)
+ this.$message.warning(response.msg)
+ }
this.fileList = fileList
this.form.renewed_id = this.fileList[0]?.response?.data?.id
},
diff --git a/src/views/attendance/statistics.vue b/src/views/attendance/statistics.vue
index fa5d820..1f88348 100644
--- a/src/views/attendance/statistics.vue
+++ b/src/views/attendance/statistics.vue
@@ -20,8 +20,7 @@
:row-config="{ isHover: true }"
:header-cell-style="{ 'white-space': 'wrap' }"
:print-config="{}"
- :export-config="{
- }"
+ :export-config="{}"
:column-config="{ resizable: true }"
:data="tableData.admins">
diff --git a/src/views/document/components/AddDocument.vue b/src/views/document/components/AddDocument.vue
index ffa4d60..95c825d 100644
--- a/src/views/document/components/AddDocument.vue
+++ b/src/views/document/components/AddDocument.vue
@@ -38,6 +38,7 @@
}"
:before-upload="beforeUpload"
:on-success="uploadSuccess"
+ :on-remove="uploadRemove"
multiple
:file-list="fileList">
点击上传
@@ -112,6 +113,9 @@ export default {
},
methods: {
getToken,
+ uploadRemove(file, fileList) {
+ this.fileList = fileList
+ },
beforeUpload(file) {
const isLt10M = file.size / 1024 / 1024 < 10
if (!isLt10M) {
@@ -120,6 +124,10 @@ export default {
return isLt10M
},
uploadSuccess(response, file, fileList) {
+ if (response.code) {
+ fileList.splice(fileList.indexOf(file), 1)
+ this.$message.warning(response.msg)
+ }
this.fileList = fileList
},
diff --git a/src/views/flow/create.vue b/src/views/flow/create.vue
index dadc6a4..fac5e23 100644
--- a/src/views/flow/create.vue
+++ b/src/views/flow/create.vue
@@ -668,7 +668,9 @@ export default {
this.form[key] = ''
}
}
- this.form[key] = data[key];
+ if (data[key] && data[key] !== 'null' && data[key] !== 'undefined') {
+ this.form[key] = data[key];
+ }
}
}
}
diff --git a/src/views/meeting/components/AddMeeting.vue b/src/views/meeting/components/AddMeeting.vue
index 6a86187..5bc4ae8 100644
--- a/src/views/meeting/components/AddMeeting.vue
+++ b/src/views/meeting/components/AddMeeting.vue
@@ -75,6 +75,7 @@
}"
:before-upload="beforeUpload"
:on-success="uploadSuccess"
+ :on-remove="uploadRemove"
multiple
:file-list="fileList"
>
@@ -96,6 +97,13 @@
@input="e => form.user_ids = e.map(i => ({ user_id: i }))">
+
+
+
+
+
+
+
@@ -114,6 +122,11 @@ import { PopupManager } from "element-ui/lib/utils/popup";
import { userListNoAuth as index } from '@/api/common'
export default {
props: {
+ type: {
+ type: String,
+ default: 'add',
+ required: true
+ },
isShow: {
type: Boolean,
default: false,
@@ -130,6 +143,7 @@ export default {
zIndex: PopupManager.nextZIndex(),
loading: false,
form: {
+ id: "",
title: "",
start_time: "",
end_time: "",
@@ -142,7 +156,20 @@ export default {
},
action: process.env.VUE_APP_UPLOAD_API,
fileList: [],
- rules: {},
+ rules: {
+ title: [
+ { required: true, message: '请填写标题' }
+ ],
+ start_time: [
+ { required: true, message: '请填写开始时间' }
+ ],
+ end_time: [
+ { required: true, message: '请结束标题' }
+ ],
+ room_id: [
+ { required: true, message: '请选择会议室' }
+ ],
+ },
};
},
computed: {},
@@ -150,6 +177,9 @@ export default {
isShow(newVal) {
if(newVal) {
this.zIndex = PopupManager.nextZIndex()
+ } else {
+ this.fileList = []
+ this.$emit('update:type', 'add')
}
}
},
@@ -157,6 +187,22 @@ export default {
this.getUsers()
},
methods: {
+ getDetail (data) {
+ for (let key in this.form) {
+ this.form[key] = data[key]
+ }
+ this.form.user_ids = data['users']?.map(i => ({ user_id: i.id }))
+ this.fileList = data['files_details']?.map(i => ({
+ name: i.original_name,
+ url: i.url,
+ response: {
+ data: i
+ }
+ })) ?? []
+ },
+ uploadRemove(file, fileList) {
+ this.fileList = fileList
+ },
beforeUpload(file) {
const isLt10M = file.size / 1024 / 1024 < 10
if (!isLt10M) {
@@ -165,6 +211,10 @@ export default {
return isLt10M
},
uploadSuccess(response, file, fileList) {
+ if (response.code) {
+ fileList.splice(fileList.indexOf(file), 1)
+ this.$message.warning(response.msg)
+ }
this.fileList = fileList
},
diff --git a/src/views/meeting/index.vue b/src/views/meeting/index.vue
index 566a579..9d5ac74 100644
--- a/src/views/meeting/index.vue
+++ b/src/views/meeting/index.vue
@@ -1,7 +1,7 @@
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -123,7 +120,7 @@
>
- 审核
@@ -177,6 +175,8 @@ import { destroy, index, save } from "@/api/meeting";
import { index as meetingRoomIndex } from "@/api/meetingRoom";
import AddMeeting from "./components/AddMeeting.vue";
import UserPicker from "@/components/UserPicker/index.vue";
+import axios from "axios";
+import {getToken} from "@/utils/auth";
export default {
components: {
@@ -185,13 +185,16 @@ export default {
},
data() {
return {
+ examineKey: 0,
isShowAdd: false,
+ isShowType: 'add',
rooms: [],
loading: false,
select: {
page: 1,
page_size: 20,
+ show_relation: ['users']
},
total: 0,
allAlign: null,
@@ -208,6 +211,7 @@ export default {
meeting_status: "",
files: [],
user_ids: [],
+ files_details: []
},
};
},
@@ -224,7 +228,40 @@ export default {
this.getList();
this.getRooms();
},
+ mounted() {
+ this.bindToolbar()
+ },
methods: {
+ uploadMethod(file, row) {
+ const formData = new FormData()
+ formData.append('file', file)
+ return axios.post(process.env.VUE_APP_UPLOAD_API, formData, {
+ headers: {
+ Authorization: `Bearer ${getToken()}`,
+ }
+ }).then((response) => {
+ if (response.status === 200 && !response.data.code) {
+ if (!(this.form['files_details'] instanceof Array)) {
+ this.form['files_details'] = []
+ }
+ this.form['files_details'].push({
+ response: response.data.data,
+ name: response.data.data.original_name,
+ url: response.data.data.url
+ })
+ } else {
+ this.$message.error("上传失败")
+ }
+ })
+ },
+ bindToolbar() {
+ this.$nextTick(() => {
+ if (this.$refs["table"] && this.$refs["toolbar"]) {
+ this.$refs["table"].connect(this.$refs["toolbar"]);
+ }
+ });
+ },
+
editRowEvent(row) {
if (this.$refs["table"]) {
this.$refs["table"].setEditRow(row);
@@ -279,10 +316,8 @@ export default {
for (const key in form) {
form[key] = row[key];
}
- if (!form.password) {
- delete form.password;
- }
this.loading = true;
+ form['files'] = this.form['files_details'].map(i => i.response?.id)
await save(form);
await this.getList();
this.loading = false;
@@ -314,6 +349,12 @@ export default {
this.loading = false;
}
},
+
+ async examine(row) {
+ this.isShowType = 'examine'
+ this.$refs['AddMeeting'].getDetail(row)
+ this.isShowAdd = true
+ }
},
};
diff --git a/src/views/notice/components/AddNotice.vue b/src/views/notice/components/AddNotice.vue
index 1f3cc40..3b0d79d 100644
--- a/src/views/notice/components/AddNotice.vue
+++ b/src/views/notice/components/AddNotice.vue
@@ -49,6 +49,7 @@
}"
:before-upload="beforeUpload"
:on-success="uploadSuccess"
+ :on-remove="uploadRemove"
multiple
:file-list="fileList"
>
@@ -150,6 +151,9 @@ export default {
this.getUsers()
},
methods: {
+ uploadRemove(file, fileList) {
+ this.fileList = fileList
+ },
beforeUpload(file) {
const isLt10M = file.size / 1024 / 1024 < 10
if (!isLt10M) {
@@ -158,6 +162,10 @@ export default {
return isLt10M
},
uploadSuccess(response, file, fileList) {
+ if (response.code) {
+ fileList.splice(fileList.indexOf(file), 1)
+ this.$message.warning(response.msg)
+ }
this.fileList = fileList
},
diff --git a/src/views/vehicle/components/AddVehicle.vue b/src/views/vehicle/components/AddVehicle.vue
index 94c3c51..c29107d 100644
--- a/src/views/vehicle/components/AddVehicle.vue
+++ b/src/views/vehicle/components/AddVehicle.vue
@@ -143,6 +143,10 @@ export default {
this.form.photo_file_id = ''
},
photoSuccess(response, file, fileList) {
+ if (response.code) {
+ fileList.splice(fileList.indexOf(file), 1)
+ this.$message.warning(response.msg)
+ }
this.fileList = fileList
this.form.photo_file_id = this.fileList[0]?.response?.data?.id
},