From 9581c0ae9f0d9a2e92744f3dca78960780b9a2df Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期一, 18 五月 2026 17:42:21 +0800
Subject: [PATCH] 附件

---
 src/pages/equipmentManagement/upkeep/add.vue |  442 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 417 insertions(+), 25 deletions(-)

diff --git a/src/pages/equipmentManagement/upkeep/add.vue b/src/pages/equipmentManagement/upkeep/add.vue
index fbdf304..abddae6 100644
--- a/src/pages/equipmentManagement/upkeep/add.vue
+++ b/src/pages/equipmentManagement/upkeep/add.vue
@@ -40,6 +40,80 @@
 					<u-icon name="arrow-right" @click="showDatePicker" />
 				</template>
 			</u-form-item>
+
+			<u-form-item label="淇濆吇浜�" prop="maintenancePerson" required border-bottom>
+				<u-input
+					v-model="form.maintenancePerson"
+					placeholder="璇烽�夋嫨淇濆吇浜�"
+					readonly
+					@click="showPersonPicker"
+					clearable
+				/>
+				<template #right>
+					<u-icon name="arrow-right" @click="showPersonPicker" />
+				</template>
+			</u-form-item>
+			
+			<u-form-item label="淇濆吇閮ㄤ綅" prop="maintenanceLocation" required border-bottom>
+				<u-input
+					v-model="form.maintenanceLocation"
+					placeholder="璇疯緭鍏ヤ繚鍏婚儴浣�"
+					clearable
+				/>
+			</u-form-item>
+
+			<u-form-item label="淇濆吇鍐呭" prop="maintenanceItems" required border-bottom>
+				<u-input
+					v-model="form.maintenanceItems"
+					placeholder="璇疯緭鍏ヤ繚鍏诲唴瀹�"
+					clearable
+				/>
+			</u-form-item>
+
+			<u-form-item label="闄勪欢" border-bottom>
+				<view class="attachment-upload">
+					<view class="upload-buttons">
+						<u-button
+							type="primary"
+							@click="chooseAttachment('camera')"
+							:loading="uploading"
+							:disabled="uploading"
+							:customStyle="{ marginRight: '10px', flex: 1 }"
+						>
+							<u-icon name="camera" size="18" color="#fff" style="margin-right: 5px;"></u-icon>
+							{{ uploading ? '涓婁紶涓�...' : '鎷嶇収' }}
+						</u-button>
+						<u-button
+							type="success"
+							@click="chooseAttachment('album')"
+							:loading="uploading"
+							:disabled="uploading"
+							:customStyle="{ flex: 1 }"
+						>
+							<u-icon name="photo" size="18" color="#fff" style="margin-right: 5px;"></u-icon>
+							{{ uploading ? '涓婁紶涓�...' : '鐩稿唽' }}
+						</u-button>
+					</view>
+					<view v-if="attachmentList.length" class="attachment-list">
+						<view
+							v-for="(file, index) in attachmentList"
+							:key="file.id || index"
+							class="attachment-item"
+						>
+							<image
+								:src="getFileAccessUrl(file)"
+								mode="aspectFill"
+								class="attachment-preview"
+								@click="previewAttachment(index)"
+							/>
+							<view class="attachment-delete" @click="removeAttachment(file, index)">
+								<u-icon name="close" size="12" color="#fff" />
+							</view>
+						</view>
+					</view>
+					<view v-else class="attachment-empty">鏆傛棤闄勪欢锛屽彲鎷嶇収鎴栦粠鐩稿唽閫夋嫨</view>
+				</view>
+			</u-form-item>
 			
 			<!-- 鎻愪氦鎸夐挳 -->
 			<view class="footer-btns">
@@ -56,6 +130,14 @@
 			@select="onDeviceConfirm"
 			@close="showDevice = false"
 		/>
+		<!-- 淇濆吇浜洪�夋嫨鍣� -->
+		<up-action-sheet
+			:show="showPerson"
+			:actions="personActions"
+			title="閫夋嫨淇濆吇浜�"
+			@select="onPersonConfirm"
+			@close="showPerson = false"
+		/>
 <up-datetime-picker
 			:show="showDate"
 			v-model="pickerDateValue"
@@ -69,12 +151,24 @@
 
 <script setup>
 import { ref, computed, onMounted, onUnmounted } from 'vue';
-import { onShow } from '@dcloudio/uni-app';
+import { onShow, onUnload } from '@dcloudio/uni-app';
 import PageHeader from '@/components/PageHeader.vue';
+import config from '@/config';
+import { getToken } from '@/utils/auth';
 import { getDeviceLedger } from '@/api/equipmentManagement/ledger';
-import { addUpkeep, editUpkeep, getUpkeepById } from '@/api/equipmentManagement/upkeep';
+import {
+	addUpkeep,
+	editUpkeep,
+	getUpkeepById,
+	listMaintenanceTaskFiles,
+	delMaintenanceTaskFile,
+} from '@/api/equipmentManagement/upkeep';
+import { userListNoPageByTenantId } from '@/api/system/user';
+import useUserStore from '@/store/modules/user';
 import dayjs from "dayjs";
 import { formatDateToYMD } from '@/utils/ruoyi';
+
+const userStore = useUserStore();
 
 defineOptions({
 	name: "璁惧淇濆吇璁″垝琛ㄥ崟",
@@ -86,11 +180,21 @@
   })
 }
 
+const normalizeId = (raw) => {
+	if (raw === null || raw === undefined) return undefined;
+	const val = String(raw).trim();
+	if (!val || val === 'undefined' || val === 'null') return undefined;
+	return val;
+};
+
 // 琛ㄥ崟寮曠敤
 const formRef = ref(null);
 const operationType = ref('add');
 const loading = ref(false);
+const uploading = ref(false);
+const attachmentList = ref([]);
 const showDevice = ref(false);
+const showPerson = ref(false);
 const showDate = ref(false);
 const pickerDateValue = ref(Date.now());
 const currentDate = ref([new Date().getFullYear(), new Date().getMonth() + 1, new Date().getDate()]);
@@ -98,12 +202,20 @@
 // 璁惧閫夐」
 const deviceOptions = ref([]);
 const deviceNameText = ref('');
+// 淇濆吇浜洪�夐」
+const userOptions = ref([]);
 // 杞崲涓� action-sheet 闇�瑕佺殑鏍煎紡
 const deviceActions = computed(() => {
 	return deviceOptions.value.map(item => ({
 		text: item.deviceName,
 		value: item.id,
 		data: item
+	}));
+});
+const personActions = computed(() => {
+	return userOptions.value.map(item => ({
+		name: item.nickName,
+		value: item.userId,
 	}));
 });
 
@@ -115,6 +227,9 @@
 const formRules = {
 	deviceLedgerId: [{ required: true, trigger: "change", message: "璇烽�夋嫨璁惧鍚嶇О" }],
 	maintenancePlanTime: [{ required: true, trigger: "change", message: "璇烽�夋嫨璁″垝淇濆吇鏃ユ湡" }],
+	maintenancePerson: [{ required: true, trigger: "change", message: "璇烽�夋嫨淇濆吇浜�" }],
+	maintenanceLocation: [{ required: true, trigger: "blur", message: "璇疯緭鍏ヤ繚鍏婚儴浣�" }],
+	maintenanceItems: [{ required: true, trigger: "blur", message: "璇疯緭鍏ヤ繚鍏诲唴瀹�" }],
 };
 
 // 浣跨敤 ref 澹版槑琛ㄥ崟鏁版嵁
@@ -122,6 +237,10 @@
 	deviceLedgerId: undefined, // 璁惧ID
 	deviceModel: undefined, // 瑙勬牸鍨嬪彿
 	maintenancePlanTime: dayjs().format("YYYY-MM-DD"), // 璁″垝淇濆吇鏃ユ湡
+	maintenancePerson: userStore.nickName || undefined, // 淇濆吇浜�
+	maintenanceLocation: undefined, // 淇濆吇閮ㄤ綅
+	maintenanceItems: undefined, // 淇濆吇鍐呭
+	tempFileIds: [], // 鏈涓婁紶闄勪欢鐨勪复鏃舵枃浠禝D锛屼繚瀛樻椂鎻愪氦
 });
 
 // 鍔犺浇璁惧鍒楄〃
@@ -134,6 +253,204 @@
 	}
 };
 
+// 鍔犺浇淇濆吇浜哄垪琛�
+const loadUserOptions = async () => {
+	try {
+		const { data } = await userListNoPageByTenantId();
+		userOptions.value = data || [];
+	} catch (e) {
+		showToast('鑾峰彇淇濆吇浜哄垪琛ㄥけ璐�');
+	}
+};
+
+// 闄勪欢鐩稿叧
+const extractTempFileId = (uploadedFile) => {
+	if (!uploadedFile) return undefined;
+	const data = Array.isArray(uploadedFile) ? uploadedFile[0] : uploadedFile;
+	return data?.tempId ?? data?.tempFileId ?? data?.id;
+};
+
+const syncTempFileIds = () => {
+	form.value.tempFileIds = attachmentList.value
+		.filter((item) => item.isTempFile)
+		.map((item) => item.tempId ?? item.tempFileId)
+		.filter((v) => v !== undefined && v !== null && v !== '');
+};
+
+const getFileAccessUrl = (file = {}) => {
+	if (file?._localPreviewUrl) return file._localPreviewUrl;
+	const url = file.url || file.tempPath || file.tempFilePath || file.path || '';
+	if (!url) return '';
+	if (String(url).startsWith('http') || String(url).startsWith('blob:') || String(url).startsWith('file:') || String(url).startsWith('wxfile:')) {
+		return url;
+	}
+	const path = String(url).startsWith('/') ? url : `/${url}`;
+	return `${config.fileUrl}${path}`;
+};
+
+const fetchAttachmentList = async (id) => {
+	if (!id) {
+		attachmentList.value = [];
+		form.value.tempFileIds = [];
+		return;
+	}
+	try {
+		const { code, data } = await listMaintenanceTaskFiles({
+			current: 1,
+			size: 100,
+			deviceMaintenanceId: id,
+		});
+		if (code === 200) {
+			const records = data?.records || [];
+			attachmentList.value = records.map((file) => ({
+				...file,
+				isTempFile: false,
+			}));
+		} else {
+			attachmentList.value = [];
+		}
+	} catch (e) {
+		attachmentList.value = [];
+	}
+	syncTempFileIds();
+};
+
+const chooseAttachment = (sourceType) => {
+	const source = sourceType === 'camera' ? ['camera'] : ['album'];
+	const remaining = 9 - attachmentList.value.length;
+	if (remaining <= 0) {
+		showToast('鏈�澶氫笂浼�9寮犻檮浠�');
+		return;
+	}
+	uni.chooseImage({
+		count: Math.min(remaining, 9),
+		sizeType: ['original', 'compressed'],
+		sourceType: source,
+		success: (res) => {
+			const files = res.tempFiles || [];
+			if (!files.length) return;
+			uploadAttachments(files, res.tempFilePaths);
+		},
+		fail: () => {
+			showToast('閫夋嫨鍥剧墖澶辫触');
+		},
+	});
+};
+
+const handleUploadSuccess = (response, file) => {
+	let uploadedFile = response?.data;
+	if (Array.isArray(uploadedFile)) {
+		uploadedFile = uploadedFile[0];
+	}
+	const tempId = extractTempFileId(uploadedFile);
+	if (!tempId) {
+		showToast('鏈幏鍙栧埌鏂囦欢ID');
+		return;
+	}
+	attachmentList.value.push({
+		tempId,
+		tempFileId: tempId,
+		isTempFile: true,
+		url: uploadedFile?.tempPath || uploadedFile?.url || uploadedFile?.downloadUrl || file.tempFilePath || file.path,
+		tempPath: uploadedFile?.tempPath || '',
+		name: uploadedFile?.originalName || uploadedFile?.originalFilename || file.name,
+		_localPreviewUrl: file.tempFilePath || file.path || '',
+	});
+	syncTempFileIds();
+};
+
+const uploadAttachments = async (files, tempFilePaths = []) => {
+	const token = getToken();
+	if (!token) {
+		showToast('鐧诲綍宸插け鏁堬紝璇烽噸鏂扮櫥褰�');
+		return;
+	}
+	uploading.value = true;
+	try {
+		for (let i = 0; i < files.length; i++) {
+			const file = files[i];
+			const filePath = file.path || file.tempFilePath || tempFilePaths[i];
+			if (!filePath) continue;
+			await new Promise((resolve, reject) => {
+				uni.uploadFile({
+					url: `${config.baseUrl}/file/upload`,
+					filePath,
+					name: 'file',
+					header: {
+						Authorization: `Bearer ${token}`,
+					},
+					success: (uploadRes) => {
+						try {
+							const parsed = JSON.parse(uploadRes.data || '{}');
+							if (uploadRes.statusCode === 200 && parsed.code === 200) {
+								handleUploadSuccess(parsed, {
+									...file,
+									tempFilePath: filePath,
+									path: filePath,
+									name: file.name || `闄勪欢_${Date.now()}_${i}.jpg`,
+								});
+								resolve(parsed);
+							} else {
+								reject(new Error(parsed.msg || '涓婁紶澶辫触'));
+							}
+						} catch (err) {
+							reject(new Error('涓婁紶鍝嶅簲瑙ｆ瀽澶辫触'));
+						}
+					},
+					fail: () => reject(new Error('涓婁紶澶辫触')),
+				});
+			});
+		}
+		showToast('涓婁紶鎴愬姛');
+	} catch (e) {
+		showToast(e?.message || '涓婁紶澶辫触');
+	} finally {
+		uploading.value = false;
+	}
+};
+
+const previewAttachment = (index) => {
+	const urls = attachmentList.value
+		.map((item) => getFileAccessUrl(item))
+		.filter(Boolean);
+	if (!urls.length) return;
+	uni.previewImage({
+		urls,
+		current: urls[index] || urls[0],
+	});
+};
+
+const removeAttachment = (file, index) => {
+	if (file?.isTempFile) {
+		attachmentList.value.splice(index, 1);
+		syncTempFileIds();
+		return;
+	}
+	if (!file?.id) {
+		attachmentList.value.splice(index, 1);
+		syncTempFileIds();
+		return;
+	}
+	uni.showModal({
+		title: '鎻愮ず',
+		content: '纭鍒犻櫎璇ラ檮浠跺悧锛�',
+		success: async (res) => {
+			if (!res.confirm) return;
+			try {
+				const { code } = await delMaintenanceTaskFile(file.id);
+				if (code === 200) {
+					attachmentList.value.splice(index, 1);
+					showToast('鍒犻櫎鎴愬姛');
+				} else {
+					showToast('鍒犻櫎澶辫触');
+				}
+			} catch (e) {
+				showToast('鍒犻櫎澶辫触');
+			}
+		},
+	});
+};
+
 // 鍔犺浇琛ㄥ崟鏁版嵁锛堢紪杈戞ā寮忥級
 const loadForm = async (id) => {
 	if (id) {
@@ -144,11 +461,15 @@
 				form.value.deviceLedgerId = data.deviceLedgerId;
 				form.value.deviceModel = data.deviceModel;
 				form.value.maintenancePlanTime = dayjs(data.maintenancePlanTime).format("YYYY-MM-DD");
+				form.value.maintenancePerson = data.maintenancePerson;
+				form.value.maintenanceLocation = data.maintenanceLocation;
+				form.value.maintenanceItems = data.maintenanceItems;
 				// 璁剧疆璁惧鍚嶇О鏄剧ず
 				const device = deviceOptions.value.find(item => item.id === data.deviceLedgerId);
 				if (device) {
 					form.value.deviceNameText = device.deviceName;
 				}
+				await fetchAttachmentList(id);
 			}
 		} catch (e) {
 			showToast('鑾峰彇璇︽儏澶辫触');
@@ -156,6 +477,8 @@
 	} else {
 		// 鏂板妯″紡
 		operationType.value = 'add';
+		attachmentList.value = [];
+		form.value.tempFileIds = [];
 	}
 };
 
@@ -187,24 +510,25 @@
 	}
 	
 	isScanning.value = true;
-	showToast('鎵爜鎴愬姛锛�3绉掑悗鑷姩濉厖璁惧淇℃伅');
+	showToast('鎵爜鎴愬姛');
 	
 	// 3绉掑悗澶勭悊鎵爜缁撴灉
 	scanTimer.value = setTimeout(() => {
 		processScanResult(scanResult);
 		isScanning.value = false;
-	}, 3000);
+	}, 1000);
 };
-
+function getDeviceIdByRegExp(url) {
+	// 鍖归厤deviceId=鍚庨潰鐨勬暟瀛�
+	const reg = /deviceId=(\d+)/;
+	const match = url.match(reg);
+	// 濡傛灉鍖归厤鍒扮粨鏋滐紝杩斿洖鏁板瓧绫诲瀷锛屽惁鍒欒繑鍥瀗ull
+	return match ? Number(match[1]) : null;
+}
 // 澶勭悊鎵爜缁撴灉骞跺尮閰嶈澶�
 const processScanResult = (scanResult) => {
-	// 鍦ㄨ澶囧垪琛ㄤ腑鏌ユ壘鍖归厤鐨勮澶�
-	// 鍋囪浜岀淮鐮佸唴瀹规槸璁惧鍚嶇О鎴栬澶囩紪鍙�
-	const matchedDevice = deviceOptions.value.find(device => 
-		device.deviceName === scanResult || 
-		device.deviceCode === scanResult ||
-		device.id.toString() === scanResult
-	);
+	const deviceId = getDeviceIdByRegExp(scanResult);
+	const matchedDevice = deviceOptions.value.find(item => item.id == deviceId);
 	
 	if (matchedDevice) {
 		// 鎵惧埌鍖归厤鐨勮澶囷紝鑷姩濉厖
@@ -221,6 +545,22 @@
 // 鏄剧ず璁惧閫夋嫨鍣�
 const showDevicePicker = () => {
 	showDevice.value = true;
+};
+
+// 鏄剧ず淇濆吇浜洪�夋嫨鍣�
+const showPersonPicker = () => {
+	if (!userOptions.value.length) {
+		showToast('鏆傛棤鍙�変繚鍏讳汉');
+		return;
+	}
+	showPerson.value = true;
+};
+
+// 纭淇濆吇浜洪�夋嫨
+const onPersonConfirm = (selected) => {
+	const user = userOptions.value.find(item => item.userId === selected.value);
+	form.value.maintenancePerson = user?.nickName || selected.name || '';
+	showPerson.value = false;
 };
 
 // 纭璁惧閫夋嫨
@@ -252,8 +592,9 @@
 });
 
 onMounted(() => {
-	// 椤甸潰鍔犺浇鏃惰幏鍙栬澶囧垪琛ㄥ拰鍙傛暟
+	// 椤甸潰鍔犺浇鏃惰幏鍙栬澶囧垪琛ㄣ�佷繚鍏讳汉鍒楄〃鍜屽弬鏁�
 	loadDeviceName();
+	loadUserOptions();
 	getPageParams();
 });
 
@@ -274,20 +615,24 @@
 		loading.value = true;
 		const id = getPageId();
 		
+		syncTempFileIds();
 		// 鍑嗗鎻愪氦鏁版嵁
 		const submitData = { ...form.value };
+		submitData.tempFileIds = form.value.tempFileIds || [];
 		// 纭繚鏃ユ湡鏍煎紡姝ｇ‘
 		if (submitData.maintenancePlanTime && !submitData.maintenancePlanTime.includes(':')) {
 			submitData.maintenancePlanTime = submitData.maintenancePlanTime + ' 00:00:00';
 		}
 		
-		const { code } = id
+		const result = id
 			? await editUpkeep({ id: id, ...submitData })
 			: await addUpkeep(submitData);
+		const { code } = result || {};
 		
 		if (code == 200) {
 			showToast(`${id ? "缂栬緫" : "鏂板"}璁″垝鎴愬姛`);
 			setTimeout(() => {
+				uni.removeStorageSync('repairId');
 				uni.navigateBack();
 			}, 1500);
 		} else {
@@ -306,26 +651,27 @@
 	uni.navigateBack();
 };
 
+// 鑾峰彇椤甸潰ID
+const getPageId = () => {
+	return normalizeId(uni.getStorageSync('repairId'));
+};
+
 // 鑾峰彇椤甸潰鍙傛暟
 const getPageParams = () => {
-	// 浠庢湰鍦板瓨鍌ㄨ幏鍙杋d
-	const id = uni.getStorageSync('repairId');
-	
-	// 鏍规嵁鏄惁鏈塱d鍙傛暟鏉ュ垽鏂槸鏂板杩樻槸缂栬緫
+	const id = getPageId();
 	if (id) {
-		// 缂栬緫妯″紡锛岃幏鍙栬鎯�
 		loadForm(id);
 	} else {
-		// 鏂板妯″紡
+		operationType.value = 'add';
+		attachmentList.value = [];
+		form.value.tempFileIds = [];
 		loadForm();
 	}
 };
 
-// 鑾峰彇椤甸潰ID
-const getPageId = () => {
-	// 浠庢湰鍦板瓨鍌ㄨ幏鍙杋d
-	return uni.getStorageSync('repairId');
-};
+onUnload(() => {
+	uni.removeStorageSync('repairId');
+});
 </script>
 
 <style scoped lang="scss">
@@ -389,4 +735,50 @@
 	margin-left: 8px;
 	cursor: pointer;
 }
+
+.attachment-upload {
+	width: 100%;
+}
+
+.upload-buttons {
+	display: flex;
+	margin-bottom: 12px;
+}
+
+.attachment-list {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 10px;
+}
+
+.attachment-item {
+	position: relative;
+	width: 80px;
+	height: 80px;
+}
+
+.attachment-preview {
+	width: 80px;
+	height: 80px;
+	border-radius: 6px;
+	background: #f5f5f5;
+}
+
+.attachment-delete {
+	position: absolute;
+	top: -6px;
+	right: -6px;
+	width: 18px;
+	height: 18px;
+	border-radius: 50%;
+	background: rgba(0, 0, 0, 0.65);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.attachment-empty {
+	font-size: 12px;
+	color: #909399;
+}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3