From 7fc578dc2032fac935267e92208f7f11384e3800 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 28 十一月 2024 08:36:36 +0800
Subject: [PATCH] 修改了相关bug
---
ruoyi-ui/src/views/search/index.vue | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/ruoyi-ui/src/views/search/index.vue b/ruoyi-ui/src/views/search/index.vue
index f7283a8..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,7 +142,12 @@
formDat: {
ctTableName:undefined,
createTime:undefined,
+ by1:undefined,
+ by2:undefined,
+ by3:undefined,
+ by4:undefined,
by5:undefined,
+ by6:undefined,
remark:undefined,
location:undefined,
ctId:undefined
@@ -222,19 +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) {
@@ -263,7 +278,7 @@
}else if(row.by5=="/family/zfDoctor"){//瀹跺涵灏忓尰鐢�
path ="/familymodel/Doctor/doctorInfo/"
- }else if(row.by5=="/family/zfClea"){ // 淇濇磥鏀剁撼 -----------鏈夐棶棰�
+ }else if(row.by5=="/family/zfClean"){ // 淇濇磥鏀剁撼 -----------鏈夐棶棰�----宸茶В鍐�
path = "/familymodel/clean/cleanInfo/"
}else if(row.by5=="/family/zfContact"){ //閫氳褰�
--
Gitblit v1.9.1