小程序代码提交

bigScreen3/.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 智能客服中心
+VITE_APP_TITLE = 河南中林智慧平台
 
 # 生产环境配置
 VITE_APP_ENV = 'production'

bigScreen3/src/views/login.vue

@@ -2,7 +2,7 @@
   <div class="login" :style="`background-image: url(${backgroundImage});`">
     <el-form ref="loginFormRef" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
       <h3 class="title">
-        焦作市智慧园林
+        河南中林智慧平台
       </h3>
       <el-form-item prop="fUsercode">
         <el-input v-model="loginForm.fUsercode" type="text" auto-complete="off" placeholder="账号">

wxproject/packageA/pages/createReport/createReport.js

@@ -5,15 +5,24 @@ Page({
    * 页面的初始数据
    */
   data: {
-    reportType: 'daily', // 填报类型：daily-日报, weekly-周报
     id: '', // 编辑时的ID
-    title: '',
-    date: '', // 日报日期
-    weekStartDate: '', // 周报开始日期
-    weekEndDate: '', // 周报结束日期
-    content: '',
+    team: '', // 管养班组
+    number: '', // 人数
+    type: '1', // 类型：1日2周3月
+    workStartTime: '', // 工作开始时间
+    workEndTime: '', // 工作结束时间
+    workContent: [ // 工作内容列表
+      {
+        content: '', // 工作内容
+        location: '', // 工作地点
+        completion: '', // 完成情况
+        remark: '' // 备注
+      }
+    ],
+    unfinishedWork: '', // 未完成工作
     submitter: '当前用户', // 实际项目中应从登录信息获取
-    isSubmitting: false
+    isSubmitting: false,
+    pageMode: 'normal' // 页面模式：normal(正常编辑), view(只读查看)
   },
 
   // 标题输入
@@ -23,204 +32,248 @@ Page({
     });
   },
 
-  // 选择填报类型
-  selectReportType(e) {
-    const type = e.currentTarget.dataset.type;
-    // 确保值确实发生了变化才执行操作
-    if (type !== this.data.reportType) {
-      this.setData({
-        reportType: type
-      });
-      
-      // 类型切换时可以添加一些重置逻辑（如果需要）
-      // 例如：当从日报切换到周报时，可以根据日报日期计算默认的周日期范围
-      if (type === 'weekly' && this.data.date) {
-        // 这里可以根据日报日期计算周报的开始和结束日期
-        // 这里仅作为示例，实际应用中可能需要更复杂的日期计算逻辑
-      }
-    }
+  // 管养班组输入
+  onTeamInput(e) {
+    this.setData({
+      team: e.detail.value
+    });
   },
 
-  // 日报日期选择
-  onDateChange(e) {
+  // 人数输入
+  onNumberInput(e) {
     this.setData({
-      date: e.detail.value
+      number: e.detail.value
     });
   },
 
-  // 周报开始日期选择
-  onWeekStartDateChange(e) {
-    const startDate = e.detail.value;
-    // 如果结束日期早于开始日期，则清空结束日期
-    if (this.data.weekEndDate && this.data.weekEndDate < startDate) {
+  // 选择类型
+  selectType(e) {
+    const type = e.currentTarget.dataset.type;
+    this.setData({
+      type: type
+    });
+  },
+
+  // 工作开始时间选择
+  onWorkStartTimeChange(e) {
+    const startTime = e.detail.value;
+    // 如果结束时间早于开始时间，则清空结束时间
+    if (this.data.workEndTime && this.data.workEndTime < startTime) {
       this.setData({
-        weekStartDate: startDate,
-        weekEndDate: ''
+        workStartTime: startTime,
+        workEndTime: ''
       });
     } else {
       this.setData({
-        weekStartDate: startDate
+        workStartTime: startTime
       });
     }
   },
 
-  // 周报结束日期选择
-  onWeekEndDateChange(e) {
+  // 工作结束时间选择
+  onWorkEndTimeChange(e) {
+    this.setData({
+      workEndTime: e.detail.value
+    });
+  },
+
+  // 工作内容输入
+  onWorkContentInput(e) {
+    const index = e.currentTarget.dataset.index;
+    const field = e.currentTarget.dataset.field;
+    const value = e.detail.value;
+    
+    const workContent = this.data.workContent;
+    workContent[index][field] = value;
+    
+    this.setData({
+      workContent: workContent
+    });
+  },
+
+  // 添加工作内容
+  addWorkContent() {
+    const workContent = this.data.workContent;
+    workContent.push({
+      content: '',
+      location: '',
+      completion: '',
+      remark: ''
+    });
+    
     this.setData({
-      weekEndDate: e.detail.value
+      workContent: workContent
     });
   },
 
-  // 内容输入
-  onContentInput(e) {
+  // 删除工作内容
+  deleteWorkContent(e) {
+    const index = e.currentTarget.dataset.index;
+    const workContent = this.data.workContent;
+    
+    if (workContent.length > 1) {
+      workContent.splice(index, 1);
+      this.setData({
+        workContent: workContent
+      });
+    } else {
+      wx.showToast({ 
+        title: '至少保留一项工作内容', 
+        icon: 'none' 
+      });
+    }
+  },
+
+  // 未完成工作输入
+  onUnfinishedWorkInput(e) {
     this.setData({
-      content: e.detail.value
+      unfinishedWork: e.detail.value
     });
   },
 
   // 提交报表
   async submitReport() {
+    // 如果是查看模式，不允许提交
+    if (this.data.pageMode === 'view') {
+      return;
+    }
+    
     // 表单验证
-    if (!this.data.title) {
-      wx.showToast({ title: '请输入标题', icon: 'none' });
+    
+    if (!this.data.team) {
+      wx.showToast({ title: '请输入管养班组', icon: 'none' });
       return;
     }
     
-    // 根据类型进行日期验证
-    if (this.data.reportType === 'daily') {
-      if (!this.data.date) {
-        wx.showToast({ title: '请选择日期', icon: 'none' });
-        return;
-      }
-    } else if (this.data.reportType === 'weekly') {
-      if (!this.data.weekStartDate) {
-        wx.showToast({ title: '请选择开始日期', icon: 'none' });
-        return;
-      }
-      if (!this.data.weekEndDate) {
-        wx.showToast({ title: '请选择结束日期', icon: 'none' });
-        return;
-      }
+    if (!this.data.number || parseInt(this.data.number) <= 0) {
+      wx.showToast({ title: '请输入有效的人数', icon: 'none' });
+      return;
     }
     
-    if (!this.data.content) {
-      wx.showToast({ title: '请输入内容', icon: 'none' });
+    if (!this.data.workStartTime) {
+      wx.showToast({ title: '请选择工作开始时间', icon: 'none' });
+      return;
+    }
+    
+    if (!this.data.workEndTime) {
+      wx.showToast({ title: '请选择工作结束时间', icon: 'none' });
+      return;
+    }
+    
+    // 验证工作内容
+    const hasValidWorkContent = this.data.workContent.some(item => 
+      item.content && item.location && item.completion
+    );
+    if (!hasValidWorkContent) {
+      wx.showToast({ title: '请至少填写一项完整的工作内容', icon: 'none' });
       return;
     }
 
     this.setData({ isSubmitting: true });
+
+    
     try {
-      // 根据类型构建不同的数据结构
+      // 构建接口所需的数据结构
       let data = {
         id: this.data.id,
-        title: this.data.title,
-        content: this.data.content,
-        type: this.data.reportType === 'daily' ? '日报' : '周报',
-        rawType: this.data.reportType,
+        team: this.data.team,
+        number: parseInt(this.data.number),
+        type: parseInt(this.data.type),
+        workStartTime: this.data.workStartTime + ' 00:00:00',
+        workEndTime: this.data.workEndTime + ' 23:59:59',
+        workContent: JSON.stringify(this.data.workContent),
+        unfinishedWork: this.data.unfinishedWork,
         submitter: this.data.submitter
       };
+      console.log('提交数据', data);
       
-      // 根据类型设置日期相关字段
-      if (this.data.reportType === 'daily') {
-        data.date = this.data.date;
-        data.displayDate = this.data.date;
-      } else if (this.data.reportType === 'weekly') {
-        data.date = this.data.weekStartDate + '至' + this.data.weekEndDate;
-        data.weekStartDate = this.data.weekStartDate;
-        data.weekEndDate = this.data.weekEndDate;
-        data.displayDate = this.data.weekStartDate + '至' + this.data.weekEndDate;
+      let res;
+      // 根据是否有id判断是新增还是编辑
+      if (this.data.id) {
+        // 编辑模式 - 使用update接口
+        res = await app.sendRequest('put', '/t-work-report/updateWorkReportBase', data);
+      } else {
+        // 新增模式 - 使用save接口
+        res = await app.sendRequest('post', '/t-work-report/saveWorkReportBase', data);
       }
       
-      // 这里模拟请求，实际需要替换为真实接口
-      // let url = this.data.id ? '/report/updateReport' : '/report/createReport';
-      // let res = await app.sendRequest('post', url, { data });
-      // if (res.status == 200) {
-      //   wx.showToast({ title: '保存成功' });
-      //   setTimeout(() => {
-      //     wx.navigateBack();
-      //   }, 1500);
-      // }
-
-      // 模拟保存成功
-      setTimeout(() => {
-        wx.showToast({ title: '保存成功' });
+      if (res.status == 200) {
+        wx.showToast({ title: this.data.id ? '更新成功' : '保存成功' });
         setTimeout(() => {
           wx.navigateBack();
         }, 1500);
-      }, 1000);
+      } else {
+        wx.showToast({ title: res.message || '操作失败', icon: 'none' });
+      }
     } catch (error) {
-      console.log('保存失败', error);
-      wx.showToast({ title: '保存失败', icon: 'none' });
+      console.log('操作失败', error);
+      wx.showToast({ title: '操作失败', icon: 'none' });
     } finally {
       this.setData({ isSubmitting: false });
     }
   },
+  
 
-  // 获取报表详情（编辑时使用）
+  // 获取报表详情（编辑或查看时使用）
   async getReportDetail() {
     if (!this.data.id) return;
     
     try {
-      let data = { id: this.data.id };
-      // 这里模拟请求，实际需要替换为真实接口
-      // let res = await app.sendRequest('post', '/report/selectReportDetail', { data });
-      // if (res.status == 200) {
-      //   // 根据类型设置不同的日期字段
-      //   if (res.data.rawType === 'daily' || res.data.type === '日报') {
-      //     this.setData({
-      //       title: res.data.title,
-      //       date: res.data.date,
-      //       content: res.data.content,
-      //       submitter: res.data.submitter,
-      //       reportType: 'daily'
-      //     });
-      //   } else if (res.data.rawType === 'weekly' || res.data.type === '周报') {
-      //     // 处理周报的日期范围
-      //     let weekStartDate = '';
-      //     let weekEndDate = '';
-      //     if (res.data.weekStartDate && res.data.weekEndDate) {
-      //       weekStartDate = res.data.weekStartDate;
-      //       weekEndDate = res.data.weekEndDate;
-      //     } else if (res.data.date && res.data.date.includes('至')) {
-      //       const dateParts = res.data.date.split('至');
-      //       weekStartDate = dateParts[0];
-      //       weekEndDate = dateParts[1];
-      //     }
-      //     this.setData({
-      //       title: res.data.title,
-      //       weekStartDate: weekStartDate,
-      //       weekEndDate: weekEndDate,
-      //       content: res.data.content,
-      //       submitter: res.data.submitter,
-      //       reportType: 'weekly'
-      //     });
-      //   }
-      // }
-
-      // 模拟数据 - 处理类型数据
-      setTimeout(() => {
-        const isDaily = this.data.type === 0;
-        const reportDetail = {
-          id: this.data.id,
-          title: isDaily ? '编辑日报标题' : '编辑周报标题',
-          content: '这是编辑中的内容...',
-          date: isDaily ? '2024-01-20' : '2024-01-15至2024-01-21',
-          submitter: '张三',
-          type: isDaily ? 'daily' : 'weekly', // 原始类型标识
-          displayDate: isDaily ? '2024-01-20' : '2024-01-15至2024-01-21'
-        };
+      // 对接获取详情接口 - GET请求
+      let res = await app.sendRequest('get', `/t-work-report/${this.data.id}`, {});
+      
+      if (res.status == 200) {
+        const reportDetail = res.data;
+        
+        // 处理工作内容（可能是JSON字符串）
+        let workContent = reportDetail.workContent;
+        try {
+          if (typeof workContent === 'string') {
+            workContent = JSON.parse(workContent);
+          }
+          if (!Array.isArray(workContent)) {
+            workContent = [{
+              content: '',
+              location: '',
+              completion: '',
+              remark: ''
+            }];
+          }
+        } catch (error) {
+          console.log('解析工作内容失败', error);
+          workContent = [{
+            content: '',
+            location: '',
+            completion: '',
+            remark: ''
+          }];
+        }
+        
+        // 处理日期格式
+        let workStartTime = reportDetail.workStartTime;
+        let workEndTime = reportDetail.workEndTime;
+        if (workStartTime && workStartTime.includes(' ')) {
+          workStartTime = workStartTime.split(' ')[0];
+        }
+        if (workEndTime && workEndTime.includes(' ')) {
+          workEndTime = workEndTime.split(' ')[0];
+        }
         
         this.setData({
           title: reportDetail.title,
-          content: reportDetail.content,
-          date: reportDetail.date,
-          submitter: reportDetail.submitter,
-          // 添加类型标识
-          rawType: reportDetail.type
+          team: reportDetail.team || '',
+          number: reportDetail.number ? String(reportDetail.number) : '',
+          type: reportDetail.type ? String(reportDetail.type) : '1',
+          workStartTime: workStartTime || '',
+          workEndTime: workEndTime || '',
+          workContent: workContent,
+          unfinishedWork: reportDetail.unfinishedWork || '',
+          submitter: reportDetail.submitter || '当前用户'
         });
-      }, 500);
+      }
     } catch (error) {
       console.log('获取详情失败', error);
+      wx.showToast({ title: '获取详情失败', icon: 'none' });
     }
   },
 
@@ -228,30 +281,41 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
+    // 判断页面模式
+    if (options.view === 'true') {
+      this.setData({ pageMode: 'view' });
+      // 设置导航栏标题为查看模式
+      wx.setNavigationBarTitle({
+        title: '报表详情'
+      });
+    }
+    
     // 如果从列表页传入了类型参数，使用传入的类型
     if (options.type !== undefined) {
-      // 设置报表类型（daily或weekly）
       this.setData({
-        reportType: options.type === '1' || options.type === 'weekly' ? 'weekly' : 'daily'
+        type: options.type
       });
-      // 设置页面标题
-      wx.setNavigationBarTitle({
-        title: this.data.reportType === 'daily' ? '新增日报' : '新增周报'
-      });
-    } else {
-      // 默认设置为日报
-      this.setData({ reportType: 'daily' });
     }
     
     if (options.id) {
       this.setData({ 
         id: options.id
       });
-      wx.setNavigationBarTitle({
-        title: '编辑报表'
-      });
+      
+      // 如果不是查看模式，则设置为编辑模式
+      if (this.data.pageMode !== 'view') {
+        wx.setNavigationBarTitle({
+          title: '编辑报表'
+        });
+      }
+      
       this.getReportDetail();
     } else {
+      // 设置页面标题
+      wx.setNavigationBarTitle({
+        title: '新增工作报表'
+      });
+      
       // 新增时自动设置当前日期
       const now = new Date();
       const year = now.getFullYear();
@@ -259,17 +323,10 @@ Page({
       const day = now.getDate().toString().padStart(2, '0');
       const today = `${year}-${month}-${day}`;
       
-      // 根据类型设置不同的日期字段
-      if (this.data.reportType === 'daily') {
-        this.setData({ date: today });
-      } else {
-        // 计算本周结束日期
-        const endDay = Math.min(day + 6, new Date(year, month, 0).getDate());
-        this.setData({
-          weekStartDate: today,
-          weekEndDate: `${year}-${month}-${endDay.toString().padStart(2, '0')}`
-        });
-      }
+      this.setData({
+        workStartTime: today,
+        workEndTime: today
+      });
     }
   }
 });

wxproject/packageA/pages/createReport/createReport.wxml

@@ -1,74 +1,169 @@
 <view class="createReport">
   <!-- 表单容器 -->
   <view class="form-container">
-    <!-- 标题输入 -->
+    
+    <!-- 管养班组 -->
     <view class="form-item">
-      <view class="form-label">标题 *</view>
-      <input 
+      <view class="form-label">管养班组 *</view>
+      <input wx:if="{{pageMode !== 'view'}}"
         class="form-input" 
-        placeholder="请输入标题" 
-        value="{{title}}" 
-        bindinput="onTitleInput"
+        placeholder="请输入管养班组" 
+        value="{{team}}" 
+        bindinput="onTeamInput"
       />
+      <view wx:else class="readonly-info">
+        <text class="readonly-text">{{team || '-'}}</text>
+      </view>
     </view>
     
-    <!-- 填报类型选择 -->
+    <!-- 人数 -->
     <view class="form-item">
-      <view class="form-label">填报类型 *</view>
-      <view class="radio-group">
+      <view class="form-label">人数 *</view>
+      <input wx:if="{{pageMode !== 'view'}}"
+        class="form-input" 
+        type="number" 
+        placeholder="请输入人数" 
+        value="{{number}}" 
+        bindinput="onNumberInput"
+      />
+      <view wx:else class="readonly-info">
+        <text class="readonly-text">{{number || '-'}}</text>
+      </view>
+    </view>
+    
+    <!-- 类型选择 -->
+    <view class="form-item">
+      <view class="form-label">类型 *</view>
+      <view wx:if="{{pageMode !== 'view'}}" class="radio-group">
         <view class="radio-item">
-          <radio value="daily" checked="{{reportType === 'daily'}}" bindtap="selectReportType" data-type="daily" />
+          <radio value="1" checked="{{type === '1'}}" bindtap="selectType" data-type="1" />
           <text class="radio-text">日报</text>
         </view>
         <view class="radio-item">
-          <radio value="weekly" checked="{{reportType === 'weekly'}}" bindtap="selectReportType" data-type="weekly" />
+          <radio value="2" checked="{{type === '2'}}" bindtap="selectType" data-type="2" />
           <text class="radio-text">周报</text>
         </view>
+        <view class="radio-item">
+          <radio value="3" checked="{{type === '3'}}" bindtap="selectType" data-type="3" />
+          <text class="radio-text">月报</text>
+        </view>
+      </view>
+      <view wx:else class="readonly-info">
+        <text class="readonly-text">{{type === '1' ? '日报' : type === '2' ? '周报' : '月报'}}</text>
       </view>
     </view>
     
-    <!-- 日期输入 - 日报 -->
-    <view class="form-item" wx:if="{{reportType === 'daily'}}">
-      <view class="form-label">日期 *</view>
-      <picker mode="date" value="{{date}}" start="2020-01-01" end="2100-12-31" bindchange="onDateChange">
-        <view class="form-input picker-input">{{date || '请选择日期'}}</view>
+    <!-- 工作开始时间 -->
+    <view class="form-item">
+      <view class="form-label">工作开始时间 *</view>
+      <picker wx:if="{{pageMode !== 'view'}}" mode="date" value="{{workStartTime}}" start="2020-01-01" end="2100-12-31" bindchange="onWorkStartTimeChange">
+        <view class="form-input picker-input">{{workStartTime || '请选择工作开始时间'}}</view>
       </picker>
+      <view wx:else class="readonly-info">
+        <text class="readonly-text">{{workStartTime || '-'}}</text>
+      </view>
     </view>
     
-    <!-- 日期输入 - 周报 -->
-    <view class="form-item" wx:if="{{reportType === 'weekly'}}">
-      <view class="form-label">开始日期 *</view>
-      <picker mode="date" value="{{weekStartDate}}" start="2020-01-01" end="2100-12-31" bindchange="onWeekStartDateChange">
-        <view class="form-input picker-input">{{weekStartDate || '请选择开始日期'}}</view>
+    <!-- 工作结束时间 -->
+    <view class="form-item">
+      <view class="form-label">工作结束时间 *</view>
+      <picker wx:if="{{pageMode !== 'view'}}" mode="date" value="{{workEndTime}}" start="{{workStartTime || '2020-01-01'}}" end="2100-12-31" bindchange="onWorkEndTimeChange">
+        <view class="form-input picker-input">{{workEndTime || '请选择工作结束时间'}}</view>
       </picker>
+      <view wx:else class="readonly-info">
+        <text class="readonly-text">{{workEndTime || '-'}}</text>
+      </view>
     </view>
-    <view class="form-item" wx:if="{{reportType === 'weekly'}}">
-      <view class="form-label">结束日期 *</view>
-      <picker mode="date" value="{{weekEndDate}}" start="{{weekStartDate || '2020-01-01'}}" end="2100-12-31" bindchange="onWeekEndDateChange">
-        <view class="form-input picker-input">{{weekEndDate || '请选择结束日期'}}</view>
-      </picker>
+    
+    <!-- 工作内容 -->
+    <view class="form-item">
+      <view class="form-label">工作内容 *</view>
+      <view class="work-content-list">
+        <view wx:for="{{workContent}}" wx:key="index" class="work-content-item">
+          <view class="content-header">
+            <text class="content-title">第{{index + 1}}项工作</text>
+            <view wx:if="{{pageMode !== 'view' && workContent.length > 1}}" class="delete-btn" bindtap="deleteWorkContent" data-index="{{index}}">删除</view>
+          </view>
+          <textarea wx:if="{{pageMode !== 'view'}}"
+            class="form-textarea" 
+            placeholder="请输入工作内容" 
+            value="{{item.content}}" 
+            bindinput="onWorkContentInput" 
+            data-index="{{index}}" 
+            data-field="content"
+            auto-height
+            maxlength="1000"
+          />
+          <view wx:else class="readonly-info">
+            <text class="readonly-text">{{item.content || '-'}}</text>
+          </view>
+          <input wx:if="{{pageMode !== 'view'}}"
+            class="form-input" 
+            placeholder="请输入工作地点" 
+            value="{{item.location}}" 
+            bindinput="onWorkContentInput" 
+            data-index="{{index}}" 
+            data-field="location"
+          />
+          <view wx:else class="readonly-info">
+            <text class="readonly-text">{{item.location || '-'}}</text>
+          </view>
+          <input wx:if="{{pageMode !== 'view'}}"
+            class="form-input" 
+            placeholder="请输入完成情况" 
+            value="{{item.completion}}" 
+            bindinput="onWorkContentInput" 
+            data-index="{{index}}" 
+            data-field="completion"
+          />
+          <view wx:else class="readonly-info">
+            <text class="readonly-text">{{item.completion || '-'}}</text>
+          </view>
+          <textarea wx:if="{{pageMode !== 'view'}}"
+            class="form-textarea" 
+            placeholder="请输入备注" 
+            value="{{item.remark}}" 
+            bindinput="onWorkContentInput" 
+            data-index="{{index}}" 
+            data-field="remark"
+            auto-height
+          />
+          <view wx:else class="readonly-info">
+            <text class="readonly-text">{{item.remark || '-'}}</text>
+          </view>
+        </view>
+      </view>
+      <view wx:if="{{pageMode !== 'view'}}" class="add-btn" bindtap="addWorkContent">
+        <text class="add-icon">+</text>
+        <text class="add-text">添加工作内容</text>
+      </view>
     </view>
     
-    <!-- 内容输入 -->
+    <!-- 未完成工作 -->
     <view class="form-item">
-      <view class="form-label">内容 *</view>
-      <textarea 
+      <view class="form-label">未完成工作</view>
+      <textarea wx:if="{{pageMode !== 'view'}}"
         class="form-textarea" 
-        placeholder="请输入详细内容" 
-        value="{{content}}" 
-        bindinput="onContentInput"
+        placeholder="请输入未完成工作" 
+        value="{{unfinishedWork}}" 
+        bindinput="onUnfinishedWorkInput"
         auto-height
-        maxlength="2000"
+        maxlength="1000"
       />
-      <view class="word-count">{{content.length}}/2000</view>
+      <view wx:else class="readonly-info">
+        <text class="readonly-text">{{unfinishedWork || '-'}}</text>
+      </view>
+      <view class="word-count">{{unfinishedWork.length}}/1000</view>
     </view>
     
     <!-- 提交按钮 -->
-    <view class="submit-btn" bindtap="submitReport" wx:if="{{!isSubmitting}}">
-      保存
-    </view>
-    <view class="submit-btn disabled" wx:else>
-      保存中...
+    <view wx:if="{{pageMode !== 'view'}}">
+      <view class="submit-btn" bindtap="submitReport" wx:if="{{!isSubmitting}}">
+        {{id ? '更新报表' : '保存'}}
+      </view>
+      <view class="submit-btn disabled" wx:else>
+        {{id ? '更新中...' : '保存中...'}}
+      </view>
     </view>
   </view>
 </view>

wxproject/packageA/pages/createReport/createReport.wxss

@@ -36,6 +36,26 @@
   width: 100%;
 }
 
+/* 只读信息显示样式 */
+.readonly-info {
+  flex: 1;
+  border: 1px solid #f0f0f0;
+  border-radius: 8rpx;
+  padding: 20rpx;
+  font-size: 28rpx;
+  background: #f9f9f9;
+  color: #333333;
+}
+
+.readonly-text {
+  display: block;
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: normal;
+  word-break: break-all;
+}
+
 /* Radio组样式 */
 .radio-group {
   display: flex;
@@ -91,23 +111,41 @@ radio {
   margin-top: 10rpx;
 }
 
+/* 文本域 */
+.form-textarea {
+  font-size: 30rpx;
+  color: #666;
+  padding: 20rpx 0;
+  width: 100%;
+  min-height: 150rpx;
+  line-height: 1.6;
+}
+
+/* 字数统计 */
+.word-count {
+  text-align: right;
+  font-size: 24rpx;
+  color: #999;
+  margin-top: 10rpx;
+}
+
 /* 提交按钮 */
 .submit-btn {
-  background-color: #1989fa;
+  background-color: #07c160;
   color: #fff;
-  font-size: 32rpx;
   text-align: center;
-  padding: 28rpx 0;
-  border-radius: 6rpx;
-  margin: 40rpx 30rpx;
+  padding: 30rpx;
+  margin: 0 30rpx 60rpx;
+  border-radius: 8rpx;
+  font-size: 32rpx;
 }
 
-.submit-btn:active {
-  opacity: 0.8;
+.submit-btn.disabled {
+  background-color: #d9d9d9;
 }
 
-.submit-btn.disabled {
-  background-color: #c9c9c9;
+.submit-btn:active:not(.disabled) {
+  background-color: #06ad56;
 }
 
 /* 输入框焦点样式 */

wxproject/packageA/pages/dailyWeeklyReport/dailyWeeklyReport.js

@@ -13,10 +13,16 @@ Page({
     startTime: '',
     endTime: '',
     submitter: '',
+    type: '', // 报表类型：''全部, '1'日报, '2'周报, '3'月报
+    team: '', // 管养班组
     // 提交人列表（实际项目中可从接口获取）
     submitterList: ['张三', '李四', '王五'],
+    // 管养班组列表（实际项目中可从接口获取）
+    teamList: ['绿化一组', '绿化二组', '绿化三组'],
     // 筛选模态框显示控制
-    scaling: false
+    scaling: false,
+    // 顶部快速筛选类型
+    filterType: ''
   },
 
   // 格式化日报标题
@@ -62,7 +68,35 @@ Page({
     this.setData({
       startTime: '',
       endTime: '',
-      submitter: ''
+      submitter: '',
+      type: '',
+      team: ''
+    });
+  },
+  
+  // 设置顶部筛选类型
+  setFilterType: function(e) {
+    const type = e.currentTarget.dataset.type;
+    this.setData({
+      filterType: type,
+      type: type,
+      current: 1,
+      reportList: []
+    });
+    this.getReportList();
+  },
+  
+  // 选择报表类型
+  bindTypeChange: function(e) {
+    this.setData({
+      type: e.detail.value
+    });
+  },
+  
+  // 选择管养班组
+  bindTeamChange: function(e) {
+    this.setData({
+      team: this.data.teamList[e.detail.value]
     });
   },
 
@@ -85,97 +119,203 @@ Page({
         size: this.data.size,
         startTime: this.data.startTime,
         endTime: this.data.endTime,
-        submitter: this.data.submitter
+        submitter: this.data.submitter,
+        type: this.data.type ? parseInt(this.data.type) : '',
+        team: this.data.team
       };
-      // 这里模拟请求，实际需要替换为真实接口
-      // let res = await app.sendRequest('post', '/report/selectReportList', { data });
-      // if (res.status == 200) {
-      //   this.setData({
-      //     reportList: this.data.current === 1 ? res.data.data : [...this.data.reportList, ...res.data.data]
-      //   });
-      // }
       
-      // 模拟数据 - 合并日报和周报数据
-      setTimeout(() => {
-        // 日报数据
-        const dailyData = [
-            { id: 1, type: 'daily', date: '2024-01-20', content: '完成园区巡检工作，处理了3处问题', submitter: '张三', displayDate: '2024-01-20' },
-            { id: 2, type: 'daily', date: '2024-01-19', content: '完成草坪修剪，施肥工作', submitter: '李四', displayDate: '2024-01-19' },
-            { id: 3, type: 'daily', date: '2024-01-18', content: '完成园区垃圾清理和消毒工作', submitter: '王五', displayDate: '2024-01-18' },
-            { id: 5, type: 'daily', date: '2024-01-17', content: '完成了前端页面的开发和样式调整', submitter: '张三', displayDate: '2024-01-17' }
-          ];
+      // 对接获取工作报表列表接口
+      let res = await app.sendRequest('get', '/t-work-report/page', data );
+      
+      if (res.status == 200) {
+        // 格式化返回的数据
+        const formattedData = res.data.data.map(item => {
+          // 构建显示日期
+          let displayDate = item.workStartTime;
+          if (item.workEndTime && item.workStartTime !== item.workEndTime) {
+            displayDate = `${item.workStartTime}至${item.workEndTime}`;
+          }
           
-          // 模拟周报数据
-          const weeklyData = [
-            { id: 4, type: 'weekly', dateRange: '2024-01-15至2024-01-21', content: '本周完成了园区绿化维护工作', submitter: '张三', displayDate: '2024-01-15至2024-01-21' },
-            { id: 5, type: 'weekly', dateRange: '2024-01-08至2024-01-14', content: '完成了园区设备检查和维护', submitter: '李四', displayDate: '2024-01-08至2024-01-14' },
-            { id: 6, type: 'weekly', dateRange: '2024-01-01至2024-01-07', content: '进行了系统测试和Bug修复，优化了性能', submitter: '赵六', displayDate: '2024-01-01至2024-01-07' }
-          ];
-        
-        // 合并数据
-        let mockData = [...dailyData, ...weeklyData];
-        
-        // 格式化数据
-        mockData = mockData.map(item => {
-          if (item.type === 'daily') {
-            return {
-              ...item,
-              title: this.formatDailyTitle(item.date),
-              displayDate: item.date
-            };
-          } else {
-            const weekInfo = this.formatWeeklyInfo(item.dateRange);
-            return {
-              ...item,
-              title: weekInfo.title,
-              displayDate: weekInfo.dateRange
-            };
+          // 格式化标题（如果没有标题）
+          let title = item.title;
+          if (!title) {
+            const typeText = item.type === 1 ? '日报' : item.type === 2 ? '周报' : '月报';
+            title = `${displayDate}${typeText}`;
           }
+          
+          return {
+            ...item,
+            title: title,
+            displayDate: displayDate,
+            // 构建内容摘要（从工作内容中提取）
+            content: this.buildContentSummary(item.workContent)
+          };
         });
         
         // 按时间降序排序
-        mockData.sort((a, b) => {
-          const dateA = new Date(a.date || a.dateRange.split('至')[0]);
-          const dateB = new Date(b.date || b.dateRange.split('至')[0]);
-          return dateB - dateA;
+        formattedData.sort((a, b) => {
+          return new Date(b.workStartTime) - new Date(a.workStartTime);
         });
         
-        // 应用筛选条件
+        this.setData({
+          reportList: this.data.current === 1 ? formattedData : [...this.data.reportList, ...formattedData]
+        });
+      }
+    } catch (error) {
+      console.log('获取报表列表失败', error);
+      
+      // 错误时使用模拟数据
+      setTimeout(() => {
+        // 模拟数据 - 包含日报、周报、月报
+        const mockData = [
+          { id: 1, type: '1', workStartTime: '2024-01-20', workEndTime: '2024-01-20', team: '绿化一组', submitter: '张三', workContent: [{content: '完成园区巡检工作', location: '东区', completion: '已完成'}] },
+          { id: 2, type: '2', workStartTime: '2024-01-15', workEndTime: '2024-01-21', team: '绿化二组', submitter: '李四', workContent: [{content: '完成草坪修剪', location: '西区', completion: '已完成'}, {content: '施肥工作', location: '全园区', completion: '已完成'}] },
+          { id: 3, type: '3', workStartTime: '2024-01-01', workEndTime: '2024-01-31', team: '绿化三组', submitter: '王五', workContent: [{content: '完成月度养护计划', location: '全园区', completion: '进行中'}] },
+          { id: 4, type: '1', workStartTime: '2024-01-19', workEndTime: '2024-01-19', team: '绿化一组', submitter: '张三', workContent: [{content: '园区垃圾清理', location: '全园区', completion: '已完成'}] },
+          { id: 5, type: '2', workStartTime: '2024-01-08', workEndTime: '2024-01-14', team: '绿化二组', submitter: '李四', workContent: [{content: '设备检查', location: '全园区', completion: '已完成'}] },
+          { id: 6, type: '3', workStartTime: '2023-12-01', workEndTime: '2023-12-31', team: '绿化三组', submitter: '赵六', workContent: [{content: '冬季防寒工作', location: '全园区', completion: '已完成'}] }
+        ];
+        
+        // 根据筛选条件过滤数据
+        let filteredData = mockData;
+        
+        if (this.data.type) {
+          filteredData = filteredData.filter(item => item.type === this.data.type);
+        }
+        
         if (this.data.startTime) {
-          mockData = mockData.filter(item => {
-            const itemDate = new Date(item.date || item.dateRange.split('至')[0]);
-            return itemDate >= new Date(this.data.startTime);
-          });
+          filteredData = filteredData.filter(item => new Date(item.workStartTime) >= new Date(this.data.startTime));
         }
         
         if (this.data.endTime) {
-          mockData = mockData.filter(item => {
-            const itemDate = new Date(item.date || item.dateRange.split('至')[1]);
-            return itemDate <= new Date(this.data.endTime);
-          });
+          filteredData = filteredData.filter(item => new Date(item.workEndTime) <= new Date(this.data.endTime));
         }
         
         if (this.data.submitter) {
-          mockData = mockData.filter(item => item.submitter === this.data.submitter);
+          filteredData = filteredData.filter(item => item.submitter === this.data.submitter);
         }
         
+        if (this.data.team) {
+          filteredData = filteredData.filter(item => item.team === this.data.team);
+        }
+        
+        // 格式化数据
+        const formattedData = filteredData.map(item => {
+          let displayDate = item.workStartTime;
+          if (item.workEndTime && item.workStartTime !== item.workEndTime) {
+            displayDate = `${item.workStartTime}至${item.workEndTime}`;
+          }
+          
+          const typeText = item.type === '1' ? '日报' : item.type === '2' ? '周报' : '月报';
+          
+          return {
+            ...item,
+            title: `${displayDate}${typeText}`,
+            displayDate: displayDate,
+            content: this.buildContentSummary(item.workContent)
+          };
+        });
+        
         this.setData({
-          reportList: mockData,
+          reportList: formattedData,
           isLoading: false
         });
       }, 500);
-    } catch (error) {
-      console.log('获取报表列表失败', error);
+    } finally {
       this.setData({ isLoading: false });
     }
   },
+  
+  // 构建内容摘要
+  buildContentSummary(workContent) {
+    try {
+      // 尝试解析JSON字符串
+      let contentArray = typeof workContent === 'string' ? JSON.parse(workContent) : workContent;
+      
+      if (!Array.isArray(contentArray) || contentArray.length === 0) {
+        return '';
+      }
+      
+      // 提取前两个工作内容的摘要
+      const summaries = contentArray.slice(0, 2).map(item => item.content || '').filter(Boolean);
+      
+      if (summaries.length === 0) {
+        return '';
+      }
+      
+      let result = summaries.join('；');
+      // 如果内容太长，进行截断
+      if (result.length > 50) {
+        result = result.substring(0, 50) + '...';
+      }
+      // 如果有更多工作内容，添加提示
+      if (contentArray.length > summaries.length) {
+        result += ` 等${contentArray.length}项工作`;
+      }
+      
+      return result;
+    } catch (error) {
+      console.log('解析工作内容失败', error);
+      return '';
+    }
+        
+    //     this.setData({
+    //       reportList: mockData,
+    //       isLoading: false
+    //     });
+    //   }, 500);
+    // } catch (error) {
+    //   console.log('获取报表列表失败', error);
+    //   this.setData({ isLoading: false });
+    // }
+  },
 
   // 去详情
   goDetail(e) {
     let id = e.currentTarget.dataset.id;
-    let type = e.currentTarget.dataset.type === 'daily' ? 0 : 1;
+    let type = e.currentTarget.dataset.type;
+    wx.navigateTo({
+      url: `../createReport/createReport?id=${id}&type=${type}&view=true`
+    });
+  },
+  
+  // 编辑报表
+  editReport(e) {
+    let id = e.currentTarget.dataset.id;
     wx.navigateTo({
-      url: `../createReport/createReport?id=${id}&type=${type}`
+      url: `../createReport/createReport?id=${id}&edit=true`
+    });
+  },
+  
+  // 删除报表
+  deleteReport(e) {
+    const id = e.currentTarget.dataset.id;
+    wx.showModal({
+      title: '确认删除',
+      content: '确定要删除该工作报表吗？',
+      success: async (res) => {
+        if (res.confirm) {
+          try {
+            wx.showLoading({ title: '删除中...' });
+            // 调用删除接口
+            const deleteRes = await app.sendRequest('delete', `/t-work-report/${id}`, {});
+            
+            if (deleteRes.status == 200) {
+              wx.showToast({ title: '删除成功' });
+              // 重新加载列表
+              this.setData({ current: 1, reportList: [] });
+              this.getReportList();
+            } else {
+              wx.showToast({ title: '删除失败', icon: 'none' });
+            }
+          } catch (error) {
+            console.log('删除报表失败', error);
+            wx.showToast({ title: '删除失败', icon: 'none' });
+          } finally {
+            wx.hideLoading();
+          }
+        }
+      }
     });
   },
 
@@ -213,6 +353,13 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
+    // 如果从其他页面传入了类型参数，设置筛选条件
+    if (options.type) {
+      this.setData({
+        type: options.type,
+        filterType: options.type
+      });
+    }
     this.getReportList();
   },
 

wxproject/packageA/pages/dailyWeeklyReport/dailyWeeklyReport.json

@@ -1,3 +1,3 @@
 {
-  "navigationBarTitleText": "日周报记录"
+  "navigationBarTitleText": "工作报表记录"
 }

wxproject/packageA/pages/dailyWeeklyReport/dailyWeeklyReport.wxml

@@ -1,18 +1,33 @@
 <view class="dailyWeeklyReport">
+  <!-- 顶部筛选栏 -->
+  <view class="filter-buttons">
+    <view class="filter-button {{filterType === '' ? 'active' : ''}}" bindtap="setFilterType" data-type="">全部</view>
+    <view class="filter-button {{filterType === '1' ? 'active' : ''}}" bindtap="setFilterType" data-type="1">日报</view>
+    <view class="filter-button {{filterType === '2' ? 'active' : ''}}" bindtap="setFilterType" data-type="2">周报</view>
+    <view class="filter-button {{filterType === '3' ? 'active' : ''}}" bindtap="setFilterType" data-type="3">月报</view>
+  </view>
+  
   <!-- 列表容器 -->
   <view class="list-container">
-    <scroll-view scroll-y scroll-top="{{scrollY}}" lower-threshold="50" bindscrolltolower="scrollToLower" style="height: 85vh;">
+    <scroll-view scroll-y scroll-top="{{scrollY}}" lower-threshold="50" bindscrolltolower="scrollToLower" style="height: calc(100vh - 120rpx);">
       <block wx:if="{{reportList.length > 0}}">
         <block wx:for="{{reportList}}" wx:key="id">
-          <view class="list-item" bind:tap="goDetail" data-id="{{item.id}}" data-type="{{item.type}}">
-            <view class="item-header">
-              <view class="item-title">{{item.title}}</view>
-              <view class="report-type {{item.type=='daily'?'daily-type':'weekly-type'}}">{{item.type=='daily'?'日报':'周报'}}</view>
-            </view>
-            <view class="item-date">{{item.displayDate}}</view>
-            <view class="item-submitter">提交人：{{item.submitter}}</view>
-            <view class="item-content">{{item.content}}</view>
-          </view>
+          <view class="list-item">
+      <view class="item-main" bind:tap="goDetail" data-id="{{item.id}}" data-type="{{item.type}}">
+        <view class="item-header">
+          <view class="item-title">{{item.title || '工作报表'}}</view>
+          <view class="report-type {{item.type=='1'?'daily-type':item.type=='2'?'weekly-type':'monthly-type'}}">{{item.type=='1'?'日报':item.type=='2'?'周报':'月报'}}</view>
+        </view>
+        <view class="item-date">{{item.displayDate}}</view>
+        <view class="item-submitter">提交人：{{item.submitter}}</view>
+        <view class="item-team" wx:if="{{item.team}}">管养班组：{{item.team}}</view>
+        <view class="item-content">{{item.content}}</view>
+      </view>
+      <view class="item-actions">
+        <view class="action-btn edit-btn" bindtap="editReport" data-id="{{item.id}}">编辑</view>
+        <view class="action-btn delete-btn" bindtap="deleteReport" data-id="{{item.id}}">删除</view>
+      </view>
+    </view>
         </block>
       </block>
       <view wx:else class="empty-tip">暂无数据</view>
@@ -30,6 +45,27 @@
         <image src="../../../images/weatherImg/close.png"></image>
       </view>
       
+      <!-- 报表类型 -->
+      <view class="scaling_itme">
+        <view class="scaling_itme_left">报表类型：</view>
+        <view class="scaling_itme_right type-select">
+          <radio-group bindchange="bindTypeChange">
+            <label>
+              <radio value="" checked="{{type === ''}}" />全部
+            </label>
+            <label>
+              <radio value="1" checked="{{type === '1'}}" />日报
+            </label>
+            <label>
+              <radio value="2" checked="{{type === '2'}}" />周报
+            </label>
+            <label>
+              <radio value="3" checked="{{type === '3'}}" />月报
+            </label>
+          </radio-group>
+        </view>
+      </view>
+      
       <!-- 开始时间 -->
       <view class="scaling_itme">
         <view class="scaling_itme_left">开始时间：</view>
@@ -54,6 +90,14 @@
         </picker>
       </view>
       
+      <!-- 管养班组 -->
+      <view class="scaling_itme">
+        <view class="scaling_itme_left">管养班组：</view>
+        <picker class="scaling_itme_right" bindchange="bindTeamChange" value="{{teamList.indexOf(team)}}" range="{{teamList}}">
+          <view>{{team || "请选择管养班组"}}</view>
+        </picker>
+      </view>
+      
       <view class="scaling_fooder">
         <view class="scaling_fooder_left" bind:tap="qxScaling">重置</view>
         <view class="scaling_fooder_right" bind:tap="qdScaling">确定</view>

wxproject/packageA/pages/dailyWeeklyReport/dailyWeeklyReport.wxss

@@ -35,6 +35,37 @@
 }
 
 /* 列表容器 */
+/* 按钮形式筛选栏 */
+.filter-buttons {
+  display: flex;
+  padding: 20rpx;
+  background: #fff;
+  justify-content: flex-start;
+  gap: 16rpx;
+  border-bottom: 1rpx solid #eee;
+  
+}
+
+.filter-button {
+  padding: 12rpx 32rpx;
+  background: #f7f7f7;
+  color: #666;
+  font-size: 28rpx;
+  border-radius: 20rpx;
+  text-align: center;
+  transition: all 0.3s;
+}
+
+.filter-button.active {
+  background: #1aad19;
+  color: #fff;
+  font-weight: bold;
+}
+
+.filter-button:active {
+  opacity: 0.8;
+}
+
 .list-container {
   background-color: #f5f5f5;
   padding: 20rpx;
@@ -47,6 +78,39 @@
   padding: 30rpx;
   margin-bottom: 20rpx;
   box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+  position: relative;
+}
+
+.item-main {
+  padding-right: 160rpx;
+}
+
+.item-actions {
+  position: absolute;
+  right: 20rpx;
+  top: 50%;
+  transform: translateY(-50%);
+  display: flex;
+  flex-direction: column;
+  gap: 16rpx;
+}
+
+.action-btn {
+  padding: 12rpx 24rpx;
+  font-size: 26rpx;
+  border-radius: 16rpx;
+  text-align: center;
+  min-width: 80rpx;
+}
+
+.edit-btn {
+  background: #e6f7ff;
+  color: #1890ff;
+}
+
+.delete-btn {
+  background: #fff1f0;
+  color: #ff4d4f;
 }
 
 .item-header {
@@ -60,6 +124,32 @@
   font-size: 34rpx;
   font-weight: bold;
   color: #333;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.item-type {
+  font-size: 24rpx;
+  padding: 4rpx 16rpx;
+  border-radius: 16rpx;
+  margin-left: 12rpx;
+  display: inline-block;
+}
+
+.type-daily {
+  background: #e6f7ff;
+  color: #1890ff;
+}
+
+.type-weekly {
+  background: #f6ffed;
+  color: #52c41a;
+}
+
+.type-monthly {
+  background: #fff7e6;
+  color: #fa8c16;
 }
 
 .item-date {
@@ -264,6 +354,26 @@
   align-items: center;
   padding: 0 20rpx;
 }
+
+/* 类型选择样式 */
+.radio-group {
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 10rpx;
+}
+
+.radio-item {
+  display: flex;
+  align-items: center;
+  margin-right: 40rpx;
+  margin-bottom: 20rpx;
+}
+
+.radio-item text {
+  margin-left: 8rpx;
+  font-size: 28rpx;
+  color: #333;
+}
 .scaling_itme_left {
   flex: 2;
   display: flex;