bonus
/
Zlpt_Portal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

冲突

This commit is contained in:
jjLv 2024-11-28 10:14:15 +08:00
parent 84f63f55cf
commit 5a73080675
1 changed files with 64 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/user/orderManagement/index.vue
View File

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