From 6976afb4d0a45ddb2f565f5c255710462f18d246 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 08 八月 2023 12:30:10 +0800
Subject: [PATCH] 性别显示已经改好了， 隐私备忘录 新增删除搞好了
---
ruoyi-ui/src/views/self/show.vue | 40 +++++++++++++++-----
ruoyi-ui/src/views/marry/index.vue | 12 +++--
ruoyi-ui/src/api/marry/index.js | 8 ++--
ruoyi-ui/src/views/secret/secretInfo.vue | 2
ruoyi-ui/src/views/secret/memo.vue | 11 +++--
ruoyi-ui/src/views/secret/index.vue | 2
6 files changed, 49 insertions(+), 26 deletions(-)
diff --git a/ruoyi-ui/src/api/marry/index.js b/ruoyi-ui/src/api/marry/index.js
index 153f8fc..681a961 100644
--- a/ruoyi-ui/src/api/marry/index.js
+++ b/ruoyi-ui/src/api/marry/index.js
@@ -3,9 +3,9 @@
// 鏌ヨ鏁版嵁
export function listMarry(query) {
return request({
- url: '/zMarry/list',
+ url: '/marrySelf',
method: 'get',
- params: query
+ // params: query
})
}
@@ -27,8 +27,8 @@
//淇敼淇℃伅
export function updateMarry(data) {
return request({
- url: '/zMarry',
- method: 'put',
+ url: '/marrySelf',
+ method: 'post',
data: data
})
}
diff --git a/ruoyi-ui/src/views/marry/index.vue b/ruoyi-ui/src/views/marry/index.vue
index 249a1dd..00e2ae4 100644
--- a/ruoyi-ui/src/views/marry/index.vue
+++ b/ruoyi-ui/src/views/marry/index.vue
@@ -703,7 +703,7 @@
// 閬僵灞�
disabled: false,
- loading: true,
+ loading: false,
formData:[],
// 閫変腑鏁扮粍
ids: [],
@@ -924,14 +924,17 @@
getList() {
- this.loading = true;
-
+ this.loading = false;
+ alert(344)
//涓汉淇℃伅
listMarry(this.queryParams).then(response => {
+ alert(124)
+ console.log(response.data)
if(response.data.length == 0){
this.loading = false;
this.marryList=[];
-
+ this.total = 0;
+ this.oldSpouseList = [];
}
else{
this.marryList = response.data;
@@ -1194,4 +1197,3 @@
}
};
</script>
-
diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue
index ca1fdb2..42431b3 100644
--- a/ruoyi-ui/src/views/secret/index.vue
+++ b/ruoyi-ui/src/views/secret/index.vue
@@ -239,7 +239,7 @@
<el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
- <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
+ <h4 class="form-header">鐩稿叧鍥剧墖</h4>
<el-upload
action="#"
list-type="picture-card"
diff --git a/ruoyi-ui/src/views/secret/memo.vue b/ruoyi-ui/src/views/secret/memo.vue
index 9f68237..4a99129 100644
--- a/ruoyi-ui/src/views/secret/memo.vue
+++ b/ruoyi-ui/src/views/secret/memo.vue
@@ -219,8 +219,9 @@
listNote(cid, 2031).then(response => {
this.memoList = response.data;
- console.log(this.memoList)
+ // alert(response.data.total)
this.total = response.data.total;
+ // alert(this.total)
this.loading = false;
}
);
@@ -339,10 +340,10 @@
addNote(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
- // this.queryParams.cid = cid
- // this.queryParams.fid = fid
- this.getList(fid,cid);
+
+ this.getList(this.formDat.fid,this.formDat.cid);
resetQuery();
+
});
}
});
@@ -380,7 +381,7 @@
}).then(() => {
// this.getList(fid,cid);
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- getList(fid,cid);
+ this.getList(fid,cid);
}).catch(() => {});
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
diff --git a/ruoyi-ui/src/views/secret/secretInfo.vue b/ruoyi-ui/src/views/secret/secretInfo.vue
index 38d6b36..48542cb 100644
--- a/ruoyi-ui/src/views/secret/secretInfo.vue
+++ b/ruoyi-ui/src/views/secret/secretInfo.vue
@@ -437,7 +437,7 @@
// const id =row.id;
const id = this.$route.params && this.$route.params.id;
// const fid =2031
- this.$router.push("/self/secret/memo/" + id );
+ this.$router.push("/self/secret/memo/" + id);
},
}
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 41e3d9a..9bd7f95 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -58,12 +58,12 @@
<!-- <el-input v-model="individualList.sex === 1 ? '鐢�':'濂�' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">-->
<!-- </el-input>-->
<template v-if="!isEditing">
- <el-input v-model="individualList.sex === 1 ? '鐢�':'濂�'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ <el-input v-model="individualList.sex === 1 ? inds='鐢�':inds='濂�'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</template>
<template v-else>
- <el-select v-model="individualList.sex" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}" :disabled="dsb">
- <el-option label="鐢�" value="1"></el-option>
- <el-option label="濂�" value="0"></el-option>
+ <el-select v-model="inds" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-option label="鐢�" value='1'></el-option>
+ <el-option label="濂�" value='0'></el-option>
</el-select>
</template>
</el-form-item>
@@ -99,13 +99,14 @@
<template v-if="!isEditing" >
<el-input v-if="individualList.maritalStatus===0" placeholder="鏈"></el-input>
<el-input v-if="individualList.maritalStatus===1" placeholder="宸插"></el-input>
- <el-input v-if="individualList.maritalStatus===2" placeholder="绂诲"></el-input>
+ <el-input v-if="individualList.maritalStatus===2" placeholder="鏈"></el-input>
+
</template>
<template v-else>
- <el-select v-model="individualList.maritalStatus" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}">
- <el-option label="鏈" value="0"></el-option>
- <el-option label="宸插" value="1"></el-option>
- <el-option label="绂诲" value="2"></el-option>
+ <el-select v-model="mrs" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}">
+ <el-option label="鏈" value='0'></el-option>
+ <el-option label="宸插" value='1'></el-option>
+ <el-option label="绂诲" value='2'></el-option>
</el-select>
</template>
</el-form-item>
@@ -712,6 +713,10 @@
componentKey: 0,
// 閫変腑鏁扮粍
ids: [],
+ //鎬у埆
+ inds:undefined,
+ //濠氬Щ绫诲埆
+ mrs:undefined,
// 闈炲崟涓鐢�
single: true,
// 闈炲涓鐢�
@@ -1224,7 +1229,12 @@
this.isShow=false
this.isShow_2=true
this.isEditing=true
- // this.isEdit=false
+ if(this.individualList.maritalStatus == 0)
+ this.mrs = '鏈'
+ else if(this.individualList.maritalStatus == 1)
+ this.mrs = '宸插'
+ else
+ this.mrs = '绂诲'// this.isEdit=false
},
/** 鏌ヨ鑷紶淇℃伅 */
@@ -1368,6 +1378,16 @@
//淇敼鍚庣殑淇濆瓨
//涓汉鍩烘湰淇℃伅
submitForm() {
+ if(this.inds=='1')
+ this.individualList.sex = 1;
+ else
+ this.individualList.sex = 0;
+ if(this.mrs=='0')
+ this.individualList.maritalStatus = 0
+ else if(this.mrs == '1')
+ this.individualList.maritalStatus = 1
+ else
+ this.individualList.maritalStatus = 2
let ul = this.fileList.map(function (elem){
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
}).join(",")
--
Gitblit v1.9.1