From fc39f41acfcb9afb8d12f3ed3799b97352bb4178 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 09 十二月 2025 16:57:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_food' into dev_food

---
 src/views/equipmentManagement/upkeep/Form/PlanForm.vue |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/src/views/equipmentManagement/upkeep/Form/PlanForm.vue b/src/views/equipmentManagement/upkeep/Form/PlanForm.vue
index e5e40c3..6d27f8a 100644
--- a/src/views/equipmentManagement/upkeep/Form/PlanForm.vue
+++ b/src/views/equipmentManagement/upkeep/Form/PlanForm.vue
@@ -24,6 +24,23 @@
         disabled
       />
     </el-form-item>
+    <el-form-item label="褰曞叆浜�">
+      <el-select
+        v-model="form.createUser"
+        placeholder="璇烽�夋嫨"
+        filterable
+        default-first-option
+        :reserve-keyword="false"
+        clearable
+      >
+        <el-option
+          v-for="item in userList"
+          :key="item.userId"
+          :label="item.userName"
+          :value="item.userId"
+        />
+      </el-select>
+    </el-form-item>
     <el-form-item label="璁″垝淇濆吇鏃ユ湡">
       <el-date-picker
         style="width: 100%"
@@ -43,6 +60,7 @@
 import { getDeviceLedger } from "@/api/equipmentManagement/ledger";
 import { onMounted } from "vue";
 import dayjs from "dayjs";
+import { userListNoPage } from "@/api/system/user.js";
 
 defineOptions({
   name: "璁″垝琛ㄥ崟",
@@ -59,6 +77,7 @@
   deviceName: undefined, // 璁惧鍚嶇О
   deviceModel: undefined, // 瑙勬牸鍨嬪彿
   maintenancePlanTime: undefined, // 璁″垝淇濆吇鏃ユ湡
+  createUser: undefined, // 褰曞叆浜�
 });
 
 const setDeviceModel = (id) => {
@@ -78,15 +97,22 @@
   form.deviceLedgerId = data.deviceLedgerId;
   form.deviceName = data.deviceName;
   form.deviceModel = data.deviceModel;
+  form.createUser = Number(data.createUser);
   form.maintenancePlanTime = dayjs(data.maintenancePlanTime).format(
     "YYYY-MM-DD HH:mm:ss"
   );
 };
 
+// 鐢ㄦ埛鍒楄〃
+const userList = ref([]);
+
 const loadForm = () => {};
 
 onMounted(() => {
   loadDeviceName();
+  userListNoPage().then((res) => {
+    userList.value = res.data;
+  });
 });
 
 defineExpose({

--
Gitblit v1.9.3