Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/chongzhouRes...

董国庆

2025-03-25 74ef5f08c232e5d0c71ff0deb7ff5e086c748788

Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/chongzhouResettle

 src/views/index.vue

@@ -7,27 +7,21 @@
          <div class="calendar-header">
            <span>日历</span>
            <div class="calendar-controls">
              <el-date-picker
                v-model="selectedMonth"
                type="month"
                :format="'yyyy年MM月'"
                placeholder="选择月份"
                @change="handleMonthChange"
              />
              <el-date-picker v-model="selectedMonth" type="month" :format="'yyyy年MM月'" placeholder="选择月份"
                @change="handleMonthChange" />
            </div>
          </div>
          <el-calendar v-model="currentDate" @change="handleCalendarChange"/>
          <el-calendar v-model="currentDate"  />
        </el-card>
      </el-col>
      

      <!-- 右侧预警通知 -->
      <el-col :span="12">
        <el-card class="notification-card">
          <div class="notification-header">预警通知</div>
          <div class="notification-list">
            <div v-for="(notification, index) in alwaysMessages" 
                 :key="index" 
                 class="notification-item">
            <div v-for="(notification, index) in alwaysMessages" :key="index" class="notification-item"
              @click="handleNotificationClick(notification)">
              <div class="notification-item-header">
                <div class="notification-dot"></div>
                <span class="notification-time">{{ notification.createTime }}</span>
@@ -37,9 +31,8 @@
                <div v-if="notification.createBy" class="notification-submitter">提交人：{{ notification.createBy }}</div>
              </div>
            </div>
            <div v-for="(notification, index) in noticeMessage" 
                 :key="index" 
                 class="notification-item">
            <div v-for="(notification, index) in noticeMessage" :key="index" class="notification-item"
              @click="handleNotificationClick(notification)">
              <div class="notification-item-header">
                <div class="notification-dot"></div>
                <span class="notification-time">{{ notification.createTime }}</span>
@@ -91,10 +84,29 @@
        this.currentDate = new Date(date);
      }
    },
    // 添加通知点击处理
    // 处理通知点击
    handleNotificationClick(notification) {
      notification.isRead = true;
      // 这里可以添加具体的业务逻辑
      // 根据id类型进行不同的路由跳转
      const id = notification.noticeId;
      switch (id) {
        case 1:
          // 自主购房安置申请批次表
          this.$router.push('/applicationBatchList/list');
          break;
        case 2:
          // 自主购房安置申请批次表
          this.$router.push('/applicationBatchList/list');
          break;
        case 3:
          // 付款明细
          this.$router.push('/payment-details/list');
          break;
        default:
          if (id > 4) {
            // 付款明细
            this.$router.push('/payment-details/list');
          }
      }
    }
  }
};
@@ -103,7 +115,7 @@
<style scoped lang="scss">
.app-container {
  padding: 20px;
  

  .calendar-card,
  .notification-card {
    min-height: 600px;
@@ -137,11 +149,11 @@
      padding: 12px 16px;
      border-bottom: 1px solid #ebeef5;
      cursor: pointer;
      

      &:hover {
        background-color: #f5f7fa;
      }
      

      &:last-child {
        border-bottom: none;
      }
@@ -167,7 +179,7 @@

      .notification-content {
        padding-left: 16px;
        

        .notification-text {
          color: #333;
          margin: 4px 0;
@@ -180,11 +192,13 @@
        }
      }
    }

    &.unread {
      .notification-dot {
        display: block;
      }
    }

    &.read {
      .notification-dot {
        display: none;

 src/views/payment-details/detail.vue

@@ -175,6 +175,7 @@
      //     id: row.id
      //   }
      // });
      this.$router.push('/placement/batch/applayPersonDetail?id=' + row.placementBatchId + '&type=detail' + '&houseId=' + row.id)
    },
  },
}

 src/views/payment-details/index.vue

@@ -48,7 +48,7 @@
        <!-- 操作工具栏 -->
        <el-row class="toolbar">
            <el-col :span="24">
                <el-button type="primary" icon="el-icon-download" @click="handleExport">导出为Excel</el-button>
                <el-button v-hasPermi="['payment-details:export']" type="primary" icon="el-icon-download" @click="handleExport">导出为Excel</el-button>
            </el-col>
        </el-row>

@@ -73,7 +73,7 @@
            <!-- 操作列 -->
            <el-table-column label="操作" fixed="right" width="80" align="center">
                <template slot-scope="scope">
                    <el-button type="text" size="small" @click="handleReview(scope.row)">详情</el-button>
                    <el-button v-hasPermi="['payment-details:detail']" type="text" size="small" @click="handleReview(scope.row)">详情</el-button>
                </template>
            </el-table-column>
        </el-table>

 src/views/storing-data/index.vue

@@ -20,7 +20,7 @@

    <!-- 操作按钮区域 -->
    <div class="action-buttons">
      <el-button type="primary" @click="handleAdd">新增资料</el-button>
      <el-button v-hasPermi="['storing-data:add']" type="primary" @click="handleAdd">新增资料</el-button>
    </div>

    <!-- 表格区域 -->
@@ -39,9 +39,9 @@
      <el-table-column label="操作" width="180" align="center" fixed="right">
        <template slot-scope="scope">
          <template>
            <el-button size="mini" type="text" @click="handleView(scope.row, 'detail')">详情</el-button>
            <el-button size="mini" type="text" @click="handleView(scope.row, 'edit')">编辑</el-button>
            <el-button size="mini" type="text" @click="handleDelete(scope.row)">删除</el-button>
            <el-button v-hasPermi="['storing-data:detail']" size="mini" type="text" @click="handleView(scope.row, 'detail')">详情</el-button>
            <el-button v-hasPermi="['storing-data:edit']" size="mini" type="text" @click="handleView(scope.row, 'edit')">编辑</el-button>
            <el-button v-hasPermi="['storing-data:delete']" size="mini" type="text" @click="handleDelete(scope.row)">删除</el-button>
          </template>
        </template>
      </el-table-column>