241102

src/views/shop/bookingCard/index.vue

@@ -65,8 +65,7 @@
     ColumnItem
   } from 'ele-admin-pro/es/ele-pro-table/types';
   import Search from './components/search.vue';
-<<<<<<< HEAD:src/views/shop/bookingCard/index.vue
-  import CardEdit from './components/cardEdit.vue';
+
   import {
     pageBookingCard,
     removeBookingCard,
@@ -76,33 +75,17 @@
     BookingCard,
     BookingCardParam
   } from '@/api/booking/bookingCard/model';
-  import { formatNumber } from 'ele-admin-pro/es';
-=======
-  import DealerApplyEdit from './components/dealerApplyEdit.vue';
-  import {
-    pageDealerApply,
-    removeDealerApply,
-    removeBatchDealerApply
-  } from '@/api/shop/dealerApply';
-  import type {
-    DealerApply,
-    DealerApplyParam
-  } from '@/api/shop/dealerApply/model';
->>>>>>> origin/master:src/views/shop/dealerApply/index.vue
+
 
   // 表格实例
   const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
 
   // 表格选中数据
-<<<<<<< HEAD:src/views/shop/bookingCard/index.vue
+
   const selection = ref<BookingCard[]>([]);
   // 当前编辑数据
   const current = ref<BookingCard | null>(null);
-=======
-  const selection = ref<DealerApply[]>([]);
-  // 当前编辑数据
-  const current = ref<DealerApply | null>(null);
->>>>>>> origin/master:src/views/shop/dealerApply/index.vue
+
   // 是否显示编辑弹窗
   const showEdit = ref(false);
   // 是否显示批量移动弹窗
@@ -121,11 +104,8 @@
     if (filters) {
       where.status = filters.status;
     }
-<<<<<<< HEAD:src/views/shop/bookingCard/index.vue
+
     return pageBookingCard({
-=======
-    return pageDealerApply({
->>>>>>> origin/master:src/views/shop/dealerApply/index.vue
       ...where,
       ...orders,
       page,
@@ -222,21 +202,16 @@
   ]);
 
   /* 搜索 */
-<<<<<<< HEAD:src/views/shop/bookingCard/index.vue
+
   const reload = (where?: BookingCardParam) => {
-=======
-  const reload = (where?: DealerApplyParam) => {
->>>>>>> origin/master:src/views/shop/dealerApply/index.vue
+
     selection.value = [];
     tableRef?.value?.reload({ where: where });
   };
 
   /* 打开编辑弹窗 */
-<<<<<<< HEAD:src/views/shop/bookingCard/index.vue
+
   const openEdit = (row?: BookingCard) => {
-=======
-  const openEdit = (row?: DealerApply) => {
->>>>>>> origin/master:src/views/shop/dealerApply/index.vue
     current.value = row ?? null;
     showEdit.value = true;
   };
@@ -247,15 +222,10 @@
   };
 
   /* 删除单个 */
-<<<<<<< HEAD:src/views/shop/bookingCard/index.vue
+
   const remove = (row: BookingCard) => {
     const hide = message.loading('请求中..', 0);
     removeBookingCard(row.cardId)
-=======
-  const remove = (row: DealerApply) => {
-    const hide = message.loading('请求中..', 0);
-    removeDealerApply(row.applyId)
->>>>>>> origin/master:src/views/shop/dealerApply/index.vue
       .then((msg) => {
         hide();
         message.success(msg);
@@ -280,11 +250,8 @@
       maskClosable: true,
       onOk: () => {
         const hide = message.loading('请求中..', 0);
-<<<<<<< HEAD:src/views/shop/bookingCard/index.vue
+
         removeBatchBookingCard(selection.value.map((d) => d.cardId))
-=======
-        removeBatchDealerApply(selection.value.map((d) => d.applyId))
->>>>>>> origin/master:src/views/shop/dealerApply/index.vue
           .then((msg) => {
             hide();
             message.success(msg);
@@ -304,11 +271,8 @@
   };
 
   /* 自定义行属性 */
-<<<<<<< HEAD:src/views/shop/bookingCard/index.vue
+
   const customRow = (record: BookingCard) => {
-=======
-  const customRow = (record: DealerApply) => {
->>>>>>> origin/master:src/views/shop/dealerApply/index.vue
     return {
       // 行点击事件
       onClick: () => {
@@ -325,11 +289,7 @@
 
 <script lang="ts">
   export default {
-<<<<<<< HEAD:src/views/shop/bookingCard/index.vue
     name: 'BookingCard'
-=======
-    name: 'DealerApply'
->>>>>>> origin/master:src/views/shop/dealerApply/index.vue
   };
 </script>