ruoyi-ui/src/views/collection/index.vue
@@ -51,16 +51,20 @@
                  -->
      </el-form-item>
      <el-form-item label="时间" style="padding-left:190px">
      <el-form-item label="时间">
        <el-date-picker
          v-model="dateRange"
          style="width: 240px"
          value-format="yyyy-MM-dd HH-MM"
          style="width:  197px;
height: 30px;
background: #FFFFFF;
border-radius: 14px 14px 14px 14px;
opacity: 0.5;
border: 1px solid rgba(0,0,0,0.25);"
          value-format="yyyy-MM-dd"
          type="daterange"
          range-separator="-"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
          @keyup.enter.native="handleQuery"
        ></el-date-picker>
      </el-form-item>
@@ -280,8 +284,11 @@
    <!-- 添加收藏与荣誉信息配置对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
<!--        <el-form-item label="获得时间" prop="happenTime">-->
<!--          <el-input v-model="formDat.happenTime" placeholder="请输入获得时间" clearable :style="{width: '100%'}" ></el-input>-->
<!--        </el-form-item>-->
        <el-form-item label="获得时间" prop="happenTime">
          <el-input v-model="formDat.happenTime" placeholder="请输入获得时间" clearable :style="{width: '100%'}" ></el-input>
          <el-date-picker v-model='formDat.happenTime' type='date' placeholder='选择日期'></el-date-picker>
        </el-form-item>
        <el-form-item label="类别" prop="type">
          <el-select v-model="formDat.type" placeholder="请选择类别" clearable :style="{width: '100%'}"  >
@@ -469,7 +476,7 @@
        type:undefined,
        owner:undefined,
        location:undefined,
        happenTime:undefined,
        // happenTime:undefined,
      },
      // searchVal:"",
@@ -488,8 +495,8 @@
          trigger: 'blur'
        }],
        happenTime: [{
          // required: true,
          message: '请输入时间',
          required: true,
          message: '请选择时间',
          trigger: 'blur'
        }],
        name: [{
@@ -578,7 +585,10 @@
    /** 查询记录列表 */
    getList() {
      this.loading = true;
      // console.log(this.queryParams)
      console.log(this.queryParams)
      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listCollection(this.queryParams).then(response => {
          //  alert(123)