From b1c7d0a18a9239eaeeba33c556b5b4bc1c023962 Mon Sep 17 00:00:00 2001 From: shy Date: Thu, 19 Jun 2025 19:20:01 +0800 Subject: [PATCH] add some --- src/production/care.go | 4 ++-- src/production/case.js | 2 +- src/production/common.go | 10 +++++++++- src/production/issue.go | 6 ++++-- src/production/portal.json | 4 ++-- src/production/task.js | 2 +- 6 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/production/care.go b/src/production/care.go index b78833e..b672682 100644 --- a/src/production/care.go +++ b/src/production/care.go @@ -67,12 +67,12 @@ func (s care) List(m *ice.Message, arg ...string) { } } func (s care) IssueList(m *ice.Message, arg ...string) { - s.Orders(m, model.STATUS, model.DESIGN_COUNT, model.TASK_COUNT, s.Desc(model.CREATED_AT)).Limit(m, 300) + s.Orders(m, model.STATUS, s.Desc(model.UPDATED_AT)).Limit(m, 300) s.OtherList(m, Issue{}, model.USER_UID, m.Option(model.UID)) m.RenameAppend(model.STORY_UID, model.PLACE_UID) } func (s care) DesignList(m *ice.Message, arg ...string) { - s.Orders(m, model.STATUS, s.Desc(model.CREATED_AT)).Limit(m, 300) + s.Orders(m, model.STATUS, s.Desc(model.UPDATED_AT)).Limit(m, 300) s.OtherList(m, Design{}, model.USER_UID, m.Option(model.UID)) m.RenameAppend(model.STORY_UID, model.PLACE_UID) } diff --git a/src/production/case.js b/src/production/case.js index c89f7b6..fb6e315 100644 --- a/src/production/case.js +++ b/src/production/case.js @@ -1,6 +1,6 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { - can.onimport.myView(can, msg, function(value) { return [ + can.onimport.myViewTabs(can, "case_status", msg, function(value) { return [ {view: html.TITLE, list: [value.title, can.onimport.textView(can, value, "case_status")]}, {view: html.STATUS, list: [ (value.process_time||value.begin_time).split(" ")[0], diff --git a/src/production/common.go b/src/production/common.go index fcfd5f0..225b275 100644 --- a/src/production/common.go +++ b/src/production/common.go @@ -89,6 +89,14 @@ func (s Table) Inputs(m *ice.Message, arg ...string) { }) default: switch m.Option(ctx.ACTION) { + case "addNote": + switch arg[0] { + case model.CONTENT: + m.Push(arg[0], "业务负责人已验收，请产研负责人验收～") + m.Push(arg[0], "产研负责人已验收，请研发负责人验收～") + default: + s.Table.Inputs(m, arg...) + } case "discuss": switch arg[0] { case "date": @@ -272,7 +280,7 @@ func (s Table) StatusPrice(m *ice.Message, arg ...string) { } } func (s Table) UserInfo(m *ice.Message, arg ...string) { - m.ProcessField(care{}, []string{m.Option(model.STORY_UID), m.Option(model.UID)}, arg...) + m.ProcessField(care{}, []string{m.Option(model.STORY_UID), m.Option(model.TO_USER_UID)}, arg...) } func (s care) UserInfo(m *ice.Message, arg ...string) { m.Cmdy(s.PrefixPortal(m), s.UserInfo, arg) diff --git a/src/production/issue.go b/src/production/issue.go index eede7d3..e3c6e09 100644 --- a/src/production/issue.go +++ b/src/production/issue.go @@ -56,7 +56,8 @@ func (s Issue) List(m *ice.Message, arg ...string) { } isCreator, isWorker := s.IsCreator(m), s.IsWorker(m) msg := m.Cmd(Design{}, s.Select, model.STORY_UID, arg[0], m.OptionSimple(model.USER_UID), model.STATUS, IssueCreate) - s.Orders(m, model.STATUS, model.DESIGN_COUNT, model.TASK_COUNT, s.Desc(model.UPDATED_AT)).Limit(m, 300) + // s.Orders(m, model.STATUS, model.DESIGN_COUNT, model.TASK_COUNT, s.Desc(model.UPDATED_AT)).Limit(m, 300) + s.Orders(m, model.STATUS, model.DESIGN_COUNT, s.Desc(model.UPDATED_AT)).Limit(m, 300) s.ValueList(m, arg) s.SelectJoinPlan(m) s.SettingSelect(m) @@ -73,7 +74,8 @@ func (s Issue) List(m *ice.Message, arg ...string) { s.PushIssueButton(m, value, button...) }).Display("") kit.If(len(arg) == 1, func() { - m.Sort("plan_status,status,design_count,task_count,updated_at", ice.STR, ice.STR, ice.STR, ice.STR, ice.STR_R) + // m.Sort("plan_status,status,design_count,task_count,updated_at", ice.STR, ice.STR, ice.STR, ice.STR, ice.STR_R) + m.Sort("plan_status,status,design_count,updated_at", ice.STR, ice.STR, ice.STR, ice.STR_R) }) s.OtherListCmd(m, s.PlanList, s.DesignList, s.TaskList, s.CaseList, s.NoteList, s.FileList, s.MeetList, s.DealList) } diff --git a/src/production/portal.json b/src/production/portal.json index c12efb8..08cc52d 100644 --- a/src/production/portal.json +++ b/src/production/portal.json @@ -6,9 +6,9 @@ "issueCreate": "原型设计", "designCreate": "界面设计", "taskCreate": "开发任务", "caseCreate": "测试用例", "issueList": "原型设计", "designList": "界面设计", "taskList": "开发任务", "caseList": "测试用例", "program": "编程", "discuss": "约会", "payfor": "支付", "setType": "设置类型", "bindPlan": "绑定计划", - "note": "备注", + "note": "验收备注", "addNote": "备注", - "noteList": "备注列表", "fileList": "附件列表", "meetList": "会议安排", "dealList": "支付记录", + "noteList": "验收备注", "fileList": "附件列表", "meetList": "会议安排", "dealList": "支付记录", "planList": "迭代计划", "style": { "preview": "notice", diff --git a/src/production/task.js b/src/production/task.js index 392c51a..25f8607 100644 --- a/src/production/task.js +++ b/src/production/task.js @@ -1,6 +1,6 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { - can.onimport.myView(can, msg, function(value) { return [ + can.onimport.myViewTabs(can, "task_status", msg, function(value) { return [ {view: html.TITLE, list: [value.title, can.onimport.textView(can, value, "task_status")]}, {view: html.STATUS, list: [ (value.process_time||value.begin_time).split(" ")[0],