Commit c467f9199e7a14d274184c92def9d67525ad2e89
1 parent
108d96ac
查询项顺序调整
Showing
2 changed files
with
29 additions
and
29 deletions
src/views/event/feedback/index.vue
| @@ -123,6 +123,14 @@ onMounted(() => { | @@ -123,6 +123,14 @@ onMounted(() => { | ||
| 123 | <!-- <h1>活动评价</h1> --> | 123 | <!-- <h1>活动评价</h1> --> |
| 124 | <el-row style="padding-bottom: 20px"> | 124 | <el-row style="padding-bottom: 20px"> |
| 125 | <el-form :inline="true" label-width="70px"> | 125 | <el-form :inline="true" label-width="70px"> |
| 126 | + <el-form-item label="名称"> | ||
| 127 | + <el-input | ||
| 128 | + v-model.trim="data.params.query.handworkName" | ||
| 129 | + placeholder="请填写名称" | ||
| 130 | + maxlength="15" | ||
| 131 | + @change="getList" | ||
| 132 | + /> | ||
| 133 | + </el-form-item> | ||
| 126 | <el-form-item label="时间"> | 134 | <el-form-item label="时间"> |
| 127 | <el-date-picker | 135 | <el-date-picker |
| 128 | v-model="value1" | 136 | v-model="value1" |
| @@ -136,14 +144,6 @@ onMounted(() => { | @@ -136,14 +144,6 @@ onMounted(() => { | ||
| 136 | > | 144 | > |
| 137 | </el-date-picker> | 145 | </el-date-picker> |
| 138 | </el-form-item> | 146 | </el-form-item> |
| 139 | - <el-form-item label="名称"> | ||
| 140 | - <el-input | ||
| 141 | - v-model.trim="data.params.query.handworkName" | ||
| 142 | - placeholder="请填写名称" | ||
| 143 | - maxlength="15" | ||
| 144 | - @change="getList" | ||
| 145 | - /> | ||
| 146 | - </el-form-item> | ||
| 147 | <el-form-item> | 147 | <el-form-item> |
| 148 | <el-button type="primary" @click="getList">查询</el-button> | 148 | <el-button type="primary" @click="getList">查询</el-button> |
| 149 | <el-button | 149 | <el-button |
| @@ -182,7 +182,7 @@ onMounted(() => { | @@ -182,7 +182,7 @@ onMounted(() => { | ||
| 182 | @selection-change="handleSelectionChange" | 182 | @selection-change="handleSelectionChange" |
| 183 | > | 183 | > |
| 184 | <el-table-column type="selection" align="center" /> | 184 | <el-table-column type="selection" align="center" /> |
| 185 | - <!-- <el-table-column prop="id" label="ID" align="center"></el-table-column> --> | 185 | + <el-table-column prop="id" label="ID" align="center"></el-table-column> |
| 186 | <el-table-column | 186 | <el-table-column |
| 187 | prop="handworkName" | 187 | prop="handworkName" |
| 188 | label="活动名称" | 188 | label="活动名称" |
src/views/event/handwork/index.vue
| @@ -170,18 +170,13 @@ onMounted(() => { | @@ -170,18 +170,13 @@ onMounted(() => { | ||
| 170 | <!-- <h1>手工活动</h1> --> | 170 | <!-- <h1>手工活动</h1> --> |
| 171 | <el-row style="padding-bottom: 20px"> | 171 | <el-row style="padding-bottom: 20px"> |
| 172 | <el-form :inline="true" label-width="70px"> | 172 | <el-form :inline="true" label-width="70px"> |
| 173 | - <el-form-item label="活动时间"> | ||
| 174 | - <el-date-picker | ||
| 175 | - v-model="value1" | ||
| 176 | - type="datetimerange" | ||
| 177 | - range-separator="至" | ||
| 178 | - format="YYYY-MM-DD HH:mm:ss" | ||
| 179 | - value-format="YYYY-MM-DD HH:mm:ss" | ||
| 180 | - start-placeholder="开始时间" | ||
| 181 | - end-placeholder="结束时间" | ||
| 182 | - @change="handleTimeChange" | ||
| 183 | - > | ||
| 184 | - </el-date-picker> | 173 | + <el-form-item label="名称"> |
| 174 | + <el-input | ||
| 175 | + v-model.trim="data.params.query.name" | ||
| 176 | + placeholder="请填写名称" | ||
| 177 | + maxlength="15" | ||
| 178 | + @change="getList" | ||
| 179 | + /> | ||
| 185 | </el-form-item> | 180 | </el-form-item> |
| 186 | <el-form-item label="活动状态"> | 181 | <el-form-item label="活动状态"> |
| 187 | <el-select | 182 | <el-select |
| @@ -197,13 +192,18 @@ onMounted(() => { | @@ -197,13 +192,18 @@ onMounted(() => { | ||
| 197 | ></el-option> | 192 | ></el-option> |
| 198 | </el-select> | 193 | </el-select> |
| 199 | </el-form-item> | 194 | </el-form-item> |
| 200 | - <el-form-item label="名称"> | ||
| 201 | - <el-input | ||
| 202 | - v-model.trim="data.params.query.name" | ||
| 203 | - placeholder="请填写名称" | ||
| 204 | - maxlength="15" | ||
| 205 | - @change="getList" | ||
| 206 | - /> | 195 | + <el-form-item label="活动时间"> |
| 196 | + <el-date-picker | ||
| 197 | + v-model="value1" | ||
| 198 | + type="datetimerange" | ||
| 199 | + range-separator="至" | ||
| 200 | + format="YYYY-MM-DD HH:mm:ss" | ||
| 201 | + value-format="YYYY-MM-DD HH:mm:ss" | ||
| 202 | + start-placeholder="开始时间" | ||
| 203 | + end-placeholder="结束时间" | ||
| 204 | + @change="handleTimeChange" | ||
| 205 | + > | ||
| 206 | + </el-date-picker> | ||
| 207 | </el-form-item> | 207 | </el-form-item> |
| 208 | <el-form-item> | 208 | <el-form-item> |
| 209 | <el-button type="primary" @click="getList">查询</el-button> | 209 | <el-button type="primary" @click="getList">查询</el-button> |
| @@ -221,7 +221,7 @@ onMounted(() => { | @@ -221,7 +221,7 @@ onMounted(() => { | ||
| 221 | align="center" | 221 | align="center" |
| 222 | element-loading-text="拼命加载中" | 222 | element-loading-text="拼命加载中" |
| 223 | > | 223 | > |
| 224 | - <!-- <el-table-column prop="id" label="ID" align="center"></el-table-column> --> | 224 | + <el-table-column prop="id" label="ID" align="center"></el-table-column> |
| 225 | <el-table-column | 225 | <el-table-column |
| 226 | prop="name" | 226 | prop="name" |
| 227 | label="活动名称" | 227 | label="活动名称" |