新增家庭会议模块

yz3456

2024-03-23 b907d9bffedeb001911c0305c661e9a3a4ad5404

新增家庭会议模块

 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',

 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)
       {

 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)
       {

 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) {

 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)
     {