修改了user和doctor模块

yz3456

2024-07-05 48846dab1d7748fe4a55b84c9a32f542bb9b1856

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

@@ -179,7 +179,7 @@
    </el-row>

    <!-- 添加或修改用户配置对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body @close="handleClose">
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-row>
          <el-col :span="12">
@@ -192,14 +192,14 @@
            <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
          </el-form-item>
        </el-col>
      


        </el-row>

        <el-row>
          <el-col :span="12">
            <el-form-item label="用户性别">
              <el-select v-model="form.sex" placeholder="请选择性别">
              <el-select v-model="form.sex" placeholder="请选择性别" @change="getSex">
                <el-option
                  v-for="dict in dict.type.sys_user_sex"
                  :key="dict.value"
@@ -222,11 +222,11 @@
          </el-col>
        </el-row>
        <el-row>
       

       <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"
@@ -237,28 +237,28 @@
           </el-select>
         </el-form-item>
       </el-col>
	   
	   
      <el-col :span="12">
        <el-form-item label="是否本家" prop="isMyFamily">


      <el-col :span="12" v-if="form.role == 102">
        <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-row v-if="form.role != 2 && form.isMyFamily == 1">

       

    <el-col :span="12">
             <el-form-item label="父亲" prop="fid">
              <el-select v-model="form.fid"   placeholder="请选择父亲"  @change="hanldeLoop">
@@ -282,20 +282,20 @@
               :value="item.userId"
             ></el-option>
           </el-select>
			 

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

        <el-row >

   


        </el-row>
        <el-row >
          <el-col :span="12">
             <el-form-item label="配偶信息" prop="spouseId">
              <el-select v-model="form.spouseId"   placeholder="请选择配偶信息">
        <el-row v-if="form.role == 102  && form.isMyFamily == 0">
          <el-col :span="12" >
             <el-form-item label="配偶信息" prop="spouseId" >
              <el-select v-model="form.spouseId"   placeholder="请选择配偶信息" @change="handleSpouse">
                <el-option
                  v-for="item in allInfo"
                  :key="item.userId"
@@ -357,7 +357,7 @@
import { getIndividual,getInfoByFid,
getAllInfo,listUser, getUser, delUser,
 updateUserInfo,addUser, updateUser, getAllFamilys,resetUserPwd,
 changeUserStatus, deptTreeSelect ,updateFM} from "@/api/system/user";
 changeUserStatus, deptTreeSelect ,updateFM, updatePO} from "@/api/system/user";
import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -368,6 +368,10 @@
  components: { Treeselect },
  data() {
    return {
      // 修改配偶时的用户id和sex
      sex:'',
      pOID:'',
      a:undefined,
      // 遮罩层
      loading: true,
      //角色保存
@@ -413,6 +417,7 @@
      motherInfo:[],
      fathorInfo:[],
      allInfo:[],
      allInfo2:[],
      faid: 0,
      maid: 0,
      form: {},
@@ -473,7 +478,7 @@
        deptId: [
          { required: true, message: "用户角色不能为空", trigger: "blur" }
        ],
     

        password: [
          { required: true, message: "用户密码不能为空", trigger: "blur" },
          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
@@ -512,15 +517,11 @@
    });
  },
  methods: {
    handleChange()
    {
   //   alert(this.fid)
    handleChange(){
      if(this.fid=="无")
        this.fid = "-1"
      if(this.fid!="-1")
      {
      if(this.fid!="-1"){
        //查询不是本家的时候，可以选择的配偶信息

       getInfoByFid(this.fid).then(response=>{
         console.log("--------------------")
         console.log(response.data)
@@ -532,7 +533,34 @@
        this.isshowMar = false
      }
    },
	

    handleSpouse(value){

    },
    // 获取性别
    getSex(value){
      if(value != undefined){
        this.sex = value
      }
      // alert(this.sex)
      const tpfid = this.pOID
      // 新增a=1,修改a=2
      if(this.a == 1){
        alert('新增a=1')
      }else{
        updatePO(tpfid,this.sex).then(response =>{
          this.allInfo2 = response.data
          console.log(this.allInfo2,'修改a=2')
        })
      }
      // console.log(sex,'sexsexsex')
    },
    // 关闭弹窗后
    handleClose(){
      this.pOID = ''
      // alert(this.pOID)
    },

   hanldeLoop(){
      let fid = this.form.fid
      let _this = this
@@ -546,16 +574,16 @@
               //_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)
@@ -567,7 +595,7 @@
               {
                  //_this.form.mid = _this.allInfo[i].spouseId
                  _this.$set(_this.form,'mid',_this.allInfo[i].spouseId);
						

               }
            }
         }else
@@ -592,7 +620,7 @@
               //_this.form.fid = _this.allInfo[i].spouseId
               jsd = false
               _this.$set(_this.form,'fid',_this.allInfo[i].spouseId);
					

            }
         }
         if(jsd == true)
@@ -611,7 +639,7 @@
               {
                  //_this.form.fid = _this.allInfo[i].spouseId
                  _this.$set(_this.form,'fid',_this.allInfo[i].spouseId);
						

               }
            }
         }else
@@ -622,16 +650,15 @@
         }
      })
   },
    handleFamily()
    handleFamily(value)
    {

      if(this.form.isMyFamily=="0")
        this.isshowMri = true
    },
    getAllIn(){
      getAllInfo().then(response => {
        this.allInfo = response.data;
        console.log(response.data)
        console.log(response.data,'allInfoallInfoallInfoallInfo')
      for(var i = 0; i < this.allInfo.length; i++)
      {
         //alert(this.allInfo[i].sex == 1)
@@ -645,7 +672,7 @@
      //console.log('----sdfdsfds')
      })
    },
    getRole(){
    getRole(value){
      this.form.roleIds = []
      this.form.roleIds.push(this.rt)
    },
@@ -759,6 +786,7 @@
    },
    /** 新增按钮操作 */
    handleAdd() {
      this.a = 1
      this.reset();
      getUser().then(response => {
        this.postOptions = response.posts;
@@ -775,6 +803,10 @@
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.a = 2
      this.pOID = row.userId
      this.sex = row.sex
      this.getSex();
      this.reset();
      const userId = row.userId || this.ids;
     this.cuid= row.userId || this.ids;
@@ -800,11 +832,11 @@
     //          console.log(response.data)
            if(response.data!=undefined)
            {
	

            _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);
@@ -850,10 +882,10 @@

        let ps = true

 

        let _this = this
   
		


        if(ps)
        {
          let fm = {}
@@ -868,11 +900,11 @@
        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
        fm.userName = this.form.userName
      

        console.log(fm)
          if (valid) {
            if (this.form.userId != undefined) {
@@ -880,8 +912,8 @@

            this.open = false;
                   this.getList();
                
            


                   // this.isshowMar = false
                   // this.isshowMri = false
              //   updateUserInfo(fm).then(response=>{
@@ -895,13 +927,13 @@
              //   })
               });
            } else {
			  

              addUser(fm).then(response => {
                this.$modal.msgSuccess("新增成功");
                this.open = false;
                this.getList();
                _this.rt = undefined
                

                // this.isshowMar = false
                // this.isshowMri = false
              });