From 256bbeb70598098d07d5eaeae90f9fc2cc50cb54 Mon Sep 17 00:00:00 2001
From: wuwei <towuwei@sina.com>
Date: Tue, 13 Jan 2026 18:43:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=9C=BA=E8=AE=B0=E5=BD=95=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/basic/employee.js                    |   7 +
 manifest.json                            | 316 +++++++++++------------
 pages/les/bindMaterial.vue               |   9 -
 pages/les/callMaterial.vue               |   6 -
 pages/les/deliveryMaterial.vue           |  12 -
 pages/les/returnPallet.vue               |   5 -
 pages/mes/jobReport/commissionRecord.vue |  94 ++-----
 7 files changed, 188 insertions(+), 261 deletions(-)

diff --git a/api/basic/employee.js b/api/basic/employee.js
index 6bc29da..b15da36 100644
--- a/api/basic/employee.js
+++ b/api/basic/employee.js
@@ -84,4 +84,11 @@ export function delEmployeeLineRel(id) {
 		url: '/basic/employee/line-rel/' + id,
 		method: 'delete'
 	})
+}
+
+export function getEmployeeByCode(code) {
+	return request({
+		url: '/basic/employee/getEmpByCode/' + code,
+		method: 'get'
+	})
 }
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 3391aea..0c32c8c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,159 +1,159 @@
 {
-	"name": "MES",
-	"appid": "__UNI__66F7FE2",
-	"description": "",
-	"versionName": "3.4.6",
-	"versionCode": 346,
-	"transformPx": false,
-	"sassImplementationName": "node-sass",
-	"app-plus": {
-		"usingComponents": true,
-		"nvueCompiler": "uni-app",
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		// 禁用 HTML5+ RunTime 提示
-		"compatible": {
-			"ignoreVersion": true
-		},
-		"modules": {
-			"Camera": {},
-			"Barcode": {}
-		},
-		"distribute": {
-			"android": {
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.INTERNET\" />",
-					"<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\" />",
-					"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
-					"<uses-permission android:name=\"com.asus.msa.SupplementaryDID.ACCESS\" />",
-					"<uses-permission android:name=\"com.huawei.android.launcher.permission.CHANGE_BADGE\" />",
-					"<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\" />",
-					"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\" />",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
-					"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				],
-				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"]
-			},
-			"ios": {
-				"dSYMs": false
-			},
-			"sdkConfigs": {
-				"ad": {}
-			},
-			"icons": {
-				"android": {
-					"hdpi": "unpackage/res/icons/72x72.png",
-					"xhdpi": "unpackage/res/icons/96x96.png",
-					"xxhdpi": "unpackage/res/icons/144x144.png",
-					"xxxhdpi": "unpackage/res/icons/192x192.png"
-				},
-				"ios": {
-					"appstore": "unpackage/res/icons/1024x1024.png",
-					"ipad": {
-						"app": "unpackage/res/icons/76x76.png",
-						"app@2x": "unpackage/res/icons/152x152.png",
-						"notification": "unpackage/res/icons/20x20.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"proapp@2x": "unpackage/res/icons/167x167.png",
-						"settings": "unpackage/res/icons/29x29.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"spotlight": "unpackage/res/icons/40x40.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png"
-					},
-					"iphone": {
-						"app@2x": "unpackage/res/icons/120x120.png",
-						"app@3x": "unpackage/res/icons/180x180.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"notification@3x": "unpackage/res/icons/60x60.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"settings@3x": "unpackage/res/icons/87x87.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png",
-						"spotlight@3x": "unpackage/res/icons/120x120.png"
-					}
-				}
-			},
-			"splashscreen": {
-				"useOriginalMsgbox": false
-			}
-		},
-		"nativePlugins": {
-			"Fvv-UniSerialPort": {
-				"__plugin_info__": {
-					"name": "安卓串口通信 Fvv-UniSerialPort",
-					"description": "Android平台串口通信插件，支持串口号、波特率、数据位、校验位、停止位、流控等参数设置",
-					"platforms": "Android",
-					"url": "https://ext.dcloud.net.cn/plugin?id=1787",
-					"android_package_name": "uni.UNI66F7FE2",
-					"ios_bundle_id": "uni.UNI66F7FE2",
-					"isCloud": true,
-					"bought": 1,
-					"pid": "1787",
-					"parameters": {}
-				}
-			}
-		},
-		"orientation": [
-			//竖屏正方向
-			"portrait-primary",
-			//竖屏反方向
-			"portrait-secondary",
-			//横屏正方向
-			"landscape-primary",
-			//横屏反方向
-			"landscape-secondary",
-			//自然方向
-			"default"
-		]
-	},
-	"quickapp": {},
-	"mp-weixin": {
-		"appid": "wx366e867b9fb64fdf",
-		"setting": {
-			"urlCheck": true,
-			"es6": false,
-			"minified": true,
-			"postcss": true
-		},
-		"optimization": {
-			"subPackages": true
-		},
-		"usingComponents": true
-	},
-	"vueVersion": "2",
-	"h5": {
-		"template": "static/index.html",
-		"devServer": {
-			"port": 9090,
-			"https": false
-		},
-		"title": "RuoYi-App",
-		"router": {
-			"mode": "hash",
-			"base": "./"
-		}
-	},
-	"permissions": {
-		"network": {
-			"description": "用于获取网络状态和IP地址"
-		}
-	}
-}
\ No newline at end of file
+    "name" : "MES",
+    "appid" : "__UNI__66F7FE2",
+    "description" : "",
+    "versionName" : "3.4.9",
+    "versionCode" : 349,
+    "transformPx" : false,
+    "sassImplementationName" : "node-sass",
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        // 禁用 HTML5+ RunTime 提示
+        "compatible" : {
+            "ignoreVersion" : true
+        },
+        "modules" : {
+            "Camera" : {},
+            "Barcode" : {}
+        },
+        "distribute" : {
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.INTERNET\" />",
+                    "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\" />",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
+                    "<uses-permission android:name=\"com.asus.msa.SupplementaryDID.ACCESS\" />",
+                    "<uses-permission android:name=\"com.huawei.android.launcher.permission.CHANGE_BADGE\" />",
+                    "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\" />",
+                    "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\" />",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
+            },
+            "ios" : {
+                "dSYMs" : false
+            },
+            "sdkConfigs" : {
+                "ad" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            },
+            "splashscreen" : {
+                "useOriginalMsgbox" : false
+            }
+        },
+        "nativePlugins" : {
+            "Fvv-UniSerialPort" : {
+                "__plugin_info__" : {
+                    "name" : "安卓串口通信 Fvv-UniSerialPort",
+                    "description" : "Android平台串口通信插件，支持串口号、波特率、数据位、校验位、停止位、流控等参数设置",
+                    "platforms" : "Android",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=1787",
+                    "android_package_name" : "uni.UNI66F7FE2",
+                    "ios_bundle_id" : "uni.UNI66F7FE2",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "1787",
+                    "parameters" : {}
+                }
+            }
+        },
+        "orientation" : [
+            //竖屏正方向
+            "portrait-primary",
+            //竖屏反方向
+            "portrait-secondary",
+            //横屏正方向
+            "landscape-primary",
+            //横屏反方向
+            "landscape-secondary",
+            //自然方向
+            "default"
+        ]
+    },
+    "quickapp" : {},
+    "mp-weixin" : {
+        "appid" : "wx366e867b9fb64fdf",
+        "setting" : {
+            "urlCheck" : true,
+            "es6" : false,
+            "minified" : true,
+            "postcss" : true
+        },
+        "optimization" : {
+            "subPackages" : true
+        },
+        "usingComponents" : true
+    },
+    "vueVersion" : "2",
+    "h5" : {
+        "template" : "static/index.html",
+        "devServer" : {
+            "port" : 9090,
+            "https" : false
+        },
+        "title" : "RuoYi-App",
+        "router" : {
+            "mode" : "hash",
+            "base" : "./"
+        }
+    },
+    "permissions" : {
+        "network" : {
+            "description" : "用于获取网络状态和IP地址"
+        }
+    }
+}
diff --git a/pages/les/bindMaterial.vue b/pages/les/bindMaterial.vue
index e9000a8..b9d84f6 100644
--- a/pages/les/bindMaterial.vue
+++ b/pages/les/bindMaterial.vue
@@ -73,7 +73,6 @@ export default {
 								bind(_this.formData).then(res => {
 									_this.$modal.closeLoading();
 									_this.$modal.msgSuccess("绑定成功！");
-									_this.reset();
 									setTimeout(() => {
 										this.$tab.switchTab("/pages/work/index");
 									}, 500);
@@ -102,7 +101,6 @@ export default {
 								unBind(_this.formData.locationCode).then(res => {
 									_this.$modal.closeLoading();
 									_this.$modal.msgSuccess("解绑成功！");
-									_this.reset();
 									setTimeout(() => {
 										this.$tab.switchTab("/pages/work/index");
 									}, 500);
@@ -117,13 +115,6 @@ export default {
 				});
 			})
 		},
-
-		reset() {
-			this.formData = {
-				locationCode: null,
-				batchNo: null,
-			};
-		}
 	}
 }
 </script>
diff --git a/pages/les/callMaterial.vue b/pages/les/callMaterial.vue
index 06be98a..2375be6 100644
--- a/pages/les/callMaterial.vue
+++ b/pages/les/callMaterial.vue
@@ -75,7 +75,6 @@ export default {
 					addDeliveryTask(_this.formData).then(res => {
 						_this.$modal.closeLoading();
 						_this.$modal.msgSuccess("提交成功！");
-						_this.reset();
 						setTimeout(() => {
 							_this.$tab.switchTab("/pages/work/index");
 						}, 500);
@@ -85,11 +84,6 @@ export default {
 				}
 			})
 		},
-
-		reset() {
-			this.formData.srcLocationCode = null;
-			this.formData.destLocationCode = null;
-		}
 	}
 }
 </script>
diff --git a/pages/les/deliveryMaterial.vue b/pages/les/deliveryMaterial.vue
index 5b8edda..9309c04 100644
--- a/pages/les/deliveryMaterial.vue
+++ b/pages/les/deliveryMaterial.vue
@@ -72,7 +72,6 @@ export default {
 					delivery(_this.formData).then(res => {
 						_this.$modal.closeLoading();
 						_this.$modal.msgSuccess("提交成功！");
-						_this.reset();
 						setTimeout(() => {
 							this.$tab.switchTab("/pages/work/index");
 						}, 500);
@@ -96,7 +95,6 @@ export default {
 							cancel(arr).then(res => {
 								_this.$modal.closeLoading();
 								_this.$modal.msgSuccess("取消成功！");
-								_this.reset();
 								setTimeout(() => {
 									this.$tab.switchTab("/pages/work/index");
 								}, 500);
@@ -108,16 +106,6 @@ export default {
 				});
 			})
 		},
-		reset() {
-			this.formData = {
-				id: null,
-				srcLocationCode: null,
-				taskTyp: null,
-				robotType: null,
-				ctnrTyp: null,
-			};
-			this.destLocationCode = null;
-		}
 	}
 }
 </script>
diff --git a/pages/les/returnPallet.vue b/pages/les/returnPallet.vue
index c45d729..f124933 100644
--- a/pages/les/returnPallet.vue
+++ b/pages/les/returnPallet.vue
@@ -66,7 +66,6 @@ export default {
 					addDeliveryTask(_this.formData).then(res => {
 						_this.$modal.closeLoading();
 						_this.$modal.msgSuccess("提交成功！");
-						_this.reset();
 						setTimeout(() => {
 							this.$tab.switchTab("/pages/work/index");
 						}, 500);
@@ -76,10 +75,6 @@ export default {
 				}
 			})
 		},
-		reset() {
-			this.formData.srcLocationCode = null;
-			this.formData.destLocationCode = null;
-		}
 	}
 }
 </script>
diff --git a/pages/mes/jobReport/commissionRecord.vue b/pages/mes/jobReport/commissionRecord.vue
index 3f22671..6874e9a 100644
--- a/pages/mes/jobReport/commissionRecord.vue
+++ b/pages/mes/jobReport/commissionRecord.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="form-container">
+	<view>
 		<uni-forms ref="form" :modelValue="formData" :rules="rules">
 			<uni-forms-item label="作业编码：" :labelWidth='90' name="pwoJobCode">
 				<uni-easyinput @confirm="searchData" suffixIcon="scan" @iconClick="scanBar" type="text"
@@ -33,17 +33,18 @@
 			<uni-forms-item label="人员：" :labelWidth='90' name="staff">
 				<uni-easyinput type="text" v-model="formData.staff" @confirm="searchStaff" />
 			</uni-forms-item>
-			<uni-forms-item label="调试单价：" :labelWidth='90' name="programmingDebuggingUnitPrice">
-				<uni-easyinput type="text" v-model="formData.programmingDebuggingUnitPrice" />
-			</uni-forms-item>
-			<view class="form-row">
-				<uni-forms-item label="调机时长：" :labelWidth='90' name="timeTake" class="form-col">
-					<uni-easyinput type="text" v-model="timeTake" />
-				</uni-forms-item>
-				<uni-forms-item label="时间单位：" :labelWidth='90' name="timeUnit" class="form-col">
-					<uni-data-select v-model="timeUnit" :localdata="unitOptions" placeholder="选择时间单位" />
-				</uni-forms-item>
-			</view>
+			<uni-row>
+				<uni-col :span="12">
+					<uni-forms-item label="调机时长：" :labelWidth='90' name="timeTake" class="form-col">
+						<uni-easyinput type="text" v-model="timeTake" />
+					</uni-forms-item>
+				</uni-col>
+				<uni-col :span="12">
+					<uni-forms-item label="时间单位：" :labelWidth='90' name="timeUnit" class="form-col">
+						<uni-data-select v-model="timeUnit" :localdata="unitOptions" placeholder="选择时间单位" />
+					</uni-forms-item>
+				</uni-col>	
+			</uni-row>		
 		</uni-forms>
 		<u-button type="primary" @click="submit">提交</u-button>
 	</view>
@@ -52,7 +53,7 @@
 <script>
 import { addRecord } from "@/api/mes/mesMachineSetUpRecord.js";
 import { listPwoJob } from "@/api/mes/jobReport.js";
-import { getUserInfo } from "@/api/system/user.js"
+import { getEmployeeByCode } from "@/api/basic/employee.js"
 export default {
 	data() {
 		return {
@@ -77,7 +78,7 @@ export default {
 		}
 	},
 	created() {
-		this.$set(this.formData, "staff", this.$store.state.user.name);
+		this.$set(this.formData, "staff", this.$store.state.employee.empName);
 	},
 	methods: {
 		scanBar() {
@@ -92,8 +93,12 @@ export default {
 		},
 		searchStaff() {
 			const _this = this;
-			getUserInfo(_this.formData.staff).then(async res => {
-				_this.$set(_this.formData, "staff", res.data.userName);
+			getEmployeeByCode(_this.formData.staff).then(async res => {
+				if(res.data != null){
+					_this.$set(_this.formData, "staff", res.data.name);
+				}else{
+					_this.$modal.msg("未查询到该员工！");
+				}
 			})
 		},
 		searchData() {
@@ -155,7 +160,7 @@ export default {
 					addRecord(_this.formData).then(res => {
 						_this.$modal.closeLoading();
 						_this.$modal.msgSuccess("提交成功！");
-						_this.reset();
+						// _this.reset();
 						setTimeout(() => {
 							this.$tab.switchTab("/pages/work/index");
 						}, 500);
@@ -193,62 +198,9 @@ export default {
 			// 拼接为 "YYYY-MM-DD HH:mm" 格式
 			return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
 		},
-		reset() {
-			this.timeTake = null;
-			this.timeUnit = 'h';
-			this.formData = {
-				startTime: null,
-				endTime: null,
-				pwoJobCode: null,
-				pwoCode: null,
-				ptNoTar: null,
-				ptTitleTar: null,
-				opCode: null,
-				opTitle: null,
-				machineAdjustmentDuration: null
-			};
-		}
 	}
 }
 </script>
 
-<style scoped>
-.form-container {
-	padding: 15px;
-}
-
-.form-row {
-	display: flex;
-	align-items: center;
-	gap: 15px;
-	/* 两个项之间的间距 */
-	width: 100%;
-	margin: 10px 0;
-	/* 与上下表单项保持默认间距 */
-}
-
-/* 并列项平分宽度 */
-.form-col {
-	flex: 1;
-	min-width: 0;
-}
-
-/* 可选：统一并列项的label样式（避免对齐错乱） */
-:deep(.form-col .uni-forms-item__label) {
-	width: 80px !important;
-	/* 固定label宽度 */
-	text-align: left;
-}
-
-/* 其他表单项保持默认样式，无需额外修改 */
-:deep(.uni-forms-item) {
-	margin-bottom: 80px;
-	/* 统一所有表单项的底部间距 */
-}
-
-.u-button {
-	height: 10% !important;
-	position: absolute;
-	bottom: 0;
-}
+<style>
 </style>
\ No newline at end of file