linwenling
2023-09-26 039aa6bf6fb6c43209f4a452a62b17833d36f27e
修改保洁收纳
2个文件已修改
187 ■■■■ 已修改文件
ruoyi-ui/src/views/clean/cleanInfo.vue 122 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/clean/index.vue 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/clean/cleanInfo.vue
@@ -13,13 +13,16 @@
    </div>
    <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px">
      <!-- <el-form-item label="序号" prop="id">
        <el-input v-model="formData.id" placeholder="请输入id" :maxlength="11" show-word-limit :disabled="true"
          clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>
      </el-form-item> -->
      <el-form-item label="类型" prop="kind">
        <el-select v-model="formData.kind=== 1 ? '收纳':'保洁'" placeholder="请选择保洁/收纳" clearable :style="{width: '100%'}" :disabled="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-select>
        </template>
      </el-form-item>
      <el-form-item label="类别" prop="type">
        <el-input v-model="formData.type" placeholder="请输入类别" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
@@ -41,42 +44,45 @@
        </el-input>
      </el-form-item>
      <el-form-item label="时间" prop="happenTime">
        <el-input v-model="formData.happenTime" placeholder="请输入时间" type="date" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
        <el-date-picker v-model="formData.happenTime" type="date" placeholder="请选择日期"
                        :editable="false" :clearable="false" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd"
        ></el-date-picker>
      </el-form-item>
      <el-form-item label="备注" prop="remark">
        <el-input v-model="formData.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
      </el-form-item>
      <el-form-item label="是否是本家庭记录" prop="ownData">
        <el-input  v-model="formData.ownData=== 1 ? '是':'否'" placeholder=" " clearable :style="{width: '100%'}" :disabled=true></el-input>
      </el-form-item>
      <h4 class="form-header">相关图片 </h4>
      <el-upload
        action="#"
        list-type="picture-card"
        multiple
        accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
        :http-request="requestUpload"
        :file-list="fileList"
        :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 v-if="uploading1" class="upload-status">正在上传...</div>
        <i v-if="!uploading1" slot="default" class="el-icon-plus"></i>
        <div slot="file" slot-scope="{file}">
          <img
            class="el-upload-list__item-thumbnail"
            :src="file.url"
            alt=""
            style="width: 147px; height: 147px"
            style="width: 100%; height: 100%; object-fit: cover;"
            fit="cover"
            :preview-src-list="[file.url]"
          >
          <span class="el-upload-list__item-actions">
          <span
            class="el-upload-list__item-preview"
            @click="handlePictureCardPreview(file)"
          >
<!--          <i class="el-icon-zoom-in"></i>-->
            <i class="el-icon-zoom-in"></i>
          </span>
          <span
@@ -108,7 +114,7 @@
        list-type="picture-card"
        :on-preview="handleFileCardPreview"
        :on-remove="handleRemoveFile"
        :http-request="requestUpload"
        :http-request="requestUpload1"
        :show-file-list="true"
        :disabled="!btn"
        :class="{ hide: !btn }"
@@ -153,6 +159,7 @@
      </el-upload>
      <el-form-item size="large">
        <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">修改</el-button>
      </el-form-item>
@@ -164,11 +171,12 @@
  </div>
</template>
<script>
import {getCLeanInfo,  uploadPic, download} from "@/api/clean/index";
import {getCLeanInfo, updateClean, uploadPic, download} from "@/api/clean/index";
import {addRole, updateRole} from "@/api/system/role";
import {blobValidate} from "@/utils/ruoyi";
import errorCode from "@/utils/errorCode";
import {Message} from "element-ui";
export default {
  components: {},
@@ -187,6 +195,7 @@
      btn:false,
      isShow:true,
      uploading: false,
      uploading1: false,
      formData: {
        type: undefined,
        kind: undefined,
@@ -319,6 +328,18 @@
      {
        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.formData.url = ul+","+uls;
        updateClean(this.formData).then(response => {
          this.$modal.msgSuccess("删除成功");
          // this.open = false;
          // this.btn=false
        });
      }
    },
@@ -335,7 +356,7 @@
        if (valid) {
          if (this.formData.id != undefined) {
            updateEconomy(this.formData).then(response => {
            updateClean(this.formData).then(response => {
              this.$modal.msgSuccess("修改成功");
              // this.open = false;
              this.btn=false
@@ -376,13 +397,25 @@
      this.desurl = process.env.VUE_APP_BASE_OTHER_API+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
      myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
    },
    //删除图片
    //删文件
    handleRemoveFile(file,) {
      for(let i = 0; i < this.fileListOther.length; i++)
      {
        if(this.fileListOther[i].url==file.url)
          this.$delete(this.fileListOther,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.formData.url = ul+","+uls;
        updateClean(this.formData).then(response => {
          this.$modal.msgSuccess("删除成功");
          // this.open = false;
          // this.btn=false
        });
      }
    },
    handleDownload(url) {
@@ -409,11 +442,48 @@
      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;
        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(",")
          this.formData.url = ul+","+uls
          console.log(this.formData.url)
          updateClean(this.formData).then(response => {
            this.$modal.msgSuccess("图片上传成功");
            // this.open = false;
            // this.btn=false
          });
        }
        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("上传成功");
        // this.$modal.msgSuccess("上传成功");
        if(_this.fot.includes(pth) === true)
        {
          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
@@ -422,11 +492,23 @@
        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)
          updateClean(this.formData).then(response => {
            this.$modal.msgSuccess("文档上传成功");
            // this.open = false;
            // this.btn=false
          });
        }
      })
    }
    },
  }
}
ruoyi-ui/src/views/clean/index.vue
@@ -221,10 +221,9 @@
            </el-input>
          </el-form-item>
          <el-form-item label="时间" prop="happenTime">
           <el-input
            v-model='formDat.happenTime'
            type='date'
            placeholder='选择日期'></el-input>
            <el-date-picker v-model="formDat.happenTime" type="date" placeholder="请选择日期"
                            :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
            ></el-date-picker>
          </el-form-item>
          <el-form-item label="保洁方法" prop="method">
            <el-input v-model="formDat.method" placeholder="请输入保洁方法" clearable :style="{width: '100%'}" >
@@ -246,6 +245,7 @@
          <h4 class="form-header">相关图片 </h4>
          <el-upload
            action="#"
            accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
            list-type="picture-card"
            multiple
            :http-request="requestUpload"
@@ -253,14 +253,16 @@
          >
            <i  slot="default" class="el-icon-plus"></i>
            <div slot="file" slot-scope="{file}">
              <template v-if="fileList">
              <img
                class="el-upload-list__item-thumbnail"
                :src="file.url"
                alt=""
                style="width: 126px; height: 126px"
                  style="width: 100%; height: 100%; object-fit: cover;"
                fit="cover"
                :preview-src-list="[file.url]"
              >
              </template>
              <span class="el-upload-list__item-actions">
          <span
            class="el-upload-list__item-preview"
@@ -268,7 +270,6 @@
          >
            <i class="el-icon-zoom-in"></i>
          </span>
          <span
            v-if="!disabled"
            class="el-upload-list__item-delete"
@@ -277,8 +278,6 @@
            <i class="el-icon-delete"></i>
          </span>
        </span>
            </div>
          </el-upload>
          <h4 class="form-header">其他附件 </h4>
@@ -289,9 +288,10 @@
            multiple
            :on-remove="handleRemoveFile"
            :http-request="requestUpload"
            :http-request="requestUpload1"
            :show-file-list="true"
          >
            <el-button type="primary">点击上传</el-button>
            <div v-if="uploading" class="upload-status">正在上传...</div>
            <template #tip>
@@ -619,10 +619,6 @@
            addClean(this.formDat).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            });
          }
        });
        // 清空formDat对象的数据
        Object.keys(this.formDat).forEach(key => {
          this.formDat[key] = '';
@@ -634,8 +630,36 @@
        for(let i = 0; i < this.fileListOther.length; i++){
          this.handleRemoveFile(this.fileListOther[0]);
        }
              this.getList();
            });
          }
        });
      },
      requestUpload(params)
      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})
          }
        })
      },
      requestUpload1(params)
      {
        var file = params.file;
        var formData = new FormData();
@@ -646,16 +670,17 @@
          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)
          if(_this.fot.includes(pth) !== true)
          {
            _this.fileList.push({name:response.data.fileName, "url":response.data.url})
          }
          else{
            // _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})
          //
          // }
        })
      },