冲突合并

src/views/user/orderManagement/index.vue

@@ -269,34 +269,29 @@ const handleViewBack = () => {
         insureList: [],
         picList: [],
     }
-<<<<<<< HEAD
-    // 打开入驻弹框
-    dialogFormVisibleSettlein.value = true
-}
-=======
 
 const settlemoneyTitle = ref('')
 const moneyParams1: any = ref({
-    /* 设备名称 */ 
+    /* 设备名称 */
     deviceName: '',
-    deviceTypeList: [], 
+    deviceTypeList: [],
     deviceCount: 1,
-    unitName: '', 
-}) 
+    unitName: '',
+})
 const moneyParams2: any = ref({
-    /* 设备名称 */ 
+    /* 设备名称 */
     deviceName: '',
-    deviceTypeList: [], 
+    deviceTypeList: [],
     deviceCount: 1,
-    unitName: '', 
-}) 
+    unitName: '',
+})
 const moneyParams3: any = ref({
-    /* 设备名称 */ 
+    /* 设备名称 */
     deviceName: '',
-    deviceTypeList: [], 
+    deviceTypeList: [],
     deviceCount: 1,
-    unitName: '', 
-}) 
+    unitName: '',
+})
 const tableData: any = ref([
    {
     name1:'测试1',
@@ -326,7 +321,7 @@ const tableData: any = ref([
     jy8:'',
     remark:'备注2',
    }
-]) 
+])
 
 const partItems1: any = ref([{}])
 const partItems2: any = ref([{}])
@@ -396,8 +391,6 @@ const dialogFormVisibleSettlemoney: any = ref(false)
         partItems3.value.splice(index, 1);
       }
     }
-
->>>>>>> hongchao-dev
 </script>
 
 <template>