From bc76c2de5632fe1433acd92dddc5842b99a06890 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 03 Nov 2021 20:22:05 +0800
Subject: [PATCH] 解决冲突
---
src/views/system/user.vue | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 1 deletions(-)
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index ed6b631..d894474 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -203,6 +203,7 @@
update,
updatePlatform,
add,
+ securitySave,
grant,
resetPassword,
} from "@/api/system/user";
@@ -528,6 +529,11 @@
],
},
{
+ label: "身份证号",
+ prop: "cardid",
+ overHidden: true,
+ },
+ {
label: "手机号码",
prop: "phone",
overHidden: true,
@@ -841,11 +847,63 @@
this.onLoad(this.page);
});
},
+ // rowSave(row, done, loading) {
+ // row.deptId = row.deptId.join(",");
+ // row.roleId = row.roleId.join(",");
+ // row.postId = row.postId.join(",");
+ // add(row).then(
+ // () => {
+ // this.initFlag = false;
+ // this.onLoad(this.page);
+ // this.$message({
+ // type: "success",
+ // message: "操作成功!",
+ // });
+ // done();
+ // },
+ // (error) => {
+ // window.console.log(error);
+ // loading();
+ // }
+ // );
+ // },
rowSave(row, done, loading) {
row.deptId = row.deptId.join(",");
row.roleId = row.roleId.join(",");
row.postId = row.postId.join(",");
- add(row).then(
+ const userMap = {
+ user: {
+ account: row.account,
+ avatar: row.avatar,
+ fingerprint: row.fingerprint,
+ healstats: row.healstats,
+ address: row.address,
+ birthday: row.birthday,
+ cardid: row.cardid,
+ deptId: row.deptId,
+ roleId: row.roleId,
+ education: row.education1,
+ email: row.email,
+ height: row.height,
+ hold: row.hold,
+ jurisdiction: row.jurisdiction,
+ myPicture: row.myPicture,
+ name: row.name,
+ nation: row.nation,
+ nativeplace: row.nativeplace,
+ password: row.password,
+ password2: row.password2,
+ phone: row.phone,
+ politicaloutlook: row.politicaloutlook,
+ realName: row.realName,
+ registered: row.registered,
+ rtime: row.rtime,
+ securitynumber: row.securitynumber,
+ sex: row.sex,
+ district: row.district,
+ },
+ };
+ securitySave(userMap).then(
() => {
this.initFlag = false;
this.onLoad(this.page);
--
Gitblit v1.9.3