Merge pull request #8889 from ulleo/dev

fix(X-Pack): 修复数据填>我的填报列表查询过滤错误的问题

core/backend/src/main/java/io/dataease/ext/ExtDataFillFormMapper.xml

@@ -219,7 +219,7 @@
                 AND t3.`name` LIKE CONCAT('%',#{taskName},'%')
             </if>
         </where>
-        ORDER BY t1.end_time DESC, t1.start_time
+        ORDER BY t1.end_time, t1.start_time
     </select>
 
     <select id="listFinishedUserTask" resultMap="BaseResultMapUserTaskDTO">

core/frontend/src/views/dataFilling/form/CreateTask.vue

@@ -126,7 +126,7 @@
                 style="padding-top: 28px; padding-bottom: 0"
               >
                 <span
-                  class="perfix"
+                  class="prefix"
                   style="margin-bottom: 28px; "
                 >任务下发时间</span>
                 <el-form-item
@@ -149,7 +149,7 @@
                 style="padding-top: 0; padding-bottom: 0"
               >
                 <span
-                  class="perfix"
+                  class="prefix"
                   style="margin-bottom: 28px"
                 >填报截止时间</span>
                 <el-form-item
@@ -218,7 +218,7 @@
                 <span class="tail">{{ $t('cron.every_exec') }}</span>
               </div>
               <div class="rate-type-time second-row">
-                <span class="perfix">在任务下发</span>
+                <span class="prefix">在任务下发</span>
                 <el-input-number
                   v-model.number="form.publishRangeTime"
                   class="w140"
@@ -930,7 +930,7 @@ export default {
     width: 160px !important;
   }
 
-  .perfix {
+  .prefix {
     font-family: PingFang SC;
     font-size: 14px;
     font-weight: 400;

core/frontend/src/views/dataFilling/myTask/index.vue

@@ -52,6 +52,24 @@ export default {
       }
     }
   },
+  watch: {
+    currentKey: {
+      handler(newVal, oldVla) {
+        if (newVal !== oldVla) {
+          this.myTaskName = ''
+          this.finishedTaskName = ''
+          this.expiredTaskName = ''
+        }
+        if (newVal === 'finished') {
+          this.searchTableFinishedTaskData()
+        } else if (newVal === 'expired') {
+          this.searchTableExpiredTaskData()
+        } else {
+          this.searchTableMyTaskData()
+        }
+      }
+    }
+  },
   mounted() {
     this.currentKey = 'todo'
     this.searchTableMyTaskData()
@@ -62,12 +80,17 @@ export default {
     },
     changeKey(key) {
       this.currentKey = key
-      if (key === 'finished') {
-        this.searchTableFinishedTaskData()
-      } else if (key === 'expired') {
-        this.searchTableExpiredTaskData()
+    },
+    entryKey(type) {
+      if (type === 'finished') {
+        this.$refs.search2.focus()
+        this.$refs.search2.blur()
+      } else if (type === 'expired') {
+        this.$refs.search3.focus()
+        this.$refs.search3.blur()
       } else {
-        this.searchTableMyTaskData()
+        this.$refs.search1.focus()
+        this.$refs.search1.blur()
       }
     },
     searchTableMyTaskData() {
@@ -348,7 +371,7 @@ export default {
               :offset="16"
             >
               <el-input
-                ref="search"
+                ref="search1"
                 v-model="myTaskName"
                 :placeholder="$t('commons.search_by_name')"
                 prefix-icon="el-icon-search"
@@ -356,7 +379,8 @@ export default {
                 size="small"
                 clearable
                 @blur="searchTableMyTaskData"
-                @clear="searchTableMyTaskData"
+                @clear="entryKey('todo')"
+                @keyup.enter.native="entryKey('todo')"
               />
             </el-col>
           </el-row>
@@ -440,15 +464,16 @@ export default {
               :offset="16"
             >
               <el-input
-                ref="search"
+                ref="search2"
                 v-model="finishedTaskName"
                 :placeholder="$t('commons.search_by_name')"
                 prefix-icon="el-icon-search"
                 class="name-email-search"
                 size="small"
                 clearable
-                @blur="searchTableMyTaskData"
-                @clear="searchTableMyTaskData"
+                @blur="searchTableFinishedTaskData"
+                @clear="entryKey('finished')"
+                @keyup.enter.native="entryKey('finished')"
               />
             </el-col>
           </el-row>
@@ -529,15 +554,16 @@ export default {
               :offset="16"
             >
               <el-input
-                ref="search"
+                ref="search3"
                 v-model="expiredTaskName"
                 :placeholder="$t('commons.search_by_name')"
                 prefix-icon="el-icon-search"
                 class="name-email-search"
                 size="small"
                 clearable
-                @blur="searchTableMyTaskData"
-                @clear="searchTableMyTaskData"
+                @blur="searchTableExpiredTaskData"
+                @clear="entryKey('expired')"
+                @keyup.enter.native="entryKey('expired')"
               />
             </el-col>
           </el-row>