diff --git a/yunxi-ui-admin-vben/src/views/xxjj/customer/branch/index.vue b/yunxi-ui-admin-vben/src/views/xxjj/customer/branch/index.vue index a3e51415..d39585ce 100644 --- a/yunxi-ui-admin-vben/src/views/xxjj/customer/branch/index.vue +++ b/yunxi-ui-admin-vben/src/views/xxjj/customer/branch/index.vue @@ -187,10 +187,27 @@ const dataSource = reactive([]) } ]; */ const pagination = reactive({ - total: 200, + total: 0, current: 1, pageSize: 10, + showSizeChanger: true, // 用于控制展示每页多少条的下拉 + showQuickJumper:true, + pageSizeOptions: ["10", "20", "50"], + showTotal: (total) => `共 ${total} 条`, + onShowSizeChange: pageSizeChange, + onChange: pageChange, }); +// 页数改变的方法 + +function pageSizeChange(val, pageNum){ + pagination.pageSize = pageNum; // 修改每页显示的条数 + pagination.current = 1; +} +// 点击上一页下一页的方法 +function pageChange(page, val){ + console.log(page, val); + pagination.current = page; +} const handleTableChange = async(page, filters, sorter, aaa) => { let param = {businessType: 0, pageNo: page.current, pageSize: page.pageSize}; if(sorter.columnKey){ @@ -232,13 +249,6 @@ const handlePage = async () => { message.error('修改失败'); } */ } - - - - - - - // 新增 let isShowModalAdd = ref(false); const doShowModalAdd = (isshow: boolean) => { diff --git a/yunxi-ui-admin-vue3/.env.dev b/yunxi-ui-admin-vue3/.env.dev index 9200ece2..941a2044 100644 --- a/yunxi-ui-admin-vue3/.env.dev +++ b/yunxi-ui-admin-vue3/.env.dev @@ -4,10 +4,10 @@ NODE_ENV=development VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://localhost:48080' +VITE_BASE_URL='http://localhost:8091' # 上传路径 -VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://localhost:8091/admin-api/infra/file/upload' # 接口前缀 VITE_API_BASEPATH=/dev-api diff --git a/yunxi-ui-admin-vue3/src/utils/dict.ts b/yunxi-ui-admin-vue3/src/utils/dict.ts index 1fc0ab27..79042c11 100644 --- a/yunxi-ui-admin-vue3/src/utils/dict.ts +++ b/yunxi-ui-admin-vue3/src/utils/dict.ts @@ -182,5 +182,26 @@ export enum DICT_TYPE { PROMOTION_ACTIVITY_STATUS = 'promotion_activity_status', // 优惠活动的状态 PROMOTION_CONDITION_TYPE = 'promotion_condition_type', // 营销的条件类型枚举 PROMOTION_BARGAIN_RECORD_STATUS = 'promotion_bargain_record_status', // 砍价记录的状态 - PROMOTION_COMBINATION_RECORD_STATUS = 'promotion_combination_record_status' // 拼团记录的状态 + PROMOTION_COMBINATION_RECORD_STATUS = 'promotion_combination_record_status', // 拼团记录的状态 + + + + // ============= BUSINESSLINE 模块================= + BUSINESS_TYPE = 'business_type', //业务线类型 + DIFF_FLAG = 'diff_flag', + CLASS_STATUS = 'class_status', //类别状态 + DUTY_TYPE = 'duty_type', //业务线的所属分类 + BUSINESS_ORGANIZATION_TYPE = 'business_organization_type', //业务组织类型 + + // ============= ENTERPRISEBRANCHING 模块================= + ENTERPRISE_TYPE = 'enterprise_type', //业务线类型 + CUSTOMER_STATUS = 'customer_status', //客户状态 + CUSTOMER_CALSSIFY = 'customer_calssify', //客户分类 + CUSTOMER_STARRATING = 'customer_starrating', //客户星级 + industrySchedule = 'industry_schedule', //客户星级 + industryClassify = 'industry_classify', //客户星级 + customerSource = 'customer_source', //客户星级 + enterpriseNature = 'enterprise_nature', //客户星级 + XUELI = 'XUELI', //学历 + ENTERPRISE_OPERATE_TYPE = 'enterprise_operate_type', //客户星级 } diff --git a/yunxi-ui-admin-vue3/src/views/xxjj/subjectBasic/SubjectBasicForm.vue b/yunxi-ui-admin-vue3/src/views/xxjj/subjectBasic/SubjectBasicForm.vue index f4ba3aed..17d9a685 100644 --- a/yunxi-ui-admin-vue3/src/views/xxjj/subjectBasic/SubjectBasicForm.vue +++ b/yunxi-ui-admin-vue3/src/views/xxjj/subjectBasic/SubjectBasicForm.vue @@ -7,13 +7,20 @@ label-width="100px" v-loading="formLoading" > - + - + + + @@ -249,7 +256,7 @@