diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index 87ef968d8..cffbba6a3 100755
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -843,7 +843,7 @@ class ProjectController extends AbstractController
* @apiName task__lists
*
* @apiParam {Object} [keys] 搜索条件
- * - keys.name: 任务名称
+ * - keys.name: ID、任务名称
*
* @apiParam {Number} [project_id] 项目ID
* @apiParam {Number} [parent_id] 主任务ID(project_id && parent_id ≤ 0 时 仅查询自己参与的任务)
@@ -897,7 +897,11 @@ class ProjectController extends AbstractController
$sorts = is_array($sorts) ? $sorts : [];
//
if ($keys['name']) {
- $builder->where("project_tasks.name", "like", "%{$keys['name']}%");
+ if (Base::isNumber($keys['name'])) {
+ $builder->where("project_tasks.id", intval($keys['name']));
+ } else {
+ $builder->where("project_tasks.name", "like", "%{$keys['name']}%");
+ }
}
//
$scopeAll = false;
diff --git a/resources/assets/js/pages/manage/components/ProjectPanel.vue b/resources/assets/js/pages/manage/components/ProjectPanel.vue
index 657bdaa67..b0bdc2909 100644
--- a/resources/assets/js/pages/manage/components/ProjectPanel.vue
+++ b/resources/assets/js/pages/manage/components/ProjectPanel.vue
@@ -39,7 +39,7 @@
-
+
@@ -443,7 +443,7 @@
+ :size="1000">
@@ -451,7 +451,7 @@
+ :size="1000">
@@ -609,7 +609,9 @@ export default {
list = list.filter(({flow_item_id}) => flow_item_id === flowInfo.value);
}
if (searchText) {
- list = list.filter(({name, desc}) => $A.strExists(`${name} ${desc}`, searchText));
+ list = list.filter(({id, name, desc}) => {
+ return id == searchText || $A.strExists(`${name} ${desc}`, searchText)
+ });
}
return list;
}
@@ -727,7 +729,7 @@ export default {
return false;
}
if (searchText) {
- if (!$A.strExists(task.name, searchText) && !$A.strExists(task.desc, searchText)) {
+ if (task.id != searchText && !$A.strExists(task.name, searchText) && !$A.strExists(task.desc, searchText)) {
return false;
}
}
@@ -758,7 +760,7 @@ export default {
return false;
}
if (searchText) {
- if (!$A.strExists(task.name, searchText) && !$A.strExists(task.desc, searchText)) {
+ if (task.id != searchText && !$A.strExists(task.name, searchText) && !$A.strExists(task.desc, searchText)) {
return false;
}
}
@@ -1298,7 +1300,7 @@ export default {
},
taskIsHidden(task) {
- const {name, desc, complete_at} = task;
+ const {id, name, desc, complete_at} = task;
const {searchText} = this;
if (!this.projectData.cacheParameter.completedTask) {
if (complete_at) {
@@ -1309,7 +1311,7 @@ export default {
return true;
}
if (searchText) {
- if (!$A.strExists(`${name} ${desc}`, searchText)) {
+ if (id != searchText && !$A.strExists(`${name} ${desc}`, searchText)) {
return true;
}
}
@@ -1405,7 +1407,7 @@ export default {
return false;
}
if (this.searchText) {
- if (!$A.strExists(task.name, this.searchText) && !$A.strExists(task.desc, this.searchText)) {
+ if (task.id != this.searchText && !$A.strExists(task.name, this.searchText) && !$A.strExists(task.desc, this.searchText)) {
return false;
}
}
@@ -1425,7 +1427,7 @@ export default {
return false;
}
if (this.searchText) {
- if (!$A.strExists(task.name, this.searchText) && !$A.strExists(task.desc, this.searchText)) {
+ if (task.id != this.searchText && !$A.strExists(task.name, this.searchText) && !$A.strExists(task.desc, this.searchText)) {
return false;
}
}
diff --git a/resources/assets/js/pages/manage/components/TaskArchived.vue b/resources/assets/js/pages/manage/components/TaskArchived.vue
index 41ea24e33..86fb86c3d 100644
--- a/resources/assets/js/pages/manage/components/TaskArchived.vue
+++ b/resources/assets/js/pages/manage/components/TaskArchived.vue
@@ -10,10 +10,10 @@