From d019c1632d2a92ed48b27b9cce1debcbe79afb2c Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期一, 07 八月 2023 16:53:46 +0800
Subject: [PATCH] 修改婚姻部分
---
ruoyi-ui/src/views/genealogy/index.vue | 55 +++++++++++++++++++++++++++++++------------------------
1 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index 16695a5..3a41912 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -57,16 +57,23 @@
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
</el-form-item>
+
<el-form-item label="鐢熸棩" prop="birth">
- <el-input
- v-model="queryParams.birth"
- placeholder="璇疯緭鍏ョ敓鏃�"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery"
- >
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
+ <el-date-picker
+ v-model="dateRange"
+ style="width: 197px;
+ height: 30px;
+ background: #FFFFFF;
+ border-radius: 14px 14px 14px 14px;
+ opacity: 0.5;
+ border: 1px solid rgba(0,0,0,0.25);"
+ value-format="yyyy-MM-dd"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ ></el-date-picker>
+
</el-form-item>
<el-form-item>
<el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
@@ -152,8 +159,9 @@
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
<el-table-column label="韬唤" prop="identity" sortable width="100" >
- <template slot-scope="scope">
- <span>绗瑊{scope.row.identity}}浠�</span>
+ <template slot-scope="scope" >
+ <span v-if="scope.row.isMyFamily==1">绗瑊{scope.row.identity}}浠�</span>
+ <span v-else>鈥斺��</span>
</template>
<!-- <template slot-scope="scope">{{ getSrc(scope.row.identity) }}</template>-->
</el-table-column>
@@ -212,30 +220,30 @@
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
<el-form-item label="韬唤" prop="identity">
- <el-input v-model="formDat.identity" placeholder="璇疯緭鍏ユ垚鍛樺鍚�" clearable :style="{width: '100%'}" >
+ <el-input v-model="formDat.identity" placeholder="璇疯緭鍏ヨ韩浠�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="濮撳悕" prop="nickName">
- <el-input v-model="formDat.nickName" placeholder="璇疯緭鍏ョО鍛�" clearable :style="{width: '100%'}" ></el-input>
+ <el-input v-model="formDat.nickName" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
<el-form-item label="鎬у埆" prop="sex">
- <el-input v-model="formDat.sex" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" >
+ <el-input v-model="formDat.sex" placeholder="璇疯緭鍏ユ�у埆" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="鍑虹敓鏃堕棿" prop="birth">
- <el-input v-model="formDat.birth" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" clearable :style="{width: '100%'}" >
+ <el-input v-model="formDat.birth" placeholder="璇疯緭鍏ュ嚭鐢熸椂闂�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="鍏ㄧ敓鍛藉懆鏈�" prop="deadDay">
- <el-input v-model="formDat.deadDay" placeholder="璇疯緭鍏ユ墜鏈�" clearable :style="{width: '100%'}" >
+ <el-input v-model="formDat.deadDay" placeholder="璇疯緭鍏ュ叏鐢熷懡鍛ㄦ湡" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="鎵嬫満鍙风爜" prop="phoneNumber">
- <el-input v-model="formDat.phoneNumber" placeholder="璇疯緭鍏ュ井淇�" clearable :style="{width: '100%'}" >
+ <el-input v-model="formDat.phoneNumber" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="鎵�鍦ㄥ崟浣�" prop="unit">
- <el-input v-model="formDat.unit" placeholder="璇疯緭鍏Q" clearable :style="{width: '100%'}" >
+ <el-input v-model="formDat.unit" placeholder="璇疯緭鍏ユ墍鍦ㄥ崟浣�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="閰嶅伓" prop="spouseName">
@@ -304,11 +312,8 @@
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
fot:[".jpg",".jif"],
- fileList:[
- ],
- fileListOther:[
-
- ],
+ fileList:[],
+ fileListOther:[],
dsb:true,
btn:false,
fit:['fill'],
@@ -344,6 +349,7 @@
secondFamilyId:undefined,
childList:undefined,
identity:undefined,
+ isMyFamily:undefined,
url: undefined,
},
@@ -470,7 +476,8 @@
this.loading = true;
// console.log(this.queryParams)
//alert(23)
-
+ this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
+ this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listUserAll(this.queryParams).then(response => {
// alert(123)
--
Gitblit v1.9.1