From b907d9bffedeb001911c0305c661e9a3a4ad5404 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期六, 23 三月 2024 21:41:45 +0800
Subject: [PATCH] 新增家庭会议模块
---
ruoyi-ui/src/views/economy/economyInfo.vue | 56 +++++-----
ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue | 79 ++++++++-------
ruoyi-ui/src/views/selfeconomy/index.vue | 45 ++++----
ruoyi-ui/src/router/index.js | 48 +++++++++
ruoyi-ui/src/views/pet/noteInfo.vue | 47 ++++----
5 files changed, 162 insertions(+), 113 deletions(-)
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index e143174..3a13ea4 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -147,6 +147,54 @@
}
]
},
+ //瀹跺涵浼氳
+ {
+ path: '/meeting/index',
+ component: Layout,
+ hidden: true,
+ permissions: ['meetingModel:meeting:list'],
+ children: [
+ {
+ // path: 'meetingInfo/',
+ path: 'meetingInfo/:id(\\d+)',
+ component: () => import('@/views/meeting/meetingInfo'),
+ name: 'meetingInfo',
+ meta: { title: '浼氳璇︽儏',activeMenu: '/meeting/meetingInfo'}
+ }
+ ]
+ },
+ //浼氳瀹℃壒
+ {
+ path: '/meeting/approve',
+ component: Layout,
+ // permissions: [],
+ hidden: true,
+ permissions: ['meetingModel:approve:list'],
+ },
+ //浼氳缁熻
+ {
+ path: '/meeting/statistics',
+ component: Layout,
+ // permissions: [],
+ hidden: true,
+ permissions: ['meetingModel:statistics:list'],
+ },
+ //鐩存挱
+ {
+ path: '/meeting/webcast',
+ component: Layout,
+ // permissions: [],
+ hidden: true,
+ permissions: ['meetingModel:webcast:list'],
+ },
+ //鐩存挱鍥炴斁
+ {
+ path: '/meeting/replay',
+ component: Layout,
+ // permissions: [],
+ hidden: true,
+ permissions: ['meetingModel:replay:list'],
+ },
//棣栭〉閫氱煡璇︽儏
{
path:'/views/shouye',
diff --git a/ruoyi-ui/src/views/economy/economyInfo.vue b/ruoyi-ui/src/views/economy/economyInfo.vue
index dcdc48c..4792616 100644
--- a/ruoyi-ui/src/views/economy/economyInfo.vue
+++ b/ruoyi-ui/src/views/economy/economyInfo.vue
@@ -15,8 +15,8 @@
<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px">
<el-form-item label="鍙拌处" prop="type">
- <el-select v-model="formData.type" placeholder="璇疯緭鍏ュ彴璐﹀唴瀹�" clearable :style="{width: '100%'}" :disabled="dsb" >
- </el-select>
+ <el-input v-model="formData.type" placeholder="璇疯緭鍏ュ彴璐﹀唴瀹�" clearable :style="{width: '100%'}" :disabled="dsb" >
+ </el-input>
</el-form-item>
<el-form-item label="鏃堕棿" prop="createTime">
<el-input v-model="formData.createTime" placeholder="璇烽�夋嫨鏃堕棿" type="date" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
@@ -215,7 +215,7 @@
uploadFileList:[],
uploadFileList1:[],
fileListOther:[
-
+
],
dsb:true,
btn:false,
@@ -321,7 +321,7 @@
for(let i = 0; i < paths.length; i++)
{
if(paths[i]!="") {
-
+
let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
// alert(pth)
if (_this.fot.includes(pth) === true)
@@ -340,7 +340,7 @@
_this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
else
_this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
-
+
}
}
}
@@ -410,10 +410,10 @@
this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1))
}
this.$delete(this.fileListOther,i);
-
+
}
}
-
+
let ul = ""
this.fileList.map(function (elem){
if(elem.res==false)
@@ -430,7 +430,7 @@
updateEconomy(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
// this.open = false;
-
+
});
}
},
@@ -454,7 +454,7 @@
// alert(this.uploadFileList.length)
}
this.$delete(this.fileList,i);
-
+
}
}
let ul = ""
@@ -473,7 +473,7 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
});
}
-
+
},
handleFileCardPreview(file){
this.dialogFileUrl = file.url;
@@ -511,11 +511,11 @@
this.btn = true
this.isShow=false
},
-
+
//鑷畾涔変笂浼犳柟娉�
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
this.uploadFileList.push(file.raw);
@@ -524,7 +524,7 @@
//鑷畾涔変笂浼犳柟娉�
handleChange1(file, fileListOther1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
this.uploadFileList1.push(file.raw);
this.fileListOther.push({name:file.name,url:file.url,res:true})
@@ -535,7 +535,7 @@
},
fileUpload(){
// var file = params.file;
-
+
var formData = new FormData();
//this.$refs.upload1.submit();
// alert(this.uploadFileList1.length)
@@ -543,14 +543,14 @@
if(this.uploadFileList1.length==0){
this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
return}
-
+
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
-
+
})
console.log(this.uploadFileList1)
let _this = this
-
+
this.uploading = true;
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
@@ -560,25 +560,25 @@
// this.open = false;
});
})
-
+
},
picUpload()
{
-
+
var formData = new FormData();
//this.$refs.upload.submit();
//alert(this.uploadFileList.length)
if(this.uploadFileList.length==0){
this.$modal.msgSuccess("鍥惧儚涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
return}
-
+
this.uploadFileList.forEach((elem)=>{
formData.append("files", elem)
-
+
})
let _this = this
-
-
+
+
uploadPic(formData).then(response => {
// console.log(response.originalFilenames)
// console.log(response.urls)
@@ -605,12 +605,12 @@
updateEconomy(_this.formData).then(response => {
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
// this.open = false;
-
+
});
// }
// else{
// _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
+
// }
});
},
@@ -618,10 +618,10 @@
{
// alert(124)
// this.uploadFileList.push(params.file);
-
+
//alert(34)
-
-
+
+
},
requestUpload1(params)
{
diff --git a/ruoyi-ui/src/views/pet/noteInfo.vue b/ruoyi-ui/src/views/pet/noteInfo.vue
index c0bb6be..9c7ef03 100644
--- a/ruoyi-ui/src/views/pet/noteInfo.vue
+++ b/ruoyi-ui/src/views/pet/noteInfo.vue
@@ -182,14 +182,14 @@
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
'.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
-
+
fileList:[
],
fileList1:[],
uploadFileList:[],
uploadFileList1:[],
fileListOther:[
-
+
],
dsb:true,
btn:false,
@@ -354,10 +354,10 @@
this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1))
}
this.$delete(this.fileListOther,i);
-
+
}
}
-
+
let ul = ""
this.fileList.map(function (elem){
if(elem.res==false)
@@ -374,7 +374,7 @@
updatenotePet(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
// this.open = false;
-
+
});
}
},
@@ -398,7 +398,7 @@
// alert(this.uploadFileList.length)
}
this.$delete(this.fileList,i);
-
+
}
}
let ul = ""
@@ -451,7 +451,7 @@
//鑷畾涔変笂浼犳柟娉�
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
this.uploadFileList.push(file.raw);
@@ -460,7 +460,7 @@
//鑷畾涔変笂浼犳柟娉�
handleChange1(file, fileListOther1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
this.uploadFileList1.push(file.raw);
this.fileListOther.push({name:file.name,url:file.url,res:true})
@@ -471,7 +471,7 @@
},
fileUpload(){
// var file = params.file;
-
+
var formData = new FormData();
//this.$refs.upload1.submit();
// alert(this.uploadFileList1.length)
@@ -479,14 +479,14 @@
if(this.uploadFileList1.length==0){
this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
return}
-
+
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
-
+
})
console.log(this.uploadFileList1)
let _this = this
-
+
this.uploading = true;
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
@@ -494,27 +494,28 @@
updatenotePet(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
+ this.uploading = false;
});
})
-
+
},
picUpload()
{
-
+
var formData = new FormData();
//this.$refs.upload.submit();
//alert(this.uploadFileList.length)
if(this.uploadFileList.length==0){
this.$modal.msgSuccess("鍥惧儚涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
return}
-
+
this.uploadFileList.forEach((elem)=>{
formData.append("files", elem)
-
+
})
let _this = this
-
-
+
+
uploadPic(formData).then(response => {
// console.log(response.originalFilenames)
// console.log(response.urls)
@@ -541,12 +542,12 @@
updatenotePet(_this.formData).then(response => {
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
// this.open = false;
-
+
});
// }
// else{
// _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
+
// }
});
},
@@ -554,10 +555,10 @@
{
// alert(124)
// this.uploadFileList.push(params.file);
-
+
//alert(34)
-
-
+
+
},
requestUpload1(params)
{
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index 2afc227..e73ed9e 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -333,7 +333,7 @@
style="margin-left: 10px"
size="small"
type="success"
-
+
@click="picUpload"
>涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
@@ -344,9 +344,9 @@
multiple
:on-remove="handleRemoveFile"
-
-
-
+
+
+
ref="upload1"
:on-change="handleChange1"
:auto-upload="false"
@@ -354,7 +354,7 @@
:http-request="requestUpload1"
:show-file-list="true"
>
-
+
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
@@ -371,7 +371,7 @@
alt=""
style="width: 100%; height: 100%"
fit="cover"></img>
-
+
<span class="el-upload-list__item-actions">
<span class="el-upload-list__item-name">{{ file.name }}</span>
<span
@@ -380,19 +380,19 @@
>
<i class="el-icon-zoom-in"></i>
</span>
-
+
<span
-
+
class="el-upload-list__item-delete"
@click="handleRemoveFile(file)"
>
<i class="el-icon-delete"></i>
</span>
</span>
-
+
</div>
-
-
+
+
</el-upload>
</el-upload>
@@ -405,7 +405,7 @@
>涓婁紶鍒版湇鍔″櫒</el-button>
</el-form>
<h4 class="form-header"> </h4>
-
+
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
@@ -659,9 +659,9 @@
for(let i = 0; i < this.fileListOther.length; i++)
{
if(this.fileListOther[i].url==file.url)
- {
+ {
this.$delete(this.fileListOther,i);
- this.$delete(this.uploadFileList1,i);
+ this.$delete(this.uploadFileList1,i);
}
}
},
@@ -735,7 +735,6 @@
handleCheck(row){
const id = row.id;
this.$router.push("/self/selfeconomy/selfeconomyInfo/" + id);
-
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
@@ -789,7 +788,7 @@
},
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
console.log(file)
@@ -812,7 +811,7 @@
},
fileUpload(){
// var file = params.file;
-
+
var formData = new FormData();
this.$refs.upload1.submit();
// formData.append('uploadFile', file);
@@ -822,18 +821,18 @@
}
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
-
+
})
-
+
let _this = this
-
+
this.uploading = true;
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
_this.formDat.url = _this.formDat.url+","+response.fileNames
_this.$modal.msgSuccess("鏂囦欢涓婁紶鎴愬姛!");
})
-
+
},
picUpload()
{
@@ -848,7 +847,7 @@
//console.log(this.uploadFileList)
this.uploadFileList.forEach((elem)=>{
formData.append("files", elem)
-
+
})
//alert(90)
let _this = this
@@ -858,7 +857,7 @@
_this.formDat.url = _this.formDat.url+","+response.fileNames
_this.uploadFileList = []
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
-
+
});
},
requestUpload(params) {
diff --git a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
index eb9c5a8..31ce44e 100644
--- a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
+++ b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -93,11 +93,11 @@
action="#"
list-type="picture-card"
multiple
-
-
+
+
ref="upload"
:show-file-list="true"
- :http-request="requestUpload"
+ :http-request="requestUpload"
:file-list="fileList"
:on-change="handleChange"
:auto-upload="false"
@@ -159,7 +159,7 @@
:on-preview="handleFileCardPreview"
:on-remove="handleRemoveFile"
:show-file-list="true"
-
+
ref="upload1"
:http-request="requestUpload1"
:on-change="handleChange1"
@@ -252,14 +252,14 @@
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
'.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
-
+
fileList:[
],
fileList1:[],
uploadFileList:[],
uploadFileList1:[],
fileListOther:[
-
+
],
dsb:true,
btn:false,
@@ -380,7 +380,7 @@
this.loading = true;
getSelfEconomyInfo({id}).then((response) => {
this.formData = response.data;
- if(this.formData.status=="1")
+ if(this.formData.status==1)
this.formData.status = '鏄�'
else
this.formData.status = '鍚�'
@@ -388,7 +388,7 @@
for(let i = 0; i < paths.length; i++)
{
if(paths[i]!="") {
-
+
let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
// alert(pth)
if (_this.fot.includes(pth) === true)
@@ -407,7 +407,7 @@
_this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
else
_this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
-
+
}
}
}
@@ -440,11 +440,12 @@
this.formData.url = ul+","+uls
this.$refs['elForm'].validate(valid => {
- if(this.formData.status=="1")
- this.formData.status = 1
- else
- this.formData.status = 0
- //alert(this.formData.status)
+ // if(this.formData.status=="鏄�")
+ // this.formData.status = 1
+ // else
+ // this.formData.status = 0
+
+ alert(this.formData.status)
if (valid) {
if (this.formData.id != undefined) {
updateSelfEconomy(this.formData).then(response => {
@@ -458,10 +459,10 @@
});
} else {
this.$modal.msgSuccess("淇敼澶辫触");
- if(this.formData.status==1)
- this.formData.status = '鏄�'
+ if(this.formData.status=='鏄�')
+ this.formData.status = 1
else
- this.formData.status = '鍚�'
+ this.formData.status = 0
}
}
})
@@ -500,10 +501,10 @@
this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1))
}
this.$delete(this.fileListOther,i);
-
+
}
}
-
+
let ul = ""
this.fileList.map(function (elem){
if(elem.res==false)
@@ -520,7 +521,7 @@
updateSelfEconomy(this.formData).then(response => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
// this.open = false;
-
+
});
}
},
@@ -544,7 +545,7 @@
// alert(this.uploadFileList.length)
}
this.$delete(this.fileList,i);
-
+
}
}
let ul = ""
@@ -600,11 +601,11 @@
this.btn = true
this.isShow=false
},
-
+
//鑷畾涔変笂浼犳柟娉�
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
this.uploadFileList.push(file.raw);
@@ -613,7 +614,7 @@
//鑷畾涔変笂浼犳柟娉�
handleChange1(file, fileListOther1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
this.uploadFileList1.push(file.raw);
this.fileListOther.push({name:file.name,url:file.url,res:true})
@@ -624,7 +625,7 @@
},
fileUpload(){
// var file = params.file;
-
+
var formData = new FormData();
//this.$refs.upload1.submit();
// alert(this.uploadFileList1.length)
@@ -632,14 +633,14 @@
if(this.uploadFileList1.length==0){
this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
return}
-
+
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
-
+
})
console.log(this.uploadFileList1)
let _this = this
-
+
this.uploading = true;
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
@@ -649,25 +650,25 @@
// this.open = false;
});
})
-
+
},
picUpload()
{
-
+
var formData = new FormData();
//this.$refs.upload.submit();
//alert(this.uploadFileList.length)
if(this.uploadFileList.length==0){
this.$modal.msgSuccess("鍥惧儚涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
return}
-
+
this.uploadFileList.forEach((elem)=>{
formData.append("files", elem)
-
+
})
let _this = this
-
-
+
+
uploadPic(formData).then(response => {
// console.log(response.originalFilenames)
// console.log(response.urls)
@@ -694,12 +695,12 @@
updateSelfEconomy(_this.formData).then(response => {
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
// this.open = false;
-
+
});
// }
// else{
// _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
+
// }
});
},
@@ -707,10 +708,10 @@
{
// alert(124)
// this.uploadFileList.push(params.file);
-
+
//alert(34)
-
-
+
+
},
requestUpload1(params)
{
--
Gitblit v1.9.1