修改了user和doctor模块

yz3456

2024-07-05 48846dab1d7748fe4a55b84c9a32f542bb9b1856

修改了user和doctor模块

 ruoyi-ui/src/api/doctor/index.js

@@ -96,10 +96,11 @@
  })
}
// 查看谁分享了数据
export function getWhoShare() {
export function getWhoShare(data) {
  return request({
    url: '/ZfDoctorShare/getInfoByShareId',
    method: 'get',
    data: data
  })
}
// 下载分享的数据

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

@@ -218,3 +218,12 @@
      method: 'get'
    })
}
//修改时选择配偶
export function updatePO(tpfid,sex)
{
  return request({
    url:'/self/user/uidAndUJd/' + tpfid + '/' + sex,
    method: 'get'
  })
}
//新增时选择配偶

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

@@ -606,26 +606,38 @@
      // shareList2: [],
      userOptions:[],
      user:undefined,
      userList:[],
      ifNum:undefined,
      selectWho:undefined,
      title1: "",
      title2: "",
      loading1: false,
      loading2: false,
      // 查询参数1
      queryParams1: {
        pageNum: 1,
        pageSize: 10,
        identity:undefined,
        nickName:undefined,
        sex:undefined,
        birth:undefined,
      },
      ids1: [],
      single1: true,
      multiple1: true,
      dateRange1: [],

      userId: undefined,
      // 遮罩层
      disabled: false,

      loading: true,
      loading1: false,
      loading2: false,
      formData:[],
      // 选中数组
      ids: [],
      ids1: [],
      // 非单个禁用
      single: true,
      single1: true,
      // 非多个禁用
      multiple: true,
      multiple1: true,
      // 显示搜索条件
      showSearch: true,
      // 总条数
@@ -635,8 +647,7 @@
      typeList:[],
      // 弹出层标题
      title: "",
      title1: "",
      title2: "",

      // 是否显示弹出层
      open: false,
      // 是否显示弹出层（数据权限）
@@ -647,7 +658,7 @@
      deptNodeAll: false,
      // 日期范围
      dateRange: [],
      dateRange1: [],

      // 数据范围选项
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
@@ -690,15 +701,7 @@
        effect:undefined,

      },
      // 查询参数1
      queryParams1: {
        pageNum: 1,
        pageSize: 10,
        identity:undefined,
        nickName:undefined,
        sex:undefined,
        birth:undefined,
      },

      // searchVal:"",

      // 表单参数
@@ -761,6 +764,7 @@
    this.getList();
    this.getTypeOptions();
    this.getInfo();

    this.getList1();
  },
  methods: {
@@ -801,7 +805,6 @@
      this.title2 = "下载的分享数据";
      showShareData().then(response => {
        this.shareList1 = response
        // console.log(this.shareList1,'showShareDatashowShareData')
      })
    },
    // 展示分享给我的数据
@@ -810,12 +813,15 @@
      this.ifNum = 2
      this.open2 = true
      this.title2 = "分享给我的数据";
      getWhoShare().then(response => {
      // const list = {"shareId": this.userList}
      const list = {"shareId": 111}
      getWhoShare(list).then(response => {
        const data = response.data
        // console.log(data,'展示分享给我的数据展示分享给我的数据')
        for(let i in data){
          console.log(i,'展示分享给我的数据展示分享给我的数据')
          this.shareList1.push(data[i])
        }

      })
    },

@@ -828,9 +834,8 @@
        this.loading2 = true;
        this.shareList1 = response.data
        this.loading2 = false;
        console.log(this.shareList1,'分享给谁了什么数据分享给谁了什么数据')
        // console.log(this.shareList1,'分享给谁了什么数据分享给谁了什么数据')
      })
      // console.log(value)
    },
    handleWho(){
      this.ifNum = 1
@@ -841,7 +846,6 @@

    /** 分享操作 */
    handleShare(row) {
      // this.getList1();
      this.id1 = row.id
      this.open1 = true;
      this.title1 = "分享";
@@ -849,8 +853,6 @@
    // 多选框选中数据
    handleSelectionChange1(selection) {
      this.ids1 = selection.map(item => item.userId)
      // console.log(selection)
      // console.log(this.ids1,'ids1ids1ids1ids1')
      this.single1 = selection.length!=1
      this.multiple1 = !selection.length
    },
@@ -862,15 +864,20 @@
      // this.single1 = selection.length!=1
      // this.multiple1 = !selection.length
    },
    getRowId1(row)
    {
      return row.id
    },
    getRowId2(row)
    {
      return row.id
    },
    getList1() {
          this.loading1 = true;
          this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
          this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
          listUserAll(this.queryParams1).then(response => {
              this.listRoot = response.data.data;
              // console.log(this.listRoot,'listrootlistroot')
              // this.total1 = response.data.total;

              const kon = {}
              this.listRoot.forEach(element => {
                kon[element['nickName']] = element['userId']
@@ -878,9 +885,10 @@
              for(let i in kon){
                this.userOptions.push({label: i,value: kon[i]})
              }
              // console.log(this.userOptions,'userListuserListuserListuserListuserList')


              for(let i in this.userOptions){
                this.userList.push(this.userOptions[i].value)
              }
              console.log(this.userList,'userListuserListuserList')
              this.loading1 = false;
            }
          );
@@ -900,6 +908,7 @@
        this.open1 = false;
      }).catch(() => {});
    },
    // ------------------------------------------------------------------

    getInfo(){
          console.log('-----------------')
@@ -1022,14 +1031,7 @@
    {
      return row.id
    },
    getRowId1(row)
    {
      return row.id
    },
    getRowId2(row)
    {
      return row.id
    },

    // 取消按钮（数据权限）
    cancelDataScope() {
      this.openDataScope = false;

 ruoyi-ui/src/views/self/show.vue

@@ -154,7 +154,7 @@
            plain
            icon="el-icon-download"
            size="mini"
            @click="handleExportTemplatem"
            @click="handleExportTemplate"
            v-hasPermi="['family:note:export']"
          >导入模板下载</el-button>
        </el-col>
@@ -1732,10 +1732,10 @@
      }
    },

    handleExportTemplatem(){
    handleExportTemplate(){
      this.download('/zSelfNote/model', {

      }, `zSelfNote${new Date().getTime()}.xlsx`)
      }, `zSelfNote_${new Date().getTime()}.xlsx`)
    },
    /** 导入操作*/
    handleEnportm(params){

 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">
@@ -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: {},
@@ -533,8 +538,27 @@

    },
    // 获取性别
    getSex(){

    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(){
@@ -634,7 +658,7 @@
    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)
@@ -762,6 +786,7 @@
    },
    /** 新增按钮操作 */
    handleAdd() {
      this.a = 1
      this.reset();
      getUser().then(response => {
        this.postOptions = response.posts;
@@ -778,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;