From ad7c86c760b2a9495787f7187a8142f8121ec1d9 Mon Sep 17 00:00:00 2001 From: Tcsm <1377977403@qq.com> Date: 星期三, 03 五月 2023 10:23:21 +0800 Subject: [PATCH] 1.通讯录详情中的0,1转为具体文字 2.家庭小医生显示查看详情按钮 3.成长经历阅历修改样式等 --- ruoyi-ui/src/views/self/show.vue | 222 ++++++++++++++++++++---------------- ruoyi-ui/src/api/self/index.js | 4 ruoyi-ui/src/views/contacts/contactsInfo.vue | 9 - ruoyi-ui/src/views/collection/index.vue | 78 +++++++++++- ruoyi-ui/src/views/doctor/index.vue | 22 ++- 5 files changed, 208 insertions(+), 127 deletions(-) diff --git a/ruoyi-ui/src/api/self/index.js b/ruoyi-ui/src/api/self/index.js index f2f201b..58824f2 100644 --- a/ruoyi-ui/src/api/self/index.js +++ b/ruoyi-ui/src/api/self/index.js @@ -191,8 +191,8 @@ }) } -//鎷垮埌鑷紶 -export function getAutobiography() +//鎷垮埌涓汉鑷紶 +export function getCategory() { return request({ url: '/zDict/byId', diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue index 4a1c8c7..9040293 100644 --- a/ruoyi-ui/src/views/collection/index.vue +++ b/ruoyi-ui/src/views/collection/index.vue @@ -151,12 +151,37 @@ v-hasPermi="['family:note:export']" >瀵煎嚭</el-button> </el-col> + <el-col :span="1.5"> + <el-button + type="warning" + plain + icon="el-icon-download" + size="mini" + @click="handleExport" + v-hasPermi="['family:note:export']" + >瀵煎叆妯℃澘涓嬭浇</el-button> + </el-col> + <el-col :span="1.2"> + + <el-upload + action="" + + class="upload-demo" + :show-file-list="false" + :http-request="handleEnport" + > + <el-button size="mini" type="primary" + plain + icon="el-icon-plus" >瀵煎叆</el-button> + + </el-upload> + </el-col> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> </el-row> </div> <el-table v-loading="loading" :data="collectionList" @selection-change="handleSelectionChange" @row-click="handleCheck" :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="搴忓彿" prop="id" sortable width="80" />--> + <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/> <el-table-column label="鑾峰緱鏃堕棿" prop="happenTime" sortable width="100" align="center"> <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template> </el-table-column> @@ -178,10 +203,24 @@ <el-table-column label="瀛樻斁浣嶇疆" prop="location" sortable width="130" align="center"> <template slot-scope="scope">{{scope.row.location? scope.row.location: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="鐢靛瓙鏂囦欢" prop="url" align="center" sortable width="110" > - <template slot-scope="scope"> - <span v-if= "scope.row.url == ','" ><img src="../../assets/images/鏂囦欢澶�-0.png" /></span> - <span v-else><img src="../../assets/images/鏂囦欢澶�-1.png" /></span> + <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="80" > + <template slot-scope="scope" > + <img + class="el-upload-list__item-thumbnail" + src="../../assets/images/deviceLis.png" + alt="" + style="width: 35px; height: 35px;" + fit="cover" + v-if="scope.row.url !== ','" + > + <img + class="el-upload-list__item-thumbnail" + src="../../assets/images/deviceA.png" + alt="" + style="width: 35px; height: 35px;" + fit="cover" + v-if="scope.row.url === ','" + > </template> </el-table-column> @@ -208,12 +247,12 @@ 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-button + size="mini" + type="text" + icon="el-icon-d-arrow-right" + @click="handleCheck(scope.row)" + >鏌ョ湅璇︽儏</el-button> </el-dropdown> </template> @@ -225,6 +264,7 @@ :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" + style="background: #FEF7FC;" @pagination="getList" /> @@ -344,6 +384,8 @@ //瀵煎叆鎺ュ彛鍑芥暟 import {listCollection, getCollection, addCollection,updateCollection, delCollection,uploadPic} from "@/api/collection/index"; +import {enload} from "@/api/doctor"; +import {Message} from "element-ui"; export default { @@ -674,6 +716,20 @@ this.download('zfCollection/export', { ...this.queryParams }, `zfCollection_${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(() => { Message({ message: "瀵煎叆澶辫触", type: 'error' })}); + } } }; diff --git a/ruoyi-ui/src/views/contacts/contactsInfo.vue b/ruoyi-ui/src/views/contacts/contactsInfo.vue index 28d001c..2011fab 100644 --- a/ruoyi-ui/src/views/contacts/contactsInfo.vue +++ b/ruoyi-ui/src/views/contacts/contactsInfo.vue @@ -46,12 +46,7 @@ </el-input> </el-form-item> <el-form-item label="鏄惁甯歌仈绯�" prop="isAlways"> - <el-input v-model="formData.isAlways" placeholder="鏄惁甯歌仈绯�" clearable :style="{width: '100%'}" :disabled="dsb"> -<!-- <template slot-scope="scope">--> -<!-- <span v-if="scope.row.isAlways===1">鏄�</span>--> -<!-- <span v-if="scope.row.isAlways===0">鍚�</span>--> -<!-- <span v-if="scope.row.isAlways== null">鈥斺��</span>--> -<!-- </template>--> + <el-input v-model="formData.isAlways === 1 ? '鏄�':'鍚�' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> <el-form-item label="澶囨敞锛堟槸鍚﹀瓨鍦ㄩ噾閽卞叧绯伙級" prop="remark"> @@ -103,7 +98,7 @@ </div> </el-upload> - + <el-form-item size="large"> <el-button type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button> diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue index df0e855..f8528d2 100644 --- a/ruoyi-ui/src/views/doctor/index.vue +++ b/ruoyi-ui/src/views/doctor/index.vue @@ -188,33 +188,34 @@ </div> <el-table v-loading="loading" :data="doctorList" @selection-change="handleSelectionChange" @row-click="handleCheck" :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="120"/> <el-table-column label="绫诲瀷" prop="type" sortable width="80"> + <el-table-column label="搴忓彿" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/> + <el-table-column label="绫诲瀷" prop="type" sortable width="80" align="center"> <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="鐥囩姸" prop="symptom" sortable :show-overflow-tooltip="true" width="80" > + <el-table-column label="鐥囩姸" prop="symptom" sortable :show-overflow-tooltip="true" width="80" align="center" > <template slot-scope="scope">{{scope.row.symptom? scope.row.symptom: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="鎸佺画鏃堕棿" prop="duration" sortable :show-overflow-tooltip="true" width="110" > + <el-table-column label="鎸佺画鏃堕棿" prop="duration" sortable :show-overflow-tooltip="true" width="110" align="center" > <template slot-scope="scope">{{scope.row.duration? scope.row.duration: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="涓尰澶勬柟" prop="cmedical" sortable width="110" > + <el-table-column label="涓尰澶勬柟" prop="cmedical" sortable width="110" align="center" > <template slot-scope="scope">{{scope.row.cmedical? scope.row.cmedical: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="瑗垮尰澶勬柟" prop="wmedical" sortable width="110"> + <el-table-column label="瑗垮尰澶勬柟" prop="wmedical" sortable width="110" align="center"> <template slot-scope="scope">{{scope.row.wmedical? scope.row.wmedical: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="鍔熸晥" prop="effect" sortable width="80" > + <el-table-column label="鍔熸晥" prop="effect" sortable width="80" align="center" > <template slot-scope="scope">{{scope.row.effect? scope.row.effect: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="閫傜敤浜�" prop="suitable" sortable width="110" > + <el-table-column label="閫傜敤浜�" prop="suitable" sortable width="110" align="center" > <template slot-scope="scope">{{scope.row.suitable? scope.row.suitable: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="澶囨敞" prop="remark" sortable width="120" > + <el-table-column label="澶囨敞" prop="remark" sortable width="120" align="center"> <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" > + <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="80" > <template slot-scope="scope" > <img class="el-upload-list__item-thumbnail" @@ -252,7 +253,7 @@ @click="handleDelete(scope.row)" v-hasPermi="['system:role:remove']" >鍒犻櫎</el-button> - + <el-button size="mini" type="text" @@ -268,6 +269,7 @@ :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" + style="background: #FEF7FC;" @pagination="getList" /> diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue index 8ef6d45..3f897d2 100644 --- a/ruoyi-ui/src/views/self/show.vue +++ b/ruoyi-ui/src/views/self/show.vue @@ -130,37 +130,13 @@ <div style="padding-left:30px;padding-top:30px" > <el-container > - <!-- <template slot-scope="scope" v-if="scope.row.roleId !== 1">--> - <!-- <el-button--> - <!-- size="mini"--> - <!-- type="text"--> - <!-- icon="el-icon-edit"--> - <!-- @click="handleUpdate(scope.row)"--> - <!-- v-hasPermi="['system:role:edit']"--> - <!-- >淇敼</el-button>--> - - <!-- </template>--> - <el-row > <el-button type="primary" - @click="handleUpdate(scope.row)" - :disabled="btn" + @click="handleEdit()" + v-if="isShow" v-hasPermi="['system:role:edit']" >缂栬緫</el-button> - <!-- @click="handleUpdate(scope.row)"--> - <!-- <el-dropdown--> - <!-- size="mini"--> - <!-- @command="(command) => handleCommand(command, scope.row)"--> - <!-- v-hasPermi="['system:role:edit']"> person:information:edit --> - <!-- <el-button--> - <!-- size="mini"--> - <!-- type="text"--> - <!-- icon="el-icon-d-arrow-right"--> - <!-- @click="handleCheck(scope.row)"--> - <!-- >鏌ョ湅璇︽儏</el-button>--> - - <!-- </el-dropdown>--> <br> <el-button type="primary" @@ -168,7 +144,7 @@ v-hasPermi="['family:note:export']" >瀵煎嚭</el-button> <br> - <el-button type="primary" @click="submitForm" :disabled="dsb">瀹屾垚</el-button> + <el-button v-if="isShow_2" type="primary" @click="submitForm" :disabled="dsb">瀹屾垚</el-button> </el-row> </el-container> @@ -233,19 +209,20 @@ <!--鎶樺彔闈㈡澘--> <el-collapse v-model="activeNames" @change="handleChange"> - <el-collapse-item title="涓昏瀛︿範鍙婂伐浣滅粡鍘�" name="1" > - <el-table v-loading="loading" :data="experienceList" @selection-change="handleSelectionChange"> + <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="content" sortable width="350" align="center" /> <el-table-column label="璇佹槑浜�" prop="witness" sortable width="300" 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="handleUpdate(scope.row)" + @click="handleAdd" v-hasPermi="['system:role:edit']" >淇敼</el-button> <el-button @@ -264,7 +241,8 @@ </el-table> </el-collapse-item> <el-collapse-item title="瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�" name="2" > - <el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange"> + <el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange" + :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> <el-table-column label="涓庢湰浜哄叧绯�" prop="relation" sortable width="260" align="center" /> <el-table-column label="濮撳悕" prop="nickName" sortable width="260" align="center" /> <el-table-column label="鍗曚綅鍙婅亴鍔�" prop="unit position" sortable width="260" align="center"> @@ -321,8 +299,9 @@ </div> </el-collapse-item> - <el-collapse-item title="鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�" name="4" > - <el-table v-loading="loading" :data="certificateList" @selection-change="handleSelectionChange"> + <el-collapse-item title="鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�" name="4"> + <el-table v-loading="loading" :data="certificateList" @selection-change="handleSelectionChange" + :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> <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" /> @@ -330,8 +309,9 @@ </el-table-column> </el-table> </el-collapse-item> - <el-collapse-item title="鍑哄浗锛堝锛夋儏鍐�" name="5" > - <el-table v-loading="loading" :data="AbroadList" @selection-change="handleSelectionChange"> + <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="destination" sortable width="350" align="center" /> <el-table-column label="浜嬬敱锛堟梾娓搞�佽蛋璁裤�佹帰浜层�佺户鎵胯储浜с�佸叾浠栵級" prop="cause" sortable width="400" align="center" /> @@ -347,28 +327,35 @@ </el-container> <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick" v-loading="loading" :data="AutobiographyList" @selection-change="handleSelectionChange"> - <!-- <el-tab-pane label="鎬昏" name="0">--> - - <!-- </el-tab-pane>--> - <!-- <div :model="AutobiographyList">--> - <el-tab-pane label="0~3宀�(濠村効鏈�)" name="1" > - <el-input v-model="AutobiographyList.content" prop="content" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> - </el-input> + <el-tab-pane v-for="item in AutobiographyList" :key="item.id" :label="item.label" :name="item.id"> + <div v-if="item.id === '1'"> + // 鏄剧ず涓巌d涓�1鐨勫瓧鍏搁」鐩稿叧鐨勫唴瀹� + </div> + <div v-else-if="item.id === '2'"> + // 鏄剧ず涓巌d涓�2鐨勫瓧鍏搁」鐩稿叧鐨勫唴瀹� + </div> + <div v-else> + // 鏄剧ず涓庡叾浠栧瓧鍏搁」鐩稿叧鐨勫唴瀹� + </div> </el-tab-pane> - <el-tab-pane label="6~12(灏忓)" name="2" ></el-tab-pane> - <el-tab-pane label="12~15(鍒濅腑)" name="3"></el-tab-pane> - <el-tab-pane label="15~18(楂樹腑)" name="4"></el-tab-pane> - <el-tab-pane label="18~22(澶у)" name="5"></el-tab-pane> - <el-tab-pane label="22~25(鐮旂┒鐢�)" name="6"></el-tab-pane> - <el-tab-pane label="26~ (宸ヤ綔)" name="7"></el-tab-pane> - <el-tab-pane label="锛熷瞾缁撳" name="8"></el-tab-pane> - <!-- </div>--> - <!-- <el-tab-pane--> - <!-- v-for="(item, index) in AutobiographyTermList"--> - <!-- :key="index"--> - <!-- :name="item"--> - <!-- :label="item"--> - <!-- />--> +<!-- <el-tab-pane label="0~3宀�(濠村効鏈�)" name="1" >--> +<!--<!– <el-input v-model="AutobiographyList.content" prop="content" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">–>--> +<!--<!– </el-input>–>--> +<!-- </el-tab-pane>--> +<!-- <el-tab-pane label="6~12(灏忓)" name="2" ></el-tab-pane>--> +<!-- <el-tab-pane label="12~15(鍒濅腑)" name="3"></el-tab-pane>--> +<!-- <el-tab-pane label="15~18(楂樹腑)" name="4"></el-tab-pane>--> +<!-- <el-tab-pane label="18~22(澶у)" name="5"></el-tab-pane>--> +<!-- <el-tab-pane label="22~25(鐮旂┒鐢�)" name="6"></el-tab-pane>--> +<!-- <el-tab-pane label="26~ (宸ヤ綔)" name="7"></el-tab-pane>--> +<!-- <el-tab-pane label="锛熷瞾缁撳" name="8"></el-tab-pane>--> +<!-- <!– </div>–>--> +<!-- <!– <el-tab-pane–>--> +<!-- <!– v-for="(item, index) in AutobiographyTermList"–>--> +<!-- <!– :key="index"–>--> +<!-- <!– :name="item"–>--> +<!-- <!– :label="item"–>--> +<!-- <!– />–>--> </el-tabs> @@ -381,6 +368,30 @@ :limit.sync="queryParams.pageSize" @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-item> + <el-form-item label="涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" prop="content"> + <el-input v-model="formDat.content" placeholder="璇疯緭鍏ヤ富瑕佸涔犵粡鍘嗐�佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" clearable :style="{width: '100%'}" > + </el-input> + </el-form-item> + <el-form-item label="璇佹槑浜�" prop="witness"> + <el-input v-model="formDat.witness" 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="submitForm">淇� 瀛�</el-button> + <el-button @click="cancelData">鍙� 娑�</el-button> + </div> + </el-dialog> @@ -404,9 +415,10 @@ getAutobiographyList, getAutobiographyTermList, getCertificateList -} from '../../api/self' +} from "@/api/self/index" import { delFamilyevent, uploadPic } from '../../api/bignote' import { blobValidate } from '../../utils/ruoyi' +import {getCategory} from "@/api/self/index"; export default { name: "show", @@ -447,6 +459,7 @@ //涓汉鑷紶 activeName: '0', AutobiographyList:[], + content1:'', //涓嶅悓鏃舵涓汉鑷紶 // AutobiographyTermList:[], // // 璁块棶鍚庡彴鐨勬暟鎹� @@ -484,8 +497,8 @@ ], dsb:true, btn:false, - - + isShow:true, + isShow_2:false, formDat: { //涓汉鍩烘湰淇℃伅 nickName:undefined, @@ -643,44 +656,24 @@ console.log(val); }, - // edit(row){ - // const id= row.id; - // this.reset(); - // this.title='缂栬緫涓汉淇℃伅'; - // this.$router.push('/self/self/edit/' + id); - // }, //涓汉鑷紶 handleClick(tab, event) { // console.log(tab, event); this.getAutobiographyInfor(); - if(tab.name == 0) { + }, + + //闅旇鍙樿壊 + tableRowClassName({ row, rowIndex }) { + if (rowIndex % 2 == 0) { + return "statistics-warning-row1"; + } else { + return "statistics-warning-row"; } - - //鏍规嵁涓嶅悓鏃舵鐨勪釜浜鸿嚜浼� - getAutobiographyTermList(this.queryParams).then(response => { - // alert(123) - // console.log(response.data) - this.AutobiographyTermList = response.data; - this.total = response.data.total; - this.loading = false; - }); - - getAutobiographyList(this.queryParams).then(response => { - // alert(123) - // console.log(response.data) - this.AutobiographyList = response.data; - this.total = response.data.total; - this.loading = false; - }); }, - - /** 鏌ヨ瑙掕壊鍒楄〃 */ - - getList() { this.loading = true; // console.log(this.queryParams) @@ -730,7 +723,22 @@ this.loading = false; } ); - + //鏌ヨ涓汉鎵�鏈夎嚜浼� + getAutobiographyList(this.queryParams).then(response => { + // alert(123) + // console.log(response.data) + this.AutobiographyList = response.data; + this.total = response.data.total; + this.loading = false; + }); + //鏍规嵁涓嶅悓鏃舵鐨勪釜浜鸿嚜浼� + getAutobiographyTermList(this.queryParams).then(response => { + // alert(123) + // console.log(response.data) + this.AutobiographyTermList = response.data; + this.total = response.data.total; + this.loading = false; + }); }, @@ -755,14 +763,14 @@ let uls = this.fileListOther.map(function (elem){ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") }).join(",") - this.formData.url = ul+","+uls + this.formDat.url = ul+","+uls this.$refs['elForm'].validate(valid => { if (valid) { - if (this.formData.id != undefined) { - updateIndividual(this.formData).then(response => { + if (this.formDat.id != undefined) { + updateIndividual(this.formDat).then(response => { this.$modal.msgSuccess("淇敼鎴愬姛"); // this.open = false; this.btn=false @@ -846,7 +854,7 @@ alert(23) }, handleRemove(file) { - alert("鎿嶄綔鎴愬姛") + alert("323") }, handlePictureCardPreview(file) { this.dialogImageUrl = file.url; @@ -866,18 +874,26 @@ saveAs(blob, filename) }) }, - //缂栬緫鎸夐挳 + // 缂栬緫鎸夐挳 handleEdit() { this.dsb = false this.btn = true + this.isShow=false + this.isShow_2=true }, - + //淇敼鎸夐挳 + /** 淇敼鎸夐挳鎿嶄綔 */ + handleAdd() { + this.reset(); + this.open = true; + this.title = "淇敼璇︾粏淇℃伅"; + }, /** 鏌ヨ鑷紶淇℃伅 */ getAutobiographyInfor() { let _this = this - getAutobiography().then(response=>{ + getCategory().then(response=>{ response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{ _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]}) @@ -958,7 +974,7 @@ }; </script> -<style scoped> +<style > /*.uoloadSty {*/ /* width:110px;*/ /* height:110px;*/ @@ -972,8 +988,20 @@ } .el-icon-top { - background: url("../../assets/icons/top.png"); + background: no-repeat center url("../../assets/icons/top.png"); } +.el-table__row.statistics-warning-row { + background: #E0EEFE; +} +.el-table__row.statistics-warning-row1 { + background: #FFEFF2; +} +/*.co-item{*/ +/* background-color: #EBAFB4;*/ +/*}*/ +.el-collapse-item__header { + background-color:#FEF7FC; +} </style> -- Gitblit v1.9.1