Merge remote-tracking branch 'origin/master'

linwenling

2023-10-22 cf948b62048be5f217623cc31a0d6d2680c72476

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

@@ -6,7 +6,10 @@
          v-model="queryParams.type"
          placeholder="请输入类型"
          clearable
          style="width: 240px"
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
@@ -16,7 +19,10 @@
          v-model="queryParams.title"
          placeholder="请输入标题"
          clearable
          style="width: 240px"
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
@@ -25,7 +31,10 @@
          v-model="queryParams.location"
          placeholder="请输入存储地址"
          clearable
          style="width: 240px"
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
@@ -34,7 +43,10 @@
          v-model="queryParams.holder"
          placeholder="请输入持有人"
          clearable
          style="width: 240px"
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
@@ -43,7 +55,10 @@
          v-model="queryParams.address"
          placeholder="请输入具体位置"
          clearable
          style="width: 240px"
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
@@ -51,7 +66,10 @@
      <el-form-item label="发生时间"  prop="happenTime">
        <el-date-picker
          v-model="dateRange"
          style="width: 240px"
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          value-format="yyyy-MM-dd"
          type="daterange"
          range-separator="-"
@@ -107,7 +125,7 @@
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          @click="handleExportTemplate"
          v-hasPermi="['family:note:export']"
        >导入模板下载</el-button>
      </el-col>
@@ -323,6 +341,7 @@

//在system/note/index.js中导入接口函数
import {listProperty,enload, getPropertyInfo, delProperty, getCategory, addProperty, uploadPic} from "@/api/note/index";
import {Message} from "element-ui";
export default {
  name: "Role",
  dicts: ['sys_normal_disable'],
@@ -652,7 +671,12 @@
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    //导入模板
    handleExportTemplate(){
      this.download('/family/property/model', {

      }, `property${new Date().getTime()}.xlsx`)
    },
    /** 导出按钮操作 */
    handleExport() {
      const Ids = this.ids;
@@ -668,24 +692,23 @@
        }, `property_${new Date().getTime()}.xlsx`)
      }
    },

    /** 导入操作*/
    handleEnport(params){
      var file = params.file;
      var formData = new FormData();
      formData.append('excelImport', file);
      let _this = this
      alert(file)

      enload(formData).then(response => {
        _this.getList();
        Message({ message: "导入成功", type: 'warning' })

      }).catch(err)
      {
        Message({ message: "导入失败", type: 'error' })
      }
      }).catch(() => { Message({ message: "导入失败", type: 'error' })});

    }
  }

};
</script>
<style>