修改用户搜索和注册

pingan/src/views/home/analysis/components/profile-card.vue

@@ -13,7 +13,7 @@
         <el-avatar :size="68" :src="loginUser.avatar" />
         -->
         <div class="ele-cell-content">
-          <h4 class="ele-elip"> Hi, {{ loginUser.nickname }} , 您好! </h4>
+          <h4 class="ele-elip"> Hi, {{ loginUser.username }} , 您好! </h4>
           <!--
           <div class="ele-text-secondary ele-elip" style="margin-top: 8px">
             <i class="el-icon-heavy-rain"></i>

pingan/src/views/home/analysis/components/statistics-card.vue

@@ -16,10 +16,49 @@
         >
         <el-divider />
         <div class="analysis-chart-card-text"
-          >累计线索：{{ data.total_clues }}条</div
+          >本月线索：{{ data.month_clues }}条</div
         >
       </el-card>
     </el-col>
+    <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <el-card class="analysis-chart-card" shadow="never">
+        <template v-slot:header>
+          <div class="ele-cell">
+            <div class="ele-cell-content">今日新增客户(工单)</div>
+            <el-tag size="mini" type="danger">日</el-tag>
+          </div>
+        </template>
+        <div
+          class="analysis-chart-card-num ele-text-heading"
+          style="margin-bottom: 10px"
+          >{{ data.today_customers }}人</div
+        >
+        <el-divider />
+        <div class="analysis-chart-card-text"
+          >本月：{{ data.month_customers }}人</div
+        >
+      </el-card>
+    </el-col>
+    <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <el-card class="analysis-chart-card" shadow="never">
+        <template v-slot:header>
+          <div class="ele-cell">
+            <div class="ele-cell-content">今日新增订单</div>
+            <el-tag size="mini" type="danger">日</el-tag>
+          </div>
+        </template>
+        <div
+          class="analysis-chart-card-num ele-text-heading"
+          style="margin-bottom: 10px"
+          >{{ data.today_orders }}单</div
+        >
+        <el-divider />
+        <div class="analysis-chart-card-text"
+          >本月：{{ data.month_orders }}单</div
+        >
+      </el-card>
+    </el-col>
+    <!--
     <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
       <el-card class="analysis-chart-card" shadow="never">
         <template v-slot:header>
@@ -38,6 +77,7 @@
         >
       </el-card>
     </el-col>
+    -->
   </el-row>
 </template>
 
@@ -61,10 +101,14 @@
         // 支付笔数柱状图配置
         payNumChartOption: {},
         data: {
-          total_clues: 0,
-          today_clues: 0,
           member: 0,
-          orders: 0
+          orders: 0,
+          today_clues: 0,
+          month_clues: 0,
+          today_customers: 0,
+          month_customers: 0,
+          today_orders: 0,
+          month_orders: 0
         }
       };
     },

pingan/src/views/organization/user/components/user-search.vue

@@ -17,8 +17,8 @@
           <el-input clearable v-model="where.mobile" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 12, md: 12 } : { span: 12 }">
-        <el-form-item label="机构团队">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="机构">
           <el-select value="" v-model="where.teamId" clearable>
             <el-option
               v-for="item in teamList"
@@ -29,6 +29,16 @@
           </el-select>
         </el-form-item>
       </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="城市:">
+          <regions-select
+            v-model="where.citys"
+            type="provinceCity"
+            placeholder="请选择省市"
+            class="ele-fluid"
+          />
+        </el-form-item>
+      </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="中心">
           <el-select v-model="where.centerNumber" clearable>
@@ -81,8 +91,10 @@
 <script>
   import { listOrganizations } from '@/api/organization/manage';
   import { groupTypeUsers, centerUsers } from '@/api/organization/user';
+  import RegionsSelect from '@/components/RegionsSelect/index.vue';
 
   export default {
+    components: { RegionsSelect },
     data() {
       // 默认表单数据
       const defaultWhere = {
@@ -91,7 +103,8 @@
         orgId: '',
         teamId: '',
         groupType: '',
-        centerNumber: ''
+        centerNumber: '',
+        citys: []
       };
       return {
         // 表单数据

pingan/src/views/organization/user/index.vue

@@ -207,7 +207,7 @@
           {
             columnKey: 'action',
             label: '操作',
-            minWidth: 100,
+            minWidth: 150,
             align: 'center',
             resizable: false,
             slot: 'action',

pingan/src/views/register/index.vue

@@ -57,7 +57,7 @@
           </el-button>
         </div>
       </el-form-item>
-      <div class="el-form-item">
+      <el-form-item prop="agreement" class="agreement">
         <el-radio value="1" v-model="form.agreement" style="margin-right: 0" />
         <span style="font-size: 12px">
           同意
@@ -77,7 +77,7 @@
         >
           返回登录
         </el-link>
-      </div>
+      </el-form-item>
       <div class="el-form-item">
         <el-button
           size="large"
@@ -156,7 +156,7 @@
           phone: '',
           userCode: '',
           code: '',
-          agreement: 0
+          agreement: ''
         },
         // 表单验证规则
         rules: {
@@ -187,6 +187,13 @@
               message: '请输入验证码',
               trigger: 'blur'
             }
+          ],
+          agreement: [
+            {
+              required: true,
+              message: '请勾选注册协议',
+              trigger: 'blur'
+            }
           ]
         },
         // 用于刷新验证码