解决冲突

src/views/business/purchase/setup.ts

@@ -60,17 +60,10 @@ export function btnAndComp() {
     // 配置右键菜单列表
     const contextMenuList = ref<MenuItem[]>([]);
     // 打开新增页的弹窗 返回打开弹窗的方法
-<<<<<<< HEAD
-    const { openAction: addAction } = openModal('addCustomInfo');
-    // 创建详情页并写入右键菜单列表(每个页面都有,写死)
-    // detailButton('customDetail', contextMenuList);
-    // 通过code跟弹窗建立联系 返回写入右键的方法
-=======
     // const { openAction: addAction } = openModal('addCustomInfo');
     // // 创建详情页并写入右键菜单列表(每个页面都有,写死)
     // detailButton('customDetail', contextMenuList);
     // // 通过code跟弹窗建立联系 返回写入右键的方法
->>>>>>> 6ee5515fe134a733dad62c180d2dd58b4398ff60
     // const { action: deleteAction } = permissionButton('purchase_pending_someprice', '点价登记', contextMenuList);
 
     const stop = watchEffect(() => {

src/views/information/custom/compoments/modify/index.vue

@@ -1,11 +1,6 @@
 <template>
-<<<<<<< HEAD
   <!-- 修改客户资料 -->
   <a-modal class="commonModal modify-custom"
-=======
-  <!-- 修改客户资料-->
-  <a-modal class="modify-custom"
->>>>>>> 6ee5515fe134a733dad62c180d2dd58b4398ff60
            title="修改客户资料"
            v-model:visible="visible"
            @cancel="cancel"
@@ -16,7 +11,6 @@
                 :loading="loading"
                 @click="submit">完成</a-button>
     </template>
-<<<<<<< HEAD
     <a-form class="inlineForm"
             :form="form"
             @submit="handleSearch">
@@ -187,28 +181,20 @@
         </a-col>
       </a-row>
     </a-form>
-=======
->>>>>>> 6ee5515fe134a733dad62c180d2dd58b4398ff60
   </a-modal>
 </template>
 
 <script lang="ts">
 import { defineComponent, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
-<<<<<<< HEAD
 import { initData } from '@/common/methods/index';
-=======
->>>>>>> 6ee5515fe134a733dad62c180d2dd58b4398ff60
 
 export default defineComponent({
     name: 'modify-custom',
     components: {},
     setup() {
-<<<<<<< HEAD
-        const { visible, cancel } = closeModal('modifyCustomInfo');
-=======
+        // const { visible, cancel } = closeModal('modifyCustomInfo');
         const { visible, cancel } = closeModal('custom_info_btn_modify');
->>>>>>> 6ee5515fe134a733dad62c180d2dd58b4398ff60
         const loading = ref<boolean>(false);
         function submit() {
             loading.value = true;
@@ -217,10 +203,7 @@ export default defineComponent({
                 cancel();
             }, 2000);
         }
-<<<<<<< HEAD
         initData(() => {});
-=======
->>>>>>> 6ee5515fe134a733dad62c180d2dd58b4398ff60
         return {
             visible,
             cancel,
@@ -233,7 +216,6 @@ export default defineComponent({
 
 <style lang="less">
 .modify-custom {
-<<<<<<< HEAD
   .upload {
       display: inline-flex;
       .ant-btn.uploadBtn {
@@ -258,8 +240,6 @@ export default defineComponent({
           cursor: pointer;
       }
   }
-=======
->>>>>>> 6ee5515fe134a733dad62c180d2dd58b4398ff60
 }
 </style
 >;