提交新内容

feige

2024-02-21 c1cff08cdbcee3278c1ac8d8a3a067e3bf015202

提交新内容

 ruoyi-ui/src/views/bignote/familyeventInfo.vue

@@ -477,10 +477,13 @@
    },
    fileUpload(){
    //    var file = params.file;

        var formData = new FormData();
        this.$refs.upload1.submit();
        // formData.append('uploadFile', file);
    //    if(this.uploadFileList1.length==0)
        if(this.uploadFileList1.length==0){
              this.$modal.msgSuccess("文档上传列表不能为空！");
              return}
        
        this.uploadFileList1.forEach((elem)=>{
            formData.append("files", elem)
@@ -491,39 +494,23 @@

        this.uploading = true;
        uploadPic(formData).then(response => {
        //   let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
        //   _this.uploading = false;
        //   // this.$modal.msgSuccess("上传成功");
        //   if(_this.fot.includes(pth) === true)
        //   {
        //     _this.fileList.push({name:response.data.fileName, "url":response.data.url})
		
        //   }
		
        //   else{
        //     _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
        //     let ul = _this.fileList.map(function (elem){
        //       return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
        //     }).join(",")
        //     let uls = _this.fileListOther.map(function (elem){
        //       return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
        //     }).join(",")
        //     _this.formData.url = ul+","+uls
        //     console.log(_this.formData.url)
        _this.uploadFileList1 = []
          _this.formData.url = _this.formData.url+","+response.fileNames
            updateFamilyevent(_this.formData).then(response => {
              this.$modal.msgSuccess("文档上传成功");
              // this.open = false;
		
            });
          })

    },
    picUpload()
    {

        var formData = new FormData();
        this.$refs.upload.submit();
	
    if(this.uploadFileList.length==0){
          this.$modal.msgSuccess("图像上传列表不能为空！");
          return}

        this.uploadFileList.forEach((elem)=>{
            formData.append("files", elem)
@@ -553,7 +540,7 @@
        //console.log(_this.fileList)
    //    alert(response.fileNames)
          _this.formData.url = _this.formData.url+","+response.fileNames

        _this.uploadFileList = []
         // alert(87)
          updateFamilyevent(_this.formData).then(response => {
            _this.$modal.msgSuccess("图片上传成功");

 ruoyi-ui/src/views/bignote/index.vue

@@ -257,6 +257,9 @@
          multiple
          :http-request="requestUpload"
          :file-list="fileList"
          :on-change="handleChange"
          :auto-upload="false"
              ref="upload"
        >
          <i slot="default" class="el-icon-plus"></i>
          <div slot="file" slot-scope="{ file }">
@@ -287,26 +290,77 @@
    </span>
          </div>
        </el-upload>
        <el-button
                 style="margin-left: 10px"
                 size="small"
                 type="success"

                 @click="picUpload"
               >上传到服务器</el-button>
        <h4 class="form-header">其他附件 </h4>
        <el-upload
          action=""
          :file-list="fileListOther"
          class="upload-demo"
          multiple

          :on-remove="handleRemoveFile"
              ref="upload1"
        :on-change="handleChange1"
        :auto-upload="false"
        list-type="picture-card"
          :http-request="requestUpload1"
          :show-file-list="true"
        >
<i slot="default" class="el-icon-plus"></i>
        <div slot="file" slot-scope="{file}">
          <!-- 添加video元素用于显示视频 -->
          <video
            v-if="file.url.includes('.mp4')"
            class="el-upload-list__item-thumbnail"
            :src="file.url"
            style="width: 147px; height: 147px"
            fit="cover"
          ></video>
          <img v-else
               class="el-upload-list__item-thumbnail"
               :src="file.url"
               alt=""
               style="width: 100%; height: 100%"
               fit="cover"></img>

          <el-button type="primary">点击上传</el-button>
          <div v-if="uploading" class="upload-status">正在上传...</div>
          <template #tip>
            <div class="el-upload__tip">
            </div>
          </template>
        </el-upload>
          <span class="el-upload-list__item-actions">
               <span class="el-upload-list__item-name">{{ file.name }}</span>
                    <span
                      class="el-upload-list__item-preview"
                      @click="handleFileCardPreview(file)"
                    >
                      <i class="el-icon-zoom-in"></i>
                    </span>
                    <span

                      class="el-upload-list__item-delete"
                      @click="handleDownload(file.url)"
                    >
                 <i class="el-icon-download"></i>
                 </span>
                    <span
                      v-if="isShow"
                      class="el-upload-list__item-delete"
                      @click="handleRemoveFile(file)"
                    >
                      <i class="el-icon-delete"></i>
                    </span>
              </span>

        </div>


      </el-upload>
     <el-button
                  style="margin-left: 10px"
                  size="small"
                  type="success"
                  @click="fileUpload"
                >上传到服务器</el-button>
      </el-form>
      <h4 class="form-header"> </h4>

@@ -357,6 +411,8 @@
      total: 0,
      // 家大事记表格数据
      familyList: [],

	  
      // 弹出层标题
      title: "",
      // 是否显示弹出层
@@ -373,6 +429,9 @@
      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,
@@ -386,7 +445,7 @@
        remark: undefined,
        familyId:undefined,
        happenTime:undefined,
        url: undefined,
        url: '',
      },
      // 菜单列表
      menuOptions: [],
@@ -578,12 +637,22 @@
    },

    handleRemove(file) {
      for(let i = 0; i < this.fileList.length; i++)
      {
        if(this.fileList[i].url==file.url)
          this.$delete(this.fileList,i);

      }
        //alert(98)
        //alert(this.fileList.length)
     for(let i = 0; i < this.fileList.length; i++)
     {
       if(this.fileList[i].url==file.url)
         this.$delete(this.fileList,i);
       let ul = this.fileList.map(function (elem){
         return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
       }).join(",")
       let uls = this.fileListOther.map(function (elem){
         return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
       }).join(",")
       this.formDat.url = ul+","+uls;
             //alert(this.formData.url)
        
     }
    },
    handleRemoveFile(file) {
      for(let i = 0; i < this.fileListOther.length; i++)
@@ -599,13 +668,14 @@
    /** 提交按钮（数据权限） */
    submitDataScope: function() {

      let ul = this.fileList.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      let uls = this.fileListOther.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      this.formDat.url = ul+","+uls
      // let ul = this.fileList.map(function (elem){
      //   return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      // }).join(",")
      // let uls = this.fileListOther.map(function (elem){
      //   return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      // }).join(",")
      // this.formDat.url = ul+","+uls
    //  alert(this.formDat.url)
      this.$refs["elForm"].validate(valid => {
        if (valid) {

@@ -629,53 +699,85 @@
      });

    },
    handleChange(file, fileList1) {
       //定义一个全局数组uploadFileList来做存储
	
     // this.uploadFileList.push(file.raw);
      console.log("=========5555=========")
      console.log(file)
    //  console.log(this.uploadFileList)
    //  this.fileList = fileList
    //alert(file)
        this.uploadFileList.push(file.raw);
         this.fileList.push({name:file.name,url:file.url})
    //alert(fileList1.length)
    },
    handleChange1(file, fileOtherList1) {
       //定义一个全局数组uploadFileList来做存储
	
     // this.uploadFileList.push(file.raw);
      console.log("=========5555=========")
      //console.log(file)
    //  console.log(this.uploadFileList)
    //  this.fileList = fileList
    },
    fileUpload(){
    //    var file = params.file;

        var formData = new FormData();
        this.$refs.upload1.submit();
        // formData.append('uploadFile', file);
        if(this.uploadFileList1.length==0){
              this.$modal.msgSuccess("文档上传列表不能为空!");
              return
        }
        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()
    {
        var formData = new FormData();
        //alert(976)
        //this.$refs.upload.submit();
        //alert(8)
    if(this.uploadFileList.length==0){
          this.$modal.msgSuccess("图片上传列表不能为空！");
          return}
    //console.log(this.uploadFileList)
        this.uploadFileList.forEach((elem)=>{
            formData.append("files", elem)
			
        })
        //alert(90)
        let _this = this
        //alert(9)
        uploadPic(formData).then(response => {
        //    alert("dds")
          _this.formDat.url = _this.formDat.url+","+response.fileNames
          _this.uploadFileList = []
          _this.$modal.msgSuccess("图片上传成功");

      });
    },
    requestUpload(params) {

      var file = params.file;
      var formData = new FormData();
      formData.append('uploadFile', file);
      let _this = this
      this.uploading1 = true;
      uploadPic(formData).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
        this.uploading1 = false;
        this.$modal.msgSuccess("上传成功");
        if(_this.fot.includes(pth) === true)
        {
          _this.fileList.push({name:response.data.fileName, "url":response.data.url})

        }

        else{
          // _this.fileListOther.push({name:response.data.fileName, url:response.data.url})

        }
      })
//alert(98)
 //    this.uploadFileList.push(params.file);
    },
    requestUpload1(params)
    {
      var file = params.file;
      var formData = new FormData();
      formData.append('uploadFile', file);
      let _this = this
      this.uploading = true;
      uploadPic(formData).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
        this.uploading = false;
        this.$modal.msgSuccess("上传成功");
        if(_this.fot.includes(pth) !== true)
        {
          // _this.fileList.push({name:response.data.fileName, "url":response.data.url})
          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})

        }

        // else{
        //   _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
        //
        // }
      })

             this.uploadFileList1.push(params.file);
    },
    /** 删除按钮操作 */
    handleDelete(row) {

 ruoyi-ui/src/views/clean/index.vue

@@ -254,6 +254,9 @@
            multiple
            :http-request="requestUpload"
            :file-list="fileList"
            :on-change="handleChange"
            :auto-upload="false"
            ref="upload"
          >
            <i slot="default" class="el-icon-plus"></i>
            <div slot="file" slot-scope="{ file }">
@@ -650,54 +653,80 @@
        });

      },
      requestUpload(params) {

        var file = params.file;
        var formData = new FormData();
        formData.append('uploadFile', file);
        let _this = this
        this.uploading1 = true;
    handleChange(file, fileList1) {
       //定义一个全局数组uploadFileList来做存储
    
     // this.uploadFileList.push(file.raw);
      console.log("=========5555=========")
      //console.log(file)
    //  console.log(this.uploadFileList)
    //  this.fileList = fileList
    },
    handleChange1(file, fileOtherList1) {
       //定义一个全局数组uploadFileList来做存储
    
     // this.uploadFileList.push(file.raw);
      console.log("=========5555=========")
      //console.log(file)
    //  console.log(this.uploadFileList)
    //  this.fileList = fileList
    },
    fileUpload(){
    //    var file = params.file;
    
        var formData = new FormData();
        this.$refs.upload1.submit();
        // formData.append('uploadFile', file);
        if(this.uploadFileList1.length==0){
              this.$modal.msgSuccess("文档上传列表不能为空!");
              return
        }
        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()
    {
        var formData = new FormData();
        this.$refs.upload.submit();
    if(this.uploadFileList.length==0){
          this.$modal.msgSuccess("图片上传列表不能为空！");
          return}
    //console.log(this.uploadFileList)
        this.uploadFileList.forEach((elem)=>{
            formData.append("files", elem)
    		
        })
        //alert(90)
        let _this = this
        //alert(9)
        uploadPic(formData).then(response => {
          let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
          this.uploading1 = false;
          this.$modal.msgSuccess("上传成功");
          if(_this.fot.includes(pth) === true)
          {
            _this.fileList.push({name:response.data.fileName, "url":response.data.url})

          }

          else{
            // _this.fileListOther.push({name:response.data.fileName, url:response.data.url})

          }
        })
      },
      requestUpload1(params)
      {
        var file = params.file;
        var formData = new FormData();
        formData.append('uploadFile', file);
        let _this = this
        this.uploading = true;
        uploadPic(formData).then(response => {
          let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
          this.uploading = false;
          this.$modal.msgSuccess("上传成功");
          if(_this.fot.includes(pth) !== true)
          {
            // _this.fileList.push({name:response.data.fileName, "url":response.data.url})
            _this.fileListOther.push({name:response.data.fileName, url:response.data.url})

          }

          // else{
          //   _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
          //
          // }
        })

      },
        //    alert("dds")
          _this.formDat.url = _this.formDat.url+","+response.fileNames
          _this.uploadFileList = []
          _this.$modal.msgSuccess("图片上传成功");
    
      });
    },
    requestUpload(params) {
    
     this.uploadFileList.push(params.file);
    },
    requestUpload1(params)
    {
             this.uploadFileList1.push(params.file);
    },
      /** 删除按钮操作 */
      handleDelete(row) {
        const Ids = row.id || this.ids;

 ruoyi-ui/src/views/economy/economyInfo.vue

@@ -22,8 +22,12 @@
        <el-input v-model="formData.createTime" placeholder="请选择时间" type="date" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
      </el-form-item>
      <el-form-item label="收入/支出" prop="price">
        <el-input v-model="formData.price" placeholder="请输入选择收入/支出" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
          <el-select v-model="formData.price" placeholder="请选择收入/支出" clearable :style="{width: '100%'}"  >
            <el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label" :value="item.value"
            ></el-option>
          </el-select>
 <!--       <el-input v-model="formData.price" placeholder="请输入选择收入/支出" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input> -->
      </el-form-item>
      <el-form-item label="用途" prop="useFor">
        <el-input v-model="formData.useFor" placeholder="请输入用途" clearable :style="{width: '100%'}" :disabled="dsb">
@@ -38,7 +42,7 @@
        </el-input>
      </el-form-item>
      <el-form-item label="金额" prop="balance">
        <el-input v-model="formData.balance" placeholder="请输入余额" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
        <el-input v-model="formData.balance" type="number" placeholder="请输入余额" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
      </el-form-item>
      <el-form-item label="备注" prop="remark">
        <el-input v-model="formData.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
@@ -246,6 +250,16 @@
          trigger: 'change'
        }],
      },
      typeOptions2: [
        {
          value: '收入',
          label: '收入',
        },
        {
          value: '支出',
          label: '支出',
        }
      ],
      typeOptions: [{
        value: '0',
        label: '基金',
@@ -301,7 +315,7 @@
        }
        this.loading = false;
      });
      this.getCateInfor()
   //   this.getCateInfor()

    }
  },

 ruoyi-ui/src/views/economy/index.vue

@@ -212,7 +212,7 @@
          </el-select>
        </el-form-item>
        <el-form-item label="金额" prop="balance">
          <el-input v-model="formDat.balance" placeholder="请输入金额" clearable :style="{width: '100%'}" >
          <el-input v-model.number="formDat.balance" type="number" placeholder="请输入金额" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="用途" prop="useFor">

 ruoyi-ui/src/views/pet/petnote.vue

@@ -251,7 +251,7 @@
      name:'',
      disabled: false,
      loading: true,
      formData:[],
      formData:{},
      // 选中数组
      ids: [],
      // 非单个禁用
@@ -486,6 +486,7 @@
      this.formDat.url = ul+","+uls
      this.$refs["elForm"].validate(valid => {
        if (valid) {
        //    alert(33)
          addPetnote(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.open = false;
@@ -501,11 +502,12 @@
    requestUpload(params)
    {
      var file = params.file;
      var formData = new FormData();
      formData.append('uploadFile', file);
      var formData1 = new FormData();
      formData1.append('uploadFile', file);
      let _this = this
    //  alert(123)

      uploadPic(formData).then(response => {
      uploadPic(formData1).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)

        if(_this.fot.includes(pth) === true)
@@ -527,6 +529,8 @@
          _this.formData.url = ul+","+uls
          console.log(_this.formData.url)
        //  alert(87)
        const pid = _this.$route.params && _this.$route.params.id;
        _this.formData.pid = pid
          updatenotePet(_this.formData).then(response => {
            this.$modal.msgSuccess("图片上传成功");
            // this.open = false;

 ruoyi-ui/src/views/self/show.vue

@@ -1728,8 +1728,8 @@
   
    //主要经历
    saveRowExperienceList(row) {
      this.$refs['elForm'].validate(valid => {
        if (valid) {
     // this.$refs['elForm'].validate(valid => {
     //   if (valid) {
          const foundIndex = this.experienceList.findIndex(item => item.id === row.id);
          if (foundIndex !== -1) {
            const updatedData = Object.assign({}, this.experienceList[foundIndex], row);
@@ -1742,15 +1742,15 @@
          } else {
            this.$modal.msgError("修改失败");
          }
        }
      });
        //}
     // });
      this.$set(row, 'isEdit', false);
      this.$set(this.editStatus, row.id, false);
    },
    //成员关系
    saveRowRelationList(row) {
      this.$refs['elForm'].validate(valid => {
        if (valid) {
     // this.$refs['elForm'].validate(valid => {
      //  if (valid) {
          const foundIndex = this.relationList.findIndex(item => item.id === row.id);
          if (foundIndex !== -1) {
            const updatedData = Object.assign({}, this.relationList[foundIndex], row);
@@ -1763,15 +1763,15 @@
          } else {
            this.$modal.msgError("修改失败");
          }
        }
      });
      //  }
    //  });
      this.$set(row, 'isEdit', false);
      this.$set(this.editStatus, row.id, false);
    },
    //证件情况
    saveRowCertificateList(row) {
      this.$refs['elForm'].validate(valid => {
        if (valid) {
     // this.$refs['elForm'].validate(valid => {
       // if (valid) {
          const foundIndex = this.certificateList.findIndex(item => item.id === row.id);
          if (foundIndex !== -1) {
            const updatedData = Object.assign({}, this.certificateList[foundIndex], row);
@@ -1784,15 +1784,15 @@
          } else {
            this.$modal.msgError("修改失败");
          }
        }
      });
     //   }
      //});
      this.$set(row, 'isEdit', false);
      this.$set(this.editStatus, row.id, false);
    },
    //出国情况
    saveRowAbroadList(row) {
      this.$refs['elForm'].validate(valid => {
        if (valid) {
     // this.$refs['elForm'].validate(valid => {
     //   if (valid) {
          const foundIndex = this.AbroadList.findIndex(item => item.id === row.id);
          if (foundIndex !== -1) {
            const updatedData = Object.assign({}, this.AbroadList[foundIndex], row);
@@ -1805,8 +1805,8 @@
          } else {
            this.$modal.msgError("修改失败");
          }
        }
      });
     //   }
     // });
      this.$set(row, 'isEdit', false);
      this.$set(this.editStatus, row.id, false);
    },

 ruoyi-ui/vue.config.js

@@ -35,7 +35,7 @@
    proxy: {
      // detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
     //  target: `https://192.168.1.5:8080/`,
     //  target: `https://192.168.1.3:8080/`,
       target: 'https://www.bendudu.com:8080/',
        changeOrigin: true,
        pathRewrite: {