设备保养真机测试，bug修改

gaoluyang

2 天以前 0f34d97b5c0c559b3d132bf1171de43a5ea9a596

 src/pages/equipmentManagement/upkeep/index.vue

@@ -1,18 +1,18 @@
<template>
  <view class="device-upkeep">
  <view class="sales-account">
    <!-- 使用通用页面头部组件 -->
    <PageHeader title="设备保养" @back="goBack" />
    
    <!-- 搜索区域 -->
    <view class="search-filter-section">
    <view class="search-section">
      <view class="search-bar">
        <view class="search-input">
          <input
          <up-input
            class="search-text"
            placeholder="请输入设备名称"
            placeholder="请输入设备名称搜索"
            v-model="searchKeyword"
            confirm-type="search"
            @confirm="getList"
            @change="getList"
            clearable
          />
        </view>
        <view class="filter-button" @click="getList">
@@ -22,9 +22,9 @@
    </view>
    
    <!-- 设备保养列表 -->
    <view class="upkeep-list" v-if="upkeepList.length > 0">
    <view class="ledger-list" v-if="upkeepList.length > 0">
      <view v-for="(item, index) in upkeepList" :key="index">
        <view class="upkeep-item" @click="toggleSelection(item)">
        <view class="ledger-item" @click="toggleSelection(item)">
          <view class="item-header">
            <view class="item-left">
              <view class="document-icon">
@@ -33,8 +33,8 @@
              <text class="item-id">设备名称：{{ item.deviceName }}</text>
            </view>
            <view class="status-tag">
              <van-tag v-if="item.status === 1" type="success">完结</van-tag>
              <van-tag v-if="item.status === 0" type="danger">待保养</van-tag>
              <u-tag v-if="item.status === 1" type="success">完结</u-tag>
              <u-tag v-if="item.status === 0" type="error">待保养</u-tag>
            </view>
          </view>
          <up-divider></up-divider>
@@ -67,28 +67,29 @@
            <view class="detail-row">
              <text class="detail-label">保养结果</text>
              <view class="detail-value">
                <van-tag v-if="item.maintenanceResult === 1" type="success">
                  完好
                </van-tag>
                <van-tag v-if="item.maintenanceResult === 0" type="danger">
                  维修
                </van-tag>
                <text v-if="item.maintenanceResult === undefined || item.maintenanceResult === null">-</text>
              </view>
              <u-tag v-if="item.maintenanceResult === 1" type="success">
                完好
              </u-tag>
              <u-tag v-if="item.maintenanceResult === 0" type="error">
                维修
              </u-tag>
              <text v-if="item.maintenanceResult === undefined || item.maintenanceResult === null">-</text>
            </view>
            </view>
          </view>
          
          <!-- 按钮区域 -->
          <view class="action-buttons">
            <van-button
            <u-button
              type="primary"
              size="small"
              class="action-btn"
              :disabled="item.status === 1"
              @click.stop="edit(item.id)"
            >
              编辑
            </van-button>
            <van-button
            </u-button>
            <u-button
              type="warning"
              size="small"
              class="action-btn"
@@ -96,16 +97,16 @@
              @click.stop="addMaintain(item.id)"
            >
              保养
            </van-button>
            <van-button
              type="danger"
            </u-button>
            <u-button
              type="error"
              size="small"
              plain
              class="action-btn"
              @click.stop="delUpkeepByIds(item.id)"
            >
              删除
            </van-button>
            </u-button>
          </view>
        </view>
      </view>
@@ -115,12 +116,10 @@
      <text>暂无设备保养数据</text>
    </view>
    
    <!-- 浮动气泡按钮 -->
    <van-floating-bubble
      axis="xy"
      icon="plus"
      @click="addPlan"
    />
    <!-- 浮动新增按钮 -->
    <view class="fab-button" @click="addPlan">
      <up-icon name="plus" size="24" color="#ffffff"></up-icon>
    </view>
  </view>
</template>

@@ -130,7 +129,13 @@
import PageHeader from '@/components/PageHeader.vue'
import { getUpkeepPage, delUpkeep } from '@/api/equipmentManagement/upkeep'
import useUserStore from "@/store/modules/user"
import { showToast } from 'vant';
// 显示提示信息
const showToast = (message) => {
  uni.showToast({
    title: message,
    icon: 'none'
  })
};
import dayjs from "dayjs"

const userStore = useUserStore()
@@ -163,6 +168,7 @@

// 查询列表
const getList = () => {
  showLoadingToast('加载中...')
  const params = {
    current: -1,
    size: -1,
@@ -172,11 +178,26 @@
    .then((res) => {
      // 如果res.data不是数组，设置为空数组
      upkeepList.value = res.records || res.data?.records || []
      closeToast()
    })
    .catch(() => {
      closeToast()
      showToast('获取数据失败')
    })
}

// 显示加载提示
const showLoadingToast = (message) => {
  uni.showLoading({
    title: message,
    mask: true
  });
};

// 关闭提示
const closeToast = () => {
  uni.hideLoading();
};

// 切换选择状态
const toggleSelection = (item) => {
@@ -200,8 +221,10 @@
    return
  }
  const targetId = id || multipleList.value[0].id
  // 使用本地存储传递id
  uni.setStorageSync('repairId', targetId)
  uni.navigateTo({
    url: `/pages/equipmentManagement/upkeep/maintain?id=${targetId}`
    url: '/pages/equipmentManagement/upkeep/maintain'
  })
}

@@ -215,8 +238,10 @@
// 编辑 - 跳转到add页面，通过id区分新增还是编辑
const edit = (id) => {
  if (!id) return
  // 使用本地存储传递id
  uni.setStorageSync('repairId', id)
  uni.navigateTo({
    url: `/pages/equipmentManagement/upkeep/add?id=${id}`
    url: '/pages/equipmentManagement/upkeep/add'
  })
}

@@ -264,58 +289,11 @@
</script>

<style scoped lang="scss">
.u-divider {
  margin: 0 !important;
}
@import '@/styles/sales-common.scss';

.device-upkeep {
  min-height: 100vh;
  background: #f8f9fa;
  position: relative;
  padding-bottom: 80px;
}

.search-filter-section {
  padding: 10px 20px;
  background: #ffffff;
}

.search-bar {
  display: flex;
  align-items: center;
  gap: 12px;
}

.search-input {
  flex: 1;
  background: #f5f5f5;
  border-radius: 24px;
  padding: 10px 16px;
  display: flex;
  align-items: center;
  gap: 8px;
}

.search-text {
  flex: 1;
  font-size: 14px;
  color: #333;
  background: transparent;
  border: none;
  outline: none;
}

.search-text::placeholder {
  color: #999;
}

.filter-button {
  width: 40px;
  height: 40px;
  border-radius: 8px;
  display: flex;
  align-items: center;
  justify-content: center;
// 设备保养特有样式
.sales-account {
  padding-bottom: 80px; // 为浮动按钮留出空间
}

.action-section {
@@ -324,36 +302,9 @@
  border-bottom: 1px solid #f0f0f0;
}

.action-buttons {
  display: flex;
  gap: 8px;
.action-section .action-buttons {
  gap: 8px; // 与公共样式中的 12px 不同
  justify-content: flex-start;
}

.upkeep-list {
  padding: 20px;
}

.upkeep-item {
  background: #ffffff;
  border-radius: 12px;
  margin-bottom: 16px;
  overflow: hidden;
  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
  padding: 0 16px;
}

.item-header {
  padding: 16px 0;
  display: flex;
  align-items: center;
  justify-content: space-between;
}

.item-left {
  display: flex;
  align-items: center;
  gap: 8px;
}

.checkbox-wrapper {
@@ -361,78 +312,22 @@
  align-items: center;
}

.document-icon {
  width: 24px;
  height: 24px;
  background: #2979ff;
  border-radius: 4px;
  display: flex;
  align-items: center;
  justify-content: center;
}

.item-id {
  font-size: 14px;
  color: #333;
  font-weight: 500;
}

.status-tag {
  display: flex;
  align-items: center;
}

.item-details {
  padding: 16px 0;
}

.detail-row {
  display: flex;
  align-items: flex-end;
  justify-content: space-between;
  margin-bottom: 8px;
  
  &:last-child {
    margin-bottom: 0;
  }
}

.detail-label {
  font-size: 12px;
  color: #777777;
  min-width: 80px;
  min-width: 80px; // 与公共样式中的 60px 不同
}

.detail-value {
  font-size: 12px;
  color: #000000;
  text-align: right;
  flex: 1;
  margin-left: 16px;
  display: flex;
  justify-content: flex-end;
  align-items: center;
}

.detail-value.highlight {
  color: #2979ff;
  font-weight: 500;
}

.no-data {
  padding: 40px 0;
  text-align: center;
  color: #999;
}

.upkeep-item .action-buttons {
  display: flex;
  gap: 8px;
  padding: 0 0 16px 0;
  justify-content: space-between;
}

.action-btn {
  flex: 1;
.ledger-item .action-buttons {
  gap: 8px; // 与公共样式中的 12px 不同
}
</style>