冲突

src/views/user/orderManagement/index.vue

@@ -207,7 +207,7 @@ const handleFileSuccess2 = (response: any) => {
     }
 }
 //退租检修
-const handleViewBack = () => {
+    const handleViewBack = () => {
         settleinTitle.value = '退租检修'
         isEditDisabled.value = true
         equipmentDeploymentParams.value = {
@@ -267,13 +267,11 @@ const handleViewBack = () => {
             maStatus: 15,
             detectionList: [],
             insureList: [],
-        picList: [],
+            picList: []
         }
-<<<<<<< HEAD
-    // 打开入驻弹框
+        // 打开退组检修弹框
         dialogFormVisibleSettlein.value = true
-}
-=======
+    }
 
 const settlemoneyTitle = ref('')
 const moneyParams1: any = ref({
@@ -397,7 +395,6 @@ const dialogFormVisibleSettlemoney: any = ref(false)
       }
     }
 
->>>>>>> hongchao-dev
 </script>
 
 <template>