From 97819279661596858ab40a40d321db61f297df93 Mon Sep 17 00:00:00 2001 From: Tcsm <1377977403@qq.com> Date: 星期六, 27 五月 2023 19:24:40 +0800 Subject: [PATCH] 成长经历阅历的新增以弹窗形式展示(但还有一点问题正在解决),可删除单独的一条数据 新增荣誉证书详情页面(但数据调不出来) --- ruoyi-ui/src/views/self/show.vue | 338 ++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 288 insertions(+), 50 deletions(-) diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue index 7526b7e..a0c9311 100644 --- a/ruoyi-ui/src/views/self/show.vue +++ b/ruoyi-ui/src/views/self/show.vue @@ -209,9 +209,9 @@ <!--鎶樺彔闈㈡澘--> <el-collapse v-model="activeNames" @change="handleChange"> - <el-collapse-item title="涓昏瀛︿範鍙婂伐浣滅粡鍘�" name="1"> + <el-collapse-item title="涓昏瀛︿範鍙婂伐浣滅粡鍘�" name="1" > <el-table v-loading="loading" :data="experienceList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> - <el-table-column label="璧锋鏃ユ湡" prop="startDate" sortable width="300" align="center" /> + <el-table-column label="寮�濮嬫棩鏈�" prop="startDate" sortable width="300" align="center" /> <el-table-column label="涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" prop="content" sortable width="350" align="center" /> <el-table-column label="璇佹槑浜�" prop="witness" sortable width="300" align="center" /> <!-- 鎿嶄綔--> @@ -222,9 +222,9 @@ size="mini" type="text" icon="el-icon-edit" - @click="handleAdd" + @click="showDialog1" v-hasPermi="['system:role:edit']" - >淇敼</el-button> + >鏂板</el-button> <el-button size="mini" type="text" @@ -232,10 +232,14 @@ @click="handleExperienceDelete(scope.row)" v-hasPermi="['system:role:remove']" >鍒犻櫎</el-button> - <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']"> - <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button> +<!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">--> +<!-- <el-button size="mini" --> +<!-- type="text" --> +<!-- icon="el-icon-d-arrow-right" --> +<!-- @click="handleCheck(scope.row)"--> +<!-- >鏌ョ湅璇︽儏</el-button>--> - </el-dropdown> +<!-- </el-dropdown>--> </template> </el-table-column> </el-table> @@ -257,6 +261,13 @@ size="mini" type="text" icon="el-icon-edit" + @click="showDialog2" + v-hasPermi="['system:role:edit']" + >鏂板</el-button> + <el-button + size="mini" + type="text" + icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']" >淇敼</el-button> @@ -264,13 +275,13 @@ size="mini" type="text" icon="el-icon-delete" - @click="handleCertificateDelete(scope.row)" + @click="handDelete(scope.row)" v-hasPermi="['system:role:remove']" >鍒犻櫎</el-button> - <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']"> - <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button> +<!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">--> +<!-- <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>--> - </el-dropdown> +<!-- </el-dropdown>--> </template> </el-table-column> </el-table> @@ -305,17 +316,97 @@ <el-table-column label="璇佷欢鍚嶇О" prop="cerName" sortable width="280" align="center" /> <el-table-column label="鎸佹湁鎯呭喌" prop="ownStatus" sortable width="280" align="center" /> <el-table-column label="璇佷欢鍙风爜" prop="idNo" sortable width="280" align="center" /> - <el-table-column label="鏈夋晥鏈�" prop="validityDate" sortable width="280" align="center"> + <el-table-column label="鏈夋晥鏈�" prop="startTime endTime" sortable width="280" align="center"> + <template slot-scope="scope"> + <span v-if="scope.row.startTime || scope.row.endTime == true"> + {{scope.row.startTime}} 鑷� {{scope.row.endTime}} + </span> + <span v-else>鈥斺�斺�斺��</span> + </template> + </el-table-column> + <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"> + <template slot-scope="scope" v-if="scope.row.roleId !== 1"> + <!-- @click="handleUpdate(scope.row)"--> + <el-button + size="mini" + type="text" + icon="el-icon-edit" + @click="showDialog3" + v-hasPermi="['system:role:edit']" + >鏂板</el-button> + <el-button + size="mini" + type="text" + icon="el-icon-edit" + @click="handleAdd" + v-hasPermi="['system:role:edit']" + >淇敼</el-button> + <el-button + size="mini" + type="text" + icon="el-icon-delete" + @click="handleCertificateDelete(scope.row)" + v-hasPermi="['system:role:remove']" + >鍒犻櫎</el-button> + <!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">--> + <!-- <el-button size="mini" --> + <!-- type="text" --> + <!-- icon="el-icon-d-arrow-right" --> + <!-- @click="handleCheck(scope.row)"--> + <!-- >鏌ョ湅璇︽儏</el-button>--> + + <!-- </el-dropdown>--> + </template> </el-table-column> </el-table> </el-collapse-item> <el-collapse-item title="鍑哄浗锛堝锛夋儏鍐�" name="5"> <el-table v-loading="loading" :data="AbroadList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> - <el-table-column label="璧锋鏃ユ湡" prop="startDate" sortable width="350" align="center" /> + <el-table-column label="璧锋鏃ユ湡" prop="startTime endTime" sortable width="350" align="center" > + <template slot-scope="scope"> + <span v-if="scope.row.startTime || scope.row.endTime == true"> + {{scope.row.startTime}} 鑷� {{scope.row.endTime}} + </span> + <span v-else>鈥斺�斺�斺��</span> + </template> + </el-table-column> <el-table-column label="鎵�鍒板浗瀹舵垨鑰呭湴鍖�" prop="destination" sortable width="350" align="center" /> <el-table-column label="浜嬬敱锛堟梾娓搞�佽蛋璁裤�佹帰浜层�佺户鎵胯储浜с�佸叾浠栵級" prop="cause" sortable width="400" align="center" /> + <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"> + <template slot-scope="scope" v-if="scope.row.roleId !== 1"> + <!-- @click="handleUpdate(scope.row)"--> + <el-button + size="mini" + type="text" + icon="el-icon-edit" + @click="showDialog4" + v-hasPermi="['system:role:edit']" + >鏂板</el-button> + <el-button + size="mini" + type="text" + icon="el-icon-edit" + @click="handleAdd" + v-hasPermi="['system:role:edit']" + >淇敼</el-button> + <el-button + size="mini" + type="text" + icon="el-icon-delete" + @click="handleAbroadDelete(scope.row)" + v-hasPermi="['system:role:remove']" + >鍒犻櫎</el-button> + <!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">--> + <!-- <el-button size="mini" --> + <!-- type="text" --> + <!-- icon="el-icon-d-arrow-right" --> + <!-- @click="handleCheck(scope.row)"--> + <!-- >鏌ョ湅璇︽儏</el-button>--> + <!-- </el-dropdown>--> + </template> + </el-table-column> </el-table> </el-collapse-item> </el-collapse> @@ -339,26 +430,6 @@ <div v-if="item.term === '宸ヤ綔'"> {{item.content}}</div> <div v-if="item.term === '缁撳鍚�'"> {{item.content}}</div> </el-tab-pane> -<!-- <el-tab-pane label="濠村効" >--> -<!-- <div v-if="AutobiographyList.term === '濠村効'" v-model="AutobiographyList.content">--> -<!-- {{AutobiographyList.content}}--> -<!-- </div>--> -<!-- </el-tab-pane>--> -<!-- <el-tab-pane label="3~6宀�(骞煎効鏈�)" name="2" ></el-tab-pane>--> -<!-- <el-tab-pane label="6~12(灏忓)" name="3" ></el-tab-pane>--> -<!-- <el-tab-pane label="12~15(鍒濅腑)" name="4"></el-tab-pane>--> -<!-- <el-tab-pane label="15~18(楂樹腑)" name="5"></el-tab-pane>--> -<!-- <el-tab-pane label="18~22(澶у)" name="6"></el-tab-pane>--> -<!-- <el-tab-pane label="22~25(鐮旂┒鐢�)" name="7"></el-tab-pane>--> -<!-- <el-tab-pane label="26~ (宸ヤ綔)" name="8"></el-tab-pane>--> -<!-- <el-tab-pane label="锛熷瞾缁撳" name="9"></el-tab-pane>--> -<!-- <!– </div>–>--> -<!-- <!– <el-tab-pane–>--> -<!-- <!– v-for="(item, index) in AutobiographyTermList"–>--> -<!-- <!– :key="index"–>--> -<!-- <!– :name="item"–>--> -<!-- <!– :label="item"–>--> -<!-- <!– />–>--> </el-tabs> @@ -372,11 +443,11 @@ @pagination="getList" /> - <!-- 淇敼涓昏缁忓巻淇℃伅閰嶇疆瀵硅瘽妗� --> + <!-- 鏂板涓昏缁忓巻淇℃伅閰嶇疆瀵硅瘽妗� --> <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body> - <el-form ref="elForm" :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-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-form-item> <el-form-item label="涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" prop="content"> <el-input v-model="formDat.content" placeholder="璇疯緭鍏ヤ富瑕佸涔犵粡鍘嗐�佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" clearable :style="{width: '100%'}" > @@ -391,12 +462,98 @@ <h4 class="form-header"> </h4> <div slot="footer" class="dialog-footer"> - <el-button type="primary" @click="submitForm">淇� 瀛�</el-button> + <el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button> <el-button @click="cancelData">鍙� 娑�</el-button> </div> </el-dialog> + <!-- 鏂板瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐典俊鎭厤缃璇濇 --> + <el-dialog :title="title" :visible.sync="relation1" width="900px" append-to-body> + <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="140px"> + <el-form-item label="涓庢湰浜哄叧绯�" prop="relation"> + <el-input v-model="formDat.relation" 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> + <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="鑱屽姟" prop="position"> + <el-input v-model="formDat.position" placeholder="璇疯緭鍏ヨ亴鍔�" clearable :style="{width: '100%'}" > + </el-input> + </el-form-item> + <el-form-item label="鏀挎不闈㈣矊" prop="politicalOutlook"> + <el-input v-model="formDat.politicalOutlook" placeholder="璇疯緭鍏ユ斂娌婚潰璨�" clearable :style="{width: '100%'}" > + </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 @click="cancelData">鍙� 娑�</el-button> + </div> + </el-dialog> + <!-- 鏂板鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐典俊鎭厤缃璇濇 --> + <el-dialog :title="title" :visible.sync="certificate" width="900px" append-to-body> + <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="140px"> + <el-form-item label="璇佷欢鍚嶇О" prop="cerName"> + <el-input v-model="formDat.cerName" placeholder="璇疯緭鍏ヨ瘉浠跺悕绉�" clearable :style="{width: '100%'}" > + </el-input> + </el-form-item> + <el-form-item label="鎸佹湁鎯呭喌" prop="ownStatus"> + <el-input v-model="formDat.ownStatus" 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="startTime"> + <el-input v-model="formDat.startTime" 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> + </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 @click="cancelData">鍙� 娑�</el-button> + </div> + </el-dialog> + <!-- 鏂板鍑哄浗锛堝锛夋儏鍐典俊鎭厤缃璇濇 --> + <el-dialog :title="title" :visible.sync="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-form-item> + <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"> + <el-input v-model="formDat.endTime" 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> + </el-form-item> + <el-form-item label="浜嬬敱(鏃呮父銆佽蛋璁裤�佹帰浜层�佺户鎵胯储浜с�佸叾浠�)" prop="cause"> + <el-input v-model="formDat.cause" placeholder="璇疯緭鍏ヤ簨鐢�(鏃呮父銆佽蛋璁裤�佹帰浜层�佺户鎵胯储浜с�佸叾浠�)" clearable :style="{width: '100%'}" > + </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 @click="cancelData">鍙� 娑�</el-button> + </div> + </el-dialog> </div> @@ -409,10 +566,22 @@ //鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁� --鎺ュソ浜� -import {getIndividualList, getIndividualRelation, delIndividual, updateIndividual, addIndividual,listExperience,updateExperience, - addExperience,delExperience} from "@/api/self/index"; import { + getIndividualList, + getIndividualRelation, + delIndividual, + updateIndividual, + addIndividual, + listExperience, + updateExperience, + addExperience, + delExperience, delCertificate, + addCertificate, + addAbroad, + delAbroad +} from "@/api/self/index"; +import { getAbroadList, getAutobiography, getAutobiographyList, @@ -422,6 +591,7 @@ import { delFamilyevent, uploadPic } from '../../api/bignote' import { blobValidate } from '../../utils/ruoyi' import {getCategory} from "@/api/self/index"; +import {addContact} from "@/api/contacts"; export default { name: "show", @@ -482,6 +652,9 @@ title: "", // 鏄惁鏄剧ず寮瑰嚭灞� open: false, + relation1:false, + certificate:false, + abroad:false, // open:true, // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛� openDataScope: false, @@ -543,6 +716,8 @@ ownStatus:undefined, //鍑哄浗锛堝锛夋儏鍐� destination:undefined, + startTime:undefined, + endTime:undefined, cause:undefined, url: undefined, }, @@ -655,8 +830,52 @@ this.reset(); }, //涓嬫媺 - handleChange(val) { - console.log(val); + handleChange(activeNames) { + // console.log(val); + this.reset(); + if (activeNames.includes('1')) { + this.showDialog1(); + }else if (activeNames.includes('2')) { + this.showDialog2(); + }else if (activeNames.includes('3')) { + this.showDialog3(); + }else if (activeNames.includes('4')) { + this.showDialog4(); + }else { + this.open = false; + this.relation1 = false; + this.certificate =false; + this.abroad=false + } + }, + //鎵撳紑涓嶅悓鐨勬柊澧炲脊绐� + showDialog1() { + this.open = true; + this.relation1 = false; + this.certificate =false; + this.abroad=false; + this.title = "娣诲姞涓昏涓汉缁忓巻淇℃伅"; + }, + showDialog2() { + this.open = false; + this.relation1 = true; + this.certificate =false; + this.abroad=false; + this.title = "娣诲姞瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�"; + }, + showDialog3() { + this.open = false; + this.relation1 = false; + this.certificate =true; + this.abroad=false; + this.title = "娣诲姞鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�"; + }, + showDialog4() { + this.open = false; + this.relation1 = false; + this.certificate =false; + this.abroad=true; + this.title = "娣诲姞鍑哄浗锛堝锛夋儏鍐�"; }, //涓汉鑷紶 @@ -769,8 +988,6 @@ this.formDat.url = ul+","+uls this.$refs['elForm'].validate(valid => { - - if (valid) { if (this.formDat.id != undefined) { updateIndividual(this.formDat).then(response => { @@ -886,11 +1103,11 @@ this.isShow_2=true }, //淇敼鎸夐挳 - /** 淇敼鎸夐挳鎿嶄綔 */ + /** 鏂板鎸夐挳鎿嶄綔 */ handleAdd() { this.reset(); - this.open = true; - this.title = "淇敼璇︾粏淇℃伅"; + // this.open = true; + this.title = "鏂板璇︾粏淇℃伅"; }, /** 鏌ヨ鑷紶淇℃伅 */ getAutobiographyInfor() @@ -916,9 +1133,20 @@ this.$refs["elForm"].validate(valid => { if (valid) { - addIndividual(this.formDat).then(response => { + + addExperience(this.formDat).then(response => { this.$modal.msgSuccess("鏂板鎴愬姛"); this.open = false; + this.getList(); + }); + addCertificate(this.formDat).then(response => { + this.$modal.msgSuccess("鏂板鎴愬姛"); + this.certificate = false; + this.getList(); + }); + addAbroad(this.formDat).then(response => { + this.$modal.msgSuccess("鏂板鎴愬姛"); + this.abroad = false; this.getList(); }); } @@ -950,7 +1178,7 @@ /** 鍒犻櫎涓汉缁忓巻鎸夐挳鎿嶄綔 */ handleExperienceDelete(row) { const Ids = row.id || this.ids; - this.$modal.confirm('鏄惁纭鍒犻櫎搴忓彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() { + this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵').then(function() { return delExperience(Ids); }).then(() => { this.getList(); @@ -960,13 +1188,23 @@ /** 鍒犻櫎鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐垫寜閽搷浣� */ handleCertificateDelete(row) { const Ids = row.id || this.ids; - this.$modal.confirm('鏄惁纭鍒犻櫎搴忓彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() { + this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵').then(function() { return delCertificate(Ids); }).then(() => { this.getList(); this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); }).catch(() => {}); }, + /** 鍒犻櫎鍑哄浗锛堝锛夋儏鍐垫寜閽搷浣� */ + handleAbroadDelete(row) { + const Ids = row.id || this.ids; + this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵').then(function() { + return delAbroad(Ids); + }).then(() => { + this.getList(); + this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); + }).catch(() => {}); + }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { this.download('/self/user/export', { -- Gitblit v1.9.1