From 65ef66fb1ea61a450cb75e206a3a4784794868e6 Mon Sep 17 00:00:00 2001 From: Tcsm <1377977403@qq.com> Date: 星期二, 30 五月 2023 22:45:06 +0800 Subject: [PATCH] 1.将通讯录的”成员姓名“改成”家人姓名“ 2.修改成长经历阅历几处新增的bug --- ruoyi-ui/src/views/collection/index.vue | 246 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 186 insertions(+), 60 deletions(-) diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue index aa06d9f..5ebd0d9 100644 --- a/ruoyi-ui/src/views/collection/index.vue +++ b/ruoyi-ui/src/views/collection/index.vue @@ -60,28 +60,34 @@ range-separator="-" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" + @keyup.enter.native="handleQuery" ></el-date-picker> </el-form-item> - <el-form-item label="绫诲埆" prop="type" > - <el-input + <el-form-item label="绫诲埆" prop="type"> + <el-select v-model="queryParams.type" - placeholder="璇疯緭鍏ョ被鍒�" + placeholder="鎵�鏈夌被鍒�" clearable style="width: 240px" - @keyup.enter.native="handleQuery"> - <i slot="prefix" class="el-input__icon el-icon-search"></i> - </el-input> + @keyup.enter.native="handleQuery" + > + <el-option + v-for="item in typeOptions" + :key="item.value" + :label="item.label" + :value="item.value" + /> + </el-select> </el-form-item> <el-cntainer> <el-col :span="9" > <el-form-item> - <el-button type="primary" icon="el-icon-search" size="mini" style=" width: 65px; height: 32px;background: #FFDDE3; - border-radius: 6px 6px 6px 6px;opacity:1; " @click="handleQuery">鎼滅储</el-button> - <el-button icon="el-icon-refresh" size="mini" style=" width: 65px; height: 32px;background: #FFDDE3; - border-radius: 6px 6px 6px 6px;opacity:1; " @click="resetQuery">閲嶇疆</el-button> - + <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3; + border-radius: 7px 7px 7px 7px;opacity: 1; " >鎼滅储</el-button> + <el-button size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3; + border-radius: 7px 7px 7px 7px;opacity: 1; ">閲嶇疆</el-button> </el-form-item> </el-col> </el-cntainer> @@ -109,14 +115,14 @@ </el-form> <div> - <div style="width: 100px; - height: 24px; - font-size: 18px; - font-family: Microsoft YaHei-Regular, Microsoft YaHei; - font-weight: 400; - color: #000000; - line-height: 21px; - ">鏀惰棌鍜岃崳瑾�</div> +<!-- <div style="width: 100px;--> +<!-- 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"> @@ -151,46 +157,83 @@ 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="handleExportModel" + 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-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 v-loading="loading" :data="collectionList" :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" :reserve-selection="true" width="25" align="center" /> + <el-table-column fixed 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> - <el-table-column label="绫诲埆" prop="type" sortable :show-overflow-tooltip="true" width="90" align="center"> - <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template> + <el-table-column label="绫诲埆" prop="type" sortable width="120" align="center"> + <template slot-scope="scope">{{ getSrc(scope.row.type) }}</template> +<!-- <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>--> </el-table-column> - <el-table-column label="鍚嶇О" prop="name" sortable :show-overflow-tooltip="true" width="90" align="center" > + <el-table-column label="鍚嶇О" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center" > <template slot-scope="scope">{{scope.row.name? scope.row.name: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="鏉ユ簮" prop="source" sortable width="90" align="center" > + <el-table-column label="鏉ユ簮" prop="source" sortable width="120" align="center" > <template slot-scope="scope">{{scope.row.source? scope.row.source: '鈥斺�斺�斺��'}}</template> </el-table-column> + <el-table-column label="鎷ユ湁鑰�" prop="owner" sortable width="110" align="center"> + <template slot-scope="scope">{{scope.row.owner? scope.row.owner: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="浠峰��" prop="price" sortable width="90" align="center"> + <el-table-column label="浠峰��" prop="price" sortable width="120" align="center"> <template slot-scope="scope">{{scope.row.price? scope.row.price: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="瀛樻斁浣嶇疆" prop="location" sortable width="130" align="center"> + <el-table-column label="瀛樻斁浣嶇疆" prop="location" sortable width="160" 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"> -<!-- <el-image style="width: 100px; height: 100px" :src="'http://47.93.189.255:8080/'+ scope.row.url" fit="cover"></el-image>--> - <span v-if= "scope.row.url ==null" ><img src="../../assets/images/鏂囦欢澶�-0.png" /></span> - - <span v-else><img src="../../assets/images/鏂囦欢澶�-1.png" /></span> - - </template> - </el-table-column> - - - <el-table-column label="澶囨敞" prop="remark" sortable width="140" align="center"> + <el-table-column label="澶囨敞" prop="remark" sortable width="90" align="center"> <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template> + </el-table-column> + <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="180" align="center"> + + <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> <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" > <template slot-scope="scope" v-if="scope.row.roleId !== 1"> @@ -217,6 +260,7 @@ type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)" + >鏌ョ湅璇︽儏</el-button> </el-dropdown> @@ -229,6 +273,7 @@ :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" + style="background: #FEF7FC;" @pagination="getList" /> @@ -239,11 +284,11 @@ <el-input v-model="formDat.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" ></el-input> </el-form-item> <el-form-item label="绫诲埆" prop="type"> - <el-input v-model="formDat.type" placeholder="璇疯緭鍏ョ被鍒�" clearable :style="{width: '100%'}" > - </el-input> + <el-select v-model="formDat.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" > + <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="name"> <el-input v-model="formDat.name" placeholder="璇疯緭鍏ュ悕绉�" clearable :style="{width: '100%'}" > </el-input> @@ -349,7 +394,9 @@ //瀵煎叆鎺ュ彛鍑芥暟 -import {listCollection, getCollection, addCollection,updateCollection, delCollection,uploadPic} from "@/api/collection/index"; +import {listCollection, getCollection, addCollection,updateCollection, delCollection,uploadPic,downloadModel} from "@/api/collection/index"; +import {enload} from "@/api/doctor"; +import {Message} from "element-ui"; export default { @@ -457,7 +504,7 @@ }], owner: [{ required: true, - message: '璇疯緭鍏ユ嫢鏈夎��', + message: '璇疯緭鍏ユ寔鏈夎��', trigger: 'blur' }], price: [{ @@ -477,12 +524,35 @@ trigger: 'blur' }], }, - typeOptions: [], + typeOptions: [ + { + value: '閭エ', + label: '閭エ' + }, { + value: '鏃ユ湰鍐涘垁', + label: '鏃ユ湰鍐涘垁' + }, { + value: '鑼呭彴閰�', + label: '鑼呭彴閰�' + }, { + value: '绾㈡湪', + label: '绾㈡湪' + }, { + value: '绾康鍝�', + label: '绾康鍝�' + }, { + value: '鐡峰櫒', + label: '鐡峰櫒' + }, { + value: '涔︾睄', + label: '涔︾睄' + } + ], }; }, created() { this.getList(); - // this.getCateInfor() + this.getCateInfor() // for (let i = 0; i < this.contactList.length; i++) { // this.formDat[i] = this.contactList[i]; // } @@ -493,7 +563,10 @@ this.open = false; this.reset(); }, - + getRowId(row) + { + return row.id + }, //闅旇鍙樿壊 tableRowClassName({ row, rowIndex }) { if (rowIndex % 2 == 0) { @@ -518,17 +591,36 @@ ); }, /** 鏌ヨ绫诲埆淇℃伅 */ - // 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(type) { + if (type === '閭エ') { + return '閭エ' + }else if(type === '鏃ユ湰鍐涘垁'){ + return '鏃ユ湰鍐涘垁' + }else if(type === '鑼呭彴閰�'){ + return '鑼呭彴閰�' + }else if(type === '绾㈡湪'){ + return '绾㈡湪' + }else if(type === '绾康鍝�'){ + return '绾康鍝�' + }else if(type === '鐡峰櫒'){ + return '鐡峰櫒' + }else if(type === '涔︾睄'){ + return '涔︾睄' + } else { + return '鍏跺畠' + } + }, handleRemove(file) { alert(323) }, @@ -602,6 +694,7 @@ handleCheck(row){ const id = row.id; this.$router.push("/familymodel/collection/collectionInfo/" + id); + }, /** 淇敼鎸夐挳鎿嶄綔 */ handleUpdate(row) { @@ -668,7 +761,7 @@ /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete(row) { const Ids = row.id || this.ids; - this.$modal.confirm('鏄惁纭鍒犻櫎缂栧彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() { + this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵').then(function() { return delCollection(Ids); }).then(() => { this.getList(); @@ -677,14 +770,47 @@ }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { + const Ids = this.ids; + + if(Ids.length==0) + { this.download('zfCollection/export', { ...this.queryParams }, `zfCollection_${new Date().getTime()}.xlsx`) + }else{ + this.download('zfCollection/export1/'+Ids, { + }, `zfCollection_${new Date().getTime()}.xlsx`) + } + }, + + /** 瀵煎叆妯℃澘涓嬭浇鎸夐挳鎿嶄綔 */ + handleExportModel() { + + this.download('/zfCollection/model', { + }, `zfCollection_model_${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' })}); + } } }; </script> <style> +.app-container{ + background-color: #FEF7FC; +} .el-table__row.statistics-warning-row { background: #E0EEFE; -- Gitblit v1.9.1