From c045bc22bc92aa51b4510daa21d598d84247bc78 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期六, 02 九月 2023 13:19:28 +0800
Subject: [PATCH] 调整成长经历个基本信息的三个按钮的位置
---
ruoyi-ui/src/views/genealogy/index.vue | 274 ++++++++++++++++++++----------------------------------
1 files changed, 101 insertions(+), 173 deletions(-)
diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index 4e1626f..b723ec3 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -48,25 +48,29 @@
</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"
- @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;
@@ -77,15 +81,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-->
@@ -148,14 +143,14 @@
</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-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
+ <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 +194,7 @@
</el-table>
<pagination
- v-show="total"
+ v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@@ -208,105 +203,40 @@
/>
- <!-- <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+ <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="myName">
- <el-input v-model="formDat.myName" placeholder="璇疯緭鍏ユ垚鍛樺鍚�" clearable :style="{width: '100%'}" >
+ <el-form-item label="韬唤" prop="identity">
+ <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-form-item label="濮撳悕" prop="nickName">
+ <el-input v-model="formDat.nickName" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
- <el-form-item label="濮撳悕" prop="name">
- <el-input v-model="formDat.name" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" >
+ <el-form-item label="鎬у埆" prop="sex">
+ <el-input v-model="formDat.sex" placeholder="璇疯緭鍏ユ�у埆" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="宸ヤ綔鍗曚綅" prop="work">
- <el-input v-model="formDat.work" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" clearable :style="{width: '100%'}" >
+ <el-form-item label="鍑虹敓鏃堕棿" prop="birth">
+ <el-input v-model="formDat.birth" 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-form-item label="鍏ㄧ敓鍛藉懆鏈�" prop="deadDay">
+ <el-input v-model="formDat.deadDay" placeholder="璇疯緭鍏ュ叏鐢熷懡鍛ㄦ湡" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="寰俊" prop="wx">
- <el-input v-model="formDat.wx" placeholder="璇疯緭鍏ュ井淇�" clearable :style="{width: '100%'}" >
+ <el-form-item label="鎵嬫満鍙风爜" prop="phoneNumber">
+ <el-input v-model="formDat.phoneNumber" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="QQ" prop="qq">
- <el-input v-model="formDat.qq" placeholder="璇疯緭鍏Q" clearable :style="{width: '100%'}" >
+ <el-form-item label="鎵�鍦ㄥ崟浣�" prop="unit">
+ <el-input v-model="formDat.unit" placeholder="璇疯緭鍏ユ墍鍦ㄥ崟浣�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="twitter" prop="twitter">
- <el-input v-model="formDat.twitter" placeholder="璇疯緭鍏witter" clearable :style="{width: '100%'}" >
+ <el-form-item label="閰嶅伓" prop="spouseName">
+ <el-input v-model="formDat.spouseName" placeholder="璇疯緭鍏witter" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="鏄惁甯歌仈绯�" prop="isAlways">
- <el-input v-model="formDat.isAlways" placeholder="鏄惁甯歌仈绯�" clearable :style="{width: '100%'}" >
- </el-input>
- </el-form-item>
-
- <el-form-item label="澶囨敞锛堟槸鍚﹀瓨鍦ㄩ噾閽卞叧绯伙級" prop="remark">
- <el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
- </el-form-item>
-
- <h4 class="form-header">鐢靛瓙鍚嶇墖 </h4>
- <el-upload
- action="#"
- list-type="picture-card"
- multiple
- :http-request="requestUpload"
- :file-list="fileList"
- >
- <i slot="default" class="el-icon-plus"></i>
- <div slot="file" slot-scope="{file}">
- <img
- class="el-upload-list__item-thumbnail"
- :src="file.url"
- alt=""
- style="width: 126px; height: 126px"
- fit="cover"
- :preview-src-list="[file.url]"
- >
- <span class="el-upload-list__item-actions">
- <span
- class="el-upload-list__item-preview"
- @click="handlePictureCardPreview(file)"
- >
- <i class="el-icon-zoom-in"></i>
- </span>
-
- <span
- v-if="!disabled"
- class="el-upload-list__item-delete"
- @click="handleRemove(file)"
- >
- <i class="el-icon-delete"></i>
- </span>
- </span>
-
-
- </div>
- </el-upload>
- <h4 class="form-header">鍏朵粬闄勪欢 </h4>
- <el-upload
- action=""
- :file-list="fileListOther"
- class="upload-demo"
- multiple
-
- :on-remove="handleRemove"
- :http-request="requestUpload"
- :show-file-list="true"
- >
- <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
- <template #tip>
- <div class="el-upload__tip">
- </div>
- </template>
- </el-upload>
</el-form>
<h4 class="form-header"> </h4>
@@ -315,7 +245,7 @@
<el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
<el-button @click="cancelData">鍙� 娑�</el-button>
</div>
- </el-dialog> -->
+ </el-dialog>
<el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
@@ -369,11 +299,8 @@
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
fot:[".jpg",".jif"],
- fileList:[
- ],
- fileListOther:[
-
- ],
+ fileList:[],
+ fileListOther:[],
dsb:true,
btn:false,
fit:['fill'],
@@ -409,6 +336,7 @@
secondFamilyId:undefined,
childList:undefined,
identity:undefined,
+ isMyFamily:undefined,
url: undefined,
},
@@ -463,6 +391,14 @@
}],
},
+ typeOption: [{
+ value: '1',
+ label: '鐢�',
+ },
+ {
+ value: '0',
+ label: '濂�',
+ }],
typeOptions: [{
value:'1',
label:'绗�1浠�'
@@ -492,30 +428,30 @@
this.reset();
},
//鎷垮埌閰嶅伓鐨勫鍚�
- // getPerson(id)
- // {
- // // alert(id)
- // // alert(typeof(id))
- // // this.listRoot.forEach(function(item, index) {
- // // //item 灏辨槸褰撴棩鎸夊惊鐜埌鐨勫璞�
- // // //index鏄惊鐜殑绱㈠紩锛屼粠0寮�濮�
- // // //alert(typeof(item.userId))
- // // if(item.userId==id){
- // // // alert(89)
- // // alert(item.nickName)
- // // return item.nickName
- // // }
- //
- // // })
- // let username = ""
- // for(let i = 0; i < this.listRoot.length;i++)
- // {
- // if(this.listRoot[i].userId==id)
- // username = this.listRoot[i].nickName
- // }
- // return username;
- // // return "12ddd"
- // },
+ getPerson(id)
+ {
+ // alert(id)
+ // alert(typeof(id))
+ // this.listRoot.forEach(function(item, index) {
+ // //item 灏辨槸褰撴棩鎸夊惊鐜埌鐨勫璞�
+ // //index鏄惊鐜殑绱㈠紩锛屼粠0寮�濮�
+ // //alert(typeof(item.userId))
+ // if(item.userId==id){
+ // // alert(89)
+ // alert(item.nickName)
+ // return item.nickName
+ // }
+
+ // })
+ let username = ""
+ for(let i = 0; i < this.listRoot.length;i++)
+ {
+ if(this.listRoot[i].userId==id)
+ username = this.listRoot[i].nickName
+ }
+ return username;
+ // return "12ddd"
+ },
//闅旇鍙樿壊
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 0) {
@@ -524,13 +460,19 @@
return "statistics-warning-row";
}
},
-
+ /** 鏂板鎸夐挳鎿嶄綔 */
+ handleAdd() {
+ this.reset();
+ this.open = true;
+ this.title = "娣诲姞璇佷欢/鑽ｈ獕/璧勮川淇℃伅";
+ },
/** 鏌ヨ閫氳褰曞垪琛� */
getList() {
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)
@@ -539,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'){
@@ -716,28 +660,12 @@
...this.queryParams
}, `zGenealogy_${new Date().getTime()}.xlsx`)
}else{
- this.download('/self/user/export/genealogy/'+Ids, {
+ this.download('/self/user/export/genealogy1/'+Ids, {
}, `zGenealogy_${new Date().getTime()}.xlsx`)
}
},
- /** 瀵煎叆鎿嶄綔*/
- // 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