联调发现的问题修复

pages/work/index.uvue

@@ -52,9 +52,9 @@
     data() { 
 	   let basic = [
 		      {colorClass: 'blue', iconType: "person-filled", text: "用户管理",path:"/pages/mine/index" },
-			  {colorClass: 'orange', iconType: "list", text: "检验任务",path:"/pages/work/download/DownloadList" },
 			  // {colorClass: 'blue', iconType: "list", text: "任务管理",path:"/pages/work/task/TaskList" },
 			  {colorClass: 'orange', iconType: "camera", text: "声像记录", path:"/pages/work/record/InfoList"},
+			  {colorClass: 'orange', iconType: "list", text: "检验任务",path:"/pages/work/download/DownloadList" },
 			  // {colorClass: 'orange', iconType: "calendar", text: "检验记录",path:"/pages/work/report/InspectionList" },
 			  // {colorClass: 'orange', iconType: "gear-filled", text: "关键工序",path:"/pages/work/process/ProcessList" },
 			  // {colorClass: 'green', iconType: "folder-add-filled", text: "文档查阅",path:"" },

pages/work/process/ProcessList.uvue

@@ -110,7 +110,7 @@
 <script setup>
 	import { ref, computed } from 'vue' // 1. 引入 computed（计算属性核心）
 	import { getListByOrder, TaskKeyProcess, recordStatusDict, updateData } from '@/api/work';
-	import { getCurrentUser } from '@/utils/auth';
+	import { getCurrentUserSync } from '@/utils/auth';
 
 	// 存储页面参数
 	let pdid = "";
@@ -206,7 +206,7 @@
 			// 更新结果值
 			currentItem.result = event.detail.value;
 			//更新数据库
-			let updatedData = "result='" + currentItem.result + "', operator='" + getCurrentUser() + "' "
+			let updatedData = "result='" + currentItem.result + "', operator='" + getCurrentUserSync() + "' "
 			updateData('app_task_keyprocess', updatedData, 'sxid', currentItem.sxid.toString()).then((res : UTSJSONObject) => {
 				let data = res?.['data'] as boolean ?? false
 				if (data != null && data== true) {
@@ -226,7 +226,7 @@
 			currentItem.measuredvaluemin = event.detail.value;
 			// 检查measuredvalue是否为null或undefined，避免空指针异常
 			const measuredValue = currentItem.measuredvaluemin ?? '';
-			let updatedData = "measuredvaluemin='" + measuredValue + "', operator='" + getCurrentUser() + "' "
+			let updatedData = "measuredvaluemin='" + measuredValue + "', operator='" + getCurrentUserSync() + "' "
 			
 			//更新数据库
 			updateData('app_task_keyprocess', updatedData, 'sxid', currentItem.sxid.toString()).then((res : UTSJSONObject) => {
@@ -247,7 +247,7 @@
 			// 更新结果值
 			currentItem.measuredvaluemax = event.detail.value;
 			//更新数据库
-			let updatedData = "measuredvaluemax='" + currentItem.measuredvaluemax + "', operator='" + getCurrentUser() + "' "
+			let updatedData = "measuredvaluemax='" + currentItem.measuredvaluemax + "', operator='" + getCurrentUserSync() + "' "
 		
 			updateData('app_task_keyprocess', updatedData, 'sxid', currentItem.sxid.toString()).then((res : UTSJSONObject) => {
 				let data = res?.['data'] as boolean ?? false
@@ -267,7 +267,7 @@
 			// 更新结果值
 			currentItem.memo = event.detail.value;
 			//更新数据库
-			let updatedData = "memo='" + currentItem.memo + "', operator='" + getCurrentUser() + "' "
+			let updatedData = "memo='" + currentItem.memo + "', operator='" + getCurrentUserSync() + "' "
 			updateData('app_task_keyprocess', updatedData, 'sxid', currentItem.sxid.toString()).then((res : UTSJSONObject) => {
 				let data = res?.['data'] as boolean ?? false
 				if (data != null && data== true) {

pages/work/report/InspectionList.uvue

@@ -110,7 +110,7 @@
 <script setup>
 	import { ref, computed } from 'vue' // 1. 引入 computed（计算属性核心）
 	import { getJoinList, QcRecord, recordStatusDict, updateData } from '@/api/work';
-	import { getCurrentUser } from '@/utils/auth';
+	import { getCurrentUserSync } from '@/utils/auth';
 
 	// 存储页面参数
 	let pdid = "";
@@ -225,7 +225,7 @@
 			// 更新结果值
 			currentItem.result = event.detail.value;
 			//更新数据库
-			let updatedData = "result='" + currentItem.result + "', recorder='" + getCurrentUser() + "' "
+			let updatedData = "result='" + currentItem.result + "', recorder='" + getCurrentUserSync() + "' "
 			console.log(updatedData)
 			updateData('app_task_record_item', updatedData, 'sxid', currentItem.sxid.toString()).then((res : UTSJSONObject) => {
 				let data = res?.['data'] as boolean ?? false
@@ -244,7 +244,7 @@
 		if (currentItem != null) {
 			// 更新结果值
 			currentItem.measuredvalue = event.detail.value;
-			let updatedData = "measuredvalue='" + currentItem.measuredvalue + "', recorder='" + getCurrentUser() + "' "
+			let updatedData = "measuredvalue='" + currentItem.measuredvalue + "', recorder='" + getCurrentUserSync() + "' "
 			if (currentItem.nature == '定量') {
 				let minValue = parseFloat(currentItem.minNum ?? '0');
 				let maxValue = parseFloat(currentItem.maxNum ?? '0');
@@ -277,7 +277,7 @@
 			// 更新结果值
 			currentItem.measuredvaluemax = event.detail.value;
 			//更新数据库
-			let updatedData = "measuredvaluemax='" + currentItem.measuredvaluemax + "', recorder='" + getCurrentUser() + "' "
+			let updatedData = "measuredvaluemax='" + currentItem.measuredvaluemax + "', recorder='" + getCurrentUserSync() + "' "
 			if (currentItem.nature == '定量') {
 				let minValue = parseFloat(currentItem.minNum ?? '0');
 				let maxValue = parseFloat(currentItem.maxNum ?? '0');
@@ -288,7 +288,7 @@
 				} else {
 					currentItem.result = '合格'
 				}
-				updatedData += " ,result = '" + currentItem.result + "', recorder='" + getCurrentUser() + "' "
+				updatedData += " ,result = '" + currentItem.result + "', recorder='" + getCurrentUserSync() + "' "
 			}
 			updateData('app_task_record_item', updatedData, 'sxid', currentItem.sxid.toString()).then((res : UTSJSONObject) => {
 				let data = res?.['data'] as boolean ?? false
@@ -308,7 +308,7 @@
 			// 更新结果值
 			currentItem.memo = event.detail.value;
 			//更新数据库
-			let updatedData = "memo='" + currentItem.memo + "', recorder='" + getCurrentUser() + "' "
+			let updatedData = "memo='" + currentItem.memo + "', recorder='" + getCurrentUserSync() + "' "
 			updateData('app_task_record_item', updatedData, 'sxid', currentItem.sxid.toString()).then((res : UTSJSONObject) => {
 				let data = res?.['data'] as boolean ?? false
 				if (data != null && data== true) {

utils/dataProcessor.uts

@@ -481,7 +481,8 @@ export const uploadDataToAPI = async (productCode : string, callback ?: () => vo
 						filePath: path,
 						name: 'file', // 文件参数名
 						header: {
-							'token': apiToken
+							'token': apiToken,
+							'content-type': 'multipart/form-data'
 						},
 						formData: {
 							'billid': pk

utils/qcDataProcessor.uts

@@ -345,34 +345,34 @@ export const downloadDataFromAPI = async (gxpk : string, callback ?: () => void)
 								// 立即保存当前图片的任务信息
 								saveTaskPhoto(values);
 							}
-							//保存关键工序
-							let keyProcessList = taskInfo?.['keyprocesslist'] as UTSJSONObject[] ?? Array<UTSJSONObject>();
-							if (keyProcessList != null && keyProcessList.length > 0) {
-								keyProcessList.forEach(item => {
-									item['pdid'] = lastId;
-									console.log(item);
-									saveTaskKeyProcess(item);
-								})
-							}
-
-							//保存检验记录
-							let recordObj = taskInfo?.['qcrecord'] as (UTSJSONObject | null);
-							console.log('------------------------------>');
-							console.log(recordObj);
-							if (recordObj != null) {
-								recordObj['pdid'] = lastId;
-								let recordItemList = recordObj?.['items'] as UTSJSONObject[] ?? Array<UTSJSONObject>();
-								if (recordItemList != null && recordItemList.length > 0) {
-									const resSave = await saveTaskRecord(recordObj);
-									const recordIdStr = resSave?.['lastId'] as string | null;
-									const recordId = recordIdStr != null ? parseInt(recordIdStr) : null;
-									if (recordId != null) {
-										recordItemList.forEach(item => {
-											item['psxid'] = recordId;
-											console.log(item);
-											saveTaskRecordItem(item);
-										})
-									}
+						}
+						//保存关键工序
+						let keyProcessList = taskInfo?.['keyprocesslist'] as UTSJSONObject[] ?? Array<UTSJSONObject>();
+						if (keyProcessList != null && keyProcessList.length > 0) {
+							keyProcessList.forEach(item => {
+								item['pdid'] = lastId;
+								console.log(item);
+								saveTaskKeyProcess(item);
+							})
+						}
+						
+						//保存检验记录
+						let recordObj = taskInfo?.['qcrecord'] as (UTSJSONObject | null);
+						console.log('------------------------------>');
+						console.log(recordObj);
+						if (recordObj != null) {
+							recordObj['pdid'] = lastId;
+							let recordItemList = recordObj?.['items'] as UTSJSONObject[] ?? Array<UTSJSONObject>();
+							if (recordItemList != null && recordItemList.length > 0) {
+								const resSave = await saveTaskRecord(recordObj);
+								const recordIdStr = resSave?.['lastId'] as string | null;
+								const recordId = recordIdStr != null ? parseInt(recordIdStr) : null;
+								if (recordId != null) {
+									recordItemList.forEach(item => {
+										item['psxid'] = recordId;
+										console.log(item);
+										saveTaskRecordItem(item);
+									})
 								}
 							}
 						}
@@ -535,7 +535,8 @@ export const uploadDataToAPI = async (gxpk : string, callback ?: () => void) : P
 								filePath: path,
 								name: 'file', // 文件参数名
 								header: {
-									'token': apiToken
+									'token': apiToken,
+									'content-type': 'multipart/form-data'
 								},
 								formData: {
 									'billid': pk