From c9f3bc911ddb0a10768fd73641728a43320e97d1 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期一, 05 六月 2023 17:42:05 +0800
Subject: [PATCH] 1.将收藏荣誉、荣誉证书中的时间字段变成了可选项 2.成长经历阅历主要经历变成长文本框，新增按钮接入蓝湖样式，点击保存之后可以自动刷新
---
ruoyi-ui/src/views/honor/index.vue | 13 ++-
ruoyi-ui/src/views/self/show.vue | 159 +++++++++++++++++++++++++++++----------
ruoyi-ui/src/assets/icons/add.png | 0
ruoyi-ui/src/views/collection/collectionInfo.vue | 3
ruoyi-ui/src/views/wish/index.vue | 13 +++
ruoyi-ui/src/views/collection/index.vue | 28 ++++--
6 files changed, 162 insertions(+), 54 deletions(-)
diff --git a/ruoyi-ui/src/assets/icons/add.png b/ruoyi-ui/src/assets/icons/add.png
new file mode 100644
index 0000000..e6f8422
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/add.png
Binary files differ
diff --git a/ruoyi-ui/src/views/collection/collectionInfo.vue b/ruoyi-ui/src/views/collection/collectionInfo.vue
index ca0552c..fe1c30a 100644
--- a/ruoyi-ui/src/views/collection/collectionInfo.vue
+++ b/ruoyi-ui/src/views/collection/collectionInfo.vue
@@ -20,6 +20,9 @@
<el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
+<!-- <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime" label-width="78px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">-->
+<!-- <el-date-picker v-model='formData.happenTime' type='date' placeholder='璇烽�夋嫨鏃ユ湡'></el-date-picker>-->
+<!-- </el-form-item>-->
</el-cow>
<el-cow >
<el-form-item label="绫诲埆" prop="type" label-width="40px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 5ebd0d9..28e4741 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -51,16 +51,20 @@
-->
</el-form-item>
- <el-form-item label="鏃堕棿" style="padding-left:190px">
+ <el-form-item label="鏃堕棿">
<el-date-picker
v-model="dateRange"
- style="width: 240px"
- value-format="yyyy-MM-dd HH-MM"
+ 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"
></el-date-picker>
</el-form-item>
@@ -280,8 +284,11 @@
<!-- 娣诲姞鏀惰棌涓庤崳瑾変俊鎭厤缃璇濇 -->
<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="happenTime">-->
+<!-- <el-input v-model="formDat.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" ></el-input>-->
+<!-- </el-form-item>-->
<el-form-item label="鑾峰緱鏃堕棿" prop="happenTime">
- <el-input v-model="formDat.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" ></el-input>
+ <el-date-picker v-model='formDat.happenTime' type='date' placeholder='閫夋嫨鏃ユ湡'></el-date-picker>
</el-form-item>
<el-form-item label="绫诲埆" prop="type">
<el-select v-model="formDat.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" >
@@ -469,7 +476,7 @@
type:undefined,
owner:undefined,
location:undefined,
- happenTime:undefined,
+ // happenTime:undefined,
},
// searchVal:"",
@@ -488,8 +495,8 @@
trigger: 'blur'
}],
happenTime: [{
- // required: true,
- message: '璇疯緭鍏ユ椂闂�',
+ required: true,
+ message: '璇烽�夋嫨鏃堕棿',
trigger: 'blur'
}],
name: [{
@@ -578,7 +585,10 @@
/** 鏌ヨ璁板綍鍒楄〃 */
getList() {
this.loading = true;
- // console.log(this.queryParams)
+ console.log(this.queryParams)
+ 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 => {
listCollection(this.queryParams).then(response => {
// alert(123)
diff --git a/ruoyi-ui/src/views/honor/index.vue b/ruoyi-ui/src/views/honor/index.vue
index 3bc5af9..d95db44 100644
--- a/ruoyi-ui/src/views/honor/index.vue
+++ b/ruoyi-ui/src/views/honor/index.vue
@@ -270,9 +270,12 @@
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
<el-form-item label="鏃堕棿" prop="createTime">
- <el-input v-model="formDat.createTime" placeholder="璇疯緭鍏ュ垱寤烘椂闂�" clearable :style="{width: '100%'}" >
+ <el-input v-model="formDat.createTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
+<!-- <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime">-->
+<!-- <el-date-picker v-model='formDat.happenTime' type='date' placeholder='閫夋嫨鏃ユ湡'></el-date-picker>-->
+<!-- </el-form-item>-->
<el-form-item label="绫诲埆" prop="type">
<!-- <el-input v-model="formDat.type" placeholder="璇疯緭鍏ョ被鍒�" clearable :style="{width: '100%'}" >-->
<!-- </el-input>-->
@@ -293,11 +296,11 @@
</el-input>
</el-form-item>
<el-form-item label="鏈夋晥鏃堕棿" prop="validityDate">
- <el-input v-model="formDat.validityDate" placeholder="璇疯緭鍏ユ湁鏁堟椂闂�" clearable :style="{width: '100%'}" >
+ <el-input v-model="formDat.validityDate" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="鑾峰緱鏃堕棿" prop="getDate">
- <el-input v-model="formDat.getDate" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" >
+ <el-input v-model="formDat.getDate" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="瀛樻斁浣嶇疆" prop="location">
@@ -549,7 +552,9 @@
/** 鏌ヨ璁板綍鍒楄〃 */
getList() {
this.loading = true;
- // console.log(this.queryParams)
+ console.log(this.queryParams)
+ 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 => {
listHonor(this.queryParams).then(response => {
// alert(123)
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index dc67c27..5291563 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -214,8 +214,10 @@
<template v-slot:title>
<div class="title-wrapper">
涓昏瀛︿範鍙婂伐浣滅粡鍘�
- <el-button class="button" type="primary" size='mini' @click="showDialog('open')">
- 鏂板</el-button>
+ <div>
+ <el-button class="button" size="mini" type="text" @click="showDialog('open')">
+ <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
+ </div>
</div>
</template>
<el-table v-loading="loading" :data="experienceList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
@@ -263,8 +265,9 @@
<template v-slot:title>
<div class="title-wrapper">
瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�
- <el-button class="button2" type="primary" size='mini' @click="showDialog('relation1')">
- 鏂板</el-button>
+ <div>
+ <el-button class="button2" size="mini" type="text" @click="showDialog('relation1')">
+ <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button></div>
</div>
</template>
<el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange"
@@ -339,8 +342,8 @@
<template v-slot:title>
<div class="title-wrapper">
鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�
- <el-button class="button" type="primary" size='mini' @click="showDialog('certificate')">
- 鏂板</el-button>
+ <el-button class="button4" size="mini" type="text" @click="showDialog('certificate')">
+ <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
</div>
</template>
<el-table v-loading="loading" :data="certificateList" @selection-change="handleSelectionChange"
@@ -396,8 +399,8 @@
<template v-slot:title>
<div class="title-wrapper">
鍑哄浗锛堝锛夋儏鍐�
- <el-button class="button5" type="primary" size='mini' @click="showDialog('abroad')">
- 鏂板</el-button>
+ <el-button class="button5" size="mini" type="text" @click="showDialog('abroad')">
+ <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
</div>
</template>
<el-table v-loading="loading" :data="AbroadList" @selection-change="handleSelectionChange"
@@ -453,22 +456,26 @@
<el-container>
<div style="width:100%"><h2 style="font-size:15px" >鑷紶</h2></div>
</el-container>
- <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick"
- v-loading="loading" :data="AutobiographyList" >
- <el-tab-pane v-for="(item, index) in AutobiographyList"
- :key='item.id' :label="item.ageBegin+'~'+item.ageEnd+'宀�'+'('+item.term+')'">
- <div v-if="item.term === '濠村効'"> {{item.content}}</div>
- <div v-if="item.term === '骞煎効'"> {{item.content}}</div>
- <div v-if="item.term === '灏忓'"> {{item.content}}</div>
- <div v-if="item.term === '鍒濅腑'"> {{item.content}}</div>
- <div v-if="item.term === '楂樹腑'"> {{item.content}}</div>
- <div v-if="item.term === '澶у'"> {{item.content}}</div>
- <div v-if="item.term === '鐮旂┒鐢�'"> {{item.content}}</div>
- <div v-if="item.term === '宸ヤ綔'"> {{item.content}}</div>
- <div v-if="item.term === '缁撳鍚�'"> {{item.content}}</div>
- </el-tab-pane>
- </el-tabs>
-
+ <div style='position: relative;'>
+ <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick"
+ v-loading="loading" :data="AutobiographyList" >
+ <el-tab-pane v-for="(item, index) in AutobiographyList"
+ :key='item.id' :label="item.ageBegin+'~'+item.ageEnd+'宀�'+'('+item.term+')'">
+ <div v-if="item.term === '濠村効'"> {{item.content}}</div>
+ <div v-if="item.term === '骞煎効'"> {{item.content}}</div>
+ <div v-if="item.term === '灏忓'"> {{item.content}}</div>
+ <div v-if="item.term === '鍒濅腑'"> {{item.content}}</div>
+ <div v-if="item.term === '楂樹腑'"> {{item.content}}</div>
+ <div v-if="item.term === '澶у'"> {{item.content}}</div>
+ <div v-if="item.term === '鐮旂┒鐢�'"> {{item.content}}</div>
+ <div v-if="item.term === '宸ヤ綔'"> {{item.content}}</div>
+ <div v-if="item.term === '缁撳鍚�'"> {{item.content}}</div>
+ </el-tab-pane>
+ </el-tabs>
+ <el-button size='mini' type="text" class="btn_autobiography" @click="showDialog('autobiography')" style='position: absolute;right:10px;top:5px;'>
+ <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
+ </el-button>
+ </div>
</div>
@@ -484,10 +491,10 @@
<el-dialog :title="title" :visible.sync="dialogVisible.open" width="900px" append-to-body>
<el-form ref="elForm1" :model="formDat" :rules="rules" size="medium" label-width="140px">
<el-form-item label="寮�濮嬫棩鏈�" prop="startDate">
- <el-input v-model="formDat.startDate" placeholder="璇疯緭鍏ュ紑濮嬫棩鏈�" clearable :style="{width: '100%'}" ></el-input>
+ <el-input v-model="formDat.startDate" type='date' 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: '100%'}" >
+ <el-input v-model="formDat.content" type="textarea" :rows="5" placeholder="璇疯緭鍏ヤ富瑕佸涔犵粡鍘嗐�佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="璇佹槑浜�" prop="witness">
@@ -568,14 +575,14 @@
<el-dialog :title="title" :visible.sync="dialogVisible.abroad" width="900px" append-to-body>
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="140px">
<el-form-item label="寮�濮嬫棩鏈�" prop="startTime">
- <el-input v-model="formDat.startTime" placeholder="璇疯緭鍏ュ紑濮嬫棩鏈�" clearable :style="{width: '100%'}" ></el-input>
+ <el-input v-model="formDat.startTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
<el-form-item label="缁撴潫鏃ユ湡" prop="endTime">
- <el-input v-model="formDat.endTime" placeholder="璇疯緭鍏ョ粨鏉熸棩鏈�" clearable :style="{width: '100%'}" >
+ <el-input v-model="formDat.endTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="鎵�鍒板浗瀹舵垨鑰呭湴鍖�" prop="destination">
- <el-input v-model="formDat.destination" placeholder="璇疯緭鍏ユ墍鍒板浗瀹舵垨鑰呭湴鍖�" clearable :style="{width: '100%'}" >
+ <el-input v-model="formDat.destination" type="textarea" :rows="5" placeholder="璇疯緭鍏ユ墍鍒板浗瀹舵垨鑰呭湴鍖�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="浜嬬敱(鏃呮父銆佽蛋璁裤�佹帰浜层�佺户鎵胯储浜с�佸叾浠�)" prop="cause">
@@ -588,6 +595,40 @@
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitDataScope5">淇� 瀛�</el-button>
+ <el-button @click="cancelData">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+ <!--鏂板鑷紶-->
+ <el-dialog :title="title" :visible.sync="dialogVisible.autobiography" width="900px" >
+ <el-col >
+ <el-form ref="elForm" :model="AutobiographyList" :rules="rules" size="medium" label-position="left"
+ v-loading="loading" :data="AutobiographyList" @selection-change="handleSelectionChange" >
+ <el-row :span="5">
+ <el-form-item label="骞撮緞娈碉細" prop="ageBegin ageEnd" label-width="70px">
+ <el-input v-model="AutobiographyList.ageBegin" placeholder="" clearable :style="{width: '20%'}" >
+ </el-input>
+ <span> 宀� 鈥斺��</span>
+ <el-input v-model="AutobiographyList.ageEnd" placeholder="" clearable :style="{width: '20%'}" >
+ </el-input>
+ <span> 宀� </span>
+ </el-form-item>
+ <el-form-item label="鏃舵湡锛�" prop="term">
+ <el-select v-model="formDat.type" placeholder="璇烽�夋嫨鏃舵湡" clearable :style="{width: '50%'}" >
+ <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="content">
+ <el-input v-model="formDat.content" type="textarea" :rows="5" placeholder="" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ </el-row>
+ </el-form>
+ </el-col>
+ <h4 class="form-header"> </h4>
+
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitDataScope6">淇� 瀛�</el-button>
<el-button @click="cancelData">鍙� 娑�</el-button>
</div>
</el-dialog>
@@ -608,7 +649,7 @@
getIndividualRelation,addRelation,updateRelation,delRelation,
getCertificateList, addCertificate, delCertificate,
getAbroadList,addAbroad, delAbroad,
- getAutobiographyList, getAutobiographyTermList,
+ getAutobiographyList, getAutobiographyTermList,addAutobiography,
getCategory} from "@/api/self/index";
import { delFamilyevent, uploadPic } from '../../api/bignote'
import { blobValidate } from '../../utils/ruoyi'
@@ -675,6 +716,7 @@
relation1:false,
certificate:false,
abroad:false,
+ autobiography:false
},
// 寮瑰嚭灞傛爣棰�
title: "",
@@ -750,6 +792,10 @@
endTime:undefined,
cause:undefined,
url: undefined,
+ //鑷紶
+ ageBegin:undefined,
+ ageEnd:undefined,
+ term:undefined
},
// 鑿滃崟鍒楄〃
menuOptions: [],
@@ -835,8 +881,8 @@
trigger: 'blur'
}],
content: [{
- required: true,
- message: '璇疯緭鍏ヤ富瑕佸涔犵粡鍘嗐�佸伐浣滃崟浣嶅強浠昏亴鎯呭喌',
+ // required: true,
+ message: '璇疯緭鍏�',
trigger: 'blur'
}],
witness: [{
@@ -859,7 +905,8 @@
this.dialogVisible.open = false;
this.dialogVisible.relation1 = false;
this.dialogVisible.certificate =false;
- this.dialogVisible.abroad=false
+ this.dialogVisible.abroad=false;
+ this.dialogVisible.autobiography=false
this.reset();
},
//涓嬫媺
@@ -1128,7 +1175,7 @@
if (valid) {
addExperience(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
+ this.dialogVisible.open = false;
this.getList();
});
}
@@ -1148,7 +1195,7 @@
if (valid) {
addRelation(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
- this.relation1 = false;
+ this.dialogVisible.relation1 = false;
this.getList();
});
}
@@ -1168,7 +1215,7 @@
if (valid) {
addCertificate(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
- this.certificate = false;
+ this.dialogVisible.certificate = false;
this.getList();
});
}
@@ -1188,7 +1235,27 @@
if (valid) {
addAbroad(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
- this.abroad = false;
+ this.dialogVisible.abroad = false;
+ this.getList();
+ });
+ }
+ });
+ },
+ submitDataScope6: 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) {
+ addAutobiography(this.formDat).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.dialogVisible.autobiography = false;
this.getList();
});
}
@@ -1304,14 +1371,24 @@
display: flex;
justify-content: space-between;
}
-
+.btn_autobiography{
+ background:center no-repeat url('../../assets/icons/add.png') ;
+}
.button {
- margin-left: 67.6vw;
+ background:center no-repeat url('../../assets/icons/add.png') ;
+ margin-left: 69.5vw;
+
}
.button2 {
- margin-left: 64vw;
+ background: center no-repeat url('../../assets/icons/add.png') ;
+ margin-left: 66vw;
+}
+.button4 {
+ background: center no-repeat url('../../assets/icons/add.png') ;
+ margin-left: 69.5vw;
}
.button5 {
- margin-left: 69.5vw;
+ background:center no-repeat url('../../assets/icons/add.png') ;
+ margin-left: 71vw;
}
</style>
diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
new file mode 100644
index 0000000..eede110
--- /dev/null
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -0,0 +1,13 @@
+<template>
+ <div>hello</div>
+</template>
+
+<script>
+export default {
+ name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>
--
Gitblit v1.9.1