From c52a0824baaa86a719da04fba3ff65fc48a70422 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 19 三月 2026 17:37:05 +0800
Subject: [PATCH] fix: 入库数量必填
---
src/pages/equipmentManagement/repair/index.vue | 548 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 382 insertions(+), 166 deletions(-)
diff --git a/src/pages/equipmentManagement/repair/index.vue b/src/pages/equipmentManagement/repair/index.vue
index c844d4b..4dd7c1e 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">
@@ -49,7 +49,7 @@
<text class="detail-value">{{ formatDate(item.repairTime) || '-' }}</text>
</view>
<view class="detail-row">
- <text class="detail-label">鎶ヤ慨浜�</text>
+ <text class="detail-label">缁翠慨浜�</text>
<text class="detail-value">{{ item.repairName || '-' }}</text>
</view>
<view class="detail-row">
@@ -57,7 +57,7 @@
<text class="detail-value">{{ item.remark || '-' }}</text>
</view>
<view class="detail-row">
- <text class="detail-label">缁翠慨浜�</text>
+ <text class="detail-label">鎶ヤ慨浜�</text>
<text class="detail-value">{{ item.maintenanceName || '-' }}</text>
</view>
<view class="detail-row">
@@ -76,9 +76,18 @@
type="primary"
size="small"
class="action-btn"
+ :disabled="item.status === 1"
@click="edit(item.id)"
>
缂栬緫
+ </u-button>
+ <u-button
+ type="success"
+ size="small"
+ class="action-btn"
+ @click="viewAttachments(item)"
+ >
+ 鏌ョ湅闄勪欢
</u-button>
<u-button
type="warning"
@@ -106,6 +115,72 @@
<view v-else class="no-data">
<text>鏆傛棤璁惧鎶ヤ慨鏁版嵁</text>
</view>
+ <!-- 鏌ョ湅闄勪欢寮圭獥 -->
+ <view v-if="showAttachmentDialog" class="custom-modal-overlay" @click="closeAttachmentDialog">
+ <view class="custom-modal-container" @click.stop>
+ <view class="attachment-popup-content">
+ <view class="attachment-popup-header">
+ <text class="attachment-popup-title">鏌ョ湅闄勪欢 - {{ currentViewRepair?.deviceName || '鎶ヤ慨' }}</text>
+ <view class="close-btn-attachment" @click="closeAttachmentDialog">
+ <u-icon name="close" size="16" color="#666"></u-icon>
+ </view>
+ </view>
+ <view class="attachment-popup-body">
+ <view class="attachment-content">
+ <view v-if="attachmentList.length > 0" class="attachment-list">
+ <view
+ v-for="(file, index) in attachmentList"
+ :key="index"
+ class="attachment-item"
+ @click="previewAttachment(file)"
+ >
+ <view class="attachment-preview-container">
+ <image
+ v-if="isImageFile(file)"
+ :src="formatFileUrl(file.url || file.downloadUrl)"
+ class="attachment-preview"
+ mode="aspectFill"
+ />
+ <view v-else class="attachment-video-preview">
+ <u-icon name="video" size="24" color="#409eff"></u-icon>
+ <text class="video-text">瑙嗛</text>
+ </view>
+ </view>
+ <view class="attachment-info">
+ <text class="attachment-name">{{ file.originalFilename || file.bucketFilename || file.name || '闄勪欢' }}</text>
+ <text class="attachment-size">{{ formatFileSize(file.byteSize || file.size) }}</text>
+ </view>
+ </view>
+ </view>
+ <view v-else class="attachment-empty">
+ <text>鏆傛棤闄勪欢</text>
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+ <!-- 瑙嗛棰勮寮圭獥 -->
+ <view v-if="showVideoDialog" class="video-modal-overlay" @click="closeVideoPreview">
+ <view class="video-modal-container" @click.stop>
+ <view class="video-modal-header">
+ <text class="video-modal-title">{{ currentVideoFile?.originalFilename || currentVideoFile?.bucketFilename || '瑙嗛棰勮' }}</text>
+ <view class="close-btn-video" @click="closeVideoPreview">
+ <u-icon name="close" size="16" color="#fff"></u-icon>
+ </view>
+ </view>
+ <view class="video-modal-body">
+ <video
+ v-if="currentVideoFile"
+ :src="currentVideoFile.url || currentVideoFile.downloadUrl"
+ class="video-player"
+ controls
+ autoplay
+ @error="handleVideoError"
+ ></video>
+ </view>
+ </view>
+ </view>
<!-- 娴姩鎿嶄綔鎸夐挳 -->
<view class="fab-button" @click="addRepair">
<up-icon name="plus" size="24" color="#ffffff"></up-icon>
@@ -117,7 +192,8 @@
import { ref, onMounted } from 'vue'
import { onShow } from '@dcloudio/uni-app'
import PageHeader from '@/components/PageHeader.vue'
-import { getRepairPage, delRepair } from '@/api/equipmentManagement/repair'
+import { getRepairPage, delRepair, getRepairById } from '@/api/equipmentManagement/repair'
+import config from '@/config'
import useUserStore from "@/store/modules/user"
const showToast = (message) => {
@@ -134,6 +210,81 @@
// 璁惧鎶ヤ慨鏁版嵁
const repairList = ref([])
+
+// 鏌ョ湅闄勪欢
+const showAttachmentDialog = ref(false)
+const attachmentList = ref([])
+const currentViewRepair = ref(null)
+const showVideoDialog = ref(false)
+const currentVideoFile = ref(null)
+
+const filePreviewBase = config.fileUrl || config.baseUrl || ''
+
+const formatFileUrl = (url) => {
+ if (!url) return ''
+ if (url.startsWith('http://') || url.startsWith('https://')) return url
+ const base = (filePreviewBase || '').replace(/\/$/, '')
+ const path = (url || '').replace(/^\/+/, '')
+ return path ? `${base}/${path}` : base
+}
+
+const isImageFile = (file) => {
+ if (file?.contentType && file.contentType.startsWith('image/')) return true
+ if (file?.type === 'image') return true
+ const name = file?.bucketFilename || file?.originalFilename || file?.name || ''
+ const ext = name.split('.').pop()?.toLowerCase()
+ return ['jpg', 'jpeg', 'png', 'gif', 'webp'].includes(ext)
+}
+
+const formatFileSize = (size) => {
+ if (!size) return ''
+ if (size < 1024) return size + 'B'
+ if (size < 1024 * 1024) return (size / 1024).toFixed(1) + 'KB'
+ return (size / (1024 * 1024)).toFixed(1) + 'MB'
+}
+
+const viewAttachments = async (item) => {
+ try {
+ currentViewRepair.value = item
+ const { code, data } = await getRepairById(item.id)
+ if (code === 200 && data) {
+ attachmentList.value = Array.isArray(data.fileList) ? data.fileList : (Array.isArray(data.commonFileList) ? data.commonFileList : [])
+ showAttachmentDialog.value = true
+ } else {
+ showToast('鑾峰彇闄勪欢澶辫触')
+ }
+ } catch (e) {
+ showToast('鑾峰彇闄勪欢澶辫触')
+ }
+}
+
+const closeAttachmentDialog = () => {
+ showAttachmentDialog.value = false
+ currentViewRepair.value = null
+ attachmentList.value = []
+}
+
+const previewAttachment = (file) => {
+ if (isImageFile(file)) {
+ const urls = attachmentList.value.filter((f) => isImageFile(f)).map((f) => formatFileUrl(f.url || f.downloadUrl))
+ uni.previewImage({
+ urls,
+ current: formatFileUrl(file.url || file.downloadUrl)
+ })
+ } else {
+ currentVideoFile.value = file
+ showVideoDialog.value = true
+ }
+}
+
+const closeVideoPreview = () => {
+ showVideoDialog.value = false
+ currentVideoFile.value = null
+}
+
+const handleVideoError = () => {
+ uni.showToast({ title: '瑙嗛鎾斁澶辫触', icon: 'none' })
+}
// 杩斿洖涓婁竴椤�
const goBack = () => {
@@ -188,8 +339,10 @@
showToast('鍙傛暟閿欒')
return
}
+ // 浣跨敤uni.setStorageSync瀛樺偍id
+ uni.setStorageSync('repairId', id)
uni.navigateTo({
- url: `/pages/equipmentManagement/repair/maintain?id=${id}`
+ url: '/pages/equipmentManagement/repair/maintain'
})
}
@@ -203,8 +356,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'
})
}
@@ -242,100 +397,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 {
@@ -343,69 +409,219 @@
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;
+ gap: 8px; // 涓庡叕鍏辨牱寮忎腑鐨� 12px 涓嶅悓
}
-.action-btn {
- flex: 1;
+/* 鏌ョ湅闄勪欢寮圭獥 */
+.custom-modal-overlay {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background: rgba(0, 0, 0, 0.5);
+ z-index: 100;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding: 20px;
}
-.fab-button {
- position: fixed;
- bottom: calc(30px + env(safe-area-inset-bottom));
- right: 30px;
- width: 56px;
- height: 56px;
- background: #2979ff;
- border-radius: 50%;
- display: flex;
- align-items: center;
- justify-content: center;
- box-shadow: 0 4px 16px rgba(41, 121, 255, 0.3);
- z-index: 1000;
- /* 纭繚娴姩鎸夐挳涓嶈搴曢儴瀹夊叏鍖哄煙閬尅 */
+
+.custom-modal-container {
+ width: 100%;
+ max-width: 500px;
+ max-height: 80vh;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.attachment-popup-content {
+ background: #fff;
+ border-radius: 12px;
+ width: 100%;
+ min-height: 300px;
+ max-height: 70vh;
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
+ box-shadow: 0 4px 20px rgba(0, 0, 0, 0.3);
+}
+
+.attachment-popup-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 15px 20px;
+ border-bottom: 1px solid #eee;
+ background: #f8f9fa;
+}
+
+.attachment-popup-title {
+ font-size: 16px;
+ font-weight: 600;
+ color: #333;
+}
+
+.close-btn-attachment {
+ width: 28px;
+ height: 28px;
+ border-radius: 50%;
+ background: #f5f5f5;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.attachment-popup-body {
+ flex: 1;
+ padding: 15px 20px;
+ overflow-y: auto;
+}
+
+.attachment-content {
+ min-height: 200px;
+}
+
+.attachment-list {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 12px;
+}
+
+.attachment-item {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ background: #fff;
+ border-radius: 12px;
+ padding: 8px;
+ border: 1px solid #e9ecef;
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+ width: calc(33.33% - 8px);
+ min-width: 100px;
+}
+
+.attachment-preview-container {
+ margin-bottom: 8px;
+}
+
+.attachment-preview {
+ width: 80px;
+ height: 80px;
+ border-radius: 8px;
+ object-fit: cover;
+ border: 2px solid #f0f0f0;
+}
+
+.attachment-video-preview {
+ width: 80px;
+ height: 80px;
+ background: linear-gradient(135deg, #f8f9fa 0%, #e9ecef 100%);
+ border-radius: 8px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ border: 2px solid #f0f0f0;
+}
+
+.attachment-info {
+ text-align: center;
+ width: 100%;
+}
+
+.attachment-name {
+ font-size: 12px;
+ color: #333;
+ display: block;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ max-width: 80px;
+}
+
+.attachment-size {
+ font-size: 10px;
+ color: #999;
+ margin-top: 2px;
+ display: block;
+}
+
+.attachment-empty {
+ text-align: center;
+ padding: 60px 20px;
+ color: #999;
+ font-size: 14px;
+ background: #f8f9fa;
+ border-radius: 8px;
+ border: 2px dashed #ddd;
+}
+
+/* 瑙嗛棰勮寮圭獥 */
+.video-modal-overlay {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background: rgba(0, 0, 0, 0.8);
+ z-index: 10001;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding: 20px;
+}
+
+.video-modal-container {
+ width: 90%;
+ max-width: 800px;
+ max-height: 80vh;
+ background: #000;
+ border-radius: 12px;
+ overflow: hidden;
+ box-shadow: 0 4px 20px rgba(0, 0, 0, 0.5);
+}
+
+.video-modal-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 15px 20px;
+ background: rgba(0, 0, 0, 0.7);
+ color: #fff;
+}
+
+.video-modal-title {
+ font-size: 16px;
+ color: #fff;
+}
+
+.close-btn-video {
+ width: 28px;
+ height: 28px;
+ border-radius: 50%;
+ background: rgba(255, 255, 255, 0.2);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.video-modal-body {
+ background: #000;
+}
+
+.video-player {
+ width: 100%;
+ height: auto;
+ max-height: 60vh;
+ display: block;
+}
+
+.video-text {
+ font-size: 12px;
+ color: #666;
+ margin-top: 4px;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3