部分码完成

src/plant/print/models/connect-printer.vue

@@ -252,11 +252,10 @@ const handleDisconnect = async () => {
     connectedDevice.value = null;
 };
 const nextSteps = () => {
-<<<<<<< HEAD
-    // if (!connectedDevice.value) {
-    //     toast('请先连接设备');
-    //     return;
-    // }
+    if (!connectedDevice.value || !connectedDevice.value?.deviceId || !connectedDevice.value?.serviceId) {
+        toast('请先连接设备');
+        return;
+    }
     emit('next', {
         info: {
             ...props.info,
@@ -266,21 +265,6 @@ const nextSteps = () => {
         nextStepValue: props.nextStepValue || 'print',
 
     });
-=======
-    if (!connectedDevice.value || !connectedDevice.value?.deviceId || !connectedDevice.value?.serviceId) {
-        toast('请先连接设备');
-        return;
-    }
-   emit('next', {
-      info: {
-        ...props.info,
-        status: 'completed',
-        device: connectedDevice.value
-      },
-      nextStepValue: props.nextStepValue || 'print',
-     
-   });
->>>>>>> 42a6860549d82abd37fa4869d071b529277a834e
 };
 const prevSteps = () => {
     emit('prev', {