解决冲突

src/api/customer.ts

@@ -30,7 +30,14 @@
        data
      })
    }
- 
+   // 获取客户线索规则列表
+   static async getCustomerClueRuleList(data:any): Promise<HttpResponse> {
+     return Axios('QYCustomer/GetCustomerClueRuleList', {
+       method: 'post',
+       responseType: 'json',
+       data
+     })
+   }
  }
  
  export default customerService

src/components/customer/request-group.vue

+<template>
+    <div class="requestgroup">
+
+    </div>
+</template>
+<script lang="ts">
+    import { defineComponent, ref, onMounted } from 'vue'
+    import customerService from '@/api/customer'
+    export default defineComponent({
+        setup() {
+            const filedList = ref([])
+            const addMsg = ref([])
+
+
+            onMounted(() => {//进入页面就调用
+                getCustomerFiledList();//获取客户字段
+            })
+            const getCustomerFiledList = () => {
+                customerService.getCustomerFiledList({ Enable: 1 }).then((res) => {
+                    let data = res.data.Data
+                    filedList.value = data;
+                    filedList.value.forEach(x=>{// IsCustom 是否自定义字段 1是 2标签 3阶段
+                        x.IsCustom = 1
+                    })
+                    let obj = { Id: '客户阶段', Name: '客户阶段', Type: 4 ,IsCustom:3}
+                    filedList.value.unshift(obj)
+                    let obj2 = { Id: '标签', Name: '标签', Type: 3 ,IsCustom:2}
+                    filedList.value.unshift(obj2)
+                    addMsg.value.push({
+                        Name:filedList.value[0].Id,
+                        Type:filedList.value,
+                        Direction:1,
+                        StartValue:'',
+                        EndValue:'',
+                        IsCustom:2,
+                    })
+                })
+            }
+
+
+
+
+            return {
+                getCustomerFiledList
+            }
+        }
+
+    })
+</script>
\ No newline at end of file

src/module/customer/customerModule.ts

@@ -122,7 +122,7 @@ const CustomerModule = () => {
     }
   }
   const changePage = (val:any) => {
-    console.log(val);
+    console.log(125,val)
   }
 
   return { getCustomerList,data,msg,title,TypeList,SeletObj,getSelectWay,TimeObj,TimeList,changePage,pagination}

src/pages/customer/customerSetup.vue

@@ -13,9 +13,11 @@
         <q-tab name="yewumoshi" label="业务模式" />
         <q-tab name="field" label="客户字段" />
         <q-tab name="label" label="标签" />
+        <q-tab name="clue" label="线索分配规则" />
       </q-tabs>
-      <div v-if="tab == 'field'">
-        <customer-Field></customer-Field>
+      <div>
+        <customer-Field v-if="tab == 'field'"></customer-Field>
+        <clue-rule v-if="tab == 'clue'"></clue-rule>
       </div>
     </q-page>
   </div>
@@ -23,13 +25,15 @@
 
 <script lang="ts">
 import customerField from './components/customerField.vue'
+import clueRule from './components/clueRule.vue'
 import {
   defineComponent,
   ref
 } from 'vue'
 export default defineComponent({
   components: {
-    customerField
+    customerField,
+    clueRule
   },
   setup() {
     return {