From 01c25c7e0f38e7f458d5dc97a70a9b7b8d4f7a6c Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期六, 07 十月 2023 23:30:45 +0800
Subject: [PATCH] 健康保健修改
---
ruoyi-ui/src/views/genealogy/index.vue | 136 +++++++++++++++++++++------------------------
1 files changed, 64 insertions(+), 72 deletions(-)
diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index 16695a5..59c0854 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -48,25 +48,30 @@
</el-form-item>
<el-form-item label="鎬у埆" prop="sex">
- <el-input
- v-model="queryParams.sex"
- placeholder="璇疯緭鍏ユ�у埆"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
+ <el-select v-model="queryParams.sex" placeholder="璇烽�夋嫨鎬у埆" clearable
+ style="width: 240px" @keyup.enter.native="handleQuery">
+ <el-option v-for="item in typeOption"
+ :key="item.value" :label="item.label" :value="item.value"/>
+ </el-select>
</el-form-item>
- <el-form-item label="鐢熸棩" prop="birth">
- <el-input
- v-model="queryParams.birth"
- placeholder="璇疯緭鍏ョ敓鏃�"
- clearable
- style="width: 240px"
+
+ <el-form-item label="鐢熸棩" prop="birth deadDay">
+ <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="缁撴潫鏃ユ湡"
@keyup.enter.native="handleQuery"
- >
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
+ ></el-date-picker>
+
</el-form-item>
<el-form-item>
<el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
@@ -77,15 +82,6 @@
</el-form-item>
</el-form>
<div>
-<!-- <div style="width: 149px;-->
-<!-- height: 24px;-->
-<!-- font-size: 18px;-->
-<!-- font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
-<!-- font-weight: 400;-->
-<!-- color: #000000;-->
-<!-- line-height: 21px;-->
-<!-- ">寮犳皬涓�瑙堣〃</div>-->
-
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
@@ -147,15 +143,15 @@
</el-row>
</div>
- <el-table v-loading="loading" :data="listRoot" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
- <el-table-column type="selection" width="25" align="center" />
+ <el-table v-loading="loading" :data="listRoot" :row-key="getRowId" ref="multipleTable" @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 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>
<el-table-column label="濮撳悕" prop="nickName" sortable :show-overflow-tooltip="true" width="100" align="center"/>
<el-table-column label="鎬у埆" prop="sex" sortable width="100" align="center" >
@@ -199,7 +195,6 @@
</el-table>
<pagination
- v-show="total"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@@ -212,30 +207,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,15 +299,12 @@
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
fot:[".jpg",".jif"],
- fileList:[
- ],
- fileListOther:[
-
- ],
+ fileList:[],
+ fileListOther:[],
dsb:true,
btn:false,
fit:['fill'],
-
+ uploading: false,
formDat: {
//寮犳皬涓�瑙堣〃
userid:undefined,
@@ -344,6 +336,7 @@
secondFamilyId:undefined,
childList:undefined,
identity:undefined,
+ isMyFamily:undefined,
url: undefined,
},
@@ -398,6 +391,14 @@
}],
},
+ typeOption: [{
+ value: '1',
+ label: '鐢�',
+ },
+ {
+ value: '0',
+ label: '濂�',
+ }],
typeOptions: [{
value:'1',
label:'绗�1浠�'
@@ -470,7 +471,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)
@@ -479,22 +481,24 @@
this.listRoot = response.data.data;
// alert(this.listRoot)
this.total = response.data.length;
+ this.pageNum=1;
+ this.pageSize=10;
// alert(this.total)
this.loading = false;
}
);
},
/** 鏌ヨ绫诲埆淇℃伅 */
- getCateInfor()
- {
- let _this = this
- getCategory().then(response=>{
-
- response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
- _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
- })
- })
- },
+ // getCateInfor()
+ // {
+ // let _this = this
+ // getCategory().then(response=>{
+ //
+ // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+ // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ // })
+ // })
+ // },
//韬唤閫夋嫨
getSrc(identity) {
if (identity === '1'){
@@ -508,6 +512,10 @@
}else {
return '鍏跺畠'
}
+ },
+ getRowId(row)
+ {
+ return row.id
},
handleRemove(file) {
@@ -662,22 +670,6 @@
}
},
- /** 瀵煎叆鎿嶄綔*/
- // handleEnport(params){
- // var file = params.file;
- // var formData = new FormData();
- // formData.append('excelImport', file);
- // let _this = this
- // enload(formData).then(response => {
- // _this.getList();
- // Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
- //
- // }).catch(err)
- // {
- // Message({ message: "瀵煎叆澶辫触", type: 'error' })
- // }
- //
- // }
}
};
</script>
--
Gitblit v1.9.1