待办

src/dashoo.cn/backend/api/controllers/oilsupplier/todolist.go

@@ -116,20 +116,24 @@ func (this *TodoListController) GetMyTaskEntityList() {
 		//找出待办任务 -- 增项
 		whereapp := "1=1"
 		whereapp = whereapp + " and b.Status>0"
+
 		var appendIdList string
-		if actisvc.GetMyTasks(workflow.OIL_APPEND_APPLY, this.User.Id) != "" {
-			appendIdList = actisvc.GetMyTasks(workflow.OIL_APPEND_APPLY, this.User.Id)
+		ids := actisvc.GetMyTasks(workflow.OIL_APPEND_APPLY, this.User.Id)
+		if ids != "" {
+			appendIdList = ids
 			appendIdList = appendIdList + ","
 		}
-		if actisvc.GetMyTasks(workflow.OIL_FIRST_APPEND_APPLY, this.User.Id) != "" {
-			appendIdList = fmt.Sprintf("%s %s", appendIdList, actisvc.GetMyTasks(workflow.OIL_FIRST_APPEND_APPLY, this.User.Id))
+		ids = actisvc.GetMyTasks(workflow.OIL_FIRST_APPEND_APPLY, this.User.Id)
+		if ids != "" {
+			appendIdList = fmt.Sprintf("%s %s", appendIdList, ids)
 			appendIdList = appendIdList + ","
 		}
-		if actisvc.GetMyTasks(workflow.OIL_SECOND_APPEND_APPLY, this.User.Id) != "" {
-			appendIdList = fmt.Sprintf("%s %s", appendIdList, actisvc.GetMyTasks(workflow.OIL_SECOND_APPEND_APPLY, this.User.Id))
+		ids = actisvc.GetMyTasks(workflow.OIL_SECOND_APPEND_APPLY, this.User.Id)
+		if ids != "" {
+			appendIdList = fmt.Sprintf("%s %s", appendIdList, ids)
 			appendIdList = appendIdList + ","
 		}
-		appendIdList = strings.Trim(appendIdList, ",")
+
 		appendIdarr := strings.Split(appendIdList, ",")
 		for i, item := range appendIdarr {
 			idx := strings.Index(item,"-")
@@ -362,7 +366,24 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 		//已办任务 -- 增项
 		whereapp := "1=1"
 		whereapp = whereapp + " and b.Status>0"
-		appendIdList := actisvc.GetHistoryMyTasks(workflow.OIL_APPEND_APPLY, this.User.Id)
+
+		var appendIdList string
+		ids := actisvc.GetHistoryMyTasks(workflow.OIL_APPEND_APPLY, this.User.Id)
+		if ids != "" {
+			appendIdList = ids
+			appendIdList = appendIdList + ","
+		}
+		ids = actisvc.GetHistoryMyTasks(workflow.OIL_FIRST_APPEND_APPLY, this.User.Id)
+		if ids != "" {
+			appendIdList = fmt.Sprintf("%s %s", appendIdList, ids)
+			appendIdList = appendIdList + ","
+		}
+		ids = actisvc.GetHistoryMyTasks(workflow.OIL_SECOND_APPEND_APPLY, this.User.Id)
+		if ids != "" {
+			appendIdList = fmt.Sprintf("%s %s", appendIdList, ids)
+			appendIdList = appendIdList + ","
+		}
+
 		appendIdarr := strings.Split(appendIdList, ",")
 		for i, item := range appendIdarr {
 			idx := strings.Index(item, "-")

src/dashoo.cn/frontend_web/src/pages/index.vue

@@ -316,6 +316,8 @@
             return '已入库'
           case '9':
             return '未通过'
+          case '10':
+            return '分办'
           default:
             return val
         }