Merge branch 'master' of http://gitlab.oytour.com/xiangwei/horse into master

src/api/customer2.ts

@@ -16,7 +16,6 @@ import Axios from './axios'
 interface CutomerParams {
   PageIndex: number,
   PageSize: number,
-  rowsPerPage: number,
   pageCount: number,
   CorpName: string, //企业名称
   CustomerName: string, //备注名
@@ -42,7 +41,7 @@ interface CutomerParams {
  */
 
 class CustomerService {
-  // 登录
+  // 获取用户列表数据
   static async getCustomerList(data: CutomerParams): Promise<HttpResponse> {
     return Axios('/QYCustomer/GetCustomerInfoPageList', {
       method: 'post',

src/module/customer/customerModule.ts

@@ -8,34 +8,54 @@
 import { StaticConfig } from '@/config/app'
 import { ref,reactive } from 'vue'
 import customer2,{CutomerParams} from '@/api/customer2'
-
+interface Params {
+  selectVal: string
+  selectWay: number
+}
+interface timeParams {
+  timeWay: number
+}
 const CustomerModule = () => {
+  //调用方法
   const getCustomerList =(param:CutomerParams)=>{
-    customer2.getCustomerList(param)
+    customer2.getCustomerList(param).then(res=>{
+      console.log(res,'数据');
+      if(res.data.Code==1){
+        data.dataList = res.data.Data.PageData;
+        msg.pageCount = res.data.Data.PageCount;
+      }
+    })
   }
   const title = ref(StaticConfig.appsuffix)
-
-  const data = {
+  //控制页显示条数
+  const pagination = reactive({
+    rowsPerPage:0
+  })
+  const data = reactive({
     columns:[{
-        name: 'desc',
+        name: 'CustomerName',
         label: '客户',
+        field: 'CustomerName',
         align: 'left',
       },
-      { name: 'calories', align: 'center', label: '客户阶段'},    
-      { name: 'fat', label: '客户标签', align: 'left'},
-      { name: 'carbs', label: '内容标签', align: 'left' },
-      { name: 'protein', label: '创建时间', align: 'left' },
-      { name: 'sodium', label: '负责人', align: 'left' },
-      { name: 'calcium', label: '上次跟进', align: 'left' },
-      { name: 'iron', label: '渠道活码来源', align: 'left'},
-      { name: 'num', label: '7日内客户回复消息数', align: 'left'},
-      { name: 'num', label: '7日内员工发送消息数', align: 'left'}],
-      selected:[]
-  }
+      { name: 'StageName', align: 'center', field:'StageName', label: '客户阶段'},    
+      { name: 'LableList', label: '客户标签', field:'LableList', align: 'left'},
+      { name: 'carbs', label: '内容标签', field:'carbs', align: 'left' },
+      { name: 'CreateTime', label: '创建时间', field:'CreateTime', align: 'left' },
+      { name: 'sodium', label: '负责人', field:'sodium', align: 'left' },
+      { name: 'LastFollowUpTime', label: '上次跟进', field:'LastFollowUpTime', align: 'left' },
+      { name: 'Source', label: '渠道活码来源', field:'Source', align: 'left'},
+      // { name: 'num', label: '7日内客户回复消息数', align: 'left'},
+      // { name: 'num', label: '7日内员工发送消息数', align: 'left'},
+      { name: 'FriendTime', label: '添加好友时间', field:'FriendTime',  align: 'left'},
+      { name: 'CheckInNum', label: '签到拜访', field:'CheckInNum', align: 'left'},
+    ],
+    selected:[],
+    dataList:[]
+  })
   const msg = reactive({
     PageIndex: 1,
     PageSize: 10,
-    rowsPerPage: 10,
     pageCount: 0,
     CorpName: '', //企业名称
     CustomerName: '', //备注名
@@ -58,7 +78,7 @@ const CustomerModule = () => {
     Name:'企业',
     Id:0
   },{
-    Name:'姓名',
+    Name:'昵称',
     Id:1
   },{
     Name:'备注名',
@@ -66,24 +86,46 @@ const CustomerModule = () => {
   },{
     Name:'电话',
     Id:3
+  }])
+  const TimeList = reactive([{
+    Name:'客户创建时间',
+    Id:1
   },{
-    Name:'昵称',
-    Id:4
+    Name:'好友添加时间',
+    Id:2
   }])
-  const SeletObj = reactive({
+  const SeletObj:Params = reactive({
     selectVal:'',
-    selectWay:''
+    selectWay:0
+  })
+  const TimeObj:timeParams = reactive({
+    timeWay:0
   })
   //选择方式
   const getSelectWay = () => {
-   
-    console.log(SeletObj);
-    // if(this.SeletObj.selectWay){
-
-    // }
+    msg.CorpName = '';
+    msg.WeChatName = '';
+    msg.CustomerName = '';
+    msg.CustomerMobile = '';
+    //1企业名称 2姓名 3备注名 4手机号
+    if(SeletObj.selectWay==0){  
+      msg.CorpName = SeletObj.selectVal;
+    }
+    if(SeletObj.selectWay==1){
+      msg.WeChatName = SeletObj.selectVal;
+    }
+    if(SeletObj.selectWay==2){
+      msg.CustomerName = SeletObj.selectVal;
+    }
+    if(SeletObj.selectWay==3){
+      msg.CustomerMobile = SeletObj.selectVal;
+    }
+  }
+  const changePage = (val:any) => {
+    console.log(val);
   }
 
-  return { getCustomerList,data,msg,title,TypeList,SeletObj,getSelectWay}
+  return { getCustomerList,data,msg,title,TypeList,SeletObj,getSelectWay,TimeObj,TimeList,changePage,pagination}
 }
 
 export default CustomerModule

src/pages/customerManage/customer.vue

@@ -4,21 +4,32 @@
       <div class="page-search row items-center">
         <div class="col row wrap q-mr-lg q-col-gutter-md">
           <div class="col-3">
-            <q-input filled v-model="SeletObj.selectVal" label="Filled">
+            <q-input filled v-model="SeletObj.selectVal" label='请输入'>
               <template #before>
-                <q-select filled style="width:120px;" @input="getSelectWay" option-value="Id" option-label="Name" v-model="SeletObj.selectWay"
+                <q-select filled style="width:120px;" @update:model-value="getSelectWay" option-value="Id" option-label="Name" v-model="SeletObj.selectWay"
                 :options="TypeList" emit-value map-options label="选择类型" />
               </template>
             </q-input>
           </div>
+          <div class="col-3">
+            <!-- <q-select filled style="width:120px;" @update:model-value="getSelectTime" option-value="Id" option-label="Name" v-model="TimeObj.timeWay"
+                :options="TimeList" emit-value map-options />
+            <q-date v-model="days" multiple /> -->
+          </div>
         </div>
       </div>
       <div class="page-content">
-        <q-table :data="data"
-          :columns="columns"
+        <q-table :rows="data.dataList"
+          :columns="data.columns"
+          class="my-sticky-header-column-table"
           row-key="name"
-          selection="multiple"
-          />
+          v-model:pagination="pagination"
+          selection="multiple">
+          <template v-slot:bottom>
+            <q-pagination class="full-width justify-end" v-model="msg.PageIndex" color="primary" :max="msg.pageCount"
+              :input="true" @input="changePage" />
+          </template>
+        </q-table>
       </div>
     </q-page>
   </div>
@@ -30,13 +41,13 @@
   export default defineComponent({
     setup() {
       let {
-       getCustomerList,data,msg,title,TypeList,SeletObj,getSelectWay
+       getCustomerList,data,msg,title,TypeList,SeletObj,getSelectWay,TimeObj,TimeList,changePage,pagination
       } = CustomerModule()
       onMounted(()=>{
         getCustomerList(msg)
       })
       return {
-        getCustomerList,data,msg,title,TypeList,SeletObj,getSelectWay
+        getCustomerList,data,msg,title,TypeList,SeletObj,getSelectWay,TimeObj,TimeList,changePage,pagination
       }
     }
   })