From 7ac41c0335aeed6a2d45afb3ae6aad80def5ddd1 Mon Sep 17 00:00:00 2001 From: zuevav Date: Fri, 18 Sep 2026 11:44:06 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D1=83=D1=87=D0=BD=D0=BE=D0=B9=20=D0=B2?= =?UTF-8?q?=D0=B2=D0=BE=D0=B4=20M2M:=20=D0=B1=D0=B5=D0=B7=20=D0=BD=D0=BE?= =?UTF-8?q?=D0=BC=D0=B5=D1=80=D0=B0=20=D0=BF=D0=BE=D1=80=D1=83=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20(=D0=BF=D1=80=D0=B8=D1=81=D0=B2=D0=B0?= =?UTF-8?q?=D0=B8=D0=B2=D0=B0=D0=B5=D1=82=20=D1=83=D1=87=D1=91=D1=82=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D0=B0),=20?= =?UTF-8?q?=D0=BE=D0=B4=D0=BD=D0=B0=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0?= =?UTF-8?q?=20=C2=AB=D0=A1=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B8=D1=82=D1=8C?= =?UTF-8?q?=20=D0=B8=20=D1=81=D0=B2=D0=B5=D1=80=D0=B8=D1=82=D1=8C=20=D1=81?= =?UTF-8?q?=20DEPO=C2=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Fable 5.1 Claude-Session: https://claude.ai/code/session_01Q4YVo4UMopqT5DzicqpPjL --- internal/lkgateway/manual.go | 2 +- internal/lkgateway/web/templates/admin_manual.html | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/internal/lkgateway/manual.go b/internal/lkgateway/manual.go index 49599c2..4afa6d9 100644 --- a/internal/lkgateway/manual.go +++ b/internal/lkgateway/manual.go @@ -311,7 +311,7 @@ func manualDataProblems(o *ManualOrder) []string { p = append(p, "не заполнено: "+what) } } - need(o.PaperNo, "номер поручения клиента") + // Номер поручению присваивает учётная система при регистрации — здесь он не нужен. if !manualDateRe.MatchString(o.PaperDate) { p = append(p, "не заполнена дата поручения клиента") } diff --git a/internal/lkgateway/web/templates/admin_manual.html b/internal/lkgateway/web/templates/admin_manual.html index 9b2cb92..99a402d 100644 --- a/internal/lkgateway/web/templates/admin_manual.html +++ b/internal/lkgateway/web/templates/admin_manual.html @@ -78,7 +78,7 @@ {{range .List}} {{.O.Number}} - № {{.O.PaperNo}} от {{.O.PaperDate}} + {{if .O.PaperNo}}№ {{.O.PaperNo}} {{end}}от {{.O.PaperDate}} {{.O.FullName}} {{len .O.Securities}} {{if .O.RecvName}}{{.O.RecvName}}{{else}}ИНН {{.O.RecvINN}}{{end}} @@ -120,7 +120,7 @@
Номер в системе
{{$o.Number}} · введено {{msk $o.CreatedAt}}{{if $o.CreatedBy}} · {{$o.CreatedBy}}{{end}}
-
Поручение клиента
№ {{$o.PaperNo}} от {{$o.PaperDate}} · {{$o.ReceivedVia}}
+
Поручение клиента
{{if $o.PaperNo}}№ {{$o.PaperNo}} {{end}}от {{$o.PaperDate}} · {{$o.ReceivedVia}}{{if not $o.PaperNo}} · номер присвоит учётная система{{end}}
Клиент
{{$o.FullName}}, дата рождения {{$o.BirthDate}}
Документ
код {{$o.DocType}} · {{$o.DocSeries}} № {{$o.DocNumber}}{{if $o.DocIssueDate}} · выдан {{$o.DocIssueDate}}{{end}}{{if $o.DocIssuer}} · {{$o.DocIssuer}}{{end}}
Счёт депо / договор
{{$o.Account}}{{if $o.Contract}} · договор {{$o.Contract}}{{end}}{{if $o.QuikCode}} · код в торговой системе {{$o.QuikCode}}{{end}}
@@ -298,7 +298,6 @@ function mfRerun(){const f=document.getElementById('mf');if(f&&f.closest('detail
1. Основание
-
- - {{if .DepoOn}}{{end}} + К списку