fix

controllers/assessment/assessment_form.go

@@ -831,6 +831,11 @@ func (this *AssessmentFormController) Cancel() {
 		br.Msg = "单据状态有误，请刷新页面"
 		return
 	}
+	outStatus := list[0].OutStatus
+	if outStatus == models.AssessmentFormOutStatusSubmitted {
+		br.Msg = "单据状态有误，请刷新页面"
+		return
+	}
 	weekEnd := list[0].WeekEnd
 	cancelOk := !weekEnd.IsZero() && time.Now().Local().Before(weekEnd)
 	if !cancelOk {

models/assessment_form.go

@@ -10,8 +10,9 @@ import (
 )
 
 const (
-	AssessmentFormStatusDraft     = 0
-	AssessmentFormStatusSubmitted = 1
+	AssessmentFormStatusDraft        = 0
+	AssessmentFormStatusSubmitted    = 1
+	AssessmentFormOutStatusSubmitted = 1
 
 	AssessmentFormMonthlyPriceUp    = "涨"
 	AssessmentFormMonthlyPriceDown  = "跌"
@@ -40,6 +41,8 @@ type AssessmentForm struct {
 	WeeklyUpForecast     string    `description:"周度上行风险：是/否"`
 	WeeklyDownForecast   string    `description:"周度下行风险：是/否"`
 	Status               int       `description:"状态：0-草稿；1-已提交；"`
+	OutNo                string    `description:"外部编码（客户内部系统编码）"`
+	OutStatus            int       `description:"外部状态：0-未使用；1-已使用"`
 	SubmitTime           time.Time `description:"提交时间"`
 	CreateTime           time.Time `description:"创建时间"`
 	ModifyTime           time.Time `description:"修改时间"`

services/assessment_form.go

@@ -160,8 +160,8 @@ func CheckAssessmentFormButton(item *models.AssessmentForm, sysAdminId int, auth
 			button.ViewButton = true
 		}
 
-		// 本周结束前可撤销(TODO:这里象屿会有一个外部条件：当周周报未提交，暂不处理视作true)
-		if sysAdminId == item.ResearcherAdminId && !item.WeekEnd.IsZero() && time.Now().Local().Before(item.WeekEnd) {
+		// 本周结束前(同时外部条件是为提交的时候)，可撤销
+		if sysAdminId == item.ResearcherAdminId && !item.WeekEnd.IsZero() && time.Now().Local().Before(item.WeekEnd) && item.OutStatus != models.AssessmentFormOutStatusSubmitted {
 			button.CancelButton = true
 		}
 	}