From f46765b3bccbc227f8f3c77456f57755247d5a88 Mon Sep 17 00:00:00 2001 From: shy Date: Mon, 12 May 2025 11:10:40 +0800 Subject: [PATCH] add some --- src/xiangmuguanli/date.js | 2 ++ src/xiangmuguanli/done.go | 2 +- src/xiangmuguanli/done.js | 2 +- src/xiangmuguanli/plan.go | 6 ++++-- src/xiangmuguanli/portal.go | 1 + src/xiangmuguanli/task.js | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/xiangmuguanli/date.js b/src/xiangmuguanli/date.js index 093a2c9..debb099 100644 --- a/src/xiangmuguanli/date.js +++ b/src/xiangmuguanli/date.js @@ -1,5 +1,7 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { + can.base.Time(null, "%Y-%D") + return can.onimport.myView(can, msg, function(value) { return [ {view: html.TITLE, list: [value.title, can.onimport.titleAction(can, value)]}, {view: html.STATUS, list: [value.uid.slice(0, 6), can.onimport.timeView(can, value), value.user_name]}, diff --git a/src/xiangmuguanli/done.go b/src/xiangmuguanli/done.go index 93c98d7..4d4337b 100644 --- a/src/xiangmuguanli/done.go +++ b/src/xiangmuguanli/done.go @@ -35,7 +35,7 @@ func (s Done) List(m *ice.Message, arg ...string) { switch DoneStatus(kit.Int(value[model.DONE_STATUS])) { case DoneCreate: if value[model.USER_UID] == user_uid { - button = append(button, s.Process) + button = append(button, s.Process, s.Modify, s.Remove) } case DoneProcess: if value[model.USER_UID] == user_uid { diff --git a/src/xiangmuguanli/done.js b/src/xiangmuguanli/done.js index 15e0213..324a8a4 100644 --- a/src/xiangmuguanli/done.js +++ b/src/xiangmuguanli/done.js @@ -1,7 +1,7 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { can.onimport.myView(can, msg, function(value) { return [ - {view: html.TITLE, list: [value.title, can.onimport.textView(can, value)]}, + {view: html.TITLE, list: [value.title, can.onimport.textView(can, value, "done_status")]}, {view: html.STATUS, list: [can.onimport.beginTime(can, value), can.onimport.unitView(can, value, "plan_title")]}, {view: html.OUTPUT, list: [value.content]}, can.onimport.titleAction(can, value), ] }) diff --git a/src/xiangmuguanli/plan.go b/src/xiangmuguanli/plan.go index 4966cfc..f4a4b01 100644 --- a/src/xiangmuguanli/plan.go +++ b/src/xiangmuguanli/plan.go @@ -27,6 +27,7 @@ func (s Plan) List(m *ice.Message, arg ...string) { s.Orders(m, model.STATUS, model.TASK_COUNT, s.Desc(model.CREATED_AT)) s.ValueList(m, arg).Table(func(value ice.Maps) { button := []ice.Any{} + defer func() { m.PushButton(button...) }() switch PlanStatus(kit.Int(value[model.PLAN_STATUS])) { case PlanCreate: if isLeader { @@ -48,14 +49,15 @@ func (s Plan) List(m *ice.Message, arg ...string) { case PlanFinish: kit.If(m.FieldsIsDetail(), func() { s.DoneMessage(m) }) } - m.PushButton(button...) }).Display("") if !s.IsLeader(m) { if m.Action(); m.Length() == 0 { m.SetResult("请等待「管理员」创建项目计划") } } - m.Option("otherList", "taskList,doneList") + if s.IsWorker(m) { + m.Option("otherList", "taskList,doneList") + } } func (s Plan) Process(m *ice.Message, arg ...string) { s.changeStatus(m, PlanCreate, PlanProcess) diff --git a/src/xiangmuguanli/portal.go b/src/xiangmuguanli/portal.go index 1afeafa..942bb86 100644 --- a/src/xiangmuguanli/portal.go +++ b/src/xiangmuguanli/portal.go @@ -20,4 +20,5 @@ func (s Portal) AfterPlaceAuth(m *ice.Message, arg ...string) { s.DashboardInsert(m, 3, "提报待办", "个", Done{}, "", "project_uid = ? AND status != ?", m.Option(model.PROJECT_UID), DoneFinish) s.DashboardInsert(m, 4, "提报总量", "个", Done{}, "") } + func init() { gonganxitong.PortalCmd(Portal{Portal: guanlixitong.NewPortal(userProject{}, project{})}) } diff --git a/src/xiangmuguanli/task.js b/src/xiangmuguanli/task.js index 918c23f..3b6b67e 100644 --- a/src/xiangmuguanli/task.js +++ b/src/xiangmuguanli/task.js @@ -1,7 +1,7 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { can.onimport.myView(can, msg, function(value) { return [ - {view: html.TITLE, list: [value.title, can.onimport.textView(can, value)]}, + {view: html.TITLE, list: [value.title, can.onimport.textView(can, value, "task_status")]}, {view: html.STATUS, list: [can.onimport.beginTime(can, value), can.onimport.unitView(can, value, "plan_title"), can.onimport.unitView(can, value, "done_count", "个")]}, {view: html.OUTPUT, list: [value.content]}, can.onimport.titleAction(can, value), ] })