From e13db9fa5e078b38b37fdd7d7ace824ca9bb907b Mon Sep 17 00:00:00 2001
From: JasonChen <jason@192.168.3.101>
Date: Tue, 1 Aug 2023 16:01:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=AF=B9=E6=8E=A5~?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user.js                 |  10 ++
 src/views/permissions/Index.vue |   4 +-
 src/views/user/Index.vue        | 177 +++++++-------------------------
 3 files changed, 51 insertions(+), 140 deletions(-)
 create mode 100644 src/api/user.js

diff --git a/src/api/user.js b/src/api/user.js
new file mode 100644
index 0000000..65b511c
--- /dev/null
+++ b/src/api/user.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 用户列表
+export function getMiddlesUser (parameter) {
+  return request({
+    url: '/middles/user/children',
+    method: 'get',
+    params: parameter
+  })
+}
diff --git a/src/views/permissions/Index.vue b/src/views/permissions/Index.vue
index ee2bdfe..c98114b 100644
--- a/src/views/permissions/Index.vue
+++ b/src/views/permissions/Index.vue
@@ -50,8 +50,8 @@
             size="default">
 
             <div slot="name" slot-scope="text, record">
-                <div>{{ record.name }}</div>
-                <div>{{ record.username }}</div>
+              <div>{{ record.name }}</div>
+              <div>{{ record.username }}</div>
             </div>
             <div slot="type" slot-scope="text, record">{{ record.type }}</div>
             <!-- <div slot="status" class="status">
diff --git a/src/views/user/Index.vue b/src/views/user/Index.vue
index 9b8f634..39f9d75 100644
--- a/src/views/user/Index.vue
+++ b/src/views/user/Index.vue
@@ -7,23 +7,18 @@
           <a-row :gutter="48">
             <a-col :md="8" :sm="24">
               <a-form-item label="用户昵称">
-                <a-input v-model="queryParam.order_no" placeholder="用户昵称" />
+                <a-input v-model="queryParam.nickname" placeholder="用户昵称" />
               </a-form-item>
             </a-col>
             <a-col :md="8" :sm="24">
-              <a-form-item label="用户昵称">
-                <a-input v-model="queryParam.item_id" placeholder="用户昵称" />
-              </a-form-item>
-            </a-col>
-            <a-col :md="8" :sm="24">
-              <a-form-item label="顶点账号">
-                <a-input v-model="queryParam.item_id" placeholder="顶点账号" />
+              <a-form-item label="用户手机号">
+                <a-input v-model="queryParam.username" placeholder="用户手机号" />
               </a-form-item>
             </a-col>
             <a-col :md="8" :sm="24">
               <a-form-item label="身份筛选" has-feedback>
-                <a-select v-model="queryParam.business_type_id" @change="onBusinessChange" placeholder="身份筛选">
-                  <a-select-option v-for="item in businessArray" :key="item.id" :value="item.id">{{ item.title }}</a-select-option>
+                <a-select v-model="queryParam.identity_id" placeholder="身份筛选">
+                  <a-select-option v-for="item in indentitys" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
@@ -31,13 +26,6 @@
               <a-button type="primary" @click="search"><a-icon type="search" />搜索</a-button>
               <a-button class="ml8" type="primary" @click="onAddRole"><a-icon type="plus" />新增</a-button>
               <a-button class="ml8" @click="resetSearch"><a-icon type="undo" />重置</a-button>
-              <a-button
-                v-if="exports_can"
-                class="ml8"
-                type="dashed"
-                shape="round"
-                icon="download"
-                @click="exports"/>
             </a-col>
           </a-row>
         </a-form>
@@ -50,16 +38,22 @@
         ref="table"
         :columns="columns"
         :data="loadData"
-        :rowKey="(row) => row.order_item_id"
+        :rowKey="(row) => row.user_id"
         showPagination="auto"
         bordered
         size="default"
         :scroll="{ x: 1200, y: 1000 }">
-        <!-- 申请用户 实习顾问 法务老师 -->
-        <div slot="user" slot-scope="text, record" style="color: #1890ff">
-          <div>{{ record.user }}</div>
+        <div slot="user_id" slot-scope="text, record">{{ record.user.user_id }}</div>
+        <div slot="nickname" slot-scope="text, record" >{{ record.user.nickname || '-' }}</div>
+        <div slot="name" slot-scope="text, record">{{ record.user.name || '-' }}</div>
+        <div slot="username" slot-scope="text, record">{{ record.user.username || '-' }}</div>
+        <div slot="identity" slot-scope="text, record">
+          <img v-if="record.identity&& record.identity.cover" :src="record.identity.cover" alt="" style="width:60px">
+          <span v-else> {{ record.identity.name }}</span>
         </div>
-        <!-- 创建时间 -->
+        <div slot="invite" slot-scope="text, record" style="color: #1890ff">{{ record.user.invite || '-' }}</div>
+        <div slot="parent" slot-scope="text, record">{{ record.parent.nickname }}<div>{{ record.parent.username }}</div></div>
+
         <span slot="created_at" slot-scope="text, record">{{ record.created_at }}</span>
         <!-- 操作 -->
         <div slot="actions" slot-scope="text, record">
@@ -73,22 +67,16 @@
 <script>
 import { STable, UserInfo } from '@/components'
 import DeriveButton from '@/components/OrderDetailInfo/DeriveButton'
-import { institutionsExports } from '@/api/storage'
 import moment from 'moment'
-import {
-  getList,
-  init,
-  canExport
-} from '@/api/organization'
-import storage from 'store'
+import { getMiddlesUser } from '@/api/user'
 import EditInvite from './widgets/EditInvite.vue'
 import AddRole from './widgets/AddRole.vue'
 
 // 列表规格
 const columns = [
   {
-    title: '用户id',
-    dataIndex: 'order_id',
+    title: '用户ID',
+    scopedSlots: { customRender: 'user_id' },
     align: 'center',
     width: 80
   },
@@ -97,36 +85,31 @@ const columns = [
     children: [
       {
         title: '昵称',
-        dataIndex: 'name',
-        key: 'name',
+        scopedSlots: { customRender: 'nickname' },
         align: 'center',
         width: 200
       },
       {
         title: '真实姓名',
-        dataIndex: 'name1',
-        key: 'name1',
+        scopedSlots: { customRender: 'name' },
         align: 'center',
         width: 140
       },
       {
         title: '用户手机',
-        dataIndex: 'name23',
-        key: 'name23',
+        scopedSlots: { customRender: 'username' },
         align: 'center',
         width: 140
       },
       {
         title: '身份',
-        dataIndex: 'name2',
-        key: 'name2',
+        scopedSlots: { customRender: 'identity' },
         align: 'center',
         width: 140
       },
       {
         title: '邀请码',
-        dataIndex: 'name554',
-        key: 'name5',
+        scopedSlots: { customRender: 'invite' },
         align: 'center',
         width: 140
       }
@@ -136,7 +119,7 @@ const columns = [
   },
   {
     title: '推荐人手机号',
-    dataIndex: 'user22',
+    scopedSlots: { customRender: 'parent' },
     width: 140,
     align: 'center'
   },
@@ -166,82 +149,32 @@ export default {
   },
   data () {
     return {
-      exports_can: false,
       columns,
-      searchType: false, // 展示全部的搜索
-      businessArray: [], // 业务类型
-      statusArray: [], // 机构列表
-
+      indentitys: [
+        { id: 1, name: '普通用户' },
+        { id: 2, name: 'VIP' },
+        { id: 4, name: '创客' },
+        { id: 6, name: '代理商' }
+      ], // 业务类型
       queryParam: {
-        order_no: '', // 订单编号
-        institution: '', // 机构名称
-        item_id: '', // 机构编号
-        nickname: '', // 下单人
-        business_type_id: '', // 业务类型
-        status: '', // 机构状态
-        paid_at: undefined, // 下单时间
-        audit_at: undefined, // 执行时间
-        settle_at: undefined // 结案时间
+        username: undefined,
+        nickname: undefined,
+        identity_id: undefined
       },
       listCount: 0,
       loadData: (parameter) => {
         const requestParameters = Object.assign({}, parameter, this.queryParam)
-        return getList(requestParameters)
+        return getMiddlesUser(requestParameters)
       }
     }
   },
   watch: {
     $route (to, from) {
-      if (
-        (from.name === 'Detail' && to.name === 'FristCheckrderIndex') ||
-        (from.name === 'Home' && to.name === 'FristCheckrderIndex') ||
-        (from.name === 'AssignrderIndex' && to.name === 'FristCheckrderIndex') ||
-        (from.name === 'SignInrderIndex' && to.name === 'FristCheckrderIndex') ||
-        (from.name === 'ReCheckrderIndex' && to.name === 'FristCheckrderIndex') ||
-        (from.name === 'HandleService' && to.name === 'FristCheckrderIndex') ||
-        (from.name === 'CompleteOrder' && to.name === 'FristCheckrderIndex')
-      ) {
-        this.$refs.table.loadData()
-      }
+      console.log(to)
     }
   },
-  created () {
-    this.init()
-  },
   methods: {
     moment,
-    // 获取检索的基本样式
-    init () {
-      init().then(res => {
-        this.statusArray = res.status // 机构状态
-        this.businessArray = res.type // 业务类型
-        this.canExports()
-      })
-    },
-    // 更改创建时间
-    onCreateChange (dates, dateStrings) {
-      this.queryParam.paid_at = dateStrings
-    },
-    // 更改执行时间
-    onCarryChange (dates, dateStrings) {
-      this.queryParam.audit_at = dateStrings
-    },
-    // 更改结案时间
-    onSettleChange (dates, dateStrings) {
-      this.queryParam.settle_at = dateStrings
-    },
-    // 处理状态
-    onDisposeChange (e) {
-      this.queryParam.dispose = e
-    },
-    // 业务类型
-    onBusinessChange (e) {
-      this.queryParam.business_type_id = e
-    },
-    // 机构状态
-    onOrganizationChange (e) {
-      this.queryParam.status = e
-    },
     // 搜索列表
     search () {
       this.$refs.table.refresh(true) // 重置接口且刷先到第一页
@@ -249,44 +182,12 @@ export default {
     // 重置搜索列表
     resetSearch () {
       this.queryParam = {
-        order_no: '', // 订单编号
-        institution: '', // 机构名称
-        item_id: '', // 机构编号
-        nickname: '', // 下单人
-        business_type_id: '', // 业务类型
-        status: '', // 机构状态
-        paid_at: undefined, // 下单时间
-        audit_at: undefined, // 执行时间
-        settle_at: undefined// 结案时间
+        username: undefined,
+        nickname: undefined,
+        identity_id: undefined
       }
       this.$refs.table.refresh(true) // 重置接口且刷先到第一页
     },
-    // 机构是否能导出
-    canExports () {
-      console.log('canExports')
-      canExport(storage.get('userid')).then(res => {
-        this.exports_can = res.exports
-      })
-    },
-    // 导出列表
-    exports () {
-      const params = this.queryParam
-      params.audit_at = this.queryParam.audit_at || ''
-      params.paid_at = this.queryParam.paid_at || ''
-      params.settle_at = this.queryParam.settle_at || ''
-      if (this.listCount > 0) {
-        let downUrl = institutionsExports() + '?user_id=' + storage.get('userid')
-        for (const key in params) {
-          downUrl = downUrl + '&' + key + '=' + params[key]
-        }
-        window.open(downUrl)
-      } else {
-        this.$notification.error({
-          message: '温馨提醒',
-          description: '数据为空不能下载！'
-        })
-      }
-    },
     // 新增用户
     onAddRole () {
       console.log('add....')