cnlive_project / cnlive-community-web-vue · Commits

Commit a8fe69d3a91a89425d1c5bf10498cbef08926158

Authored by 张红振
2 parents 5511ac9b c467f919

Merge branch 'dev' of http://bj.gitlab.cnlive.com/cnlive_project/cnlive-community-web-vue into dev

Inline Side-by-side
Showing 2 changed files with 29 additions and 29 deletions
src/views/event/feedback/index.vue
  View file @a8fe69d
... ... @@ -123,6 +123,14 @@ onMounted(() => {
123 123 <!-- <h1>活动评价</h1> -->
124 124 <el-row style="padding-bottom: 20px">
125 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 134 <el-form-item label="时间">
127 135 <el-date-picker
128 136 v-model="value1"
... ... @@ -136,14 +144,6 @@ onMounted(() =&gt; {
136 144 >
137 145 </el-date-picker>
138 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 147 <el-form-item>
148 148 <el-button type="primary" @click="getList">查询</el-button>
149 149 <el-button
... ... @@ -182,7 +182,7 @@ onMounted(() =&gt; {
182 182 @selection-change="handleSelectionChange"
183 183 >
184 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 186 <el-table-column
187 187 prop="handworkName"
188 188 label="活动名称"
... ...
src/views/event/handwork/index.vue
  View file @a8fe69d
... ... @@ -170,18 +170,13 @@ onMounted(() =&gt; {
170 170 <!-- <h1>手工活动</h1> -->
171 171 <el-row style="padding-bottom: 20px">
172 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 180 </el-form-item>
186 181 <el-form-item label="活动状态">
187 182 <el-select
... ... @@ -197,13 +192,18 @@ onMounted(() =&gt; {
197 192 ></el-option>
198 193 </el-select>
199 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 207 </el-form-item>
208 208 <el-form-item>
209 209 <el-button type="primary" @click="getList">查询</el-button>
... ... @@ -221,7 +221,7 @@ onMounted(() =&gt; {
221 221 align="center"
222 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 225 <el-table-column
226 226 prop="name"
227 227 label="活动名称"
... ...