From bd4b9aa6ab74a8aa6f55265d24b4a4249abcb636 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期一, 11 十二月 2023 19:18:39 +0800
Subject: [PATCH] 问题解决
---
ruoyi-ui/src/views/register.vue | 2
ruoyi-ui/src/views/marry/index.vue | 6 ++-
ruoyi-ui/src/api/marry/index.js | 3 +
ruoyi-ui/src/views/system/user/index.vue | 27 ++++++++++---
ruoyi-ui/src/router/index.js | 14 +++++++
ruoyi-ui/src/views/secret/index.vue | 12 -----
ruoyi-ui/src/api/system/user.js | 9 ++++
7 files changed, 50 insertions(+), 23 deletions(-)
diff --git a/ruoyi-ui/src/api/marry/index.js b/ruoyi-ui/src/api/marry/index.js
index d894bc6..6f8a63f 100644
--- a/ruoyi-ui/src/api/marry/index.js
+++ b/ruoyi-ui/src/api/marry/index.js
@@ -13,7 +13,8 @@
export function addMarryOld(data) {
return request({
url: '/marryUser',
- method: 'post'
+ method: 'post',
+ data: data
})
}
diff --git a/ruoyi-ui/src/api/system/user.js b/ruoyi-ui/src/api/system/user.js
index e7a29de..1738144 100644
--- a/ruoyi-ui/src/api/system/user.js
+++ b/ruoyi-ui/src/api/system/user.js
@@ -35,7 +35,14 @@
data: data
})
}
-
+export function updateUserInfo(data)
+{
+ return request({
+ url: '/self/user',
+ method: 'put',
+ data: data
+ })
+}
// 鍒犻櫎鐢ㄦ埛
export function delUser(userId) {
return request({
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 32a1cf8..38144f8 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -95,6 +95,20 @@
}
]
},
+ {
+ path: '/famInfo',
+ component: Layout,
+ hidden: true,
+ redirect: 'noredirect',
+ children: [
+ {
+ path: 'famInfo',
+ component: () => import('@/views/system/family/index'),
+ name: 'famInfo',
+ meta: { title: '涓汉涓績', icon: 'user' }
+ }
+ ]
+ },
// {
// path: '',
// component: Layout,
diff --git a/ruoyi-ui/src/views/marry/index.vue b/ruoyi-ui/src/views/marry/index.vue
index 0721a19..722e443 100644
--- a/ruoyi-ui/src/views/marry/index.vue
+++ b/ruoyi-ui/src/views/marry/index.vue
@@ -622,7 +622,7 @@
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
'.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
-
+
fileList:[
],
fileListOther:[
@@ -926,12 +926,14 @@
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
+ let _this = this
this.$refs["elForm"].validate(valid => {
if (valid) {
-
+ console.log(this.formDat)
addMarryOld(this.formDat).then(response => {
// marryList.oldSpouseList.push(this.formDat);
this.$modal.msgSuccess("鏂板鎴愬姛");
+ _this.formDat = {}
this.open = false;
this.getList();
});
diff --git a/ruoyi-ui/src/views/register.vue b/ruoyi-ui/src/views/register.vue
index 573244a..a4bc647 100644
--- a/ruoyi-ui/src/views/register.vue
+++ b/ruoyi-ui/src/views/register.vue
@@ -1,7 +1,7 @@
<template>
<div class="register">
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
- <h3 class="title">鏈兘閮藉缃戝悗鍙扮鐞嗙郴缁�</h3>
+ <h3 class="title">鏂扮敤鎴锋敞鍐�</h3>
<el-form-item prop="username">
<el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="璐﹀彿">
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue
index 4cb6a08..e2e1670 100644
--- a/ruoyi-ui/src/views/secret/index.vue
+++ b/ruoyi-ui/src/views/secret/index.vue
@@ -1,17 +1,7 @@
<template>
<div class="app-container" style="opacity: 1;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
- <el-form-item label="" prop="phone wx qq timeLimit type happenTime">
- <el-input
- v-model="queryParams.searchText"
- placeholder="鍦ㄢ�滆储浜р�濅腑鎼滅储"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuer1(queryParams)">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
- </el-form-item>
-
+
<el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
v-model="dateRange"
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 1dfef73..b2b305a 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -320,7 +320,7 @@
</template>
<script>
-import { listUser, getUser, delUser, addUser, updateUser, getAllFamilys,resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
+import { listUser, getUser, delUser, updateUserInfo,addUser, updateUser, getAllFamilys,resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -461,7 +461,7 @@
methods: {
getRole(){
this.form.roleIds = []
- alert(123)
+ //alert(123)
this.form.roleIds.push(this.rt)
},
getFamlilyInfo(){
@@ -616,22 +616,35 @@
// alert(this.fid)
//alert(this.rt)
- alert(this.form.roleIds)
+ // alert(this.form.roleIds)
let ps = true
// alert(this.rt)
// alert(this.fid)
-
+ let _this = this
if(this.rt===2 && (this.fid!="鏃�"))
+ {
ps = false
+
+ }
// alert(ps)
if(ps)
{
if (valid) {
if (this.form.userId != undefined) {
updateUser(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
+
+ let fm = {}
+ fm.userId = _this.form.userId
+
+ if(_this.fid==="鏃�")
+ fm.familyId= -1
+ else
+ fm.familyId = _this.fid
+ updateUserInfo(fm).then(response=>{
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.open = false;
+ this.getList();
+ })
});
} else {
addUser(this.form).then(response => {
--
Gitblit v1.9.1