|
|
@@ -118,9 +118,7 @@
|
|
|
</template>
|
|
|
</Modal>
|
|
|
|
|
|
- <<<<<<< HEAD
|
|
|
<component :is="modal1Component" v-model:open="modal1Open" :model-data="selectDatas" @refresh-data="refresh" />
|
|
|
- =======
|
|
|
<Modal v-model:show="titleModal" :show-canel-button="false" :show-ok-button="false">
|
|
|
<template #header>
|
|
|
{{ tabButtonModel.tipsTitle }}
|
|
|
@@ -135,14 +133,6 @@
|
|
|
</button>
|
|
|
</template>
|
|
|
</Modal>
|
|
|
-
|
|
|
- <component
|
|
|
- :is="modal1Component"
|
|
|
- v-model:open="modal1Open"
|
|
|
- :model-data="selectDatas"
|
|
|
- @refresh-data="refresh"
|
|
|
- />
|
|
|
- >>>>>>> 5152f209cc33b97d23cb378b32e5ff64cf301097
|
|
|
</template>
|
|
|
|
|
|
<script setup>
|
