Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

feige

2024-11-17 7c33a1164d3019feb3ad9e4844b3d364e5c6eb44

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

@@ -15,14 +15,17 @@
    <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-select v-model="formData.type"    filterable clearable  placeholder="请输入台账内容" clearable :style="{width: '100%'}" :disabled="dsb" >
              </el-select> -->
      </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>
      </el-form-item>
      <el-form-item label="收入/支出" prop="price">
        <el-select v-model="formData.price" placeholder="请选择收入/支出" clearable :style="{width: '100%'}"  >
        <el-select :disabled="dsb" 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>
@@ -139,7 +142,7 @@
          ></video>
          <img v-else
               class="el-upload-list__item-thumbnail"
               src="../../assets/401_images/401.gif"
               src="../../assets/images/deviceLis.png"
               alt=""
               style="width: 147px; height: 147px"
               fit="cover">
@@ -215,8 +218,9 @@
      uploadFileList:[],
      uploadFileList1:[],
      fileListOther:[
      

      ],
      fileListOther1:[],
      dsb:true,
      btn:false,
      isShow:true,
@@ -302,7 +306,7 @@
      this.btn= jd;
      this.dsb = !jd;
      this.isShow=true;
      this.$route.meta.title = "修改家庭收支台账详细信息";//列表的名称
      this.$route.meta.title = "修改家庭收支台账信息";//列表的名称
    }
    else{
      this.$route.meta.title = "家庭收支台账详细信息";//列表的名称
@@ -321,16 +325,30 @@
        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)
             {
                if(paths[i][0]=="/")
                _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
               else
                  _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
               }
             // {
             //    if(paths[i][0]=="/")
           //      _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
             //   else
             //      _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
             //   }
            {
              if(paths[i].includes(process.env.VUE_APP_BASE_TRUE_API)){
                if(paths[i][0]=="/")
                      _this.fileList.push({name:paths[i],url: paths[i].substr(1),res:false})
                else
                   _this.fileList.push({name:paths[i],url: paths[i],res:false})
              }else{
                if(paths[i][0]=="/")
                      _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
                else
                   _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
              }

              }
              else {
                // alert(paths[i])
              // alert()
@@ -340,7 +358,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})
          		

             }
            }
        }
@@ -352,6 +370,43 @@
  },
  mounted() {},
  methods: {
    getData(){
      const id = this.$route.params && this.$route.params.id;
      let _this = this
       if (id) {
         this.loading = true;
         getEconomyInfo(id).then((response) => {
           this.formData = response.data;
          // console.log(this.formData)
           //alert(this.formData.ownData)
           let paths = response.data.url.split(",");
           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)
                {
              console.log()
                  }
                 else {
                   let nms = paths[i].split("\/")
                   let nm = nms[nms.length - 1]
                  if(paths[i][0]=="/")
                   _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
                   else
                   _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})

                }
               }
           }
           _this.fileListOther = _this.fileListOther1
           this.loading = false;
         });
       }
    },

    getSrc1(price) {
      if (price === 收入) {
        return '收入'
@@ -410,10 +465,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 +485,7 @@
           updateEconomy(this.formData).then(response => {
            this.$modal.msgSuccess("删除成功");
            // this.open = false;
      	  

           });
        }
    },
@@ -454,7 +509,7 @@
               //     alert(this.uploadFileList.length)
            }
           this.$delete(this.fileList,i);
        

       }
       }
       let ul = ""
@@ -465,7 +520,7 @@
       let uls = ""
       this.fileListOther.map(function (elem){
         if(elem.res==false)
           elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
           uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
       })
       this.formData.url = ul+","+uls;
       if(res==true){
@@ -473,7 +528,7 @@
           this.$modal.msgSuccess("删除成功");
          });
       }
     

    },
    handleFileCardPreview(file){
      this.dialogFileUrl = file.url;
@@ -511,20 +566,20 @@
      this.btn = true
      this.isShow=false
    },
   

   //自定义上传方法
       handleChange(file, fileList1) {
          //定义一个全局数组uploadFileList来做存储
   

        // this.uploadFileList.push(file.raw);
         console.log("=========5555=========")
        this.uploadFileList.push(file.raw);
         this.fileList.push({name:file.name,url:file.url,res:true})
       },
      //自定义上传方法
      handleChange1(file, fileListOther1) {
      handleChange1(file, fileListOther12) {
             //定义一个全局数组uploadFileList来做存储
   	

           // this.uploadFileList.push(file.raw);
          this.uploadFileList1.push(file.raw);
           this.fileListOther.push({name:file.name,url:file.url,res:true})
@@ -535,7 +590,7 @@
      },
      fileUpload(){
      //   var file = params.file;
   

         var formData = new FormData();
         //this.$refs.upload1.submit();
      //   alert(this.uploadFileList1.length)
@@ -543,14 +598,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 = []
@@ -558,27 +613,29 @@
             updateEconomy(_this.formData).then(response => {
               this.$modal.msgSuccess("文档上传成功");
               // this.open = false;
            this.getData()
            this.fileListOther1=[]
             });
           })
   

      },
      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 +662,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 +675,10 @@
       {
      //  alert(124)
   //    this.uploadFileList.push(params.file);
   

        //alert(34)
    
   	


       },
       requestUpload1(params)
       {