From 32148fb89c6cbedc24aaf9cb93a215a6cc665f2b Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期二, 09 七月 2024 16:56:14 +0800
Subject: [PATCH] 修改了一些报错，完善了用户管理配偶的选择模块
---
ruoyi-ui/src/views/self/show.vue | 2 +-
ruoyi-ui/src/views/system/user/index.vue | 37 ++++++++++++++++++++-----------------
ruoyi-ui/src/views/meeting/meetingInfo.vue | 1 +
ruoyi-ui/src/api/system/user.js | 7 +++++++
ruoyi-ui/src/views/doctor/index.vue | 2 +-
5 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/ruoyi-ui/src/api/system/user.js b/ruoyi-ui/src/api/system/user.js
index 654559b..963737b 100644
--- a/ruoyi-ui/src/api/system/user.js
+++ b/ruoyi-ui/src/api/system/user.js
@@ -227,3 +227,10 @@
})
}
//鏂板鏃堕�夋嫨閰嶅伓
+export function addPO(sex)
+{
+ return request({
+ url:'/self/user/sex/'+sex,
+ method: 'get'
+ })
+}
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index 3a76111..ddec3fd 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -817,7 +817,7 @@
const list = {"shareId": 111}
getWhoShare(list).then(response => {
const data = response.data
- // console.log(data,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁')
+ console.log(data,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁s')
for(let i in data){
console.log(i,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁')
this.shareList1.push(data[i])
diff --git a/ruoyi-ui/src/views/meeting/meetingInfo.vue b/ruoyi-ui/src/views/meeting/meetingInfo.vue
index eca955a..77d23e9 100644
--- a/ruoyi-ui/src/views/meeting/meetingInfo.vue
+++ b/ruoyi-ui/src/views/meeting/meetingInfo.vue
@@ -383,6 +383,7 @@
this.$refs['elForm'].validate(valid => {
if (valid) {
if (this.formData.id != undefined) {
+ this.formData.statu = 3
updateMeeting(this.formData).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
// if (this.formData.status == 1)
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 92a39be..9fb10c6 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -903,7 +903,7 @@
getCertificateList, addCertificate, updateCertificate, delCertificate,
getAbroadList, addAbroad, updateAbroad, delAbroad, listType,
getAutobiographyList, getAutobiographyTermList, addAutobiography, updateAutobiography,delAutobiography,
- getCategory,
+ getCategory,download
} from "@/api/self/index";
// import { listRole, getRole, delRole, addRole, updateRole, dataScope,changeRoleStatus, deptTreeSelect } from "@/api/system/role";
// import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 2084858..4f0408d 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -297,7 +297,7 @@
<el-form-item label="閰嶅伓淇℃伅" prop="spouseId" >
<el-select v-model="form.spouseId" placeholder="璇烽�夋嫨閰嶅伓淇℃伅" @change="handleSpouse">
<el-option
- v-for="item in allInfo"
+ v-for="item in allInfo2"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
@@ -357,7 +357,7 @@
import { getIndividual,getInfoByFid,
getAllInfo,listUser, getUser, delUser,
updateUserInfo,addUser, updateUser, getAllFamilys,resetUserPwd,
- changeUserStatus, deptTreeSelect ,updateFM, updatePO} from "@/api/system/user";
+ changeUserStatus, deptTreeSelect ,updateFM, updatePO, addPO} from "@/api/system/user";
import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -546,11 +546,18 @@
const tpfid = this.pOID
// 鏂板a=1,淇敼a=2
if(this.a == 1){
- alert('鏂板a=1')
+ addPO(this.sex).then(response =>{
+ for(let i in response.data[0]){
+ this.allInfo2.push({'nickName':response.data[0][i],'userId':i})
+ }
+ console.log(this.allInfo2,'鏂板a=1鏂板a=1鏂板a=1')
+ })
}else{
updatePO(tpfid,this.sex).then(response =>{
- this.allInfo2 = response.data
- console.log(this.allInfo2,'淇敼a=2')
+ for(let i in response.data[0]){
+ this.allInfo2.push({'nickName':response.data[0][i],'userId':i})
+ }
+ console.log(this.allInfo2,'淇敼a=2淇敼a=2淇敼a=2')
})
}
// console.log(sex,'sexsexsex')
@@ -558,6 +565,7 @@
// 鍏抽棴寮圭獥鍚�
handleClose(){
this.pOID = ''
+ this.allInfo2 = []
// alert(this.pOID)
},
@@ -814,8 +822,8 @@
//alert(this.fid)
getUser(userId).then(response => {
this.form = response.data;
- console.log(response.data)
- console.log(response.data)
+ console.log(response.data,'formformformformform')
+ // console.log(response.data)
this.postOptions = response.posts;
this.roleOptions = response.roles;
console.log(this.roleOptions)
@@ -891,10 +899,10 @@
let fm = {}
fm.userId = _this.zinfid;
fm.nickName = this.form.nickName
- alert(this.form.role)
+ // alert(this.form.role)
fm.roleId = this.form.role
fm.sex = this.form.sex
- alert(fm.sex)
+ // alert(fm.sex)
fm.status = this.form.status
fm.fid = this.form.fid
fm.mid = this.form.mid
@@ -904,16 +912,15 @@
fm.spouseId = this.form.spouseId
fm.sysId = this.form.userId
fm.userName = this.form.userName
+ fm.remark = this.form.remark
+ alert(fm.remark)
console.log(fm)
if (valid) {
if (this.form.userId != undefined) {
updateUser(fm).then(response => {
-
- this.open = false;
+ this.open = false;
this.getList();
-
-
// this.isshowMar = false
// this.isshowMri = false
// updateUserInfo(fm).then(response=>{
@@ -927,20 +934,16 @@
// })
});
} else {
-
addUser(fm).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
_this.rt = undefined
-
// this.isshowMar = false
// this.isshowMri = false
});
}
}
-
-
}
else{
this.$modal.msgSuccess("鏅�氳鑹蹭笉鑳芥嫢鏈夊搴彿锛�");
--
Gitblit v1.9.1