From 0782140a00e554ec7a1c724ecc1eb36726d994f8 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期一, 22 五月 2023 11:45:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/manager/User.vue | 80 ++++++++++++++++++++++-----------------
1 files changed, 45 insertions(+), 35 deletions(-)
diff --git a/src/views/manager/User.vue b/src/views/manager/User.vue
index 0108609..80785e4 100644
--- a/src/views/manager/User.vue
+++ b/src/views/manager/User.vue
@@ -3,8 +3,8 @@
<el-card style="height: 100%">
<template slot="header">
<el-form :inline="true" :model="queryInfo" class="demo-form-inline">
- <el-form-item label="鐢ㄦ埛鍚嶏細">
- <el-input placeholder="璇疯緭鍏�" v-model="queryInfo.nickName"></el-input>
+ <el-form-item label="鎵嬫満鍙凤細">
+ <el-input placeholder="璇疯緭鍏�" v-model="queryInfo.userMobile"></el-input>
</el-form-item>
<el-form-item label="鐢ㄦ埛濮撳悕锛�">
<el-input placeholder="璇疯緭鍏�" v-model="queryInfo.realName"></el-input>
@@ -120,11 +120,13 @@
</el-input>
</el-form-item>
</el-col>
+ <el-col :span="12">
<el-form-item label="澶囨敞" prop="userMemo">
<el-input v-model="detailsRow.userMemo" placeholder="璇疯緭鍏ュ娉�" clearable
:style="{ width: '100%' }">
</el-input>
</el-form-item>
+ </el-col>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
@@ -192,7 +194,8 @@
total: null,
//鏌ヨ鏉′欢
queryInfo: {
- nickName: '',
+ userMobile: '',
+ realName: '',
current: 1,
size: 10
},
@@ -225,31 +228,31 @@
methods:
{
exportList(){
- this.$http({
- url:'/api/user/exp',
- responseType: 'blob',
- method: 'post',
- }).then(res=>{
- console.log(res)
- this.$message.success('鎿嶄綔鎴愬姛');
- let time = new Date()
- let deathdate =time.toLocaleDateString()
- const blob = new Blob([res.data], {
- type: "application/vnd.ms-excel;charset=utf-8",
- });
- if (window.navigator.msSaveBlob) {
- window.navigator.msSaveBlob(blob, deathdate + ".xlsx");
- } else {
- const url = window.URL.createObjectURL(blob);
- const link = document.createElement("a");
- link.style.display = "none";
- link.href = url;
- link.download = deathdate + ".xlsx";
- document.body.appendChild(link);
- link.click();
- document.body.removeChild(link);
- }
- })
+ this.$http({
+ url:'/api/user/exp',
+ responseType: 'blob',
+ method: 'post',
+ }).then(res=>{
+ console.log(res)
+ this.$message.success('鎿嶄綔鎴愬姛');
+ let time = new Date()
+ let deathdate =time.toLocaleDateString()
+ const blob = new Blob([res.data], {
+ type: "application/vnd.ms-excel;charset=utf-8",
+ });
+ if (window.navigator.msSaveBlob) {
+ window.navigator.msSaveBlob(blob, deathdate + ".xlsx");
+ } else {
+ const url = window.URL.createObjectURL(blob);
+ const link = document.createElement("a");
+ link.style.display = "none";
+ link.href = url;
+ link.download = deathdate + ".xlsx";
+ document.body.appendChild(link);
+ link.click();
+ document.body.removeChild(link);
+ }
+ })
},
handleToManager(data) {
toManager(data.id).then(res => {
@@ -313,12 +316,19 @@
},
update() {
this.$http.put('/api/user', this.detailsRow).then(res => {
- this.$message({
- message: '缂栬緫鎴愬姛',
- type: 'success'
- }
- )
- this.search();
+ console.log(res)
+ if (res.data.code == 200){
+ this.$message({
+ message: '缂栬緫鎴愬姛',
+ type: 'success'
+ }
+ )
+ this.search();
+ }else {
+ this.$message.error(res.data.msg)
+ this.search();
+ }
+
}
);
this.detailsVisible = false;
@@ -377,7 +387,7 @@
let param = {}
param.current = this.queryInfo.current
param.realName = this.queryInfo.realName
- param.nickName = this.queryInfo.nickName
+ param.userMobile = this.queryInfo.userMobile
param.size = this.queryInfo.size
getPublicityList(param).then(res => {
this.publicityList = res.records;
--
Gitblit v1.8.0