bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

测试问题修改前端优化

This commit is contained in:
zzyuan 2025-09-04 13:10:37 +08:00
parent c9fb763bc1
commit 29d08c7f56
17 changed files with 210 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/views/canteen/accountCenter/account/accountManager/index.vue
View File

@ -348,7 +348,7 @@
<div style="height: 30px;padding-left: 10px;line-height: 30px;margin: 20px 0;font-size: 14px;color: #000;background: #e7f0fa;border-left: 3px solid #4b80fd;">第二步：输入金额</div> <div style="height: 30px;padding-left: 10px;line-height: 30px;margin: 20px 0;font-size: 14px;color: #000;background: #e7f0fa;border-left: 3px solid #4b80fd;">第二步：输入金额</div>
<el-form ref="batchForm" :model="batchForm" :rules="batchRules" label-width="100px"> <el-form ref="batchForm" :model="batchForm" :rules="batchRules" label-width="100px">
<el-form-item label="补贴金额" prop="amount"> <el-form-item label="补贴金额" prop="amount">
<el-input v-model="batchForm.amount" placeholder="请输入补贴金额" maxlength="9" clearable style="width: 300px;" <el-input v-model="batchForm.amount" placeholder="请输入补贴金额" maxlength="8" clearable style="width: 300px;"
@input="(v)=>(batchForm.amount=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"> @input="(v)=>(batchForm.amount=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))">
<template slot="append">元</template> <template slot="append">元</template>
</el-input> </el-input>
@ -361,7 +361,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog title="批量补贴预览" :visible.sync="openResult" width="800px" append-to-body> <el-dialog title="批量补贴预览" :visible.sync="openResult" width="800px" append-to-body>
<div style="margin-bottom: 10px;">总人数： {{resultData.totalUserSum || '--' }} ， 补贴人数：{{resultData.validCount || '--' }}， 补贴总额：{{(resultData.validTotalAmount/100) || '--' }}， 无效人数：{{resultData.invalidCount || '--'}}</div> <div style="margin-bottom: 10px;">总人数： {{resultData.totalUserSum || '--' }} ， 补贴人数：{{resultData.validCount || '--' }}， 补贴总金额：{{(resultData.validTotalAmount/100) || '--' }}， 无效人数：{{resultData.invalidCount || '--'}}</div>
<div style="font-weight: 600;">无效人数</div> <div style="font-weight: 600;">无效人数</div>
<el-table :data="resultData.errVOList" max-height="250"> <el-table :data="resultData.errVOList" max-height="250">
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" /> <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" />
@ -373,7 +373,7 @@
<dict-tag :options="dict.type.sys_user_type" :value="scope.row.userType"/> <dict-tag :options="dict.type.sys_user_type" :value="scope.row.userType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="金额" align="center" prop="amount" :show-overflow-tooltip="true"> <el-table-column label="补贴金额" align="center" prop="amount" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ (scope.row.amount/100).toFixed(2) }}</span> <span>{{ (scope.row.amount/100).toFixed(2) }}</span>
</template> </template>
@ -391,7 +391,7 @@
<dict-tag :options="dict.type.sys_user_type" :value="scope.row.userType"/> <dict-tag :options="dict.type.sys_user_type" :value="scope.row.userType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="金额" align="center" prop="amount" :show-overflow-tooltip="true"> <el-table-column label="补贴金额" align="center" prop="amount" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ (scope.row.amount/100).toFixed(2) }}</span> <span>{{ (scope.row.amount/100).toFixed(2) }}</span>
</template> </template>
@ -735,14 +735,16 @@
submitSendCard(){ submitSendCard(){
this.$refs["cardForm"].validate(valid => { this.$refs["cardForm"].validate(valid => {
if (valid) { if (valid) {
let param = { this.$modal.confirm('是否确认继续发卡?').then(() => {
...this.cardForm let param = {
} ...this.cardForm
accCardApi(param).then(response => { }
this.$modal.msgSuccess("发卡成功"); accCardApi(param).then(response => {
this.openCard = false; this.$modal.msgSuccess("发卡成功");
this.getList(); this.openCard = false;
}); this.getList();
});
}).catch(() => {});
} }
}); });
}, },
@ -795,17 +797,19 @@
submitSubsidy(){ submitSubsidy(){
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
let param = { this.$modal.confirm('补贴金额:'+this.form.amount+'元，是否确认继续补贴?').then(() => {
userId:this.form.userId, let param = {
amount:Number(this.form.amount*100) userId:this.form.userId,
} amount:Number(this.form.amount*100)
updateAccRechargeSingleApi(param).then(response => { }
this.$modal.msgSuccess("操作成功"); updateAccRechargeSingleApi(param).then(response => {
this.openSubsidy = false; this.$modal.msgSuccess("操作成功");
this.getList(); this.openSubsidy = false;
}); this.getList();
});
}).catch(() => {});
} }
}); });
}, },
//充值按钮操作 //充值按钮操作
handleRecharge(row){ handleRecharge(row){
@ -819,15 +823,31 @@
submitRecharge(){ submitRecharge(){
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
let param = { if(Number(this.form.walletBal)>300000){
userId:this.form.userId, this.$modal.confirm('个人钱包余额已超过3000，是否确认继续充值?').then(() => {
amount:Number(this.form.amount*100) let param = {
userId:this.form.userId,
amount:Number(this.form.amount*100)
}
rechargeAccWalletApi(param).then(response => {
this.$modal.msgSuccess("操作成功");
this.openRecharge = false;
this.getList();
});
}).catch(() => {});
}else{
this.$modal.confirm('充值金额:'+this.form.amount+'元，是否确认继续充值?').then(() => {
let param = {
userId:this.form.userId,
amount:Number(this.form.amount*100)
}
rechargeAccWalletApi(param).then(response => {
this.$modal.msgSuccess("操作成功");
this.openRecharge = false;
this.getList();
});
}).catch(() => {});
} }
rechargeAccWalletApi(param).then(response => {
this.$modal.msgSuccess("操作成功");
this.openRecharge = false;
this.getList();
});
} }
}); });
}, },
@ -843,15 +863,17 @@
submitTake(){ submitTake(){
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
let param = { this.$modal.confirm('提现金额:'+this.form.amount+'元，是否确认继续提现?').then(() => {
userId:this.form.userId, let param = {
amount:Number(this.form.amount*100) userId:this.form.userId,
} amount:Number(this.form.amount*100)
withdrawAccWalletApi(param).then(response => { }
this.$modal.msgSuccess("操作成功"); withdrawAccWalletApi(param).then(response => {
this.openTake = false; this.$modal.msgSuccess("操作成功");
this.getList(); this.openTake = false;
}); this.getList();
});
}).catch(() => {});
} }
}); });
}, },

58
src/views/canteen/accountCenter/account/wallet/index.vue
View File

@ -508,15 +508,31 @@
submitForm: function() { submitForm: function() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
let param = { if(Number(this.form.walletBal)>300000){
userId:this.form.userId, this.$modal.confirm('个人钱包余额已超过3000，是否确认继续充值?').then(() => {
amount:Number(this.form.amount*100) let param = {
userId:this.form.userId,
amount:Number(this.form.amount*100)
}
rechargeAccWalletApi(param).then(response => {
this.$modal.msgSuccess("操作成功");
this.openRecharge = false;
this.getList();
});
}).catch(() => {});
}else{
this.$modal.confirm('充值金额:'+this.form.amount+'元，是否确认继续充值?').then(() => {
let param = {
userId:this.form.userId,
amount:Number(this.form.amount*100)
}
rechargeAccWalletApi(param).then(response => {
this.$modal.msgSuccess("操作成功");
this.openRecharge = false;
this.getList();
});
}).catch(() => {});
} }
rechargeAccWalletApi(param).then(response => {
this.$modal.msgSuccess("操作成功");
this.open = false;
this.getList();
});
} }
}); });
}, },
@ -524,28 +540,32 @@
submitTakeForm: function() { submitTakeForm: function() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
let param = { this.$modal.confirm('提现金额:'+this.form.amount+'元，是否确认继续提现?').then(() => {
let param = {
userId:this.form.userId, userId:this.form.userId,
amount:Number(this.form.amount*100) amount:Number(this.form.amount*100)
} }
withdrawAccWalletApi(param).then(response => { withdrawAccWalletApi(param).then(response => {
this.$modal.msgSuccess("操作成功"); this.$modal.msgSuccess("操作成功");
this.openTake = false; this.openTake = false;
this.getList(); this.getList();
}); });
}).catch(() => {});
} }
}); });
}, },
/** 清空提交按钮 */ /** 清空提交按钮 */
submitClearForm: function() { submitClearForm: function() {
let param = { this.$modal.confirm('是否确认清空钱包?').then(() => {
userId:this.form.userId let param = {
} userId:this.form.userId
clearAccWalletApi(param).then(response => { }
this.$modal.msgSuccess("操作成功"); clearAccWalletApi(param).then(response => {
this.openClear = false; this.$modal.msgSuccess("操作成功");
this.getList(); this.openClear = false;
this.getList();
}); });
}).catch(() => {});
}, },
} }

52
src/views/canteen/accountCenter/butie/butie/index.vue
View File

@ -737,19 +737,21 @@
submitForm: function() { submitForm: function() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
let param = { this.$modal.confirm('补贴金额:'+this.form.amount+'元，是否确认继续补贴?').then(() => {
// ...this.form, let param = {
// remark:this.form.remark, // ...this.form,
// receiveEndDate:this.form.receiveEndDate, // remark:this.form.remark,
// validateDay:this.form.validateDay, // receiveEndDate:this.form.receiveEndDate,
userId:this.form.userId, // validateDay:this.form.validateDay,
amount:Number(this.form.amount*100) userId:this.form.userId,
} amount:Number(this.form.amount*100)
updateAccRechargeSingleApi(param).then(response => { }
this.$modal.msgSuccess("操作成功"); updateAccRechargeSingleApi(param).then(response => {
this.open = false; this.$modal.msgSuccess("操作成功");
this.getList(); this.open = false;
}); this.getList();
});
}).catch(() => {});
} }
}); });
}, },
@ -757,17 +759,19 @@
submitClearForm: function() { submitClearForm: function() {
// this.$refs["form"].validate(valid => { // this.$refs["form"].validate(valid => {
// if (valid) { // if (valid) {
let param = { this.$modal.confirm('是否确认清空补贴?').then(() => {
userId:this.form.userId let param = {
// ...this.form, userId:this.form.userId
// clearType:this.form.clearType, // ...this.form,
// amount:Number(this.form.amount*100) // clearType:this.form.clearType,
} // amount:Number(this.form.amount*100)
clearAccRechargeSingleApi(param).then(response => { }
this.$modal.msgSuccess("操作成功"); clearAccRechargeSingleApi(param).then(response => {
this.openClear = false; this.$modal.msgSuccess("操作成功");
this.getList(); this.openClear = false;
}); this.getList();
});
}).catch(() => {});
// } // }
// }); // });
}, },

1
src/views/canteen/accountCenter/cardManage/cardList/index.vue
View File

@ -195,6 +195,7 @@
"pageSize": this.queryParams.pageSize, "pageSize": this.queryParams.pageSize,
"serialNum": this.queryParams.serialNum, "serialNum": this.queryParams.serialNum,
"userId": this.queryParams.userId, "userId": this.queryParams.userId,
"cardStatus":"1"
// "accountStatusList": this.queryParams.accountStatusList, // "accountStatusList": this.queryParams.accountStatusList,
// "deptIdList": this.queryParams.deptIdList, // "deptIdList": this.queryParams.deptIdList,
// "walletType": this.queryParams.walletType, // "walletType": this.queryParams.walletType,

2
src/views/canteen/base/mobile/complaint/index.vue
View File

@ -41,7 +41,7 @@
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span> <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="投诉人" align="center" prop="createBy" :show-overflow-tooltip="true"/> <el-table-column label="投诉人账号" align="center" prop="createBy" :show-overflow-tooltip="true"/>
<el-table-column label="用户手机号" align="center" prop="contactTel" :show-overflow-tooltip="true"/> <el-table-column label="用户手机号" align="center" prop="contactTel" :show-overflow-tooltip="true"/>
<el-table-column label="投诉日期" align="center" prop="createTime" :show-overflow-tooltip="true"/> <el-table-column label="投诉日期" align="center" prop="createTime" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/> --> <!-- <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/> -->

2
src/views/canteen/base/mobile/evaManeager/index.vue
View File

@ -181,7 +181,7 @@
<el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true"/> <el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true"/>
<el-table-column label="所属档口" align="center" prop="stallName" :show-overflow-tooltip="true"/> <el-table-column label="所属档口" align="center" prop="stallName" :show-overflow-tooltip="true"/>
<el-table-column label="意见和建议" align="center" prop="proposal" :show-overflow-tooltip="true"/> <el-table-column label="意见和建议" align="center" prop="proposal" :show-overflow-tooltip="true"/>
<el-table-column label="用户姓名" align="center" prop="createBy" :show-overflow-tooltip="true"/> <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true"/>
<el-table-column label="评价日期" align="center" prop="evaluateDate" :show-overflow-tooltip="true"/> <el-table-column label="评价日期" align="center" prop="evaluateDate" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width"> <!-- <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">

82
src/views/canteen/healthCenter/examinationReport/index.vue
View File

@ -71,49 +71,35 @@
/> />
<!-- 体检报告对话框 --> <!-- 体检报告对话框 -->
<el-dialog :title="titleAddReport" :visible.sync="openAddReport" custom-class="dialog-right" append-to-body> <el-dialog :title="titleAddReport" :visible.sync="openAddReport" custom-class="dialog-right" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="90px"> <div style="margin: 10px;">
<el-row justify="center"> <el-button
<table align="center" width="100%" cellspacing="0"> type="primary"
<tr > plain
<td colspan="4" class="table-title"> icon="el-icon-plus"
<el-col :span="1.5"> size="mini"
<el-button @click="handleAddReport"
type="primary" >新增体检报告</el-button>
plain </div>
icon="el-icon-plus" <el-table v-loading="loading" :data="reportListData" height="600" ref="multipleTable">
size="mini" <el-table-column label="体检日期" align="center" prop="medicalDate" :show-overflow-tooltip="true" >
@click="handleAddReport" </el-table-column>
>新增体检报告</el-button> <el-table-column label="体检机构" align="center" prop="medicalMechanism" :show-overflow-tooltip="true">
</el-col> </el-table-column>
</td> <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
</tr> <template slot-scope="scope">
<tr > <el-button
<td colspan="4" class="table-title"> size="mini"
<el-table v-loading="loading" :data="reportListData" height="800" ref="multipleTable"> type="text"
<el-table-column label="体检日期" align="center" prop="medicalDate" :show-overflow-tooltip="true" > @click="handleViewReport(scope.row)"
</el-table-column> >检查报告</el-button>
<el-table-column label="体检机构" align="center" prop="medicalMechanism" :show-overflow-tooltip="true"> <el-button
</el-table-column> size="mini"
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right"> type="text"
<template slot-scope="scope"> @click="handleDeleteReport(scope.row)"
<el-button >删除</el-button>
size="mini" </template>
type="text" </el-table-column>
@click="handleViewReport(scope.row)" </el-table>
>检查报告</el-button>
<el-button
size="mini"
type="text"
@click="handleDeleteReport(scope.row)"
>删除</el-button>
</template>
</el-table-column>
</el-table>
</td>
</tr>
</table>
</el-row>
</el-form>
</el-dialog> </el-dialog>
<!-- 新增-体检报告对话框 --> <!-- 新增-体检报告对话框 -->
<el-dialog :title="titleAddReportModel" :visible.sync="openAddReportModel" append-to-body> <el-dialog :title="titleAddReportModel" :visible.sync="openAddReportModel" append-to-body>
@ -142,10 +128,10 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 体检报告详情-对话框 --> <!-- 体检报告详情-对话框 -->
<el-dialog :title="titleReportDetail" :visible.sync="openReportDetail" width="1330px" append-to-body :close-on-click-modal="false"> <el-dialog :title="titleReportDetail" :visible.sync="openReportDetail" width="80%" append-to-body :close-on-click-modal="false">
<el-tabs v-model="activeName"> <el-tabs v-model="activeName">
<!-- 体检报告 --> <!-- 体检报告 -->
<el-tab-pane label="体检报告" name="1" style="height: 650px;overflow-y: auto;"> <el-tab-pane label="体检报告" name="1" style="height: 600px;overflow-y: auto;">
<el-form label-width="90px"> <el-form label-width="90px">
<div class="box box-content"> <div class="box box-content">
<div class="title">体检报告单</div> <div class="title">体检报告单</div>
@ -211,7 +197,7 @@
</el-form> </el-form>
</el-tab-pane> </el-tab-pane>
<!-- 个人信息 --> <!-- 个人信息 -->
<el-tab-pane label="个人信息" name="2" style="height: 650px;overflow-y: auto;" > <el-tab-pane label="个人信息" name="2" style="height: 600px;overflow-y: auto;" >
<el-form label-width="90px"> <el-form label-width="90px">
<div class="box box-content"> <div class="box box-content">
<div class="tabledata" style="width: 75%;border-spacing: 0px;"> <div class="tabledata" style="width: 75%;border-spacing: 0px;">
@ -239,7 +225,7 @@
</tr> </tr>
<tr> <tr>
<td style="width:12% ;">位置信息</td> <td style="width:12% ;">位置信息</td>
<td style="width:48% ;" colspan="4">{{personData.nickName}}</td> <td style="width:48% ;" colspan="4">{{personData.placeFullName}}</td>
<td style="width:12% ;">出生日期 </td> <td style="width:12% ;">出生日期 </td>
<td style="width:24% ;" colspan="2">{{personData.birthday}}</td> <td style="width:24% ;" colspan="2">{{personData.birthday}}</td>
</tr> </tr>
@ -316,7 +302,7 @@
<script> <script>
import { deptTreeSelect } from '@/api/system/user' import { deptTreeSelect } from '@/api/system/user'
import { dictHealthChronicApi,getHealthSciencePageApi,addHealthScienceApi,editHealthScienceApi,delHealthScienceApi,getHealthInfoPageApi import { dictHealthChronicApi,addHealthScienceApi,editHealthScienceApi,delHealthScienceApi,getHealthInfoPageApi
,getModelListApi,getHealthInfoDetailApi,getModelByIdApi,addReportApi,getReportApi,delReportListApi,getReportByIdApi } from "@/api/healthCenter/index"; ,getModelListApi,getHealthInfoDetailApi,getModelByIdApi,addReportApi,getReportApi,delReportListApi,getReportByIdApi } from "@/api/healthCenter/index";
import { imgUpLoadTwo } from '@/api/system/upload' import { imgUpLoadTwo } from '@/api/system/upload'
import { decryptWithSM4,encryptWithSM4 } from '@/utils/sm'; import { decryptWithSM4,encryptWithSM4 } from '@/utils/sm';

2
src/views/canteen/reportCenter/tradedDetail/index.vue
View File

@ -48,7 +48,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120" fixed="left"/> <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120" fixed="left"/>
<el-table-column label="用户姓名" align="center" prop="userName" :show-overflow-tooltip="true" width="120" fixed="left"/> <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="120" fixed="left"/>
<el-table-column label="用户手机号" align="center" prop="phonenumber" :show-overflow-tooltip="true" width="120"/> <el-table-column label="用户手机号" align="center" prop="phonenumber" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="组织全称" align="center" prop="deptFullName" :show-overflow-tooltip="true" width="180"/> <el-table-column label="组织全称" align="center" prop="deptFullName" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120"> <el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">

2
src/views/company-manage/components/add-form.vue
View File

@ -168,7 +168,7 @@
<template slot="label"> <template slot="label">
<div class="custom-label"> <div class="custom-label">
<span>手机号码：</span> <span>手机号码：</span>
<span>（登录账号）</span> <span>（用户账号）</span>
</div> </div>
</template> </template>
<el-input v-model="addOrEditForm.phonenumber" clearable /> <el-input v-model="addOrEditForm.phonenumber" clearable />

4
src/views/monitor/online/index.vue
View File

@ -9,10 +9,10 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="用户名称" prop="userName"> <el-form-item label="用户姓名" prop="userName">
<el-input <el-input
v-model="queryParams.userName" v-model="queryParams.userName"
placeholder="请输入用户名称" placeholder="请输入用户姓名"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />

6
src/views/system/logininfor/index.vue
View File

@ -10,10 +10,10 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="用户名称" prop="userName"> <el-form-item label="用户姓名" prop="userName">
<el-input <el-input
v-model="queryParams.userName" v-model="queryParams.userName"
placeholder="请输入用户名称" placeholder="请输入用户姓名"
clearable clearable
style="width: 240px;" style="width: 240px;"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@ -107,7 +107,7 @@
> >
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="访问编号" align="center" prop="infoId"/> <el-table-column label="访问编号" align="center" prop="infoId"/>
<el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" <el-table-column label="用户姓名" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom"
:sort-orders="['descending', 'ascending']" :sort-orders="['descending', 'ascending']"
/> />
<el-table-column label="地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true"/> <el-table-column label="地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true"/>

8
src/views/system/role/authUser.vue
View File

@ -1,10 +1,10 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form-item label="用户名称" prop="userName"> <el-form-item label="用户账号" prop="userName">
<el-input <el-input
v-model="queryParams.userName" v-model="queryParams.userName"
placeholder="请输入用户名称" placeholder="请输入用户账号"
clearable clearable
style="width: 240px" style="width: 240px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@ -61,8 +61,8 @@
<el-table v-loading="loading" height="650" :data="userList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" height="650" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" /> <el-table-column label="用户账号" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" /> <el-table-column label="用户姓名" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" /> <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
<el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" /> <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">

8
src/views/system/role/selectUser.vue
View File

@ -2,10 +2,10 @@
<!-- 授权用户 --> <!-- 授权用户 -->
<el-dialog title="选择用户" :visible.sync="visible" width="800px" top="5vh" append-to-body> <el-dialog title="选择用户" :visible.sync="visible" width="800px" top="5vh" append-to-body>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
<el-form-item label="用户名称" prop="userName"> <el-form-item label="用户账号" prop="userName">
<el-input <el-input
v-model="queryParams.userName" v-model="queryParams.userName"
placeholder="请输入用户名称" placeholder="请输入用户账号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@ -26,8 +26,8 @@
<el-row> <el-row>
<el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange" height="260px"> <el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange" height="260px">
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" /> <el-table-column label="用户账号" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" /> <el-table-column label="用户姓名" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" /> <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
<el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" /> <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">

4
src/views/system/user/authRole.vue
View File

@ -4,12 +4,12 @@
<el-form ref="form" :model="form" label-width="80px"> <el-form ref="form" :model="form" label-width="80px">
<el-row> <el-row>
<el-col :span="8" :offset="2"> <el-col :span="8" :offset="2">
<el-form-item label="用户昵称" prop="nickName"> <el-form-item label="用户姓名" prop="nickName">
<el-input v-model="form.nickName" disabled /> <el-input v-model="form.nickName" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" :offset="2"> <el-col :span="8" :offset="2">
<el-form-item label="登录账号" prop="userName"> <el-form-item label="用户账号" prop="userName">
<el-input v-model="form.userName" disabled /> <el-input v-model="form.userName" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>

35
src/views/system/user/index.vue
View File

@ -37,10 +37,19 @@
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
> >
<el-form-item label="用户名称" prop="userName"> <!-- <el-form-item label="用户姓名" prop="nickName">
<el-input
v-model="queryParams.nickName"
placeholder="请输入用户姓名"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="用户账号" prop="userName">
<el-input <el-input
v-model="queryParams.userName" v-model="queryParams.userName"
placeholder="请输入用户名称" placeholder="请输入用户账号"
clearable clearable
style="width: 240px" style="width: 240px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@ -203,7 +212,7 @@
v-if="columns[0].visible" v-if="columns[0].visible"
/> />
<el-table-column <el-table-column
label="用户名称" label="用户账号"
align="center" align="center"
key="userName" key="userName"
prop="userName" prop="userName"
@ -211,7 +220,7 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="用户昵称" label="用户姓名"
align="center" align="center"
key="nickName" key="nickName"
prop="nickName" prop="nickName"
@ -397,10 +406,10 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="用户昵称" prop="nickName"> <el-form-item label="用户姓名" prop="nickName">
<el-input <el-input
v-model="form.nickName" v-model="form.nickName"
placeholder="请输入用户昵称" placeholder="请输入用户姓名"
maxlength="30" maxlength="30"
/> />
</el-form-item> </el-form-item>
@ -450,12 +459,12 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item
v-if="form.userId == undefined" v-if="form.userId == undefined"
label="用户名称" label="用户账号"
prop="userName" prop="userName"
> >
<el-input <el-input
v-model="form.userName" v-model="form.userName"
placeholder="请输入用户名称" placeholder="请输入用户账号"
maxlength="30" maxlength="30"
/> />
</el-form-item> </el-form-item>
@ -841,8 +850,8 @@ export default {
// 列信息 // 列信息
columns: [ columns: [
{ key: 0, label: `用户编号`, visible: true }, { key: 0, label: `用户编号`, visible: true },
{ key: 1, label: `用户名称`, visible: true }, { key: 1, label: `用户账号`, visible: true },
{ key: 2, label: `用户昵称`, visible: true }, { key: 2, label: `用户姓名`, visible: true },
{ key: 3, label: `部门`, visible: true }, { key: 3, label: `部门`, visible: true },
{ key: 4, label: `手机号码`, visible: true }, { key: 4, label: `手机号码`, visible: true },
{ key: 5, label: `状态`, visible: true }, { key: 5, label: `状态`, visible: true },
@ -854,20 +863,20 @@ export default {
userName: [ userName: [
{ {
required: true, required: true,
message: '用户名称不能为空', message: '用户账号不能为空',
trigger: 'blur', trigger: 'blur',
}, },
{ {
min: 2, min: 2,
max: 20, max: 20,
message: '用户名称长度必须介于 2 和 20 之间', message: '用户账号长度必须介于 2 和 20 之间',
trigger: 'blur', trigger: 'blur',
}, },
], ],
nickName: [ nickName: [
{ {
required: true, required: true,
message: '用户昵称不能为空', message: '用户姓名不能为空',
trigger: 'blur', trigger: 'blur',
}, },
], ],

2
src/views/system/user/profile/index.vue
View File

@ -12,7 +12,7 @@
</div> </div>
<ul class="list-group list-group-striped"> <ul class="list-group list-group-striped">
<li class="list-group-item"> <li class="list-group-item">
<svg-icon icon-class="user" />用户名称 <svg-icon icon-class="user" />用户姓名
<div class="pull-right">{{ user.userName }}</div> <div class="pull-right">{{ user.userName }}</div>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">

2
vue.config.js
View File

@ -37,7 +37,7 @@ module.exports = {
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.2.75:48380`,//旭 // target: `http://192.168.2.75:48380`,//旭
target: `http://192.168.0.244:48380`,//测试 target: `http://192.168.0.244:48380`,//测试
// target: `http://192.168.1.176:48380`,//测试 // target: `http://192.168.2.108:48380`,//测试
// target: `http://192.168.0.34:48380`,//测试 // target: `http://192.168.0.34:48380`,//测试
// target: `http://192.168.0.176:48380`,// // target: `http://192.168.0.176:48380`,//
changeOrigin: true, changeOrigin: true,