解决冲突

package.json

@@ -14,6 +14,7 @@
     "@types/lockr": "^0.8.7",
     "@types/lodash": "^4.14.175",
     "@types/webpack-env": "^1.16.2",
+    "ant-design-vue": "^2.2.8",
     "axios": "^0.21.1",
     "core-js": "^3.6.5",
     "element-plus": "^1.2.0-beta.2",

src/api/clue.ts

+import Axios from './axios'
+import { HttpResponse } from '@/@types'
+interface ClueParams {
+  PageIndex: number
+  PageSize: number
+  pageCount: number
+  CorpName: string //企业名称
+  CustomerName: string //备注名
+  WeChatName: string //昵称
+  CustomerMobile: string //手机号码
+  CreateSTime: string //创建开始时间
+  CreateETime: string //创建结束时间
+  FriendSTime: string //好友开始时间
+  FriendETime: string //好友结束时间
+  Q_NotFollowUpDay: number //几天未跟进
+  Q_Friends: string //好友关系 多选逗号分隔、
+  Q_AddWay: string //获取来源 多选英文逗号分隔
+  EmpId: number //员工id
+  CustomerType: number //类型1微信用户 2企业微信用户
+  SelectList: Array<any> //自定义查询
+  OrderBy: number //排序
+  AddCondition: number //查询条件
+}
+class customerService {
+  // 获取用户列表数据
+  static async getCustomerList(data: ClueParams): Promise<HttpResponse> {
+    return Axios('/QYCustomer/GetCustomerInfoPageList', {
+      method: 'post',
+      responseType: 'json',
+      data
+    })
+  }
+}
+
+export { ClueParams }
+export default customerService

src/boot/axios.ts

 import { boot } from 'quasar/wrappers'
 import axios, { AxiosInstance } from 'axios'
+import { Cascader } from 'ant-design-vue'
 declare module '@vue/runtime-core' {
 	interface ComponentCustomProperties {
 		$axios: AxiosInstance
@@ -19,7 +20,7 @@ export default boot(({ app }) => {
 	app.config.globalProperties.$axios = axios
 	// ^ ^ ^ this will allow you to use this.$axios (for Vue Options API form)
 	//       so you won't necessarily have to import axios in each vue file
-
+	app.use(Cascader)
 	/**
 	 * @deprecated 弃用的方法
 	 */

src/module/customer/clueModule.ts

+// import { ref, reactive } from 'vue'
+import customerService, { ClueParams } from '@/api/clue'
+
+// interface dataType{
+
+// }
+
+// let data = reactive({})
+
+const ClueModule = () => {
+  //获取线索列表
+  const getCluerList = (param: ClueParams) => {
+    customerService.getCustomerList(param).then(res => {
+      console.log(res, '数据')
+      
+    })
+  }
+
+  return { getCluerList }
+}
+export default ClueModule
\ No newline at end of file

src/pages/customer/components/clueRule.vue

@@ -26,7 +26,7 @@
                 <tr v-if="data.length == 0&&defaultData.length == 0">
                     <td :colspan="9" align="center">暂无数据</td>
                 </tr>
-                <tr v-for="item in defaultData" v-if="defaultData.length > 0">
+                <tr v-for="(item,index) in defaultData" v-if="defaultData.length > 0" :key="index">
                     <td>
                                 <span v-if="item.RuleSelectType === 1">并且</span>
                                 <span v-if="item.RuleSelectType === 2">或者</span>

src/pages/customerManage/customer.vue

@@ -96,14 +96,17 @@
             <q-input filled v-model="msg.Q_NotFollowUpDay" label='几天未跟进'></q-input>
           </div>
           <div class="col-2">
-            <!-- <q-tree class="col-12 col-sm-6"
-              :nodes="data.EmployeeList"
-              node-key="DeptName"
+            <q-tree class="col-12 col-sm-6"
               tick-strategy="leaf"
-              v-model:selected="selected"
-            /> -->
-            <!-- <selectTree :treeData='data.EmployeeList' nodeKey="newId" :multiple="false"
-              labelKey="DeptName" childrenKey="ChildList" tipText="选择部门/人员"></selectTree> -->
+              :nodes="data.EmployeeList"
+              v-model:ticked="ticked"
+              v-model:expanded="expanded"
+              node-key="DeptId"
+              label-key="DeptName"
+              children-key="ChildList"
+              :tick-strategy="tickStrategy"
+              default-expand-all
+            />
           </div>
         </div>
       </div>
@@ -133,7 +136,7 @@
   </div>
 </template>
 <script lang='ts'>
-  import {defineComponent,onMounted} from 'vue'
+  import {ref,defineComponent,onMounted} from 'vue'
   import CustomerModule from '@/module/customer/customerModule'
 
   export default defineComponent({
@@ -157,6 +160,8 @@
         friendOptions,
         getEmployeeData
       } = CustomerModule()
+      let ticked=ref([])
+      let expanded=ref([])
       onMounted(() => {
         getCustomerList(msg)
         getWayList({})
@@ -179,7 +184,9 @@
         customSetObj,
         friendObj,
         friendOptions,
-        getEmployeeData
+        getEmployeeData,
+        ticked,
+        expanded
       }
     }
   })