From aef876fd5e4f26eead249243b1523ec4cf355340 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 10 六月 2024 12:10:09 +0800
Subject: [PATCH] 用户修改，删除，增加进行了修改
---
ruoyi-ui/src/views/marry/index.vue | 131 +++++++++++++++++++++++++------------------
1 files changed, 76 insertions(+), 55 deletions(-)
diff --git a/ruoyi-ui/src/views/marry/index.vue b/ruoyi-ui/src/views/marry/index.vue
index 722e443..ae8973d 100644
--- a/ruoyi-ui/src/views/marry/index.vue
+++ b/ruoyi-ui/src/views/marry/index.vue
@@ -11,7 +11,7 @@
<el-divider />
<!-- 鍩烘湰淇℃伅-->
- <h2 style="font-size:21px">鍩烘湰鎯呭喌</h2>
+ <!-- <h2 style="font-size:21px">鍩烘湰鎯呭喌</h2>
<el-container>
<div style="padding-left:0px;width: 28%;" >
<el-container >
@@ -26,8 +26,7 @@
</el-row>
<el-row :span="16">
<el-form-item label="鍑虹敓鏃ユ湡" prop="birthday" label-width="75px">
- <!-- <el-input v-model="marryList.birthday" placeholder="" type="date" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input> -->
+
<el-date-picker v-model="marryList.birthday"
type="date"
placeholder="璇烽�夋嫨鏃ユ湡"
@@ -119,47 +118,8 @@
- <div style="padding-left:400px;padding-top:30px" >
- <el-container >
-
- <el-row :gutter="10" class="mb8">
- <el-col >
- <el-button
- plain
- @click="handleEdit()"
- style="width: 80px;height: 32px;background: #E0EEFE;"
- v-if="isShow"
- v-hasPermi="['system:role:edit']"
- >缂栬緫</el-button>
- <el-button v-if="isShow_2" style="width: 80px;height: 32px;background: #E0EEFE;" @click="submitForm" :disabled="dsb">瀹屾垚</el-button>
- <br>
-
- </el-col>
-
- <el-col style="padding-top: 10px;">
- <el-button
- plain
- style="width: 80px;height: 32px;background: #D2F3E0;"
- @click="handleExport"
- v-hasPermi="['family:note:export']"
- >瀵煎嚭</el-button></el-col>
-
- <el-col style="padding-top: 10px;">
- <el-button
- plain
- style="width: 80px;height: 32px;background: #FFDDE3;"
- v-print="'#printable-content'"
- v-hasPermi="['family:note:export']"
- >鎵撳嵃</el-button></el-col>
-
-
- </el-row>
-
- </el-container>
- </div>
- <!-- </el-dialog> self:user:export-->
- </el-container>
+ </el-container> -->
<h2 style="font-size:16px " >閰嶅伓鎯呭喌</h2>
<el-container>
<div style="padding-top:15px;width: 28%;" >
@@ -259,7 +219,45 @@
</el-container>
</div>
+ <div style="padding-left:400px;padding-top:30px" >
+ <el-container >
+
+ <el-row :gutter="10" class="mb8" v-if="userId != 2">
+ <el-col >
+ <el-button
+ plain
+ @click="handleEdit()"
+ style="width: 80px;height: 32px;background: #E0EEFE;"
+ v-if="isShow"
+ v-hasPermi="['system:role:edit']"
+ >缂栬緫</el-button>
+ <el-button v-if="isShow_2" style="width: 80px;height: 32px;background: #E0EEFE;" @click="submitForm" :disabled="dsb">瀹屾垚</el-button>
+ <br>
+
+ </el-col>
+
+ <el-col style="padding-top: 10px;">
+ <el-button
+ plain
+ style="width: 80px;height: 32px;background: #D2F3E0;"
+ @click="handleExport"
+ v-hasPermi="['family:note:export']"
+ >瀵煎嚭</el-button></el-col>
+
+ <el-col style="padding-top: 10px;">
+ <el-button
+ plain
+ style="width: 80px;height: 32px;background: #FFDDE3;"
+ v-print="'#printable-content'"
+ v-hasPermi="['family:note:export']"
+ >鎵撳嵃</el-button></el-col>
+
+
+ </el-row>
+
+ </el-container>
+ </div>
<div style="padding-left:30px;padding-top:30px" >
<el-container >
@@ -360,7 +358,7 @@
</template>
</el-table-column>
<!-- 鎿嶄綔 -->
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" v-if="userId != 2">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button size="mini" type="text" icon="el-icon-edit" v-if="!editStatus[scope.row.id]"
@click="editRow(scope.row)" v-hasPermi="['system:role:edit']">淇敼</el-button>
@@ -541,13 +539,14 @@
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
import {listMarry,updateMarry,delMarryOld,addMarryOld,updateMarryOld} from "@/api/marry/index";
import { blobValidate } from '../../utils/ruoyi'
+import {getInfo} from "@/api/login";
export default {
name: "show",
dicts: ['sys_normal_disable'],
data() {
return {
-
+userId: undefined,
showOldSpouse:false,//鏄剧ず鍓嶄换淇℃伅
// 閬僵灞�
disabled: false,
@@ -572,6 +571,7 @@
limitCountImg:1,//涓婁紶鍥剧墖鐨勬渶澶ф暟閲�
//涓汉淇℃伅鏁版嵁
marryList:{
+ id:undefined,
name:undefined,
sex:undefined,
birthday:undefined,
@@ -604,11 +604,14 @@
activeNames:['1'],
// 寮瑰嚭灞傛爣棰�
title: "",
+ iddd:undefined,
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
// open:true,
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
bear:undefined,
+ handsj:undefined,
+ onebear:undefined,
mrs:undefined,
smrs:undefined,
openDataScope: false,
@@ -672,13 +675,13 @@
},
// 琛ㄥ崟鏍￠獙
rules: {
- id: [{
- required: true,
+ idNo: [{
+ // required: true,
message: '璇疯緭鍏ヨ韩浠借瘉鍙风爜',
trigger: 'blur'
}],
name: [{
- required: true,
+ // required: true,
message: '璇疯緭鍏ュ鍚�',
trigger: 'blur'
}],
@@ -688,7 +691,7 @@
trigger: 'change'
}],
marryStatus: [{
- required: true,
+ // required: true,
message: '璇烽�夋嫨濠氬Щ鐘跺喌',
trigger: 'change'
}],
@@ -727,9 +730,16 @@
},
created() {
this.getList()
+ this.getInfo()
},
methods: {
-
+ getInfo(){
+ console.log('-----------------')
+ getInfo().then(response=>{
+ console.log(response.user.roles[0].roleId,'roleID')
+ this.userId = response.user.roles[0].roleId
+ })
+ },
handleMarryStatusChange() {
// 鍒ゆ柇褰撳墠閫変腑鐨勫濮荤姸鎬佹槸鍚︿负鍐嶅
if (this.mrs === '3') {
@@ -753,6 +763,7 @@
cancelData() {
this.open = false;
this.reset();
+
},
//涓嬫媺
handleChange(val) {
@@ -782,7 +793,10 @@
this.oldSpouseList = this.marryList.oldSpouseList;
console.log(111)
console.log("淇℃伅")
- console.log(this.marryList.marryStatus);
+ console.log(this.marryList,'1111111111111111111');
+ this.iddd = this.marryList.id
+ console.log(this.iddd,'2222222222222')
+ //alert(this.marryList.bearStatus)
if(this.marryList.marryStatus===3){
this.showOldSpouse = true;
} else{
@@ -832,7 +846,7 @@
deptCheckStrictly: true,
remark: undefined
};
- this.resetForm("form");
+ this.resetForm("elForm");
},
@@ -956,17 +970,22 @@
//淇敼鍚庣殑淇濆瓨
submitForm() {
- if(parseInt(this.mrs))
+ if(this.mrs!=undefined)
this.marryList.marryStatus = parseInt(this.mrs)
- if(parseInt(this.smrs))
+ if(this.smrs!=undefined)
this.marryList.spouseMarryStatus = parseInt(this.smrs)
- if(parseInt(this.bear))
+
+ if(this.bear!=undefined)
this.marryList.bearStatus = parseInt(this.bear)
+
this.marryList.oneBorn = parseInt(this.onebear)
this.marryList.handbookStatus =parseInt(this.handsj)
this.marryList.sex = this.sinds
this.marryList.spouseSex = this.inds
+ console.log(this.marryList,'marryListmarryListmarryListmarryList')
+ // this.marryList.id = this.iddd
this.$refs['elForm'].validate(valid => {
+ // alert(valid)
if (valid) {
if (this.marryList.id !== undefined) {
updateMarry(this.marryList).then(response => {
@@ -977,6 +996,7 @@
this.dsb = true
this.isShow_2=false
this.isShow = true
+ this.getList()
}).catch(error => {
console.error(error);
@@ -988,6 +1008,7 @@
}
}
})
+ this.getList()
// 鍒锋柊椤甸潰
// window.location.reload();
},
--
Gitblit v1.9.1