c-hongqw1/zhgh_hhu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
@jyuhsin
2024-10-31 16:36:09 +08:00
parent d11034e86c 90f088eaff
commit f6176e4997
5 changed files with 60 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/mobile/meeting/myMeeting.html
+1 -1
View File
@@ -602,7 +602,7 @@ layout("/mobile/platform.html"){
if(this.helpLeave) {
const confirm = await vant.Dialog.confirm({
title: '提示',
message: '您确定要替' + this.needLeaveUser.userName + '报名吗？',
message: '您确定要替' + this.needLeaveUser.userName + '请假吗？',
})
if (confirm !== 'confirm') {
return
src/main/resources/views/platform/hd/wmhd/mobile/staffActivities.html
+7 -1
View File
@@ -654,9 +654,15 @@
const i = this.formData.hdlb_i
if (flag === true) {
if (this.fd[i].imgList.length === 0) {
/*if (this.fd[i].imgList.length === 0) {
this.$toast.fail("请您选择要上传的作品！")
return
}*/
if (this.chooseLb.isUploadPhoto === true || this.chooseLb.isUploadOther === true || this.chooseLb.isUploadZip === true) {
if (this.fd[i].videoList.length === 0 || this.fd[i].imgList.length === 0 || this.fd[i].zipList.length === 0) {
this.$toast.fail("请您选择要上传的作品！")
return
}
}
if (!this.fd[i].zplb || !this.fd[i].zpmc || !this.fd[i].zpms) {
this.$toast.fail("请您填写完整再提交！")
src/main/resources/views/platform/hd/wmhd/zpMange.html
+36 -24
View File
@@ -761,15 +761,21 @@ layout("/layouts/platform.html"){
let formdata = new FormData();
formdata.append("flag", flag);
formdata.append("data", JSON.stringify(this.AddFormData));
this.picturelist.forEach(val => {
formdata.append("file", val.raw);
});
this.vadlist.forEach(val => {
formdata.append("file", val.raw);
});
this.ziplist.forEach(val => {
formdata.append("file", val.raw);
});
if(this.picturelist && this.picturelist.length > 0) {
this.picturelist.forEach(val => {
formdata.append("file", val.raw);
});
}
if(this.vadlist && this.vadlist.length > 0) {
this.vadlist.forEach(val => {
formdata.append("file", val.raw);
});
}
if(this.ziplist && this.ziplist.length > 0) {
this.ziplist.forEach(val => {
formdata.append("file", val.raw);
});
}
$.ajax({
url: "/platform/hd/jzghd/sczp/doSubmit",
type: "post",
@@ -835,21 +841,27 @@ layout("/layouts/platform.html"){
formdata.append("flag", flag);
formdata.append("data", JSON.stringify(this.EditFormData));
formdata.append("readytodelfile", JSON.stringify(this.readytodelfile));
this.picturelist.forEach(val => {
if (val.status === 'ready') {
formdata.append("file", val.raw);
}
});
this.vadlist.forEach(val => {
if (val.status === 'ready') {
formdata.append("file", val.raw);
}
});
this.ziplist.forEach(val => {
if (val.status === 'ready') {
formdata.append("file", val.raw);
}
});
if(this.picturelist && this.picturelist.length > 0) {
this.picturelist.forEach(val => {
if (val.status === 'ready') {
formdata.append("file", val.raw);
}
});
}
if(this.vadlist && this.vadlist.length > 0) {
this.vadlist.forEach(val => {
if (val.status === 'ready') {
formdata.append("file", val.raw);
}
});
}
if(this.ziplist && this.ziplist.length > 0) {
this.ziplist.forEach(val => {
if (val.status === 'ready') {
formdata.append("file", val.raw);
}
});
}
$.ajax({
url: "/platform/hd/jzghd/sczp/doEdit",
type: "post",