fix:客户模块修改

src/pages/index/customer/customer_list/components/AddCustomerDialog.vue

@@ -10,8 +10,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item :label-width="labelWidth" label="客户账号" prop="customer_account">
+          <el-form-item :label-width="labelWidth" label="客户邮箱" prop="customer_email">
-            <el-input v-model='formData.customer_account' type="text" placeholder='请输入客户账号'></el-input>
+            <el-input v-model='formData.customer_email' type="text" placeholder='请输入客户邮箱'></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -24,11 +24,6 @@
             <el-input v-model='formData.customer_phone' type="text" placeholder='请输入客户手机号'></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item :label-width="labelWidth" label="客户邮箱" prop="customer_email">
-            <el-input v-model='formData.customer_email' type="text" placeholder='请输入客户邮箱'></el-input>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item :label-width="labelWidth" label="客户性别" prop="customer_sex">
             <el-select v-model="formData.customer_sex" clearable placeholder="请选择">
@@ -119,18 +114,18 @@ const rules = reactive({
       message: '客户昵称不能为空'
     }
   ],
-  customer_account: [
-    {
-      required: true,
-      message: '客户账号不能为空'
-    }
-  ],
   customer_password: [
     {
       required: true,
       message: '客户密码不能为空'
     }
   ],
+  customer_email: [
+    {
+      required: true,
+      message: '客户邮箱不能为空'
+    }
+  ],
 });
 
 

src/pages/index/customer/customer_list/components/DetailCustomerDialog.vue

@@ -10,8 +10,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item :label-width="labelWidth" label="客户账号" prop="customer_account">
+          <el-form-item :label-width="labelWidth" label="客户邮箱" prop="customer_email">
-            <el-input v-model='formData.customer_account' type="text" placeholder='请输入客户账号'></el-input>
+            <el-input v-model='formData.customer_email' type="text" placeholder='请输入客户邮箱'></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -19,11 +19,6 @@
             <el-input v-model='formData.customer_phone' type="text" placeholder='请输入客户手机号'></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item :label-width="labelWidth" label="客户邮箱" prop="customer_email">
-            <el-input v-model='formData.customer_email' type="text" placeholder='请输入客户邮箱'></el-input>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item :label-width="labelWidth" label="客户性别" prop="customer_sex">
             <el-select v-model="formData.customer_sex" clearable placeholder="请选择">
@@ -38,6 +33,11 @@
               style='--el-switch-on-color: #ff4949;' />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item :label-width="labelWidth" label="客户注册时间" prop="customer_phone">
+            <el-input v-model='formData.customer_create_time' type="text" placeholder='请输入客户注册时间'></el-input>
+          </el-form-item>
+        </el-col>
 
 
       </el-row>

src/pages/index/customer/customer_list/components/EditCustomerDialog.vue

@@ -10,8 +10,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item :label-width="labelWidth" label="客户账号" prop="customer_account">
+          <el-form-item :label-width="labelWidth" label="客户邮箱" prop="customer_email">
-            <el-input disabled v-model='formData.customer_account' type="text" placeholder='请输入客户账号'></el-input>
+            <el-input disabled v-model='formData.customer_email' type="text" placeholder='请输入客户邮箱'></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -19,11 +19,6 @@
             <el-input v-model='formData.customer_phone' type="text" placeholder='请输入客户手机号'></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item :label-width="labelWidth" label="客户邮箱" prop="customer_email">
-            <el-input v-model='formData.customer_email' type="text" placeholder='请输入客户邮箱'></el-input>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item :label-width="labelWidth" label="客户性别" prop="customer_sex">
             <el-select v-model="formData.customer_sex" clearable placeholder="请选择">
@@ -127,12 +122,6 @@ const rules = reactive({
       message: '客户昵称不能为空'
     }
   ],
-  customer_account: [
-    {
-      required: true,
-      message: '客户账号不能为空'
-    }
-  ],
 });
 
 const handleEditClick = async (formEl) => {

src/pages/index/customer/customer_list/components/EditPswDialog.vue

@@ -3,12 +3,12 @@
         <el-form ref="formRef" :model="formData" :rules="rules">
             <el-col :span="12">
                 <el-form-item :label-width="labelWidth" label="客户昵称" prop="customer_name">
-                    <el-input v-model='formData.customer_name'  disabled type="text" placeholder='请输入客户昵称'></el-input>
+                    <el-input v-model='formData.customer_name' disabled type="text" placeholder='请输入客户昵称'></el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
-                <el-form-item :label-width="labelWidth" label="客户账号" prop="customer_account">
+                <el-form-item :label-width="labelWidth" label="客户邮箱" prop="customer_email">
-                    <el-input v-model='formData.customer_account' disabled type="text" placeholder='请输入客户账号'></el-input>
+                    <el-input v-model='formData.customer_email' disabled type="text" placeholder='请输入客户邮箱'></el-input>
                 </el-form-item>
             </el-col>
             <el-row>

src/pages/index/customer/customer_list/index.vue

@@ -11,15 +11,12 @@
     <el-form-item label="客户昵称">
       <el-input v-model='params.customer_name' placeholder='请输入客户昵称'></el-input>
     </el-form-item>
-    <el-form-item label="客户账号">
+    <el-form-item label="客户邮箱">
-      <el-input v-model='params.customer_account' placeholder='请输入客户账号'></el-input>
+      <el-input v-model='params.customer_email' placeholder='请输入客户邮箱'></el-input>
     </el-form-item>
     <el-form-item label="客户手机号">
       <el-input v-model='params.customer_phone' placeholder='请输入客户手机号'></el-input>
     </el-form-item>
-    <el-form-item label="客户邮箱">
-      <el-input v-model='params.customer_email' placeholder='请输入客户邮箱'></el-input>
-    </el-form-item>
     <el-form-item label="客户性别">
       <el-select v-model="params.customer_sex" clearable placeholder="请选择">
         <el-option v-for="item in sex" :key="item.dictionary_guid" :label="item.dictionary_name"
@@ -32,6 +29,10 @@
           :value="item.dictionary_value"></el-option>
       </el-select>
     </el-form-item>
+    <el-form-item label="注册时间范围" prop="date_time">
+      <el-date-picker v-model="params.date_time" type="datetimerange" range-separator="至" start-placeholder="起始日期时间"
+        end-placeholder="结束日期时间" value-format="YYYY-MM-DD HH:mm" />
+    </el-form-item>
     <el-form-item>
       <el-button type="primary" @click="tableRef.reload()" icon="ElIconSearch">
         搜索
@@ -60,7 +61,7 @@
   </el-space>
   <!-- 数据表格 -->
   <DataTable ref="tableRef" style="width: 100%" :onSelectionChange="data => (selectionData = data)" :column="column"
-    :params="params" :request="params => getCustomerList(params)">
+    :params="params" border :request="params => getCustomerList(params)">
 
 
     <template #customer_sex='scope'>
@@ -139,12 +140,11 @@ const headers = {
 // 查询参数
 const params = reactive({
   customer_name: "",
-  customer_account: "",
   customer_phone: "",
   customer_email: "",
   customer_sex: "",
   customer_blacklist: "",
-
+  date_time: "",
 });
 const column = [
 
@@ -157,31 +157,31 @@ const column = [
     label: '客户昵称',
     width: '150'
   },
-  {
-    prop: "customer_account",
-    label: '客户账号',
-    width: '150'
-  },
-  {
-    prop: "customer_phone",
-    label: '客户手机号',
-    width: '150'
-  },
   {
     prop: "customer_email",
     label: '客户邮箱',
-    width: '150'
+    width: '200'
-  },
-  {
-    prop: "customer_sex",
-    label: '客户性别',
-    width: '150'
   },
+  // {
+  //   prop: "customer_phone",
+  //   label: '客户手机号',
+  //   width: '200'
+  // },
+  // {
+  //   prop: "customer_sex",
+  //   label: '客户性别',
+  //   width: '150'
+  // },
   {
     prop: "customer_blacklist",
     label: '黑名单',
     width: '150'
   },
+  {
+    prop: "customer_create_time",
+    label: '注册时间',
+    width: '200'
+  },
   {
     label: '操作',
     prop: 'chaoz',