|
|
@@ -205,15 +205,77 @@
|
|
|
<view class="fab-button" @click="handleAdd">
|
|
|
<u-icon name="plus" size="24" color="#ffffff" />
|
|
|
</view>
|
|
|
+
|
|
|
+ <!-- 查看检查弹窗 -->
|
|
|
+ <u-popup
|
|
|
+ :show="showViewPopup"
|
|
|
+ mode="bottom"
|
|
|
+ :round="20"
|
|
|
+ closeable
|
|
|
+ :safe-area-inset-bottom="true"
|
|
|
+ @close="handleViewPopupClose"
|
|
|
+ >
|
|
|
+ <view class="popup-container">
|
|
|
+ <view class="popup-header">
|
|
|
+ <text class="popup-title">
|
|
|
+ {{ currentViewItem ? currentViewItem.roomName : '' }} - 查看检查
|
|
|
+ </text>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <scroll-view scroll-y class="popup-scroll" :style="{ height: popupHeight + 'px' }">
|
|
|
+ <SingleRoomCheck
|
|
|
+ v-if="showViewPopup && currentViewItem"
|
|
|
+ :room-info="currentViewRoomInfo"
|
|
|
+ :check-info="currentViewCheckInfo"
|
|
|
+ :existing-data="currentViewData"
|
|
|
+ :is-view-mode="true"
|
|
|
+ @cancel="handleViewPopupClose"
|
|
|
+ />
|
|
|
+ </scroll-view>
|
|
|
+ </view>
|
|
|
+ </u-popup>
|
|
|
+
|
|
|
+ <!-- 修改检查弹窗 -->
|
|
|
+ <u-popup
|
|
|
+ :show="showEditPopup"
|
|
|
+ mode="bottom"
|
|
|
+ :round="20"
|
|
|
+ closeable
|
|
|
+ :safe-area-inset-bottom="true"
|
|
|
+ @close="handleEditPopupClose"
|
|
|
+ >
|
|
|
+ <view class="popup-container">
|
|
|
+ <view class="popup-header">
|
|
|
+ <text class="popup-title">
|
|
|
+ {{ currentEditItem ? currentEditItem.roomName : '' }} - 修改检查
|
|
|
+ </text>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <scroll-view scroll-y class="popup-scroll" :style="{ height: popupHeight + 'px' }">
|
|
|
+ <SingleRoomCheck
|
|
|
+ v-if="showEditPopup && currentEditItem"
|
|
|
+ :room-info="currentRoomInfo"
|
|
|
+ :check-info="currentCheckInfo"
|
|
|
+ :existing-data="currentEditData"
|
|
|
+ @submit="handleEditSubmit"
|
|
|
+ @cancel="handleEditPopupClose"
|
|
|
+ />
|
|
|
+ </scroll-view>
|
|
|
+ </view>
|
|
|
+ </u-popup>
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
import { request } from '@/common/request.js';
|
|
|
import { getDict, getDictLabel, getDictTagType } from '@/common/dict.js';
|
|
|
+import SingleRoomCheck from './components/SingleRoomCheck.vue';
|
|
|
|
|
|
export default {
|
|
|
name: 'DormHygieneCheck',
|
|
|
+ components: {
|
|
|
+ SingleRoomCheck,
|
|
|
+ },
|
|
|
data() {
|
|
|
return {
|
|
|
loading: false,
|
|
|
@@ -236,6 +298,21 @@ export default {
|
|
|
xg_dorm_hygiene_check_type: [],
|
|
|
xg_dorm_hygiene_check_level: [],
|
|
|
xg_dorm_hygiene_grade: [],
|
|
|
+
|
|
|
+ // 修改弹窗相关
|
|
|
+ showEditPopup: false,
|
|
|
+ currentEditItem: null,
|
|
|
+ currentEditData: null,
|
|
|
+ currentRoomInfo: null,
|
|
|
+ currentCheckInfo: null,
|
|
|
+ popupHeight: 600,
|
|
|
+
|
|
|
+ // 查看弹窗相关
|
|
|
+ showViewPopup: false,
|
|
|
+ currentViewItem: null,
|
|
|
+ currentViewData: null,
|
|
|
+ currentViewRoomInfo: null,
|
|
|
+ currentViewCheckInfo: null,
|
|
|
};
|
|
|
},
|
|
|
|
|
|
@@ -254,6 +331,12 @@ export default {
|
|
|
uni.$on('refreshCheckList', this.handleRefreshEvent);
|
|
|
},
|
|
|
|
|
|
+ onReady() {
|
|
|
+ // 计算弹窗高度（屏幕高度的70%）
|
|
|
+ const systemInfo = uni.getSystemInfoSync();
|
|
|
+ this.popupHeight = systemInfo.windowHeight * 0.7;
|
|
|
+ },
|
|
|
+
|
|
|
beforeDestroy() {
|
|
|
// 移除事件监听
|
|
|
uni.$off('refreshCheckList', this.handleRefreshEvent);
|
|
|
@@ -455,17 +538,157 @@ export default {
|
|
|
},
|
|
|
|
|
|
// 查看检查
|
|
|
- handleView(item) {
|
|
|
- uni.navigateTo({
|
|
|
- url: `/pages/xgss/wsjc/wsjcDetail?id=${item.id}&type=view`,
|
|
|
- });
|
|
|
+ async handleView(item) {
|
|
|
+ try {
|
|
|
+ uni.showLoading({ title: '加载中...' });
|
|
|
+
|
|
|
+ // 加载检查记录详情
|
|
|
+ const res = await request({
|
|
|
+ url: `/dormHygieneCheck/dormHygieneCheck/${item.id}`,
|
|
|
+ method: 'GET',
|
|
|
+ });
|
|
|
+
|
|
|
+ uni.hideLoading();
|
|
|
+
|
|
|
+ if (res && res.code === 200 && res.data) {
|
|
|
+ this.currentViewItem = item;
|
|
|
+ this.currentViewData = res.data;
|
|
|
+
|
|
|
+ // 构造房间信息
|
|
|
+ this.currentViewRoomInfo = {
|
|
|
+ id: item.roomId,
|
|
|
+ roomName: item.roomName,
|
|
|
+ roomCode: item.roomCode,
|
|
|
+ campusId: item.campusId,
|
|
|
+ campusName: item.campusName,
|
|
|
+ areaId: item.areaId,
|
|
|
+ areaName: item.areaName,
|
|
|
+ buildingId: item.buildingId,
|
|
|
+ buildingName: item.buildingName,
|
|
|
+ };
|
|
|
+
|
|
|
+ // 构造检查基础信息
|
|
|
+ this.currentViewCheckInfo = {
|
|
|
+ checkTitle: item.checkTitle,
|
|
|
+ checkDate: item.checkDate,
|
|
|
+ checkerId: item.checkerId,
|
|
|
+ checkerName: item.checkerName,
|
|
|
+ checkType: item.checkType,
|
|
|
+ checkLevel: item.checkLevel,
|
|
|
+ campusId: item.campusId,
|
|
|
+ campusName: item.campusName,
|
|
|
+ buildingId: item.buildingId,
|
|
|
+ buildingName: item.buildingName,
|
|
|
+ };
|
|
|
+
|
|
|
+ this.showViewPopup = true;
|
|
|
+ } else {
|
|
|
+ uni.showToast({
|
|
|
+ title: res?.msg || '加载失败',
|
|
|
+ icon: 'none',
|
|
|
+ });
|
|
|
+ }
|
|
|
+ } catch (error) {
|
|
|
+ uni.hideLoading();
|
|
|
+ console.error('❌ 加载检查记录失败:', error);
|
|
|
+ uni.showToast({
|
|
|
+ title: '加载失败',
|
|
|
+ icon: 'none',
|
|
|
+ });
|
|
|
+ }
|
|
|
},
|
|
|
|
|
|
// 修改检查
|
|
|
- handleUpdate(item) {
|
|
|
- uni.navigateTo({
|
|
|
- url: `/pages/xgss/wsjc/wsjcAdd?id=${item.id}&type=update`,
|
|
|
+ async handleUpdate(item) {
|
|
|
+ try {
|
|
|
+ uni.showLoading({ title: '加载中...' });
|
|
|
+
|
|
|
+ // 加载检查记录详情
|
|
|
+ const res = await request({
|
|
|
+ url: `/dormHygieneCheck/dormHygieneCheck/${item.id}`,
|
|
|
+ method: 'GET',
|
|
|
+ });
|
|
|
+
|
|
|
+ uni.hideLoading();
|
|
|
+
|
|
|
+ if (res && res.code === 200 && res.data) {
|
|
|
+ this.currentEditItem = item;
|
|
|
+ this.currentEditData = res.data;
|
|
|
+
|
|
|
+ // 构造房间信息
|
|
|
+ this.currentRoomInfo = {
|
|
|
+ id: item.roomId,
|
|
|
+ roomName: item.roomName,
|
|
|
+ roomCode: item.roomCode,
|
|
|
+ campusId: item.campusId,
|
|
|
+ campusName: item.campusName,
|
|
|
+ areaId: item.areaId,
|
|
|
+ areaName: item.areaName,
|
|
|
+ buildingId: item.buildingId,
|
|
|
+ buildingName: item.buildingName,
|
|
|
+ };
|
|
|
+
|
|
|
+ // 构造检查基础信息
|
|
|
+ this.currentCheckInfo = {
|
|
|
+ checkTitle: item.checkTitle,
|
|
|
+ checkDate: item.checkDate,
|
|
|
+ checkerId: item.checkerId,
|
|
|
+ checkerName: item.checkerName,
|
|
|
+ checkType: item.checkType,
|
|
|
+ checkLevel: item.checkLevel,
|
|
|
+ campusId: item.campusId,
|
|
|
+ campusName: item.campusName,
|
|
|
+ buildingId: item.buildingId,
|
|
|
+ buildingName: item.buildingName,
|
|
|
+ };
|
|
|
+
|
|
|
+ this.showEditPopup = true;
|
|
|
+ } else {
|
|
|
+ uni.showToast({
|
|
|
+ title: res?.msg || '加载失败',
|
|
|
+ icon: 'none',
|
|
|
+ });
|
|
|
+ }
|
|
|
+ } catch (error) {
|
|
|
+ uni.hideLoading();
|
|
|
+ console.error('❌ 加载检查记录失败:', error);
|
|
|
+ uni.showToast({
|
|
|
+ title: '加载失败',
|
|
|
+ icon: 'none',
|
|
|
+ });
|
|
|
+ }
|
|
|
+ },
|
|
|
+
|
|
|
+ // 修改检查提交处理
|
|
|
+ handleEditSubmit(data) {
|
|
|
+ uni.showToast({
|
|
|
+ title: '修改成功',
|
|
|
+ icon: 'success',
|
|
|
});
|
|
|
+
|
|
|
+ // 关闭弹窗
|
|
|
+ this.handleEditPopupClose();
|
|
|
+
|
|
|
+ // 刷新列表
|
|
|
+ this.loadCheckList();
|
|
|
+ },
|
|
|
+
|
|
|
+ // 修改检查弹窗关闭处理
|
|
|
+ handleEditPopupClose() {
|
|
|
+ this.showEditPopup = false;
|
|
|
+ this.currentEditItem = null;
|
|
|
+ this.currentEditData = null;
|
|
|
+ this.currentRoomInfo = null;
|
|
|
+ this.currentCheckInfo = null;
|
|
|
+ },
|
|
|
+
|
|
|
+ // 查看检查弹窗关闭处理
|
|
|
+ handleViewPopupClose() {
|
|
|
+ this.showViewPopup = false;
|
|
|
+ this.currentViewItem = null;
|
|
|
+ this.currentViewData = null;
|
|
|
+ this.currentViewRoomInfo = null;
|
|
|
+ this.currentViewCheckInfo = null;
|
|
|
},
|
|
|
|
|
|
// 删除检查
|
|
|
@@ -858,4 +1081,25 @@ export default {
|
|
|
::v-deep .u-button {
|
|
|
border-radius: 8rpx;
|
|
|
}
|
|
|
+
|
|
|
+// 修改弹窗样式
|
|
|
+.popup-container {
|
|
|
+ background-color: #fff;
|
|
|
+ border-radius: 20rpx 20rpx 0 0;
|
|
|
+}
|
|
|
+
|
|
|
+.popup-header {
|
|
|
+ padding: 30rpx;
|
|
|
+ border-bottom: 2rpx solid #f0f0f0;
|
|
|
+}
|
|
|
+
|
|
|
+.popup-title {
|
|
|
+ font-size: 32rpx;
|
|
|
+ font-weight: 600;
|
|
|
+ color: #303133;
|
|
|
+}
|
|
|
+
|
|
|
+.popup-scroll {
|
|
|
+ overflow-y: auto;
|
|
|
+}
|
|
|
</style>
|
