feige
2024-03-04 0947adf188a83eecf0a6a545cea25c97f7ce17f0
修改了备忘录等内容
16个文件已修改
827 ■■■■ 已修改文件
ruoyi-ui/src/api/secret/index.js 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/bignote/familyeventInfo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/clean/cleanInfo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/collection/collectionInfo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/contacts/contactsInfo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/device/equipmentInfo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/device/memo.vue 81 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/doctor/doctorInfo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/economy/economyInfo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/healthy/healthYear.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/marry/index.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/note/propertyInfo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/pet/noteInfo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/secret/index.vue 258 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/secret/memo.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/secret/secretInfo.vue 419 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/api/secret/index.js
@@ -49,7 +49,7 @@
//上传文件
export function uploadPic(data) {
  return request({
    url: '/common/upload',
    url: '/common/uploads',
    method: 'post',
    data: data
  })
@@ -71,3 +71,11 @@
  })
}
export function getCategory()
{
    return request({
       url: '/zSecret/type',
       method: 'get',
    //   params: {'id':22}
     })
}
ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -441,7 +441,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){
ruoyi-ui/src/views/clean/cleanInfo.vue
@@ -519,7 +519,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){
ruoyi-ui/src/views/collection/collectionInfo.vue
@@ -527,7 +527,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){
ruoyi-ui/src/views/contacts/contactsInfo.vue
@@ -506,7 +506,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(this.formData.isAlways=='否')
ruoyi-ui/src/views/device/equipmentInfo.vue
@@ -494,7 +494,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(this.formData.status=='是')
ruoyi-ui/src/views/device/memo.vue
@@ -86,7 +86,7 @@
//在system/note/index.js中导入接口函数  --接好了
import {addNote,listNote,enload,delNote, uploadPic} from "@/api/allmemo/index";
import {addNote,updateNote, listNote,enload,delNote, uploadPic} from "@/api/allmemo/index";
import { TimeSelect } from "element-ui";
export default {
@@ -94,7 +94,8 @@
  dicts: ['sys_normal_disable'],
  data() {
    return {
      // 遮罩层
      // 遮罩层isEdit1:false,isEdit1:false,
      isEdit1:false,
      disabled: false,
      loading: true,
      formData:[],
@@ -309,14 +310,14 @@
    /** 修改按钮操作 */
    handleUpdate(row) {
      const id = row.id;
      let jd = true
      this.$router.push({
        path:"/self/travel/travelInfo/" + id,
        query:{
          detail:jd
        }
      });
     this.isEdit1 = true;
     this.formDat.cid = row.cid;
     this.formDat.id = row.id;
     this.formDat.happenTime = row.happenTime;
     this.formDat.content = row.content;
     this.open = true;
    },
@@ -328,31 +329,53 @@
    submitDataScope: function() {
      const cid = this.$route.params && this.$route.params.id;
      const fid =2017;
      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(",")
      // 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.fid = 2017;
      this.formDat.cid = cid ;
      this.formDat.url = ul+","+uls
      // this.formDat.url = ul+","+uls
        let _this = this
      this.$refs["elForm"].validate(valid => {
        if (valid) {
          addNote(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.open = false;
            // this.queryParams.cid = cid
            this.getList(_this.formDat.fid,_this.formDat.cid);
   //清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
            resetQuery();
          });
          if (this.isEdit1) {
              // 执行修改操作
              updateNote(this.formDat).then(response => {
                console.log("1")
                this.$modal.msgSuccess("修改成功");
                this.open = false;
                //清空formDat对象的数据
                Object.keys(this.formDat).forEach(key => {
                  this.formDat[key] = '';
                });
                this.isEdit1 = false;
                this.getList(2017,cid);
              }).catch(error => {
                console.log(error);
                this.isEdit1 = false;
                this.open = false;
              });
          }
          else{
              addNote(this.formDat).then(response => {
                       this.$modal.msgSuccess("新增成功");
                       this.open = false;
                       // this.queryParams.cid = cid
                       this.getList(_this.formDat.fid,_this.formDat.cid);
              //清空formDat对象的数据
                 Object.keys(this.formDat).forEach(key => {
                   this.formDat[key] = '';
                 });
                  //     resetQuery();
                     });
          }
        }
      });
   
ruoyi-ui/src/views/doctor/doctorInfo.vue
@@ -522,7 +522,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){
ruoyi-ui/src/views/economy/economyInfo.vue
@@ -465,7 +465,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){
ruoyi-ui/src/views/healthy/healthYear.vue
@@ -1275,7 +1275,8 @@
        } else {
          this.HealthyBaseList = response.data;
          console.log("----------00000000-----------")
          console.log(this.HealthyBaseList)
          //血型的
          if (this.HealthyBaseList.bloodClass.a === 1) {
            this.selectedBloodType = 'a';
@@ -2007,6 +2008,7 @@
      };
      console.log(111)
      console.log(this.bloodData)
      if(isObjectEmpty(this.bloodData)){
        this.HealthyBaseList.bloodClass = this.HealthyBaseList.bloodClass;
      }else {
@@ -2122,11 +2124,11 @@
        this.HealthNowList.otherDiseaseClass = this.otherDiseaseTypeData;
      }
      this.$refs['elForm'].validate(valid => {
        if (valid) {
          if (this.HealthyBaseList!== undefined) {
            updateHealthBase(this.HealthyBaseList).then(response => {
              this.$modal.msgSuccess("修改成功11");
              // this.open = false;
              this.btn=false
@@ -2134,7 +2136,7 @@
              this.dsb = true
              this.isShow_2=false
              this.isShow = true
               this.getList();
            });
          } else {
            this.$modal.msgSuccess("修改失败");
@@ -2153,7 +2155,7 @@
              this.dsb = true
              this.isShow_2=false
              this.isShow = true
   this.getList();
            });
          } else {
            this.$modal.msgSuccess("修改失败");
@@ -2172,7 +2174,7 @@
              this.dsb = true
              this.isShow_2=false
              this.isShow = true
   this.getList();
            });
          } else {
            this.$modal.msgSuccess("修改失败");
@@ -2191,7 +2193,7 @@
              this.dsb = true
              this.isShow_2=false
              this.isShow = true
   this.getList();
            });
          } else {
            this.$modal.msgSuccess("修改失败");
@@ -2200,7 +2202,7 @@
        }
      })
      // 刷新页面
      this.getList();
    },
    //年度健康报告
    toYearhealthy(){
ruoyi-ui/src/views/marry/index.vue
@@ -781,6 +781,7 @@
            console.log(111)
            console.log("信息")
            console.log(this.marryList.marryStatus);
            //alert(this.marryList.bearStatus)
            if(this.marryList.marryStatus===3){
              this.showOldSpouse = true;
            } else{
@@ -954,12 +955,16 @@
    //修改后的保存
    submitForm() {
      if(parseInt(this.mrs))
      if(this.mrs!=undefined)
        this.marryList.marryStatus = parseInt(this.mrs)
      if(parseInt(this.smrs))
      if(this.smrs!=undefined)
        this.marryList.spouseMarryStatus = parseInt(this.smrs)
      if(parseInt(this.bear))
      // console.log(this.bear)
      // alert(this.bear)
      // if( parseInt(this.bear))
      if(this.bear!=undefined)
        this.marryList.bearStatus = parseInt(this.bear)
      this.marryList.oneBorn = parseInt(this.onebear)
      this.marryList.handbookStatus =parseInt(this.handsj)
      this.marryList.sex = this.sinds
ruoyi-ui/src/views/note/propertyInfo.vue
@@ -462,7 +462,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){
ruoyi-ui/src/views/pet/noteInfo.vue
@@ -409,7 +409,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){
ruoyi-ui/src/views/secret/index.vue
@@ -18,7 +18,7 @@
        </el-form-item>
        <el-form-item label="类别" prop="type">
          <el-input
       <!--   <el-input
            v-model="queryParams.type"
            placeholder="请输入类别"
            clearable
@@ -28,6 +28,17 @@
                   opacity: 0.5;"
            @keyup.enter.native="handleQuery"
          />
          -->
          <el-select v-model="queryParams.type" placeholder="请选择类别" clearable
            style="width: 200px;
                     height: 35px;
                     border-radius: 16px 16px 16px 16px;
                     opacity: 0.5;" allow-create
          filterable clearable :style="{width: '100%'}"  >
            <el-option v-for="(item, index) in typeOpt" :key="index" :label="item.label" :value="item.value"
            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="账号" prop="accNo">
@@ -213,7 +224,13 @@
            ></el-date-picker>
          </el-form-item>
            <el-form-item label="类别" prop="type">
            <el-input v-model="formDat.type" placeholder="请输入类别" clearable :style="{width: '100%'}" ></el-input>
            <el-select v-model="formDat.type" placeholder="请输入类别"  allow-create
          filterable clearable :style="{width: '100%'}"  >
              <el-option v-for="(item, index) in typeOpt" :key="index" :label="item.label" :value="item.value"
              ></el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="账号" prop="accNo">
            <el-input v-model="formDat.accNo" placeholder="请输入账号" clearable :style="{width: '100%'}" ></el-input>
@@ -263,8 +280,11 @@
            action="#"
            list-type="picture-card"
            multiple
            :http-request="requestUpload"
            :file-list="fileList"
          :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}">
@@ -296,6 +316,13 @@
            </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=""
@@ -303,17 +330,60 @@
            class="upload-demo"
            multiple
            :on-remove="handleRemoveFile"
            :http-request="requestUpload"
            :show-file-list="true"
            ref="upload1"
            :on-change="handleChange1"
            :auto-upload="false"
            list-type="picture-card"
              :http-request="requestUpload1"
              :show-file-list="true"
          >
            <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>
          <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>
                    <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="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>
@@ -339,7 +409,7 @@
  //在system/note/index.js中导入接口函数  --接好了
  import {listSecret,enload,delSecret, addSecret, uploadPic} from "@/api/secret/index";
  import {listSecret,enload,delSecret, addSecret, uploadPic,getCategory} from "@/api/secret/index";
  export default {
    name: "Role",
@@ -381,9 +451,10 @@
        
        fileList:[
        ],
        fileListOther:[
        ],
        fileList1:[],
        uploadFileList: [],
        uploadFileList1: [],
        fileListOther:[],
        dsb:true,
        btn:false,
        uploading: false,
@@ -398,7 +469,7 @@
          isPrivate:undefined,
          location:undefined,
          remark: undefined,
          url: undefined,
          url: "",
        },
        // 菜单列表
        menuOptions: [],
@@ -487,16 +558,36 @@
            value: '1',
            label: '私有',
          }
        ],
        typeOpt: [
        ]
      };
    },
    created() {
      this.getList();
      this.getCateInfor()
      this.getCateInfo();
    },
    methods: {
        getCateInfo()
        {
            let _this = this
              _this.typeOpt = []
              getCategory().then(response=>{
                console.log(response.data)
            //    alert(9801)
                response.data.map(elem=>{
                  _this.typeOpt.push({"label":elem, "value":elem})
                })
                // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
                //   _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
                // })
              })
        },
      //基金/台账的选择
      getSrc1(type) {
        if (type === 0) {
@@ -553,14 +644,20 @@
        for(let i = 0; i < this.fileList.length; i++)
        {
          if(this.fileList[i].url==file.url)
          {
            this.$delete(this.fileList,i);
                 this.$delete(this.uploadFileList,i);
                 }
        }
      },
      handleRemoveFile(file) {
        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);
                  }
        }
      },
@@ -655,13 +752,13 @@
      /** 提交按钮(数据权限) */
      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
        this.$refs["elForm"].validate(valid => {
          if (valid) {
@@ -684,30 +781,89 @@
          this.handleRemoveFile(this.fileListOther[0]);
        }
      },
      requestUpload(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)
          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.uploadFileList1.push(file.raw);
           this.fileListOther.push({name:file.name,url:file.url})
           // 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)
              //alert(this.uploadFileList.length)
          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) {
      //alert(98)
       //    this.uploadFileList.push(params.file);
          },
          requestUpload1(params)
          {
            _this.fileList.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) {
        const Ids = row.id || this.ids;
ruoyi-ui/src/views/secret/memo.vue
@@ -382,15 +382,15 @@
    /** 提交按钮(数据权限) */
    submitDataScope: function() {
      const cid = this.$route.params && this.$route.params.id;
      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(",")
      // 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.fid = 2031;
      this.formDat.cid = cid ;
      this.formDat.url = ul+","+uls
      // this.formDat.url = ul+","+uls
      this.$refs["elForm"].validate(valid => {
        if (valid) {
ruoyi-ui/src/views/secret/secretInfo.vue
@@ -22,9 +22,12 @@
        <el-form-item label="发生时间" prop="happenTime">
          <el-input v-model="formData.happenTime" placeholder="请选择时间" type="date" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
        </el-form-item>
        <el-form-item label="类型" prop="type">
          <el-select v-model="formData.type" placeholder="请选择基金/台账" clearable :style="{width: '100%'}" :disabled="dsb" >
          </el-select>
            <el-form-item label="类别" prop="type">
     <el-select v-model="formData.type" placeholder="请输入类别"  allow-create
     filterable clearable :style="{width: '100%'}"  >
                   <el-option v-for="(item, index) in typeOpt" :key="index" :label="item.label" :value="item.value"
                   ></el-option>
                 </el-select>
        </el-form-item>
        <el-form-item label="有效期" prop="validityDate">
          <el-input v-model="formData.validityDate" placeholder="请选择时间" type="date" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
@@ -70,12 +73,15 @@
          action="#"
          list-type="picture-card"
          multiple
          :http-request="requestUpload"
          :file-list="fileList"
        ref="upload"
        :show-file-list="true"
        :http-request="requestUpload"
               :file-list="fileList"
             :on-change="handleChange"
              :auto-upload="false"
          :disabled="!btn"
          :class="{ hide: !btn }"
        >
          <div v-if="uploading" class="upload-status">正在上传...</div>
          <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
          <div slot="file" slot-scope="{file}">
            <img
@@ -113,7 +119,13 @@
          </div>
        </el-upload>
     <el-button
                  style="margin-left: 10px"
                  size="small"
                  type="success"
                  v-if="btn"
                  @click="picUpload"
                >上传到服务器</el-button>
        <h4 class="form-header">其他附件 </h4>
      <el-upload
              action=""
@@ -122,13 +134,18 @@
              multiple
              list-type="picture-card"
              :on-preview="handleFileCardPreview"
              :on-remove="handleRemoveFile"
              :http-request="requestUpload"
              :show-file-list="true"
              ref="upload1"
              :on-remove="handleRemoveFile"
            :http-request="requestUpload1"
             :on-change="handleChange1"
              :auto-upload="false"
              :disabled="!btn"
              :class="{ hide: !btn }"
            >
        <div v-if="uploading" class="upload-status">正在上传...</div>
        <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
        <div slot="file" slot-scope="{file}">
          <!-- 添加video元素用于显示视频 -->
@@ -174,7 +191,14 @@
            </el-upload>
     <el-button
                  style="margin-left: 10px"
                  size="small"
                  type="success"
                  v-if="btn"
                  @click="fileUpload"
                >上传到服务器</el-button>
                      <h4 class="form-header"> </h4>
        <el-form-item size="large">
          <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">修改</el-button>
        </el-form-item>
@@ -187,7 +211,7 @@
    </div>
  </template>
  <script>
  import {getSecretInfo,  uploadPic, download, updateSecret} from "@/api/secret/index";
  import {getSecretInfo,  uploadPic, download, updateSecret,getCategory} from "@/api/secret/index";
  import {addRole, updateRole} from "@/api/system/role";
  import {blobValidate} from "@/utils/ruoyi";
  import errorCode from "@/utils/errorCode";
@@ -206,8 +230,11 @@
        fileList:[
        ],
        fileList1:[],
        uploadFileList:[],
        uploadFileList1:[],
        fileListOther:[
        ],
        dsb:true,
        btn:false,
@@ -224,7 +251,7 @@
          isPrivate:undefined,
          location:undefined,
          remark: undefined,
          url: undefined,
          url: "",
        },
          dialogImageUrl: '',
          dialogVisible: false,
@@ -300,6 +327,7 @@
    value: '1',
    label: '台账',
  }],
  typeOpt:[],
      }
    },
    computed: {},
@@ -327,44 +355,72 @@
      if (id) {
        this.loading = true;
        getSecretInfo({id}).then((response) => {
          this.formData = response.data;
          if(this.formData.isFinger==1)
            this.formData.isFinger = '是'
          _this.formData = response.data;
          if(_this.formData.isFinger==1)
            _this.formData.isFinger = '是'
          else
          this.formData.isFinger = '否'
     if(this.formData.isFace==1)
            this.formData.isFace = '是'
          _this.formData.isFinger = '否'
     if(_this.formData.isFace==1)
            _this.formData.isFace = '是'
          else
          this.formData.isFace = '否'
          if(this.formData.isPrivate==0)
                 this.formData.isPrivate = '公有'
          _this.formData.isFace = '否'
          if(_this.formData.isPrivate==0)
                 _this.formData.isPrivate = '公有'
               else
               this.formData.isPrivate = '私有'
               _this.formData.isPrivate = '私有'
          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)
              if (_this.fot.includes(pth) === true)
                _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
              else {
                // alert(paths[i])
                let nms = paths[i].split("\/")
                let nm = nms[nms.length - 1]
                _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+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})
                  }
                else {
                 // alert()
                  let nms = paths[i].split("\/")
                  let nm = nms[nms.length - 1]
                  if(paths[i][0]=="/")
                  _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})
                }
              }
            }
          }
            //   alert(this.fileListOther.length)
          this.loading = false;
        });
        this.getCateInfor()
        this.getCateInfo()
      }
    },
    mounted() {},
    methods: {
        getCateInfo()
        {
            let _this = this
              _this.typeOpt = []
              getCategory().then(response=>{
                console.log(response.data)
            //    alert(9801)
                response.data.map(elem=>{
                  _this.typeOpt.push({"label":elem, "value":elem})
                })
                // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
                //   _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
                // })
              })
        },
      getSrc1(type) {
      if (type === 0) {
        return '基金'
@@ -460,18 +516,109 @@
        })
      },
      handleRemoveFile(file) {
        for(let i = 0; i < this.fileListOther.length; i++)
        {
          if(this.fileListOther[i].url==file.url)
            this.$delete(this.fileListOther,i);
        }
        let res = false
          for(let i = 0; i < this.fileListOther.length; i++)
          {
            if(this.fileListOther[i].url==file.url)
            {
                if(this.fileListOther[i].res==false)
                    res = true
                else
                {
                    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)
                      ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
          })
          let uls = ""
          this.fileListOther.map(function (elem){
            if(elem.res==false)
                      uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
          })
          this.formData.url = ul+","+uls;
        //  alert(this.formData.url)
          if(res==true){
              if(this.formData.isFinger=='是')
                     this.formData.isFinger = 1
                   else
                   this.formData.isFinger = 0
              if(this.formData.isFace=='是')
                     this.formData.isFace = 1
                   else
                   this.formData.isFace = 0
                   if(this.formData.isPrivate=='公有')
                          this.formData.isPrivate = 0
                        else
                        this.formData.isPrivate = 1
              updateSecret(this.formData).then(response => {
                this.$modal.msgSuccess("删除成功");
                // this.open = false;
              });
          }
      },
      handleRemove(file) {
        for(let i = 0; i < this.fileList.length; i++)
        {
          if(this.fileList[i].url==file.url)
            this.$delete(this.fileList,i);
        }
        //判断是否是之前的图片
          let res = false
        //  alert(this.fileList.length)
          for(let i = 0; i < this.fileList.length; i++)
          {
            if(this.fileList[i].url==file.url)
            {
                //原来图像标记为false
                //alert(this.fileList[i].res)
              if(this.fileList[i].res==false)
                res = true
              else
              {
                //  alert(this.uploadFileList.length)
                //  alert(87)
                 this.$delete(this.uploadFileList, Math.abs(i - this.uploadFileList.length-1))
                     //      alert(this.uploadFileList.length)
                 }
              this.$delete(this.fileList,i);
          }
          }
          let ul = ""
          this.fileList.map(function (elem){
            if(elem.res==false)
                ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
          })
          let uls = ""
          this.fileListOther.map(function (elem){
            if(elem.res==false)
                uls = uls + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
          })
          this.formData.url = ul+","+uls;
          if(res==true){
              if(this.formData.isFinger=='是')
                     this.formData.isFinger = 1
                   else
                   this.formData.isFinger = 0
              if(this.formData.isFace=='是')
                     this.formData.isFace = 1
                   else
                   this.formData.isFace = 0
                   if(this.formData.isPrivate=='公有')
                          this.formData.isPrivate = 0
                        else
                        this.formData.isPrivate = 1
              updateSecret(this.formData).then(response => {
                this.$modal.msgSuccess("删除成功");
              });
          }
      },
      handleFileCardPreview(file){
        this.dialogFileUrl = file.url;
@@ -509,44 +656,150 @@
        // this.btn = true
        this.isShow=false
      },
      requestUpload(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)
      //自定义上传方法
          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) {
                 //定义一个全局数组uploadFileList来做存储
               // this.uploadFileList.push(file.raw);
               this.uploadFileList1.push(file.raw);
                this.fileListOther.push({name:file.name,url:file.url,res:true})
                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();
          //    alert(this.uploadFileList1.length)
              // formData.append('uploadFile', file);
              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 = []
                _this.formData.url = _this.formData.url+","+response.fileNames
              if(_this.formData.isFinger=='是')
                     _this.formData.isFinger = 1
                   else
                   _this.formData.isFinger = 0
              if(_this.formData.isFace=='是')
                     _this.formData.isFace = 1
                   else
                   _this.formData.isFace = 0
                   if(_this.formData.isPrivate=='公有')
                          _this.formData.isPrivate = 0
                        else
                        _this.formData.isPrivate = 1
                  updateSecret(_this.formData).then(response => {
                    this.$modal.msgSuccess("文档上传成功");
                    // 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)
                  // console.log(response.fileNames)
                  //         console.log(response.newFileNames)
              // let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
              // _this.uploading1= false;
              // console.log(_this.fot.includes(pth))
              // // debugger
              // if(_this.fot.includes(pth) === true)
              // {
              //   _this.fileList.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(",")
              //console.log(_this.fileList)
          //    alert(response.fileNames)
                _this.formData.url = _this.formData.url+","+response.fileNames
              _this.uploadFileList = []
               // alert(87)
               if(_this.formData.isFinger=='是')
                      _this.formData.isFinger = 1
                    else
                    _this.formData.isFinger = 0
               if(_this.formData.isFace=='是')
                      _this.formData.isFace = 1
                    else
                    _this.formData.isFace = 0
                    if(_this.formData.isPrivate=='公有')
                           _this.formData.isPrivate = 0
                         else
                         _this.formData.isPrivate = 1
                updateSecret(_this.formData).then(response => {
                  _this.$modal.msgSuccess("图片上传成功");
                  // this.open = false;
                });
              // }
              // else{
              //   _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
              // }
            });
          },
           requestUpload(params)
          {
            _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)
          //  alert(87)
            updateSecret(_this.formData).then(response => {
              this.$modal.msgSuccess("图片上传成功");
              // this.open = false;
            });
        })
      },
         //  alert(124)
      //     this.uploadFileList.push(params.file);
           //alert(34)
          },
          requestUpload1(params)
          {
          //    alert(123)
         // this.uploadFileList1.push(params.file);
        //  console.log("-----------")
          //console.log(this.uploadFileList1)
          },
      /** 导出按钮操作 */
      handleExport() {