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

feige

2024-11-10 b075e99a05e05649d24ed59a74cae29fc3192875

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

@@ -14,15 +14,19 @@

    <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px">
      <el-form-item label="类型" prop="kind">
        <template v-if="dsb">
        <!-- <template v-if="dsb">
          <el-input v-model="formData.kind === 1 ? '收纳':'保洁'" :disabled="true"></el-input>
        </template>
        <template v-else>
          <el-select v-model="formData.kind" placeholder="请选择保洁/收纳" clearable :style="{width: '100%'}">
            <el-option label="收纳" value="1"></el-option>
            <el-option label="保洁" value="0"></el-option>
            <el-option label="保洁" value='0'></el-option>
            <el-option label="收纳" value='1'></el-option>
          </el-select>
        </template>
        </template> -->
        <el-select v-model="formData.kind" placeholder="请选择保洁/收纳 " clearable :style="{width: '100%'}" :disabled="dsb"  >
          <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
          ></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="类别" prop="type">
        <el-input v-model="formData.type" placeholder="请输入类别" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
@@ -143,7 +147,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">
@@ -223,6 +227,7 @@
     uploadFileList1:[],
     fileListOther:[
      ],
      fileListOther1:[],
      dsb:true,
      btn:false,
      isShow:true,
@@ -280,11 +285,11 @@

      },
      typeOptions: [{
        value: '0',
        value: '保洁',
        label: '保洁',
      },
        {
          value: '1',
          value: '收纳',
          label: '收纳',
        }],
    }
@@ -315,6 +320,11 @@
      this.loading = true;
      getCLeanInfo(id).then((response) => {
        this.formData = response.data;
      console.log(this.formData)
        if(this.formData.kind==1)
           this.formData.kind = '收纳'
        else
           this.formData.kind = '保洁'
        let paths = response.data.url.split(",");
        for(let i = 0; i < paths.length; i++)
        {
@@ -323,12 +333,26 @@
              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()
@@ -344,12 +368,54 @@
        }
        this.loading = false;
      });
      this.getCateInfor()
   //  this.getCateInfor()

    }
  },
  mounted() {},
  methods: {
    getData(){
      const id = this.$route.params && this.$route.params.id;
      let _this = this
      if (id) {
        this.loading = true;
        getCLeanInfo(id).then((response) => {
          this.formData = response.data;
         // if(this.formData.kind==1)
        //     this.formData.kind = '收纳'
        //  else
         //    this.formData.kind = '保洁'
       if(response.data.url!=null){
          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;
        });
       // this.getCateInfor()

      }
    },
    getSrc1(type) {
      if (type === 0) {
        return '基金'
@@ -395,16 +461,27 @@
      // this.formData.url = ul+","+uls

      this.$refs['elForm'].validate(valid => {

        if(this.formData.kind=='收纳')
           this.formData.kind = 1
        else
           this.formData.kind = 0
        if (valid) {
          if (this.formData.id != undefined) {
            updateClean(this.formData).then(response => {
              this.$modal.msgSuccess("修改成功");
              if(this.formData.kind==1)
                 this.formData.kind = '收纳'
              else
                 this.formData.kind = '保洁'
              // this.open = false;
              this.btn=false
            });
          } else {
            this.$modal.msgSuccess("修改失败");
            if(this.formData.kind==1)
               this.formData.kind = '收纳'
            else
               this.formData.kind = '保洁'

          }
        }
@@ -478,8 +555,16 @@
     this.formData.url = ul+","+uls;
   //  alert(this.formData.url)
     if(res==true){
      if(this.formData.kind=='收纳')
         this.formData.kind = 1
      else
         this.formData.kind = 0
        updateClean(this.formData).then(response => {
         this.$modal.msgSuccess("删除成功");
      if(this.formData.kind==1)
         this.formData.kind = '收纳'
      else
         this.formData.kind = '保洁'
         // this.open = false;

        });
@@ -523,8 +608,16 @@
     })
     this.formData.url = ul+","+uls;
     if(res==true){
      if(this.formData.kind=='收纳')
         this.formData.kind = 1
      else
         this.formData.kind = 0
        updateClean(this.formData).then(response => {
         this.$modal.msgSuccess("删除成功");
      if(this.formData.kind==1)
         this.formData.kind = '收纳'
      else
         this.formData.kind = '保洁'
        });
     }

@@ -551,7 +644,7 @@
         this.fileList.push({name:file.name,url:file.url,res:true})
       },
      //自定义上传方法
      handleChange1(file, fileListOther1) {
      handleChange1(file, fileListOther12) {
             //定义一个全局数组uploadFileList来做存储

           // this.uploadFileList.push(file.raw);
@@ -580,6 +673,11 @@
         console.log(this.uploadFileList1)
         let _this = this

      if(this.formData.kind=='收纳')
         this.formData.kind = 1
      else
         this.formData.kind = 0

         this.uploading = true;
         uploadPic(formData).then(response => {
         _this.uploadFileList1 = []
@@ -587,6 +685,12 @@
             updateClean(_this.formData).then(response => {
               this.$modal.msgSuccess("文档上传成功");
               // this.open = false;
            this.getData()
            this.fileListOther1=[]
            if(this.formData.kind==1)
               this.formData.kind = '收纳'
            else
               this.formData.kind = '保洁'
             });
           })

@@ -607,7 +711,10 @@
         })
         let _this = this


      if(this.formData.kind=='收纳')
         this.formData.kind = 1
      else
         this.formData.kind = 0
           uploadPic(formData).then(response => {
            // console.log(response.originalFilenames)
            // console.log(response.urls)
@@ -633,6 +740,10 @@
            // alert(87)
             updateClean(_this.formData).then(response => {
               _this.$modal.msgSuccess("图片上传成功");
              if(this.formData.kind==1)
                 this.formData.kind = '收纳'
              else
                 this.formData.kind = '保洁'
               // this.open = false;

             });