提交了修改

feige

2024-02-02 bd40473c9c634005bc7e62e7fc901bcd8b598fa0

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

@@ -4,7 +4,7 @@
      <el-form-item label="时间" prop="happenTime">
        <el-date-picker
          v-model="dateRange"
          style="width:  197px;
          style="width:  240px;
          height: 30px;
          background: #FFFFFF;
          border-radius: 14px 14px 14px 14px;
@@ -169,7 +169,7 @@
            v-hasPermi="['family:note:export']"
          >导入模板下载</el-button>
        </el-col>
        <el-col :span="1.2">
        <el-col :span="1.5">

          <el-upload
            action=""
@@ -180,15 +180,15 @@
          >
            <el-button size="mini"   type="primary"
                       plain
                       icon="el-icon-plus" >导入</el-button>
                      icon="el-icon-top" >导入</el-button>
          </el-upload>
        </el-col>
        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
      </el-row>
    </div>
    <el-table v-loading="loading" :data="collectionList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
    <el-table v-loading="loading" :data="collectionList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" >
      <el-table-column type="selection" :reserve-selection="true" width="55"  align="center" />
      <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
      <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80px"/>
      <el-table-column label="获得时间" prop="happenTime" sortable width="120" align="center">
        <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
      </el-table-column>
@@ -249,6 +249,7 @@
              size="mini"
              type="text"
              icon="el-icon-edit"
                     :disabled="!scope.row.ownData"
              @click="handleUpdate(scope.row)"
              v-hasPermi="['system:role:edit']"
            >
@@ -258,6 +259,7 @@
              size="mini"
              type="text"
              icon="el-icon-delete"
                     :disabled="!scope.row.ownData"
              @click="handleDelete(scope.row)"
              v-hasPermi="['system:role:remove']"
            ><span style="font-size: 14px;">删除</span></el-button>
@@ -582,19 +584,25 @@
      // console.log(this.queryParams)
      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]

      let _this = this
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listCollection(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          this.collectionList = response.data.data;
          this.total = response.data.total;
          this.loading = false;
          if(response.msg=="您没加入到对应的家庭，请联系管理员")
          {
              _this.$modal.msgSuccess("您没加入到对应的家庭，请联系管理员");
              _this.loading = false;
          }else{
          _this.collectionList = response.data.data;
          _this.total = response.data.total;
          _this.loading = false;
          }
        }
      );
      listType(this.queryParams).then(response => {
          this.typeList = response.data;
          this.total = response.data.total;

          // console.log( this.typeList )
          // 在回调函数中调用 getTypeOptions()
          this.getTypeOptions();
@@ -859,7 +867,7 @@
  }
};
</script>
<style>
<style scoped>
.app-container{
  background-color: #FEF7FC;
}