From 952240909a036a341300ec25a2259e6faed33362 Mon Sep 17 00:00:00 2001 From: gaoluyang <2820782392@qq.com> Date: 星期四, 04 九月 2025 16:09:49 +0800 Subject: [PATCH] 设备保修真机测试,bug修改 --- src/pages/equipmentManagement/repair/index.vue | 239 +++++++++++------------------------------------------------ 1 files changed, 45 insertions(+), 194 deletions(-) diff --git a/src/pages/equipmentManagement/repair/index.vue b/src/pages/equipmentManagement/repair/index.vue index d4ce7be..49b2374 100644 --- a/src/pages/equipmentManagement/repair/index.vue +++ b/src/pages/equipmentManagement/repair/index.vue @@ -1,18 +1,18 @@ <template> - <view class="device-repair"> + <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="repair-list" v-if="repairList.length > 0"> + <view class="ledger-list" v-if="repairList.length > 0"> <view v-for="(item, index) in repairList" :key="index"> - <view class="repair-item"> + <view class="ledger-item"> <view class="item-header"> <view class="item-left"> <view class="document-icon"> @@ -33,38 +33,8 @@ <text class="item-id">璁惧鍚嶇О锛歿{ item.deviceName }}</text> </view> <view class="status-tag"> - <!-- 鏇挎崲鏍囩鍜屾寜閽� --> - <!-- 鐘舵�佹爣绛� --> <u-tag v-if="item.status === 1" type="success">瀹岀粨</u-tag> <u-tag v-if="item.status === 0" type="error">寰呯淮淇�</u-tag> - - <!-- 鎿嶄綔鎸夐挳 --> - <view class="action-buttons"> - <u-button - type="primary" - size="small" - class="action-btn" - @click="openForm('add')" - > - 鏂板鎶ヤ慨 - </u-button> - <u-button - type="warning" - size="small" - class="action-btn" - @click="openForm('edit', item)" - > - 缂栬緫 - </u-button> - <u-button - type="success" - size="small" - class="action-btn" - @click="maintain(item)" - > - 缁翠慨 - </u-button> - </view> </view> </view> <up-divider></up-divider> @@ -102,15 +72,16 @@ <!-- 鎸夐挳鍖哄煙 --> <view class="action-buttons"> - <van-button + <u-button type="primary" size="small" class="action-btn" + :disabled="item.status === 1" @click="edit(item.id)" > 缂栬緫 - </van-button> - <van-button + </u-button> + <u-button type="warning" size="small" class="action-btn" @@ -118,16 +89,16 @@ @click="addMaintain(item.id)" > 鏂板缁翠慨 - </van-button> - <van-button - type="danger" + </u-button> + <u-button + type="error" size="small" plain class="action-btn" @click="delRepairByIds(item.id)" > 鍒犻櫎 - </van-button> + </u-button> </view> </view> </view> @@ -136,9 +107,8 @@ <view v-else class="no-data"> <text>鏆傛棤璁惧鎶ヤ慨鏁版嵁</text> </view> - - <!-- 娴姩姘旀场鎸夐挳 --> - <view class="fab-button" @click="addRepair"> + <!-- 娴姩鎿嶄綔鎸夐挳 --> + <view class="fab-button" @click="addRepair"> <up-icon name="plus" size="24" color="#ffffff"></up-icon> </view> </view> @@ -150,10 +120,7 @@ import PageHeader from '@/components/PageHeader.vue' import { getRepairPage, delRepair } from '@/api/equipmentManagement/repair' import useUserStore from "@/store/modules/user" -// 鏇挎崲 Vant 鐨� toast -// import { showToast } from 'vant'; -// 鏇挎崲 toast 鏂规硶 const showToast = (message) => { uni.showToast({ title: message, @@ -186,6 +153,7 @@ // 鏌ヨ鍒楄〃 const getList = () => { + showLoadingToast('鍔犺浇涓�...') const params = { current: -1, size: -1, @@ -194,11 +162,26 @@ getRepairPage(params) .then((res) => { repairList.value = res.records || res.data?.records || [] + closeToast() }) .catch(() => { + closeToast() showToast('鑾峰彇鏁版嵁澶辫触') }) } + +// 鏄剧ず鍔犺浇鎻愮ず +const showLoadingToast = (message) => { + uni.showLoading({ + title: message, + mask: true + }); +}; + +// 鍏抽棴鎻愮ず +const closeToast = () => { + uni.hideLoading(); +}; // 鏂板缁翠慨 - 璺宠浆鍒扮淮淇〉闈� const addMaintain = (id) => { @@ -206,8 +189,10 @@ showToast('鍙傛暟閿欒') return } + // 浣跨敤uni.setStorageSync瀛樺偍id + uni.setStorageSync('repairId', id) uni.navigateTo({ - url: `/pages/equipmentManagement/repair/maintain?id=${id}` + url: '/pages/equipmentManagement/repair/maintain' }) } @@ -221,8 +206,10 @@ // 缂栬緫 - 璺宠浆鍒癮dd椤甸潰锛岄�氳繃id鍖哄垎鏂板杩樻槸缂栬緫 const edit = (id) => { if (!id) return + // 浣跨敤uni.setStorageSync瀛樺偍id + uni.setStorageSync('repairId', id) uni.navigateTo({ - url: `/pages/equipmentManagement/repair/add?id=${id}` + url: '/pages/equipmentManagement/repair/add' }) } @@ -260,100 +247,11 @@ </script> <style scoped lang="scss"> -.u-divider { - margin: 0 !important; -} +@import '@/styles/sales-common.scss'; -.device-repair { - 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; -} - -.repair-list { - padding: 20px; -} - -.repair-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; -} - -.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; +// 璁惧缁翠慨鐗规湁鏍峰紡 +.sales-account { + padding-bottom: 80px; // 涓烘诞鍔ㄦ寜閽暀鍑虹┖闂� } .status-tag { @@ -361,54 +259,7 @@ 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: 60px; -} - -.detail-value { - font-size: 12px; - color: #000000; - text-align: right; - flex: 1; - margin-left: 16px; -} - -.detail-value.highlight { - color: #2979ff; - font-weight: 500; -} - -.no-data { - padding: 40px 0; - text-align: center; - color: #999; -} - .action-buttons { - display: flex; - gap: 8px; - padding: 0 0 16px 0; - justify-content: space-between; -} - -.action-btn { - flex: 1; + gap: 8px; // 涓庡叕鍏辨牱寮忎腑鐨� 12px 涓嶅悓 } </style> \ No newline at end of file -- Gitblit v1.9.3