问题解决

feige

2023-12-11 bd4b9aa6ab74a8aa6f55265d24b4a4249abcb636

问题解决

 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
  })
}


 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({

 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,

 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();
          });

 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" />

 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"

 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 => {