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

feige

2024-08-27 76a3eb05129f0af9f9b5798b1c8abbf9afaf7f19

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

@@ -154,7 +154,7 @@
        </el-row>
      </div>

      <el-table v-loading="loading" border :data="selfeconomyList" :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" border :data="selfeconomyList" :row-key="getRowId1" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
        <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 label="日期" prop="happenTime" sortable width="100" align="center">
@@ -208,10 +208,10 @@
              ></div>
          </template>
        </el-table-column>
        <el-table-column label="备注" prop="remark" sortable width="90" align="center">
        <el-table-column label="备注" prop="remark" sortable align="center">
          <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
        </el-table-column>
        <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
        <el-table-column label="操作" align="center" width="220" class-name="small-padding fixed-width" v-if="userId != 2">
          <template slot-scope="scope" v-if="scope.row.roleId !== 1">
            <div class="button-container">
            <el-button
@@ -339,8 +339,7 @@
              <span class="el-upload-list__item-actions">
          <span
            class="el-upload-list__item-preview"
            @click="handlePictureCardPreview(file)"
          >
                @click="handlePictureCardPreview(file)">
            <i class="el-icon-zoom-in"></i>
          </span>

@@ -448,7 +447,7 @@
      <!-- 分享对话框1 -->
      <el-dialog :title="title1" :visible.sync="open1" width="500px" append-to-body @close="handleClose2">

      <el-table v-loading="loading1" :data="listRoot" :row-key="getRowId1" ref="table1"  @selection-change="handleSelectionChange1"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
      <el-table v-loading="loading1" :data="listRoot" :row-key="getRowId2" ref="table1"  @selection-change="handleSelectionChange1"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
            <el-table-column type="selection" width="55"  align="center" />
            <el-table-column fixed label="序号" sortable type="index" :index="(queryParams1.pageNum-1)*queryParams1.pageSize+1" width="130"/>
            <el-table-column label="身份" prop="identity" sortable width="130" >
@@ -483,7 +482,7 @@
        </el-select>
              </div>

        <el-table v-loading="loading2" :data="shareList1" :row-key="getRowId2" ref="multipleTable"  @selection-change="handleSelectionChange2"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
        <el-table v-loading="loading2" :data="shareList1" :row-key="getRowId3" ref="multipleTable"  @selection-change="handleSelectionChange2"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
                <el-table-column label="日期" prop="happenTime" sortable width="100" align="center">
                  <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
                </el-table-column>
@@ -630,6 +629,7 @@
        multiple1: true,
        dateRange1: [],

        selfeconomyList: [],

        userId: undefined,
        // 遮罩层
@@ -647,6 +647,7 @@
        showSearch: true,
        // 总条数
        total: 0,
        total1: 0,
        // 百年心愿表格数据
        wishList: [],
        // 弹出层标题
@@ -794,10 +795,12 @@
      };
    },
    created() {
      this.getList1()
      this.getList1();
      this.getList();
    //  this.getCateInfor()
      this.getInfo()

      //this.getCateInfor();
      this.getInfo();

      // for (let i = 0; i < this.contactList.length; i++) {
      //   this.formDat[i] = this.contactList[i];
      // }
@@ -931,14 +934,6 @@
        // this.single1 = selection.length!=1
        // this.multiple1 = !selection.length
      },
      getRowId1(row)
      {
        return row.id
      },
      getRowId2(row)
      {
        return row.id
      },
      getList1() {
            this.loading1 = true;
            this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
@@ -999,7 +994,15 @@
        this.open = false;
        this.reset();
      },
      getRowId(row)
      getRowId1(row)
      {
        return row.id
      },
      getRowId2(row)
      {
        return row.id
      },
      getRowId3(row)
      {
        return row.id
      },