From 850618a035d9999cf60d77dafd6da8a09f36a1fe Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期二, 06 五月 2025 18:32:07 +0800 Subject: [PATCH] 修改了对应文件 --- ruoyi-ui/src/views/search/index.vue | 96 ++++++++++++++++++++++++++++++------------------ 1 files changed, 60 insertions(+), 36 deletions(-) diff --git a/ruoyi-ui/src/views/search/index.vue b/ruoyi-ui/src/views/search/index.vue index 4a55a9a..f99cc28 100644 --- a/ruoyi-ui/src/views/search/index.vue +++ b/ruoyi-ui/src/views/search/index.vue @@ -15,7 +15,7 @@ <el-form-item label="鏃堕棿" prop="happenTime"> <el-date-picker v-model="dateRange" - style="width: 197px; + style="width: 240px; height: 30px; background: #FFFFFF; border-radius: 14px 14px 14px 14px; @@ -30,7 +30,7 @@ </el-form-item> <el-form-item> - <el-button size="mini" @click="getList" style=" width: 67px;height: 27px;background: #FFDDE3; + <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> @@ -47,14 +47,20 @@ <template slot-scope="scope">{{scope.row.ctTableName? scope.row.ctTableName: '鈥斺�斺�斺��'}}</template> <!-- <template slot-scope="scope">{{ getSrc1(scope.row.type) }}</template>--> </el-table-column> - <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 label=" " prop="by1" sortable width="120" align="center" > + <template slot-scope="scope">{{scope.row.by1? scope.row.by1: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="鏃堕棿" prop="getDate" sortable width="170" align="center" > - <template slot-scope="scope">{{scope.row.getDate? scope.row.getDate: '鈥斺�斺�斺��'}}</template> + <el-table-column label=" " prop="by2" sortable width="170" align="center" > + <template slot-scope="scope">{{scope.row.by2? scope.row.by2: '鈥斺�斺�斺��'}}</template> </el-table-column> - <el-table-column label="浣嶇疆" prop="by5" sortable width="170" align="center" > - <template slot-scope="scope">{{scope.row.by5 ? scope.row.by5: '鈥斺�斺�斺��'}}</template> + <el-table-column label=" " prop="by3" sortable width="170" align="center" > + <template slot-scope="scope">{{scope.row.by3 ? scope.row.by3: '鈥斺�斺�斺��'}}</template> + </el-table-column> + <el-table-column label=" " prop="by4" sortable width="170" align="center" > + <template slot-scope="scope">{{scope.row.by4? scope.row.by4: '鈥斺�斺�斺��'}}</template> + </el-table-column> + <el-table-column label=" " prop="by6" sortable width="170" align="center" > + <template slot-scope="scope">{{scope.row.by6 ? scope.row.by6: '鈥斺�斺�斺��'}}</template> </el-table-column> <!-- </el-table-column>--> @@ -136,9 +142,15 @@ formDat: { ctTableName:undefined, createTime:undefined, + by1:undefined, + by2:undefined, + by3:undefined, + by4:undefined, by5:undefined, + by6:undefined, remark:undefined, - + location:undefined, + ctId:undefined }, // 鏌ヨ鍙傛暟 queryParams: { @@ -187,7 +199,6 @@ } ); }, - // 鍙栨秷鎸夐挳 cancel() { this.open = false; @@ -222,20 +233,23 @@ deptCheckStrictly: true, remark: undefined }; - this.resetForm("form"); + this.resetForm("elForm"); }, /** 鎼滅储鎸夐挳鎿嶄綔 */ handleQuery() { this.queryParams.pageNum = 1; - this.getList(); + if(this.keyword!=''||this.dateRange.length!=0) + this.getList(); }, /** 閲嶇疆鎸夐挳鎿嶄綔 */ resetQuery() { this.dateRange = []; this.keyword = ''; - this.getList(); + this.queryParams.pageNum = 1; + this.searchList = [] + // this.getList(); }, // 澶氶�夋閫変腑鏁版嵁 handleSelectionChange(selection) { @@ -244,33 +258,43 @@ this.single = selection.length!=1 this.multiple = !selection.length }, - // //姣忔鏀瑰彉input妗嗗�兼椂灏辨敼鍙榯his.myTableData鐨勫�� - // inputChange() { //寰幆姣忎竴椤� 鍙content鐨勫�煎惈鏈夎緭鍏ョ殑searchVal鍊硷紝灏卞姞杩沶ewList锛涘弽涔嬶紝灏辨棤涓滆タ鍔犺繘newList - // let newlist = this.formDat.filter( - // (item) => item.content.indexOf(this.searchVal) > -1 - // ); - // this.contactList = newlist; - // }, - - /** 鏌ョ湅璇︾粏淇℃伅 */ handleCheck(row){ - const id = row.id; - this.$router.push("/self/Honor/honorInfo/" + id); - }, - /** 淇敼鎸夐挳鎿嶄綔 */ - handleUpdate(row) { - const id = row.id; - let jd = true + // const id = row.id; + console.log(row.by5 +'/' + row.ctId); + var path = row.by5 + if (row.by5=="/family/zfEvent" ){ //瀹跺ぇ浜嬭 + path = "/familymodel/bignote/familyeventInfo/" - this.$router.push({ - path:"/self/Honor/honorInfo/" + id, - query:{ - detail:jd - } - }); - }, + }else if(row.by5=="/family/zfProperty"){//瀹跺涵璧勪骇绠$悊 + path ="/familymodel/property/propertyInfo/" + }else if(row.by5=="/family/zfEquipment"){//瀹跺涵璁惧 + path ="/familymodel/Device/equipmentInfo/" + + }else if(row.by5=="/family/zfCollection"){//鏀惰棌鍜岃崳瑾� + path = "/familymodel/collection/collectionInfo/" + + }else if(row.by5=="/family/zfDoctor"){//瀹跺涵灏忓尰鐢� + path ="/familymodel/Doctor/doctorInfo/" + + }else if(row.by5=="/family/zfClean"){ // 淇濇磥鏀剁撼 -----------鏈夐棶棰�----宸茶В鍐� + path = "/familymodel/clean/cleanInfo/" + + }else if(row.by5=="/family/zfContact"){ //閫氳褰� + path ="/familymodel/Contact/contactsInfo/" + + }else if(row.by5=="/familymodel/zfPet"){ // 榄呭疇 + path = "/familymodel/pet/petInfo/" + + }else if(row.by5=="/family/zfEconomy"){ // 瀹跺涵鏀舵敮鍙拌处 + path = "/familymodel/economy/economyInfo/" + } + + this.$router.push(path + row.ctId); + + + }, }, -- Gitblit v1.9.1