From 0039b22ae537bc95dc22f1bcc684c5e9d644622a Mon Sep 17 00:00:00 2001 From: linwenling <3256558519@qq.com> Date: 星期日, 13 八月 2023 20:45:41 +0800 Subject: [PATCH] 完善婚姻模块(完) --- ruoyi-ui/src/views/marry/index.vue | 856 +++++++++++++++++++++----------------------------------- 1 files changed, 317 insertions(+), 539 deletions(-) diff --git a/ruoyi-ui/src/views/marry/index.vue b/ruoyi-ui/src/views/marry/index.vue index 4f41c1e..314a763 100644 --- a/ruoyi-ui/src/views/marry/index.vue +++ b/ruoyi-ui/src/views/marry/index.vue @@ -39,7 +39,7 @@ </el-row> <el-row :span="16"> <el-form-item label="鍑虹敓鏃ユ湡" prop="birthday" label-width="70px"> - <el-input v-model="marryList.birthday" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> + <el-input v-model="marryList.birthday" placeholder="" type="date" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> @@ -89,15 +89,15 @@ <el-row :span="16"> <el-form-item label="鎬у埆" prop="sex" label-width="40px"> - <template v-if="!isEditing"> - <el-input v-model="marryList.sex === '鐢�' ? sinds='鐢�':sinds='濂�'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input> - </template> - <template v-else> - <el-select v-model="sinds" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}" :disabled="dsb"> - <el-option label="鐢�" value='鐢�'></el-option> - <el-option label="濂�" value='濂�'></el-option> - </el-select> - </template> + <template v-if="!isEditing"> + <el-input v-model="marryList.sex === '鐢�' ? sinds='鐢�':sinds='濂�'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input> + </template> + <template v-else> + <el-select v-model="sinds" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}" :disabled="dsb"> + <el-option label="鐢�" value='鐢�'></el-option> + <el-option label="濂�" value='濂�'></el-option> + </el-select> + </template> </el-form-item> </el-row> <el-row :span="16"> @@ -114,7 +114,7 @@ </el-row> <el-row :span="16"> <el-form-item label="缁撳鏃堕棿" prop="marryTime" label-width="70px"> - <el-input v-model="marryList.marryTime" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> + <el-input v-model="marryList.marryTime" placeholder="" type="date" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> @@ -160,18 +160,18 @@ </el-row> <el-row :span="16"> <el-form-item label="鍑虹敓鏃ユ湡" prop="spouseBirthday" label-width="70px"> - <el-input v-model="marryList.spouseBirthday" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> + <el-input v-model="marryList.spouseBirthday" placeholder="" type="date" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="16"> - <el-form-item label="韬唤璇佸彿鐮�" prop="spouseId" label-width="85px"> - <el-input v-model="marryList.spouseId" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> + <el-form-item label="韬唤璇佸彿鐮�" prop="spouseIdNo" label-width="85px"> + <el-input v-model="marryList.spouseIdNo" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="16"> - <el-form-item label="濠氬Щ鐘跺喌" prop="spouseMarryStatus" label-width="70px"> + <el-form-item label="濠氬Щ鐘跺喌" prop="spouseMarryStatus" label-width="70px" > <template v-if="!isEditing"> <el-input v-if="marryList.spouseMarryStatus===0" placeholder="鏈" :disabled="dsb"></el-input> <el-input v-if="marryList.spouseMarryStatus===1" placeholder="鍒濆" :disabled="dsb"></el-input> @@ -210,13 +210,13 @@ <el-form-item label="鎬у埆" prop="spouseSex" label-width="40px"> <template v-if="!isEditing"> - <el-input v-model="marryList.spouseSex === '鐢�' ? inds='鐢�':inds='濂�'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input> + <el-input v-model="marryList.spouseSex === '鐢�' ? inds='鐢�':inds='濂�'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input> </template> <template v-else> - <el-select v-model="inds" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}" :disabled="dsb"> - <el-option label="鐢�" value='鐢�'></el-option> - <el-option label="濂�" value='濂�'></el-option> - </el-select> + <el-select v-model="inds" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}" :disabled="dsb"> + <el-option label="鐢�" value='鐢�'></el-option> + <el-option label="濂�" value='濂�'></el-option> + </el-select> </template> </el-form-item> @@ -234,8 +234,8 @@ </el-form-item> </el-row> <el-row :span="16"> - <el-form-item label="缁撳鏃堕棿" prop="marryTime" label-width="70px"> - <el-input v-model="marryList.marryTime" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> + <el-form-item label="缁撳鏃堕棿" prop="spouseMarryTime" label-width="70px"> + <el-input v-model="marryList.spouseMarryTime" placeholder="" type="date" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> @@ -256,92 +256,35 @@ <!-- </el-dialog> self:user:export--> </el-container> - <!-- <h2 style="font-size:16px " >鍓嶄换鎯呭喌</h2> --> - <!-- <div> - <el-table v-loading="loading" :data="oldSpouseList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> - <el-table-column type="selection" width="55" align="center" /> - <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="70"/> - <el-table-column label="鍚嶅瓧" prop="name" sortable width="120" /> - <el-table-column label="鍑虹敓鏃堕棿" prop="birthday" sortable width="120" /> - <el-table-column label="鎴风睄鍦板潃" prop="address" sortable width="120" /> - <el-table-column label="宸ヤ綔鍦板潃" prop="workAddress" sortable width="120" /> - <el-table-column label="濠氬Щ鐘舵��" prop="marryStatus" sortable width="120" > - <template slot-scope="scope"> - <span v-if="scope.row.marryStatus== 0">鏈</span> - <span v-if="scope.row.marryStatus== 1">鍒濆</span> - <span v-if="scope.row.marryStatus== 2">绂诲</span> - <span v-if="scope.row.marryStatus== 3">鍐嶅</span> - </template> - - </el-table-column> - <el-table-column label="鎬у埆" prop="sex" sortable width="100" > - <template slot-scope="scope"> - <span v-if="scope.row.sex== 0">濂�</span> - <span v-if="scope.row.sex== 1">鐢�</span> - </template> - </el-table-column> - <el-table-column label="姘戞棌" prop="nation" sortable width="100" /> - <el-table-column label="鐢佃瘽鍙风爜" prop="phone" sortable width="150" /> - <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"> - <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> - <el-button size="mini" type="text" - v-if="editStatus[scope.row.id]" @click="saveRowExperienceList(scope.row)">淇濆瓨</el-button> - <el-button size="mini" type="text" icon="el-icon-delete" - @click="handleExperienceDelete(scope.row)" v-hasPermi="['system:role:remove']">鍒犻櫎</el-button> - </template> - </el-table-column> - </el-table> - </div> --> <div> <el-collapse v-model="activeNames" @change="handleChange"> <el-collapse-item name="1" > <template v-slot:title> + <h2 style="font-size:16px ">鍓嶄换鎯呭喌</h2> <div class="title-wrapper"> - <h2 style="font-size:16px ">鍓嶄换鎯呭喌</h2> <div> - <el-button class="button" size="mini" type="text" @click="showDialog('open')"> + <el-button class="button" size="mini" type="text" @click="handleAdd"> <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button> </div> + + </div> </template> <el-table v-loading="loading" :data="oldSpouseList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> - <el-table-column label="濮撳悕" prop="name" sortable width="180" align="center" > + <el-table-column label="濮撳悕" prop="name" sortable width="160" align="center" > <template slot-scope="scope"> <template v-if="!scope.row.isEdit">{{ scope.row.name }}</template> <template v-else><el-input v-model="scope.row.name"></el-input></template> </template> </el-table-column> - <el-table-column label="鍑虹敓鏃ユ湡" prop="birthday" sortable width="180" align="center" > - <template slot-scope="scope"> - <template v-if="!scope.row.isEdit">{{ scope.row.birthday }}</template> - <template v-else><el-input v-model="scope.row.birthday"></el-input></template> - </template> - </el-table-column> - <el-table-column label="鎴风睄鍦板潃" prop="address" sortable width="180" align="center" > - <template slot-scope="scope"> - <template v-if="!scope.row.isEdit">{{ scope.row.address }}</template> - <template v-else><el-input v-model="scope.row.address"></el-input></template> - </template> - </el-table-column> - <el-table-column label="宸ヤ綔鍦板潃" prop="workAddress" sortable width="180" align="center" > - <template slot-scope="scope"> - <template v-if="!scope.row.isEdit">{{ scope.row.workAddress }}</template> - <template v-else><el-input v-model="scope.row.workAddress"></el-input></template> - </template> - </el-table-column> - <el-table-column label="鎴风睄鍦板潃" prop="address" sortable width="180" align="center" > - <template slot-scope="scope"> - <template v-if="!scope.row.isEdit">{{ scope.row.address }}</template> - <template v-else><el-input v-model="scope.row.address"></el-input></template> - </template> - </el-table-column> - <el-table-column label="鎬у埆" prop="sex" sortable width="100" align="center" > + <el-table-column label="鎬у埆" prop="sex" sortable width="80" align="center" > <template slot-scope="scope"> <template v-if="!scope.row.isEdit">{{ scope.row.sex }}</template> - <template v-else><el-input v-model="scope.row.sex"></el-input></template> + <template v-else><el-select v-model="scope.row.sex" placeholder="璇烽�夋嫨"> + <el-option label="濂�" value="0"></el-option> + <el-option label="鐢�" value="1"></el-option> + </el-select></template> </template> </el-table-column> <el-table-column label="姘戞棌" prop="nation" sortable width="100" align="center" > @@ -350,13 +293,55 @@ <template v-else><el-input v-model="scope.row.nation"></el-input></template> </template> </el-table-column> - <el-table-column label="濠氬Щ鐘舵��" prop="marryStatus" sortable width="140" align="center" > + <el-table-column label="鍑虹敓鏃ユ湡" prop="birthday" sortable width="150" align="center" > <template slot-scope="scope"> - <template v-if="!scope.row.isEdit">{{ scope.row.marryStatus }}</template> - <template v-else> <span v-if="scope.row.marryStatus== 0">鏈</span> + <template v-if="!scope.row.isEdit">{{ scope.row.birthday }}</template> + <template v-else><el-input v-model="scope.row.birthday" type="date" placeholder="閫夋嫨鏃ユ湡"> + </el-input></template> + </template> + </el-table-column> + <el-table-column label="鎴风睄鍦板潃" prop="address" sortable width="180" align="center" > + <template slot-scope="scope"> + <template v-if="!scope.row.isEdit">{{ scope.row.address }}</template> + <template v-else><el-input v-model="scope.row.address"></el-input></template> + </template> + </el-table-column> + <el-table-column label="韬唤璇佸彿" prop="idNo" sortable width="180" align="center" > + <template slot-scope="scope"> + <template v-if="!scope.row.isEdit">{{ scope.row.idNo }}</template> + <template v-else><el-input v-model="scope.row.idNo"></el-input></template> + </template> + </el-table-column> + <el-table-column label="宸ヤ綔鍦板潃" prop="address" sortable width="180" align="center" > + <template slot-scope="scope"> + <template v-if="!scope.row.isEdit">{{ scope.row.address }}</template> + <template v-else><el-input v-model="scope.row.address"></el-input></template> + </template> + </el-table-column> + + + <el-table-column label="濠氬Щ鐘舵��" prop="marryStatus" sortable width="100" align="center" > + <template slot-scope="scope"> + <template v-if="!scope.row.isEdit"> + <span v-if="scope.row.marryStatus== 0">鏈</span> <span v-if="scope.row.marryStatus== 1">鍒濆</span> <span v-if="scope.row.marryStatus== 2">绂诲</span> <span v-if="scope.row.marryStatus== 3">鍐嶅</span></template> + <template v-else> <el-select v-model="scope.row.marryStatus" placeholder="璇烽�夋嫨"> + <el-option label="鏈" value="0"></el-option> + <el-option label="鍒濆" value="1"></el-option> + <el-option label="绂诲" value="2"></el-option> + <el-option label="鍐嶅" value="3"></el-option> + </el-select></template> + </template> + </el-table-column> + + + <el-table-column label="缁撳鏃堕棿" prop="marryTime" sortable width="150" align="center" > + <template slot-scope="scope"> + <template v-if="!scope.row.isEdit">{{ scope.row.marryTime }}</template> + <template v-else><el-input v-model="scope.row.marryTime" type="date" placeholder="閫夋嫨鏃ユ湡"> + </el-input></template> </template> </el-table-column> <!-- 鎿嶄綔 --> @@ -387,25 +372,50 @@ v-loading="loading" :data="marryList" @selection-change="handleSelectionChange" > <el-row :span="16"> <el-form-item label="鐢熻偛鎯呭喌" prop="bearStatus" label-width="80px"> - <template > - <el-input v-if="marryList.bearStatus===0" placeholder="鏈敓鑲�" :disabled="dsb"></el-input> + <template v-if="!isEditing"> + <el-input v-if="marryList.bearStatus===0" placeholder="鏈敓鑲�" style="" :disabled="dsb"></el-input> <el-input v-if="marryList.bearStatus===1" placeholder="鍦ㄥ瓡" :disabled="dsb"></el-input> <el-input v-if="marryList.bearStatus===2" placeholder="宸茬敓鑲�" :disabled="dsb"></el-input> - + </template> + <template v-else> + <el-select v-model="bear" 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> </el-row> <el-row :span="16"> <el-form-item label="棰嗗彇銆婅鍒掔敓鑲叉湇鍔℃墜鍐屻��" prop="handbookStatus" label-width="180px"> - <el-input v-model="marryList.handbookStatus ===1 ? '鏄�':'鍚�' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> - </el-input> + <template v-if="!isEditing"> + <el-input v-if="marryList.handbookStatus===0" placeholder="鍚�" style="" :disabled="dsb"></el-input> + <el-input v-if="marryList.handbookStatus===1" placeholder="鏄�" :disabled="dsb"></el-input> + + </template> + <template v-else> + <el-select v-model="handsj" placeholder="璇烽�夋嫨鏄�/鍚�" clearable :style="{width: '100%'}"> + <el-option label="鍚�" value='0'></el-option> + <el-option label="鏄�" value='1'></el-option> + </el-select> + </template> + </el-form-item> </el-row> <el-row :span="16"> <el-form-item label="棰嗗彇銆婄嫭鐢熷瓙濂宠瘉銆�" prop="oneBorn" label-width="150px"> - <el-input v-model="marryList.oneBorn ===1 ? '鏄�':'鍚�' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> - </el-input> + <template v-if="!isEditing"> + <el-input v-if="marryList.oneBorn===0" placeholder="鍚�" style="" :disabled="dsb"></el-input> + <el-input v-if="marryList.oneBorn===1" placeholder="鏄�" :disabled="dsb"></el-input> + + </template> + <template v-else> + <el-select v-model="onebear" placeholder="璇烽�夋嫨鏄�/鍚�" clearable :style="{width: '100%'}"> + <el-option label="鍚�" value='0'></el-option> + <el-option label="鏄�" value='1'></el-option> + </el-select> + </template> </el-form-item> </el-row> @@ -421,13 +431,13 @@ <el-row :span="16" > <el-form-item label="棰嗚瘉鏃堕棿" prop="handbookTime" label-width="70px"> - <el-input v-model="marryList.handbookTime " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> + <el-input v-model="marryList.handbookTime " placeholder="" type="date" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="16"> <el-form-item label="棰嗚瘉鏃堕棿" prop="oneBornTime" label-width="70px"> - <el-input v-model="marryList.oneBornTime" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> + <el-input v-model="marryList.oneBornTime" placeholder="" type="date" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> @@ -446,7 +456,7 @@ <h2 style="font-size:16px " >闇�澹版槑鐨勬儏鍐�</h2> <el-container> - <el-input v-model="marryList.content " placeholder="" clearable :style="{width: '80%'}" :disabled="dsb"> </el-input> + <el-input v-model="marryList.notion " placeholder="" clearable :style="{width: '80%'}" :disabled="dsb"> </el-input> </el-container> <h2 style="font-size:16px " >澶囨敞</h2> <el-container> @@ -454,248 +464,73 @@ </el-container> <!-- 鏂板 --> - <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body> - <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px"> - <h2 style="margin-left: 50px;">鍩烘湰鎯呭喌</h2> - <div style="width: 500px; display:table-cell;"> - <el-form-item label="濮撳悕" prop="name"> - <el-input v-model="formDat.name" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" ></el-input> - </el-form-item> - <el-form-item label="鍑虹敓鏃堕棿" prop="birthday" > - <el-date-picker - v-model='formDat.birthday' - type='date' - placeholder='閫夋嫨鏃ユ湡' - style="width: 100%;" - ></el-date-picker> - </el-form-item> - <el-form-item label="韬唤璇佸彿" prop="id"> - <el-input v-model="formDat.id" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" clearable :style="{width: '100%'}" > - </el-input> - </el-form-item> - <el-form-item label="濠氬Щ鐘跺喌" prop="marryStatus"> - <el-select v-model="formDat.marryStatus" placeholder="璇烽�夋嫨濠氬Щ鐘跺喌" clearable :style="{width: '100%'}" > - <el-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value" - ></el-option> - </el-select> - </el-form-item> - <el-form-item label="鎴风睄鍦板潃" prop="address"> - <el-input v-model="formDat.address" placeholder="璇疯緭鍏ユ埛绫嶅湴鍧�" clearable :style="{width: '100%'}" > - </el-input> - </el-form-item> - - - </div> - <div style=" width: 500px;display:table-cell;"> - <el-form-item label="鎬у埆" prop="sex"> - <el-select v-model="formDat.sex" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}" > - <el-option v-for="(item, index) in typeOption1" :key="index" :label="item.label" :value="item.value" - ></el-option> - </el-select> - </el-form-item> - <el-form-item label="姘戞棌" prop="nation"> - <el-input v-model="formDat.nation" placeholder="璇疯緭鍏ユ皯鏃�" clearable :style="{width: '100%'}" > - </el-input> - </el-form-item> - <el-form-item label="鑱旂郴鐢佃瘽" prop="phone"> - <el-input v-model="formDat.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" clearable :style="{width: '100%'}" > - </el-input> - </el-form-item> - - <el-form-item label="缁撳鏃堕棿" prop="marryTime"> - <el-date-picker - v-model='formDat.marryTime' - type='date' - placeholder='閫夋嫨缁撳鏃ユ湡' - style="width: 100%;" - ></el-date-picker> - </el-form-item> - </div> - - <h2 style="margin-left: 50px;">閰嶅伓鎯呭喌</h2> - <div style="width: 500px; display:table-cell;"> - <el-form-item label="濮撳悕" prop="spouseName"> - <el-input v-model="formDat.spouseName" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" ></el-input> - </el-form-item> - - <el-form-item label="鍑虹敓鏃堕棿" prop="spouseBirthday" > - <el-date-picker - v-model='formDat.spouseBirthday' - type='date' - placeholder='閫夋嫨鏃ユ湡' - style="width: 100%;" - ></el-date-picker> - </el-form-item> - <el-form-item label="韬唤璇佸彿" prop="spouseId"> - <el-input v-model="formDat.spouseId" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" clearable :style="{width: '100%'}" > - </el-input> - </el-form-item> - <el-form-item label="濠氬Щ鐘跺喌" prop="spouseMarryStatus"> - <el-select v-model="formDat.spouseMarryStatus" placeholder="璇烽�夋嫨濠氬Щ鐘跺喌" clearable :style="{width: '100%'}" > - <el-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value" - ></el-option> - </el-select> - </el-form-item> - <el-form-item label="鎴风睄鍦板潃" prop="spouseAddress"> - <el-input v-model="formDat.spouseAddress" placeholder="璇疯緭鍏ユ埛绫嶅湴鍧�" clearable :style="{width: '100%'}" > - </el-input> - </el-form-item> - - - </div> - <div style=" width: 500px;display:table-cell;"> - <el-form-item label="鎬у埆" prop="spouseSex"> - <el-select v-model="formDat.spouseSex" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}" > - <el-option v-for="(item, index) in typeOption1" :key="index" :label="item.label" :value="item.value" - ></el-option> - </el-select> - </el-form-item> - <el-form-item label="姘戞棌" prop="spouseNation"> - <el-input v-model="formDat.spouseNation" placeholder="璇疯緭鍏ユ皯鏃�" clearable :style="{width: '100%'}" > - </el-input> - </el-form-item> - <el-form-item label="鑱旂郴鐢佃瘽" prop="spousePhone"> - <el-input v-model="formDat.spousePhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" clearable :style="{width: '100%'}" > - </el-input> - </el-form-item> - - <el-form-item label="缁撳鏃堕棿" prop="marryTime"> - <el-date-picker - v-model='formDat.marryTime' - type='date' - placeholder='閫夋嫨缁撳鏃ユ湡' - style="width: 100%;" - ></el-date-picker> - </el-form-item> - </div> - - - <h2 style="margin-left: 50px;">鍓嶄换鎯呭喌</h2> - <div style="width: 500px; display:table-cell;"> - <el-form-item label="濮撳悕" prop="spouseName"> - <el-input v-model="formDat.spouseName" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" ></el-input> - </el-form-item> - - <el-form-item label="鍑虹敓鏃堕棿" prop="spouseBirthday" > - <el-date-picker - v-model='formDat.spouseBirthday' - type='date' - placeholder='閫夋嫨鏃ユ湡' - style="width: 100%;" - ></el-date-picker> - </el-form-item> - <el-form-item label="韬唤璇佸彿" prop="spouseId"> - <el-input v-model="formDat.spouseId" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" clearable :style="{width: '100%'}" > - </el-input> - </el-form-item> - <el-form-item label="濠氬Щ鐘跺喌" prop="spouseMarryStatus"> - <el-select v-model="formDat.spouseMarryStatus" placeholder="璇烽�夋嫨濠氬Щ鐘跺喌" clearable :style="{width: '100%'}" > - <el-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value" - ></el-option> - </el-select> - </el-form-item> - <el-form-item label="鎴风睄鍦板潃" prop="spouseAddress"> - <el-input v-model="formDat.spouseAddress" placeholder="璇疯緭鍏ユ埛绫嶅湴鍧�" clearable :style="{width: '100%'}" > - </el-input> - </el-form-item> - - - </div> - <div style=" width: 500px;display:table-cell;"> - <el-form-item label="鎬у埆" prop="spouseSex"> - <el-select v-model="formDat.spouseSex" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}" > - <el-option v-for="(item, index) in typeOption1" :key="index" :label="item.label" :value="item.value" - ></el-option> - </el-select> - </el-form-item> - <el-form-item label="姘戞棌" prop="spouseNation"> - <el-input v-model="formDat.spouseNation" placeholder="璇疯緭鍏ユ皯鏃�" clearable :style="{width: '100%'}" > - </el-input> - </el-form-item> - <el-form-item label="鑱旂郴鐢佃瘽" prop="spousePhone"> - <el-input v-model="formDat.spousePhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" clearable :style="{width: '100%'}" > - </el-input> - </el-form-item> - - <el-form-item label="缁撳鏃堕棿" prop="marryTime"> - <el-date-picker - v-model='formDat.marryTime' - type='date' - placeholder='閫夋嫨缁撳鏃ユ湡' - style="width: 100%;" - ></el-date-picker> - </el-form-item> - </div> - - <h2 style="margin-left: 50px;">鐢熻偛鎯呭喌</h2> - <div style="width: 500px; display:table-cell;"> - <el-form-item label="鐢熻偛鎯呭喌" prop="bearStatus"> - <el-select v-model="formDat.bearStatus" placeholder="璇烽�夋嫨鐢熻偛鎯呭喌" clearable :style="{width: '100%'}" > - <el-option v-for="(item, index) in typeOption2" :key="index" :label="item.label" :value="item.value" - ></el-option> - </el-select> - </el-form-item> - <el-form-item label="棰嗗彇銆婅鍒掔敓鑲叉湇鍔℃墜鍐屻��" prop="handbookStatus"> - <el-select v-model="formDat.handbookStatus" placeholder="璇烽�夋嫨" clearable :style="{width: '100%'}" > - <el-option v-for="(item, index) in typeOption3" :key="index" :label="item.label" :value="item.value" - ></el-option> - </el-select> - </el-form-item> - <el-form-item label="鎵嬪唽棰嗗彇鏃堕棿" prop="handbookTime" > - <el-date-picker - v-model='formDat.handbookTime' - type='date' - placeholder='閫夋嫨鏃ユ湡' - style="width: 100%;" - ></el-date-picker> - </el-form-item> - <el-form-item label="棰嗗彇銆婄嫭鐢熷瓙濂宠瘉銆�" prop="oneBorn"> - <el-select v-model="formDat.oneBorn" placeholder="璇烽�夋嫨" clearable :style="{width: '100%'}" > - <el-option v-for="(item, index) in typeOption3" :key="index" :label="item.label" :value="item.value" - ></el-option> - </el-select> - </el-form-item> - <el-form-item label="銆婄嫭鐢熷瓙濂宠瘉銆嬮鍙栨椂闂�" prop="oneBornTime" > - <el-date-picker - v-model='formDat.oneBornTime' - type='date' - placeholder='閫夋嫨鏃ユ湡' - style="width: 100%;" - ></el-date-picker> - </el-form-item> - - - </div> - <el-form-item label="澶囨敞" prop="remark"> - <el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '80%'}" ></el-input> + <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body> + <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px"> + <el-form-item label="濮撳悕" prop="name"> + <el-input v-model="formDat.name" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" ></el-input> </el-form-item> - <el-form-item label="闇�澹版槑鎯呭喌" prop="content"> - <el-input v-model="formDat.content" placeholder="璇疯緭鍏ラ渶澹版槑鎯呭喌" clearable :style="{width: '80%'}" ></el-input> + + <el-form-item label="鎬у埆" prop="sex"> + <el-select v-model="formDat.sex" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}" > + <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value" + ></el-option> + </el-select> </el-form-item> + <el-form-item label="鍑虹敓鏃ユ湡" prop="birthday"> + <el-input + v-model='formDat.birthday' + type='date' + placeholder='閫夋嫨鏃ユ湡' + ></el-input> + </el-form-item> + <el-form-item label="姘戞棌" prop="nation"> + <el-input v-model="formDat.nation" placeholder="璇疯緭鍏ユ皯鏃�" clearable :style="{width: '100%'}" > + </el-input> + </el-form-item> + <el-form-item label="韬唤璇佸彿" prop="idNo"> + <el-input v-model="formDat.idNo" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" clearable :style="{width: '100%'}" > + </el-input> + </el-form-item> + <el-form-item label="鎵嬫満鍙风爜" prop="phone"> + <el-input v-model="formDat.phone" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" clearable :style="{width: '100%'}" > + </el-input> + </el-form-item> + <el-form-item label="鍦板潃" prop="address"> + <el-input v-model="formDat.address" placeholder="璇疯緭鍏ュ湴鍧�" clearable :style="{width: '100%'}" ></el-input> + </el-form-item> + <el-form-item label="濠氬Щ鐘舵��" prop="marryStatus"> + <el-select v-model="formDat.marryStatus" placeholder="璇烽�夋嫨濠氬Щ鐘舵��" clearable :style="{width: '100%'}" > + <el-option v-for="(item, index) in typeOptions1" :key="index" :label="item.label" :value="item.value" + ></el-option> + </el-select> + </el-form-item> + <el-form-item label="缁撳鏃堕棿" prop="marryTime"> + <el-input + v-model='formDat.marryTime' + type='date' + placeholder='閫夋嫨鏃ユ湡' + ></el-input> + </el-form-item> + </el-form> + <h4 class="form-header"> </h4> <div slot="footer" class="dialog-footer"> - <el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button> + <el-button type="primary" @click="submitDataScope">纭� 瀹�</el-button> <el-button @click="cancelData">鍙� 娑�</el-button> </div> </el-dialog> - </div> </template> <script> import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role"; import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu"; - - - -//鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁� --鎺ュソ浜� -import {listMarry,updateMarry,delMarry,addMarry} from "@/api/marry/index"; -import { delFamilyevent, uploadPic } from '../../api/bignote' +import {listMarry,updateMarry,delMarryOld,addMarryOld,updateMarryOld} from "@/api/marry/index"; import { blobValidate } from '../../utils/ruoyi' export default { @@ -726,7 +561,33 @@ noneBtnImg:false, limitCountImg:1,//涓婁紶鍥剧墖鐨勬渶澶ф暟閲� //涓汉淇℃伅鏁版嵁 - marryList:{}, + marryList:{ + name:undefined, + sex:undefined, + birthday:undefined, + nation:undefined, + idNo:undefined, + phone:undefined, + marryStatus:undefined, + marryTime:undefined, + address:undefined, + bearStatus:undefined, + handbookStatus:undefined, + handbookTime:undefined, + oneBorn:undefined, + oneBornTime:undefined, + notion:undefined, + remark:undefined, + spouseName:undefined, + spouseSex:undefined, + spouseBirthday:undefined, + spouseIdNo:undefined, + spouseAddress:undefined, + spouseMarryStatus:undefined, + spouseNation:undefined, + spouseMarryTime:undefined, + spousePhone:undefined, + }, fit:['fill'], oldSpouseList:{}, @@ -738,6 +599,7 @@ open: false, // open:true, // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛� + bear:undefined, mrs:undefined, smrs:undefined, openDataScope: false, @@ -759,10 +621,29 @@ btn:false, isShow:true, isShow_2:false, - + oldSpouseList:undefined, + oldSpouseList:{ + name:undefined, + sex:undefined, + birthday:undefined, + nation:undefined, + idNo:undefined, + phone:undefined, + marryStatus:undefined, + marryTime:undefined, + address:undefined, + }, formDat: { - - oldSpouseList:undefined, + //鍓嶄换淇℃伅 + name:undefined, + sex:undefined, + birthday:undefined, + nation:undefined, + idNo:undefined, + phone:undefined, + marryStatus:undefined, + marryTime:undefined, + address:undefined, }, // 鑿滃崟鍒楄〃 menuOptions: [], @@ -770,11 +651,7 @@ deptOptions: [], // 鏌ヨ鍙傛暟 queryParams: { - pageNum: 1, - pageSize: 5, - startDate:undefined, - content:undefined, - witness:undefined, + }, // 琛ㄥ崟鍙傛暟 form: {}, @@ -784,135 +661,48 @@ }, // 琛ㄥ崟鏍¢獙 rules: { - //鍩烘湰淇℃伅 - nickName: [{ - // required: true, - message: '璇疯緭鍏ュ鍚�', - trigger: 'blur' - }], - oldName: [{ - // required: true, - message: '璇疯緭鍏ユ浘鐢ㄥ悕', - trigger: 'blur' - }], - idNum: [{ - // required: true, - message: '璇疯緭鍏ヨ韩浠借瘉鍙�', - trigger: 'blur' - }], - nationality: [{ - // required: true, - message: '璇疯緭鍏ュ浗绫�', - trigger: 'blur' - }], - maritalStatus: [{ - // required: true, - message: '璇疯緭鍏ユ皯鏃�', - trigger: 'blur' - }], - locationAddress: [{ - // required: true, - message: '璇疯緭鍏ユ埛绫嶅湴鍧�', - trigger: 'blur' - }], - alwaysAddress: [{ - // required: true, - message: '璇疯緭鍏ュ父浣忓湴鍧�', - trigger: 'blur' - }], - unit: [{ - // required: true, - message: '璇疯緭鍏ュ崟浣�', - trigger: 'blur' - }], - position: [{ - // required: true, - message: '璇疯緭鍏ヨ亴鍔¤亴绉�', - trigger: 'blur' - }], - locationPolice: [{ - // required: true, - message: '璇疯緭鍏ユ埛绫嶅湴鍏畨鏈哄叧', - trigger: 'blur' - }], - alwaysPolice: [{ - // required: true, - message: '璇疯緭鍏ュ父浣忓湴鍏畨鏈哄叧', - trigger: 'blur' - }], - //涓昏瀛︿範鍙婂伐浣滅粡鍘� - startDate: [{ - required: true, - message: '璇疯緭鍏ヨ捣濮嬫棩鏈�', - trigger: 'blur' - }], - content: [{ - required: true, - message: '璇疯緭鍏ヤ富瑕佸涔犵粡鍘嗐�佸伐浣滃崟浣嶅強浠昏亴鎯呭喌', - trigger: 'blur' - }], - witness: [{ - required: true, - message: '璇疯緭鍏ヨ瘉鏄庝汉', - trigger: 'blur' - }], }, typeOptions: [], - //濠氬Щ鐘跺喌 - typeOption: [{ - value:'0', - label:'鏈' - },{ - value:'1', - label:'鍒濆' - },{ - value:'2', - label:'绂诲' + typeOptions: [ { + value: '濂�', + label: '濂�', }, { - value:'3', - label:'鍐嶅' + value: '鐢�', + label: '鐢�', }], - //鎬у埆 - typeOption1: [{ - value:'0', - label:'濂�' - },{ - value:'1', - label:'鐢�' - }], - - //鐢熻偛鎯呭喌 - - typeOption2: [{ - value:'0', - label:'鏈敓鑲�' - },{ - value:'1', - label:'鍦ㄥ瓡' + typeOptions1: [ { + value: '0', + label: '鏈', }, { - value:'2', - label:'宸茬敓鑲�' - }], - //棰嗗彇璇佷欢 - typeOption3: [{ - value:'0', - label:'鍚�' - },{ - value:'1', - label:'鏄�' - }, - ], + value: '1', + label: '鍒濆', + }, + { + value: '2', + label: '绂诲', + }, + { + value: '3', + label: '鍐嶅', + },], }; }, created() { this.getList() }, methods: { - + //鎬у埆 + getSrc1(sex) { + if (sex === '濂�') { + return '濂�' + }else { + return '鐢�' + } + }, // 鍙栨秷鎸夐挳 cancelData() { @@ -935,19 +725,18 @@ this.loading = false; //涓汉淇℃伅 listMarry(this.queryParams).then(response => { - console.log(response.data) + if(response.data.length == 0){ this.loading = false; this.marryList={}; - this.oldSpouseList = {}; } else{ this.marryList = response.data; - this.oldSpouseList = this.marryList.oldSpouseList; this.loading = false; - + console.log(111) + console.log(this.oldSpouseList) } } @@ -992,37 +781,13 @@ }; this.resetForm("form"); }, - /** 鎼滅储鎸夐挳鎿嶄綔 */ - handleQuery() { - this.queryParams.pageNum = 1; - this.getList(); - }, - /** 閲嶇疆鎸夐挳鎿嶄綔 */ - resetQuery() { - this.dateRange = []; - this.resetForm("queryForm"); - this.handleQuery(); - }, - // 澶氶�夋閫変腑鏁版嵁 - handleSelectionChange(selection) { - this.ids = selection.map(item => item.id) - console.log(this.ids) - this.single = selection.length!=1 - this.multiple = !selection.length - }, + /** 鏂板鎸夐挳鎿嶄綔 */ handleAdd() { this.reset(); this.open = true; this.title = "鏂板濠氬Щ淇℃伅"; - }, - - - /** 鏌ョ湅璇︾粏淇℃伅 */ - handleCheck(row){ - const id = row.id; - this.$router.push("/self/self/edit/" + id); }, /** 淇敼鎸夐挳鎿嶄綔 */ handleUpdate() { @@ -1044,27 +809,33 @@ this.isShow=false this.isShow_2=true this.isEditing=true - if(this.marryList.marryStatus == 0) - this.mrs = '鏈' + if(this.marryList.marryStatus == 0) + this.mrs = '鏈' else if(this.marryList.marryStatus == 1) - this.mrs = '鍒濆' - else if(this.marryList.marryStatus == 2) - this.mrs = '绂诲' + this.mrs = '鍒濆' + else if(this.marryList.marryStatus == 2) + this.mrs = '绂诲' else - this.mrs = '鍐嶅'// this.isEdit=false - if(this.marryList.spouseMarryStatus == 0) - this.smrs = '鏈' - else if(this.marryList.spouseMarryStatus == 1) - this.smrs = '鍒濆' - else if(this.marryList.spouseMarryStatus == 2) - this.smrs = '绂诲' - else - this.smrs = '鍐嶅'// this.isEdit=false - // this.isEdit=false + this.mrs = '鍐嶅'// this.isEdit=false + if(this.marryList.spouseMarryStatus == 0) + this.smrs = '鏈' + else if(this.marryList.spouseMarryStatus == 1) + this.smrs = '鍒濆' + else if(this.marryList.spouseMarryStatus == 2) + this.smrs = '绂诲' + else + this.smrs = '鍐嶅' + if(this.marryList.bearStatus == 0) + this.bear = '鏈敓鑲�' + else if(this.marryList.bearStatus == 1) + this.bear = '鍦ㄥ瓡' + else if(this.marryList.bearStatus == 2) + this.bear = '宸茬敓鑲�' + }, handleRemoveFile(file) { - alert(23) + alert(鎿嶄綔鎴愬姛) }, handleRemove(file) { alert("鎿嶄綔鎴愬姛") @@ -1091,47 +862,17 @@ /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */ submitDataScope: function() { - - let ul = this.fileList.map(function (elem){ - return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") - }).join(",") - let uls = this.fileListOther.map(function (elem){ - return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") - }).join(",") - this.formDat.url = ul+","+uls this.$refs["elForm"].validate(valid => { if (valid) { - addMarry(this.formDat).then(response => { + addMarryOld(this.formDat).then(response => { + // marryList.oldSpouseList.push(this.formDat); this.$modal.msgSuccess("鏂板鎴愬姛"); this.open = false; this.getList(); }); } }); - }, - requestUpload(params) - { - var file = params.file; - var formData = new FormData(); - formData.append('uploadFile', file); - let _this = this - - uploadPic(formData).then(response => { - let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length) - - if(_this.fot.includes(pth) === true) - { - _this.fileList.push({name:response.data.fileName, "url":response.data.url}) - - } - - else{ - _this.fileListOther.push({name:response.data.fileName, url:response.data.url}) - - } - }) - }, editRow(row) { @@ -1141,12 +882,16 @@ //淇敼鍚庣殑淇濆瓨 submitForm() { - if(parseInt(this.mrs)) - this.marryList.marryStatus = parseInt(this.mrs) + if(parseInt(this.mrs)) + this.marryList.marryStatus = parseInt(this.mrs) if(parseInt(this.smrs)) - this.marryList.spouseMarryStatus = parseInt(this.smrs) - this.marryList.sex = this.sinds - this.marryList.spouseSex = this.inds + this.marryList.spouseMarryStatus = parseInt(this.smrs) + if(parseInt(this.bear)) + 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 this.$refs['elForm'].validate(valid => { if (valid) { if (this.marryList.id !== undefined) { @@ -1159,6 +904,9 @@ this.isShow_2=false this.isShow = true + }).catch(error => { + console.error(error); + this.$modal.msgError("淇敼澶辫触"); }); } else { this.$modal.msgSuccess("淇敼澶辫触"); @@ -1169,16 +917,23 @@ // 鍒锋柊椤甸潰 // window.location.reload(); }, - //涓昏缁忓巻 + //鍓嶄换淇敼 saveRowmarryList(row) { this.$refs['elForm'].validate(valid => { + + console.log(this.oldSpouseList) if (valid) { - this.oldSpouseList = this.marryList.oldSpouseList + this.marryList.oldSpouseList = this.oldSpouseList + const foundIndex = this.oldSpouseList.findIndex(item => item.id === row.id); if (foundIndex !== -1) { const updatedData = Object.assign({}, this.marryList.oldSpouseList[foundIndex], row); - updateMarry(updatedData).then(response => { + updateMarryOld(updatedData).then(response => { + this.oldSpouseList = this.marryList.oldSpouseList this.$modal.msgSuccess("淇敼鎴愬姛"); + console.log(updatedData) + this.getList(); + // console.log(this.oldSpouseList) }).catch(error => { this.$modal.msgError("淇敼澶辫触"); console.log(error); @@ -1200,15 +955,24 @@ return "statistics-warning-row"; } }, - /** 鍒犻櫎涓汉缁忓巻鎸夐挳鎿嶄綔 */ + /** 鍒犻櫎鍓嶄换 */ handleDelete(row) { - const Ids = row.id || this.ids; + console.log(this.oldSpouseList) + const id = row.id || this.oldSpouseList.id + console.log(id) + this.$modal.confirm('鏄惁纭鍒犻櫎鎵�閫夋暟鎹」锛�').then(function() { - return delMarry(Ids); + return delMarryOld({id}); }).then(() => { - this.getList(); + this.oldSpouseList = this.oldSpouseList.filter(item => item.id !== id); + this.marryList.oldSpouseList=this.oldSpouseList + console.log(this.marryList.oldSpouseList) + + console.log(this.oldSpouseList) this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); - window.location.reload(); + this.getList(); + + // window.location.reload(); }).catch(() => {}); }, @@ -1222,3 +986,17 @@ } }; </script> +<style> +.el-table__row.statistics-warning-row { + background: #E0EEFE; + +} +.el-table__row.statistics-warning-row1 { + background: #FFEFF2; + +} +.button { + background:center no-repeat url('../../assets/icons/add1.png') ; + margin-left: 69.5vw; + +}</style> -- Gitblit v1.9.1