用户信息页面初步完善

2023-09-19 18:17:19 +08:00 · 2023-09-19 18:17:19 +08:00 · 36b7d71289
parent deab30eb4a
commit 36b7d71289
6 changed files with 399 additions and 9 deletions
--- a/admin/scripts/release.mjs
+++ b/admin/scripts/release.mjs
@ -3,7 +3,7 @@ import fsExtra from 'fs-extra'
 const { existsSync, remove, copy } = fsExtra
 const cwd = process.cwd()
 //打包发布路径，谨慎改动
-const releaseRelativePath = '../../../dist'
+const releaseRelativePath = '../server/public/admin'
 const distPath = path.resolve(cwd, 'dist')
 const releasePath = path.resolve(cwd, releaseRelativePath)

--- a/admin/src/api/users.ts
+++ b/admin/src/api/users.ts
@ -0,0 +1,6 @@
+import request from "@/utils/request";
+
+// 余额明细
+export function accountLog(params?: any) {
+  return request.get({ url: "/finance.account_log/lists", params });
+}
--- a/admin/src/config/index.ts
+++ b/admin/src/config/index.ts
@ -1,10 +1,10 @@
 const config = {
-    terminal: 1, //终端
-    title: '后台管理系统', //网站默认标题
-    version: '1.6.0', //版本号
-    baseUrl: `${import.meta.env.VITE_APP_BASE_URL || ''}/`, //请求接口域名
-    urlPrefix: 'adminapi', //请求默认前缀
-    timeout: 10 * 1000 //请求超时时长
-}
+  terminal: 1, //终端
+  title: "后台管理系统", //网站默认标题
+  version: "1.6.0", //版本号
+  baseUrl: `${import.meta.env.VITE_APP_BASE_URL || "http://192.168.1.6:8081"}/`, //请求接口域名
+  urlPrefix: "adminapi", //请求默认前缀
+  timeout: 10 * 1000, //请求超时时长
+};

-export default config
+export default config;
--- a/admin/src/views/users/balanceList.vue
+++ b/admin/src/views/users/balanceList.vue
@ -0,0 +1,118 @@
+<template>
+  <el-card class="!border-none mb-4" shadow="never">
+    <el-form class="mb-[-16px]" :model="queryParams" inline>
+      <el-form-item label="公司名称" prop="company_id">
+        <el-input
+          class="w-[280px]"
+          v-model="queryParams.company_id"
+          clearable
+          placeholder="请输入公司"
+        />
+      </el-form-item>
+      <el-form-item label="合同类型" prop="contract_type">
+        <el-select
+          v-model="queryParams.contract_type"
+          clearable
+          placeholder="请输入合同类型"
+        >
+          <el-option
+            v-for="item in statusdata"
+            :key="item.label"
+            :value="item.id"
+            :label="item.name"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="合同编号" prop="contract_no">
+        <el-input
+          class="w-[280px]"
+          v-model="queryParams.contract_no"
+          clearable
+          placeholder="请输入合同编号"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          clearable
+          placeholder="请选择状态"
+        >
+          <el-option
+            v-for="item in statusdata"
+            :key="item.label"
+            :value="item.id"
+            :label="item.name"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="甲方片区经理" prop="area_manager">
+        <el-input
+          class="w-[280px]"
+          v-model="queryParams.area_manager"
+          clearable
+          placeholder="请输入甲方片区经理"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="resetPage">查询</el-button>
+        <el-button @click="resetParams">重置</el-button>
+      </el-form-item>
+    </el-form>
+  </el-card>
+  <el-card class="!border-none mb-4" shadow="never">
+    <el-table :data="pager.lists">
+      <el-table-column label="时间" prop="id" />
+      <el-table-column label="资金变动" prop="name" show-overflow-tooltip />
+      <el-table-column label="项目" prop="remark" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column
+        label="交易渠道/场所"
+        prop="remark"
+        show-overflow-tooltip
+      >
+      </el-table-column>
+      <el-table-column label="交易ID" prop="remark" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column label="支付方式" prop="remark" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column label="交易类型" prop="remark" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column label="账户余额" prop="remark" show-overflow-tooltip>
+      </el-table-column>
+    </el-table>
+    <div class="flex mt-4 justify-end">
+      <pagination v-model="pager" @change="getLists" />
+    </div>
+  </el-card>
+</template>
+
+<script setup lang="ts">
+import { usePaging } from "@/hooks/usePaging";
+import { accountLog } from "@/api/users";
+// 查询条件
+const queryParams = reactive({
+  name: "",
+  status: "name1",
+  company_id: "",
+  contract_type: "",
+  contract_no: "",
+  party_a: "",
+  party_b: "",
+  area_manager: "",
+  type: "",
+});
+
+const { pager, getLists, resetParams, resetPage } = usePaging({
+  fetchFun: accountLog,
+  params: queryParams,
+});
+
+const statusdata = reactive([
+  { label: "lable", id: 0, name: "name1" },
+  { label: "lable2", id: 0, name: "name2" },
+]);
+</script>
+
+<style lang="scss" scoped></style>
--- a/admin/src/views/users/detail.vue
+++ b/admin/src/views/users/detail.vue
@ -0,0 +1,156 @@
+<template>
+  <el-card class="!border-none mb-4" shadow="never">
+    <el-form class="mb-[-16px]" :model="queryParams" inline>
+      <el-row>
+        <el-col :span="4">
+          <el-form-item label="用户名:" prop="name"> 张用户 </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="注册手机号:" prop="name">
+            19130550023
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="性别:" prop="name"> 男 </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="年龄:" prop="name"> 36 </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="注册时间:" prop="name"> 2023.09.11</el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="身份证号:" prop="name">
+            513701200012105612
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="所属片区:" prop="name">
+            四川省泸州市江阳区xx粉红色的积分开朗大方</el-form-item
+          >
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="最近登录ip:" prop="name">
+            2+1.10.124</el-form-item
+          >
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="账户状态:" prop="name">
+            <el-select
+              v-model="queryParams.status"
+              placeholder="是否显示"
+              clearable
+              class="w-[240px]"
+            >
+              <el-option label="正常" value="1"></el-option>
+              <el-option label="异常" value="0"></el-option> </el-select
+          ></el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-card>
+
+  <el-card class="!border-none mb-4" shadow="never">
+    <el-form-item label="账户余额:" prop="name">
+      9999999999 &nbsp;&nbsp;
+      <router-link :to="{ path: 'balanceList' }">
+        <el-button type="primary"> 查看全部 </el-button>
+      </router-link></el-form-item
+    >
+    <el-table :data="pager.lists">
+      <el-table-column label="时间" prop="id" />
+      <el-table-column label="资金变动" prop="name" show-overflow-tooltip />
+      <el-table-column label="项目" prop="remark" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column
+        label="交易渠道/场所"
+        prop="remark"
+        show-overflow-tooltip
+      >
+      </el-table-column>
+      <el-table-column label="交易ID" prop="remark" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column label="支付方式" prop="remark" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column label="交易类型" prop="remark" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column label="账户余额" prop="remark" show-overflow-tooltip>
+      </el-table-column>
+      <!-- <el-table-column label="状态" prop="status" show-overflow-tooltip>
+            <template #default="{ row }">
+              <span v-if="row.status == 1">启用</span>
+              <span v-if="row.status == 0">禁用</span>
+            </template>
+          </el-table-column> -->
+    </el-table>
+    <div class="flex mt-4 justify-end">
+      <pagination v-model="pager" @change="getLists" />
+    </div>
+  </el-card>
+  <div class="bottomTables">
+    <el-card
+      style="flex: 2; margin-right: 2vw"
+      class="!border-none mb-4"
+      shadow="never"
+    >
+      <el-form-item label="积分累计:" prop="name">
+        9999999999 &nbsp;&nbsp;
+        <router-link :to="{ path: 'integral' }">
+          <el-button type="primary"> 查看全部 </el-button>
+        </router-link>
+      </el-form-item>
+      <el-table :data="pager.lists">
+        <el-table-column label="时间" prop="id" />
+        <el-table-column label="积分变动" prop="name" show-overflow-tooltip />
+        <el-table-column label="项目" prop="remark" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column
+          label="积分变更场所"
+          prop="remark"
+          show-overflow-tooltip
+        >
+        </el-table-column>
+        <el-table-column label="分类" prop="remark" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column label="积分累计" prop="remark" show-overflow-tooltip>
+        </el-table-column>
+      </el-table>
+      <div class="flex mt-4 justify-end">
+        <pagination v-model="pager" @change="getLists" />
+      </div>
+    </el-card>
+    <el-card style="flex: 1" class="!border-none mb-4" shadow="never">
+      <el-form-item label="各应用使用情况:" prop="name"> </el-form-item>
+      <el-table :data="pager.lists">
+        <el-table-column label="时间" prop="id" />
+        <el-table-column label="使用应用" prop="name" show-overflow-tooltip />
+        <el-table-column label="使用时长" prop="remark" show-overflow-tooltip>
+        </el-table-column>
+      </el-table>
+      <div class="flex mt-4 justify-end">
+        <pagination v-model="pager" @change="getLists" />
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script lang="ts" setup name="flowLists">
+import { usePaging } from "@/hooks/usePaging";
+import { accountLog } from "@/api/users";
+
+const queryParams = reactive({
+  name: "",
+  status: "1",
+});
+const { pager, getLists, resetParams, resetPage } = usePaging({
+  fetchFun: accountLog,
+  params: queryParams,
+});
+</script>
+<style lang="scss" scoped>
+.bottomTables {
+  display: flex;
+}
+</style>
--- a/admin/src/views/users/integral.vue
+++ b/admin/src/views/users/integral.vue
@ -0,0 +1,110 @@
+<template>
+  <el-card class="!border-none mb-4" shadow="never">
+    <el-form class="mb-[-16px]" :model="queryParams" inline>
+      <el-form-item label="公司名称" prop="company_id">
+        <el-input
+          class="w-[280px]"
+          v-model="queryParams.company_id"
+          clearable
+          placeholder="请输入公司"
+        />
+      </el-form-item>
+      <el-form-item label="合同类型" prop="contract_type">
+        <el-select
+          v-model="queryParams.contract_type"
+          clearable
+          placeholder="请输入合同类型"
+        >
+          <el-option
+            v-for="item in statusdata"
+            :key="item.label"
+            :value="item.id"
+            :label="item.name"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="合同编号" prop="contract_no">
+        <el-input
+          class="w-[280px]"
+          v-model="queryParams.contract_no"
+          clearable
+          placeholder="请输入合同编号"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          clearable
+          placeholder="请选择状态"
+        >
+          <el-option
+            v-for="item in statusdata"
+            :key="item.label"
+            :value="item.id"
+            :label="item.name"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="甲方片区经理" prop="area_manager">
+        <el-input
+          class="w-[280px]"
+          v-model="queryParams.area_manager"
+          clearable
+          placeholder="请输入甲方片区经理"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="resetPage">查询</el-button>
+        <el-button @click="resetParams">重置</el-button>
+      </el-form-item>
+    </el-form>
+  </el-card>
+  <el-card class="!border-none mb-4" shadow="never">
+    <el-table :data="pager.lists">
+      <el-table-column label="时间" prop="id" />
+      <el-table-column label="积分变动" prop="name" show-overflow-tooltip />
+      <el-table-column label="项目" prop="remark" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column label="积分变更场所" prop="remark" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column label="分类" prop="remark" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column label="积分累计" prop="remark" show-overflow-tooltip>
+      </el-table-column>
+    </el-table>
+    <div class="flex mt-4 justify-end">
+      <pagination v-model="pager" @change="getLists" />
+    </div>
+  </el-card>
+</template>
+
+<script setup lang="ts">
+import { usePaging } from "@/hooks/usePaging";
+import { accountLog } from "@/api/users";
+// 查询条件
+const queryParams = reactive({
+  name: "",
+  status: "name1",
+  company_id: "",
+  contract_type: "",
+  contract_no: "",
+  party_a: "",
+  party_b: "",
+  area_manager: "",
+  type: "",
+});
+
+const { pager, getLists, resetParams, resetPage } = usePaging({
+  fetchFun: accountLog,
+  params: queryParams,
+});
+
+const statusdata = reactive([
+  { label: "lable", id: 0, name: "name1" },
+  { label: "lable2", id: 0, name: "name2" },
+]);
+</script>
+
+<style lang="scss" scoped></style>