修改了权限代码

feige

2024-06-16 2f56209d3cdfda779aeed6cd30b1c0cc0cda3e70

修改了权限代码

 ruoyi-ui/src/api/system/user.js

@@ -210,3 +210,11 @@
  })
}
// export function get
//修改父亲母亲
export function updateFM(uid, tpfid)
{
    return request({
      url:'/self/user/uidAndUJd/'+uid+'/'+tpfid,
      method: 'get'
    })
}

 ruoyi-ui/src/views/mindMap/index.vue

@@ -78,11 +78,12 @@
      getUserProfile().then(response => {
        this.user = response.data;
      });
      listRoot(5).then(response =>{
      listRoot(10).then(response =>{
        this.rootList =response.data;

        const mindMapData = this.rootList[0];
         console.log(mindMapData)
         console.log('9999')
        // console.log(this.drawData(mindMapData))
        this.mapData = this.drawData(mindMapData)
        this.showMindMap = true

 ruoyi-ui/src/views/system/user/index.vue

@@ -187,20 +187,12 @@
              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="角色" prop="roleIds">
              <el-select v-model="rt" placeholder="请选择角色" @change="getRole">

                <el-option
                  v-for="item in roleOptions"
                  :key="item.roleId"
                  :label="item.roleName"
                  :value="item.roleId"
                  :disabled="item.status == 1"
                ></el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="用户名称" prop="userName">
              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
            </el-form-item>
          </el-col>
      

        </el-row>

@@ -230,66 +222,77 @@
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
            </el-form-item>
          </el-col>
       
       <el-col :span="12">
         <el-form-item label="角色" prop="role">
           <el-select v-model="form.role" placeholder="请选择角色" @change="getRole">
       
             <el-option
               v-for="item in roleOptions"
               :key="item.roleId"
               :label="item.roleName"
               :value="item.roleId"
               :disabled="item.status == 1"
             ></el-option>
           </el-select>
         </el-form-item>
       </el-col>
	   
	   
       <el-col :span="12">
         <el-form-item label="是否本家" prop="isMyFamily">
           <el-select v-model="form.isMyFamily"   placeholder="请输入是否本家"  @change="handleFamily">
	   
       <el-option
         v-for="item in famOptions"
         :key="item.opsi"
         :label="item.opName"
         :value="item.opsi"
	
       ></el-option>
	       
           </el-select>
	   
         </el-form-item>
       </el-col>
        </el-row>
        <el-row>

        <el-col :span="12">
          <el-form-item label="家庭号">
            <el-select v-model="fid"   placeholder="请选择家庭号" @change="handleChange">

  <el-option
      key="-1"
      label="无"
      value="-1"
              ></el-option>
              <el-option
                v-for="item in famiInfo"
                :key="item.id"
                :label="item.name"
                :value="item.id"

              ></el-option>
            </el-select>

          </el-form-item>
        </el-col>

         </el-row>

        <el-row v-if="isshowMar">

          <el-col :span="12">
            <el-form-item label="是否本家" prop="isMyFamily">
              <el-select v-model="form.isMyFamily"   placeholder="请输入是否本家"  @change="handleFamily">


       
    <el-col :span="12">
             <el-form-item label="父亲" prop="fid">
              <el-select v-model="form.fid"   placeholder="请选择父亲"  @change="hanldeLoop">
                <el-option
                  key=1
                  label="是"
                  value=1
                ></el-option>
                <el-option
                  key=0
                  label="否"
                  value=0
                  v-for="item in fathorInfo"
                  :key="item.userId"
                  :label="item.nickName"
                  :value="item.userId"
                ></el-option>
              </el-select>

            </el-form-item>
          </el-col>
             </el-form-item>
                  </el-col>
                  <el-col  :span="12">
             <el-form-item label="母亲" prop="mid">
              <el-select v-model="form.mid"   placeholder="请选择母亲" @change="hanldeLoopMon">
                <el-option
                  v-for="item in motherInfo"
                  :key="item.userId"
                  :label="item.nickName"
                  :value="item.userId"
                ></el-option>
              </el-select>
			 
             </el-form-item>
           </el-col>
         </el-row>

        <el-row >

   

        </el-row>
        <el-row v-if="isshowMri">
        <el-row >
          <el-col :span="12">
             <el-form-item label="配偶信息" prop="spouseId">
              <el-select v-model="form.spouseId"   placeholder="请选择配偶信息">
@@ -354,7 +357,7 @@
import { getIndividual,getInfoByFid,
getAllInfo,listUser, getUser, delUser,
 updateUserInfo,addUser, updateUser, getAllFamilys,resetUserPwd,
 changeUserStatus, deptTreeSelect } from "@/api/system/user";
 changeUserStatus, deptTreeSelect ,updateFM} from "@/api/system/user";
import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -402,7 +405,11 @@
      postOptions: [],
      // 角色选项
      roleOptions: [],
      famOptions:[{"opsi":1,"opName":"是"},{"opsi":0,"opName":"否"}],
      // 表单参数
      cuid: undefined,
      orfid: undefined,
      ormid: undefined,
      motherInfo:[],
      fathorInfo:[],
      allInfo:[],
@@ -466,9 +473,7 @@
        deptId: [
          { required: true, message: "用户角色不能为空", trigger: "blur" }
        ],
        spouseId: [
          { required: true, message: "配偶信息不能为空", trigger: "blur" }
        ],
     
        password: [
          { required: true, message: "用户密码不能为空", trigger: "blur" },
          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
@@ -501,7 +506,7 @@
    this.getFamlilyInfo();
    this.getDeptTree();
    //拿到自己定义的用户信息
   // this.getAllIn();
    this.getAllIn();
    this.getConfigKey("sys.user.initPassword").then(response => {
      this.initPassword = response.msg;
    });
@@ -527,6 +532,96 @@
        this.isshowMar = false
      }
    },
	
    hanldeLoop(){
        let fid = this.form.fid
        let _this = this
        if(this.cuid==undefined)
        {
                    let jsd = true
            for(var i = 0; i < _this.allInfo.length; i++)
            {
                if(_this.allInfo[i].userId==_this.form.fid)
                {
                    //_this.form.mid = _this.allInfo[i].spouseId
                    _this.$set(_this.form,'mid',_this.allInfo[i].spouseId);
                    jsd = false
					
                }
                if(jsd == true)
                                    _this.$set(_this.form,'mid','');
            }
                return;
        }
	
        //alert(this.cuid)
	
        //alert(fid)
        updateFM(this.cuid, fid).then(response => {
            //alert(response.data)
            if(!response.data)
            {
                for(var i = 0; i < _this.allInfo.length; i++)
                {
                    if(_this.allInfo[i].userId==_this.form.fid)
                    {
                        //_this.form.mid = _this.allInfo[i].spouseId
                        _this.$set(_this.form,'mid',_this.allInfo[i].spouseId);
						
                    }
                }
            }else
            {
                //alert(fid)
                _this.$set(_this.form,'fid',_this.orfid);
                this.$modal.msgSuccess("不能选择子孙为父亲！");
            }
        })
    },
    hanldeLoopMon(){
        //alert(this.cuid)
        let fid = this.form.mid
        let _this = this
        if(this.cuid==undefined)
        {
            let jsd = true
            for(var i = 0; i < _this.allInfo.length; i++)
            {
                if(_this.allInfo[i].userId==_this.form.mid)
                {
                    //_this.form.fid = _this.allInfo[i].spouseId
                    jsd = false
                    _this.$set(_this.form,'fid',_this.allInfo[i].spouseId);
					
                }
            }
            if(jsd == true)
                                _this.$set(_this.form,'fid','');
        return;
        }

        //alert(fid)
        updateFM(this.cuid, fid).then(response => {
            //alert(response.data)
            if(!response.data)
            {
                for(var i = 0; i < _this.allInfo.length; i++)
                {
                    if(_this.allInfo[i].userId==_this.form.mid)
                    {
                        //_this.form.fid = _this.allInfo[i].spouseId
                        _this.$set(_this.form,'fid',_this.allInfo[i].spouseId);
						
                    }
                }
            }else
            {
                //alert(fid)
                _this.$set(_this.form,'mid',_this.ormid);
                this.$modal.msgSuccess("不能选择子孙为母亲！");
            }
        })
    },
    handleFamily()
    {

@@ -535,8 +630,19 @@
    },
    getAllIn(){
      getAllInfo().then(response => {
       // this.allInfo = response.data;
      //  console.log(response.data)
        this.allInfo = response.data;
        console.log(response.data)
        for(var i = 0; i < this.allInfo.length; i++)
        {
            //alert(this.allInfo[i].sex == 1)
            if(this.allInfo[i].sex == 0)
                this.fathorInfo.push(this.allInfo[i])
            else
                this.motherInfo.push(this.allInfo[i])
        }
    //    alert(98)
        //console.log(this.fathorInfo)
        //console.log('----sdfdsfds')
      })
    },
    getRole(){
@@ -660,6 +766,8 @@
          this.roleOptions= []
        this.roleOptions.push(response.roles[1])
          this.roleOptions.push(response.roles[3])
          console.log(this.roleOptions)
          console.log("0-009888")
        this.open = true;
        this.title = "添加用户";
        this.form.password = this.initPassword;
@@ -669,32 +777,49 @@
    handleUpdate(row) {
      this.reset();
      const userId = row.userId || this.ids;

      this.cuid= row.userId || this.ids;
      //  this.fid = response.data.familyId
        //alert(this.fid)
      getUser(userId).then(response => {
        this.form = response.data;
        console.log(response.data)
        console.log(response.data)
        this.postOptions = response.posts;
        this.roleOptions = response.roles;
        console.log(this.roleOptions)
        // this.$set(this.form, "postIds", response.postIds);
        // this.$set(this.form, "roleIds", response.roleIds);
       // alert(response.roleIds.length)
        if(response.roleIds.length!=0)
        this.rt = response.roleIds[0]
        // if(response.roleIds.length!=0)
        // this.rt = response.roleIds[0]
        let _this = this

     getIndividual(userId).then(response => {
           //  alert(123)
           console.log('++++++++-----0000((((((9999))))))')
              console.log(response.data)
           // console.log('++++++++-----0000((((((9999))))))')
     //          console.log(response.data)
            if(response.data!=undefined)
            {
              _this.fid = response.data.familyId;
	
                _this.orfid = response.data.fatherId
                _this.ormid = response.data.momId
                //alert(response.data.roleId)
			
                _this.$set(_this.form,'fid',response.data.fatherId);
                _this.$set(_this.form,'mid',response.data.momId);
                _this.$set(_this.form,'isMyFamily',response.data.isMyFamily);
                _this.$set(_this.form,'spouseId',response.data.spouseId);
                if(response.data.roleId==3)
                    _this.$set(_this.form,'role',102);
                else
                    _this.$set(_this.form,'role',response.data.roleId);
            //  alert(_this.form.fid)
              _this.zinfid = response.data.userId
            //  alert(78)
              }
          }
        );
        this.$set(this.form, "postIds", response.postIds);
        this.$set(this.form, "roleIds", response.roleIds);

        this.open = true;
        this.title = "修改用户";
        this.form.password = "";
@@ -725,50 +850,40 @@

        let ps = true

        if(this.fid=="无")
          this.fid = -1
 
        let _this = this
        if(this.rt===2 && (this.fid!=-1))
        {
          ps = false

        }
        if(this.rt!=2&&this.fid==-1)
        {
           this.$modal.msgSuccess("家庭成员，必须要拥有家庭号！");
           return
        }
   
        
        if(ps)
        {
          let fm = {}
          fm.userId = _this.zinfid;
          fm.nickName = this.form.nickName
          fm.roleId =this.rt
          alert(this.form.role)
          fm.roleId = this.form.role
          fm.sex = this.form.sex
          alert(fm.sex)
          fm.status = this.form.status
          fm.familyId = this.fid
		  
          fm.isMyFamily = this.form.isMyFamily
          fm.fid = this.form.fid
          fm.mid = this.form.mid
    //    alert(this.form.isMyFamily)
          fm.isMyFamily = this.form.isMyFamily=='1'?1:0
	
          fm.spouseId = this.form.spouseId
          fm.sysId = this.form.userId
	
          if(_this.fid==="无")
            fm.familyId= -1
          else
            fm.familyId = _this.fid
          this.form.familyId = fm.familyId
          fm.userName = this.form.userName
      
          console.log(fm)
          if (valid) {
            if (this.form.userId != undefined) {
              updateUser(fm).then(response => {

 this.open = false;
                this.open = false;
                   this.getList();
                   _this.rt = undefined
                   _this.fid = "无"
                   this.isshowMar = false
                   this.isshowMri = false
                
            
                   // this.isshowMar = false
                   // this.isshowMri = false
              //   updateUserInfo(fm).then(response=>{
              //      this.$modal.msgSuccess("修改成功");
              //      this.open = false;
@@ -780,15 +895,15 @@
              //   })
               });
            } else {
  
              addUser(this.form).then(response => {
			  
              addUser(fm).then(response => {
                this.$modal.msgSuccess("新增成功");
                this.open = false;
                this.getList();
                _this.rt = undefined
                _this.fid = "无"
                this.isshowMar = false
                this.isshowMri = false
                
                // this.isshowMar = false
                // this.isshowMri = false
              });
            }
            }
@@ -798,7 +913,7 @@
        else{
          this.$modal.msgSuccess("普通角色不能拥有家庭号！");
        //  _this.rt = undefined
          _this.fid = "无"
         // _this.fid = "无"
          _this.isshowMar = false
        }
      });

 ruoyi-ui/vue.config.js

@@ -36,7 +36,7 @@
      // detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
      //target: `https://10.39.18.174:8080/`,
      // target: `https://192.168.1.3:8089/`,
     //  target: `https://192.168.1.5:8080/`,
       target: 'https://www.bendudu.com:8080/',
        changeOrigin: true,
        pathRewrite: {