App设备管理确认

packages/mobile/src/views/Equipment/EquipmentDetails.vue

@@ -698,38 +698,6 @@
           />
         </van-popup>
 
-        <!-- 设备管理员弹窗 -->
-        <van-popup
-          :show="showAdminPicker"
-          round
-          position="bottom"
-          close-on-click-overlay
-          @close="showAdminPicker = false"
-        >
-          <van-picker
-            title="选择设备管理员"
-            :columns="adminOptions"
-            @confirm="onAdminConfirm"
-            @cancel="showAdminPicker = false"
-          />
-        </van-popup>
-
-        <!-- 操作员弹窗 -->
-        <van-popup
-          :show="showOperatorPicker"
-          round
-          position="bottom"
-          close-on-click-overlay
-          @close="showOperatorPicker = false"
-        >
-          <van-picker
-            title="选择操作员"
-            :columns="operatorOptions"
-            @confirm="operatorConfirm"
-            @cancel="showOperatorPicker = false"
-          />
-        </van-popup>
-
         <!-- 购置日期弹窗 -->
         <van-popup
           :show="showTimePicker"
@@ -800,6 +768,38 @@
         </van-button>
       </div>
     </van-popup>
+
+    <!-- 设备管理员弹窗 -->
+    <van-popup
+      :show="showAdminPicker"
+      round
+      position="bottom"
+      close-on-click-overlay
+      @close="showAdminPicker = false"
+    >
+      <van-picker
+        title="选择设备管理员"
+        :columns="adminOptions"
+        @confirm="onAdminConfirm"
+        @cancel="showAdminPicker = false"
+      />
+    </van-popup>
+
+    <!-- 操作员弹窗 -->
+    <van-popup
+      :show="showOperatorPicker"
+      round
+      position="bottom"
+      close-on-click-overlay
+      @close="showOperatorPicker = false"
+    >
+      <van-picker
+        title="选择操作员"
+        :columns="operatorOptions"
+        @confirm="operatorConfirm"
+        @cancel="showOperatorPicker = false"
+      />
+    </van-popup>
   </div>
 </template>
   
@@ -1057,15 +1057,14 @@ const getPersonList = async () => {
 // 打开编辑弹窗
 const onEditPopupOpen = async () => {
   await getPersonList();
-  Object.assign(editForm, {
+  editForm.equipment = JSON.parse(JSON.stringify(equipmentDetailInfo.value));
-    equipment: equipmentDetailInfo.value,
+  editForm.photos = [...photos.value];
-    photos: photos.value,
+
-  });
   fileList.value = photos.value.map((photo) => ({
-    url: photo.photoUrl, // 显示用的URL
+    url: photo.photoUrl,
-    status: "done", // 上传状态为已完成
+    status: "done",
-    message: "上传成功", // 提示信息
+    message: "上传成功",
-    serverUrl: photo.photoUrl, // 保留服务器返回的原始URL
+    serverUrl: photo.photoUrl,
   }));
   showEditPopup.value = true;
 };
@@ -1332,17 +1331,15 @@ const notYHZConfirm = async () => {
 const addToThisYHZPupup = ref(false);
 const addToThisYHZPopupOpen = async () => {
   await getPersonList();
-  Object.assign(editForm, {
+  editForm.equipment = JSON.parse(JSON.stringify(equipmentDetailInfo.value));
-    equipment: equipmentDetailInfo.value,
+  editForm.photos = [...photos.value];
-    photos: photos.value,
-  });
-  fileList.value = photos.value.map((photo) => ({
-    url: photo.photoUrl, // 显示用的URL
-    status: "done", // 上传状态为已完成
-    message: "上传成功", // 提示信息
-    serverUrl: photo.photoUrl, // 保留服务器返回的原始URL
-  }));
 
+  fileList.value = photos.value.map((photo) => ({
+    url: photo.photoUrl,
+    status: "done",
+    message: "上传成功",
+    serverUrl: photo.photoUrl,
+  }));
   addToThisYHZPupup.value = true;
 };
 const addToThisYHZPopupClose = () => {