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

张红振
2 parents 5511ac9b c467f919
Showing 2 changed files with 29 additions and 29 deletions
src/views/event/feedback/index.vue
src/views/event/handwork/index.vue
@@ -123,6 +123,14 @@ onMounted(() =&gt; {
     <!-- <h1>活动评价</h1> -->
     <el-row style="padding-bottom: 20px">
       <el-form :inline="true" label-width="70px">
+        <el-form-item label="名称">
+          <el-input
+            v-model.trim="data.params.query.handworkName"
+            placeholder="请填写名称"
+            maxlength="15"
+            @change="getList"
+          />
+        </el-form-item>
         <el-form-item label="时间">
           <el-date-picker
             v-model="value1"
@@ -136,14 +144,6 @@ onMounted(() =&gt; {
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="名称">
-          <el-input
-            v-model.trim="data.params.query.handworkName"
-            placeholder="请填写名称"
-            maxlength="15"
-            @change="getList"
-          />
-        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="getList">查询</el-button>
           <el-button
@@ -182,7 +182,7 @@ onMounted(() =&gt; {
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" align="center" />
-      <!-- <el-table-column prop="id" label="ID" align="center"></el-table-column> -->
+      <el-table-column prop="id" label="ID" align="center"></el-table-column>
       <el-table-column
         prop="handworkName"
         label="活动名称"
@@ -170,18 +170,13 @@ onMounted(() =&gt; {
     <!-- <h1>手工活动</h1> -->
     <el-row style="padding-bottom: 20px">
       <el-form :inline="true" label-width="70px">
-        <el-form-item label="活动时间">
-          <el-date-picker
-            v-model="value1"
-            type="datetimerange"
-            range-separator="至"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            @change="handleTimeChange"
-          >
-          </el-date-picker>
+        <el-form-item label="名称">
+          <el-input
+            v-model.trim="data.params.query.name"
+            placeholder="请填写名称"
+            maxlength="15"
+            @change="getList"
+          />
         </el-form-item>
         <el-form-item label="活动状态">
           <el-select
@@ -197,13 +192,18 @@ onMounted(() =&gt; {
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="名称">
-          <el-input
-            v-model.trim="data.params.query.name"
-            placeholder="请填写名称"
-            maxlength="15"
-            @change="getList"
-          />
+        <el-form-item label="活动时间">
+          <el-date-picker
+            v-model="value1"
+            type="datetimerange"
+            range-separator="至"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            @change="handleTimeChange"
+          >
+          </el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="getList">查询</el-button>
@@ -221,7 +221,7 @@ onMounted(() =&gt; {
       align="center"
       element-loading-text="拼命加载中"
     >
-      <!-- <el-table-column prop="id" label="ID" align="center"></el-table-column> -->
+      <el-table-column prop="id" label="ID" align="center"></el-table-column>
       <el-table-column
         prop="name"
         label="活动名称"