Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue

src/api/base/customer/index.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 创建客户管理
 export function createCustomerMain(data) {
   return request({
-    url: '/base/customer-main/create',
+    url: '/base/custom/create',
     method: 'post',
     data: data
   })
@@ -12,7 +12,7 @@ export function createCustomerMain(data) {
 // 更新客户管理
 export function updateCustomerMain(data) {
   return request({
-    url: '/base/customer-main/update',
+    url: '/base/custom/update',
     method: 'put',
     data: data
   })
@@ -21,7 +21,7 @@ export function updateCustomerMain(data) {
 // 删除客户管理
 export function deleteCustomerMain(id) {
   return request({
-    url: '/base/customer-main/delete?id=' + id,
+    url: '/base/custom/delete?id=' + id,
     method: 'delete'
   })
 }
@@ -29,7 +29,7 @@ export function deleteCustomerMain(id) {
 // 获得客户管理
 export function getCustomerMain(id) {
   return request({
-    url: '/base/customer-main/get?id=' + id,
+    url: '/base/custom/get?id=' + id,
     method: 'get'
   })
 }
@@ -37,7 +37,7 @@ export function getCustomerMain(id) {
 // 获得客户管理分页
 export function getCustomerMainPage(params) {
   return request({
-    url: '/base/customer-main/page',
+    url: '/base/custom/page',
     method: 'get',
     params
   })
@@ -45,7 +45,7 @@ export function getCustomerMainPage(params) {
 // 导出客户管理 Excel
 export function exportCustomerMainExcel(params) {
   return request({
-    url: '/base/customer-main/export-excel',
+    url: '/base/custom/export-excel',
     method: 'get',
     params,
     responseType: 'blob'

src/utils/dict.js

@@ -81,6 +81,19 @@ export const DICT_TYPE = {
   PROMOTION_COUPON_TAKE_TYPE: 'promotion_coupon_take_type', // 优惠劵的领取方式
   PROMOTION_ACTIVITY_STATUS: 'promotion_activity_status', // 优惠活动的状态
   PROMOTION_CONDITION_TYPE: 'promotion_condition_type', // 营销的条件类型枚举
+  // ==========base模块 ==========
+  //客户类型字典编码
+  DICT_CUS_TYPE : "cus_type",
+  //客户初始来源字典编码
+  DICT_CUS_DATA_FROM : 'cus_data_from',
+  //业务分类字典编码
+  DICT_CUS_BUSI_TYPE : 'cus_busi_type',
+  //客户注册方式字典编码
+  DICT_SIGN_TYPE : 'cus_sign_type',
+  //性别
+  DICT_SYS_USER_SEX : 'system_user_sex',
+  //客户状态
+  DICT_CUS_INFO_STATUS : 'cus_info_status',
 }
 
 /**

src/views/base/customer/CustomerMainForm.vue

@@ -4,25 +4,26 @@
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body>
       <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
         <el-form-item label="sys_user表id" prop="userId">
-                      <el-input v-model="formData.userId" placeholder="请输入sys_user表id" />
+          <el-input v-model="formData.userId" placeholder="请输入sys_user表id"/>
         </el-form-item>
         <el-form-item label="用户类型" prop="typeCode">
-                      <el-input v-model="formData.typeCode" placeholder="请输入用户类型" />
+          <el-input v-model="formData.typeCode" placeholder="请输入用户类型"/>
         </el-form-item>
         <el-form-item label="所属企业code（部门表code）" prop="deptCode">
-                      <el-input v-model="formData.deptCode" placeholder="请输入所属企业code（部门表code）" />
+          <el-input v-model="formData.deptCode" placeholder="请输入所属企业code（部门表code）"/>
         </el-form-item>
         <el-form-item label="客户名称（政企客户填企业名称）" prop="cusName">
-                      <el-input v-model="formData.cusName" placeholder="请输入客户名称（政企客户填企业名称）" />
+          <el-input v-model="formData.cusName" placeholder="请输入客户名称（政企客户填企业名称）"/>
         </el-form-item>
         <el-form-item label="联系方式" prop="phoneNumber">
-                      <el-input v-model="formData.phoneNumber" placeholder="请输入联系方式" />
+          <el-input v-model="formData.phoneNumber" placeholder="请输入联系方式"/>
         </el-form-item>
         <el-form-item label="生日" prop="birthday">
-                      <el-date-picker clearable v-model="formData.birthday" type="date" value-format="timestamp" placeholder="选择生日" />
+          <el-date-picker clearable v-model="formData.birthday" type="date" value-format="timestamp"
+                          placeholder="选择生日"/>
         </el-form-item>
         <el-form-item label="住址" prop="address">
-                      <el-input v-model="formData.address" placeholder="请输入住址" />
+          <el-input v-model="formData.address" placeholder="请输入住址"/>
         </el-form-item>
         <el-form-item label="性别" prop="sex">
           <el-radio-group v-model="formData.sex">
@@ -30,26 +31,27 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="身份证号" prop="idCard">
-                      <el-input v-model="formData.idCard" placeholder="请输入身份证号" />
+          <el-input v-model="formData.idCard" placeholder="请输入身份证号"/>
         </el-form-item>
         <el-form-item label="身份证照片">
           <ImageUpload v-model="formData.idCardImage"/>
         </el-form-item>
         <el-form-item label="客户初始来源" prop="dataFrom">
-                      <el-input v-model="formData.dataFrom" placeholder="请输入客户初始来源" />
+          <el-input v-model="formData.dataFrom" placeholder="请输入客户初始来源"/>
         </el-form-item>
         <el-form-item label="最近业务办理时间" prop="nearDoTime">
-                      <el-date-picker clearable v-model="formData.nearDoTime" type="date" value-format="timestamp" placeholder="选择最近业务办理时间" />
+          <el-date-picker clearable v-model="formData.nearDoTime" type="date" value-format="timestamp"
+                          placeholder="选择最近业务办理时间"/>
         </el-form-item>
         <el-form-item label="最近办理业务（数据字典业务标识）">
           <Editor v-model="formData.nearDoContent" :min-height="192"/>
         </el-form-item>
         <el-form-item label="邀请者user_id" prop="inviter">
-                      <el-input v-model="formData.inviter" placeholder="请输入邀请者user_id" />
+          <el-input v-model="formData.inviter" placeholder="请输入邀请者user_id"/>
         </el-form-item>
         <el-form-item label="邀请者类型" prop="inviterType">
           <el-select v-model="formData.inviterType" placeholder="请选择邀请者类型">
-                            <el-option label="请选择字典生成" value="" />
+            <el-option label="请选择字典生成" value=""/>
           </el-select>
         </el-form-item>
         <el-form-item label="客户状态" prop="status">
@@ -67,10 +69,11 @@
 </template>
 
 <script>
-  import * as CustomerMainApi from '@/api/base/customer';
+import * as CustomerMainApi from '@/api/base/customer';
-  import ImageUpload from '@/components/ImageUpload';
+import ImageUpload from '@/components/ImageUpload';
-  import Editor from '@/components/Editor';
+import Editor from '@/components/Editor';
-      export default {
+
+export default {
   name: "CustomerMainForm",
   components: {
     ImageUpload,
@@ -105,8 +108,7 @@
         status: undefined,
       },
       // 表单校验
-        formRules: {
+      formRules: {},
-        },
     };
   },
   methods: {
@@ -175,5 +177,5 @@
       this.resetForm("formRef");
     }
   }
-  };
+};
 </script>

src/views/base/customer/index.vue

@@ -2,59 +2,23 @@
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="sys_user表id" prop="userId">
+
-        <el-input v-model="queryParams.userId" placeholder="请输入sys_user表id" clearable @keyup.enter.native="handleQuery"/>
+      <el-form-item label="客户名称" prop="cusName">
-      </el-form-item>
+        <el-input v-model="queryParams.cusName" placeholder="请输入客户名称" clearable
-      <el-form-item label="用户类型" prop="typeCode">
+                  @keyup.enter.native="handleQuery"/>
-        <el-input v-model="queryParams.typeCode" placeholder="请输入用户类型" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="所属企业code（部门表code）" prop="deptCode">
-        <el-input v-model="queryParams.deptCode" placeholder="请输入所属企业code（部门表code）" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="客户名称（政企客户填企业名称）" prop="cusName">
-        <el-input v-model="queryParams.cusName" placeholder="请输入客户名称（政企客户填企业名称）" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="联系方式" prop="phoneNumber">
         <el-input v-model="queryParams.phoneNumber" placeholder="请输入联系方式" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="生日" prop="birthday">
-        <el-date-picker clearable v-model="queryParams.birthday" type="date" value-format="yyyy-MM-dd" placeholder="选择生日" />
-      </el-form-item>
-      <el-form-item label="住址" prop="address">
-        <el-input v-model="queryParams.address" placeholder="请输入住址" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="性别" prop="sex">
-        <el-select v-model="queryParams.sex" placeholder="请选择性别" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
       <el-form-item label="身份证号" prop="idCard">
         <el-input v-model="queryParams.idCard" placeholder="请输入身份证号" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="客户初始来源" prop="dataFrom">
+
-        <el-input v-model="queryParams.dataFrom" placeholder="请输入客户初始来源" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="最近业务办理时间" prop="nearDoTime">
-        <el-date-picker v-model="queryParams.nearDoTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item label="邀请者user_id" prop="inviter">
-        <el-input v-model="queryParams.inviter" placeholder="请输入邀请者user_id" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="邀请者类型" prop="inviterType">
-        <el-select v-model="queryParams.inviterType" placeholder="请选择邀请者类型" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
       <el-form-item label="客户状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择客户状态" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
+          <el-option label="请选择字典生成" value=""/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -65,52 +29,62 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
-                   v-hasPermi="['base:customer-main:create']">新增</el-button>
+                   v-hasPermi="['base:customer-main:create']">新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-                   v-hasPermi="['base:customer-main:export']">导出</el-button>
+                   :loading="exportLoading"
+                   v-hasPermi="['base:customer-main:export']">导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-            <el-table-column label="uuid" align="center" prop="id" />
+      <el-table-column label="客户名称" align="center" prop="cusName"/>
-      <el-table-column label="sys_user表id" align="center" prop="userId" />
+      <el-table-column label="联系方式" align="center" prop="phoneNumber"/>
-      <el-table-column label="用户类型" align="center" prop="typeCode" />
-      <el-table-column label="所属企业code（部门表code）" align="center" prop="deptCode" />
-      <el-table-column label="客户名称（政企客户填企业名称）" align="center" prop="cusName" />
-      <el-table-column label="联系方式" align="center" prop="phoneNumber" />
       <el-table-column label="生日" align="center" prop="birthday" width="180">
         <template v-slot="scope">
-          <span>{{ parseTime(scope.row.birthday) }}</span>
+          <span>{{ parseTime(scope.row.birthday,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="住址" align="center" prop="address"/>
+      <el-table-column label="性别" align="center" prop="sex">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.DICT_SYS_USER_SEX" :value="scope.row.sex" />
+        </template>
+      </el-table-column>
+      <el-table-column label="身份证号" align="center" prop="idCard"/>
+      <el-table-column label="客户初始来源" align="center" prop="dataFrom">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.DICT_CUS_DATA_FROM" :value="scope.row.dataFrom" />
         </template>
       </el-table-column>
-      <el-table-column label="住址" align="center" prop="address" />
-      <el-table-column label="性别" align="center" prop="sex" />
-      <el-table-column label="身份证号" align="center" prop="idCard" />
-      <el-table-column label="身份证照片" align="center" prop="idCardImage" />
-      <el-table-column label="客户初始来源" align="center" prop="dataFrom" />
       <el-table-column label="最近业务办理时间" align="center" prop="nearDoTime" width="180">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.nearDoTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="最近办理业务（数据字典业务标识）" align="center" prop="nearDoContent" />
+      <el-table-column label="最近办理业务" align="center" prop="nearDoContent">
-      <el-table-column label="邀请者user_id" align="center" prop="inviter" />
-      <el-table-column label="邀请者类型" align="center" prop="inviterType" />
-      <el-table-column label="客户状态" align="center" prop="status" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
+          <dict-tag :type="DICT_TYPE.DICT_CUS_BUSI_TYPE" :value="scope.row.nearDoContent" />
         </template>
       </el-table-column>
+      <el-table-column label="客户状态" align="center" prop="status">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.DICT_CUS_INFO_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
-                     v-hasPermi="['base:customer-main:update']">修改</el-button>
+                     v-hasPermi="['base:customer-main:update']">修改
+          </el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:customer-main:delete']">删除</el-button>
+                     v-hasPermi="['base:customer-main:delete']">删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -118,13 +92,14 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
                 @pagination="getList"/>
     <!-- 对话框(添加 / 修改) -->
-    <CustomerMainForm ref="formRef" @success="getList" />
+    <CustomerMainForm ref="formRef" @success="getList"/>
   </div>
 </template>
 
 <script>
 import * as CustomerMainApi from '@/api/base/customer';
 import CustomerMainForm from './CustomerMainForm.vue';
+
 export default {
   name: "CustomerMain",
   components: {
@@ -181,7 +156,7 @@ export default {
       try {
         this.loading = true;
         const res = await CustomerMainApi.getCustomerMainPage(this.queryParams);
-        this.list = res.data.list;
+        this.list = res.data.records;
         this.total = res.data.total;
       } finally {
         this.loading = false;
@@ -209,7 +184,8 @@ export default {
         await CustomerMainApi.deleteCustomerMain(id);
         await this.getList();
         this.$modal.msgSuccess("删除成功");
-      } catch {}
+      } catch {
+      }
     },
     /** 导出按钮操作 */
     async handleExport() {