Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3f16a8ab3e | ||
|
|
14e733faf0 | ||
|
|
aac72e1fd9 | ||
|
|
f0a6abe538 |
No files matched your search
@@ -2677,7 +2677,7 @@ def update_collection_protocol(
|
|||||||
next_status = protocol_status.strip()
|
next_status = protocol_status.strip()
|
||||||
assert_protocol_status_transition(obj.protocol_status or "", next_status, kind="protocol")
|
assert_protocol_status_transition(obj.protocol_status or "", next_status, kind="protocol")
|
||||||
obj.protocol_status = next_status
|
obj.protocol_status = next_status
|
||||||
if next_status == "yzf" and from_status != "yzf":
|
if next_status in ("yzf", "sdfq") and from_status not in ("yzf", "sdfq"):
|
||||||
voided_now = True
|
voided_now = True
|
||||||
if next_status == "yzf" and void_time is not None:
|
if next_status == "yzf" and void_time is not None:
|
||||||
if void_type is None or not str(void_type).strip():
|
if void_type is None or not str(void_type).strip():
|
||||||
|
|||||||
@@ -1702,7 +1702,8 @@ def change_status(
|
|||||||
)
|
)
|
||||||
|
|
||||||
db.add(obj)
|
db.add(obj)
|
||||||
if ns == "yzf" and (current or "").strip() != "yzf":
|
from_status = (current or "").strip()
|
||||||
|
if ns in ("yzf", "sdfq") and from_status not in ("yzf", "sdfq"):
|
||||||
from app.services.protocol_reception_discard_sync import after_protocol_voided
|
from app.services.protocol_reception_discard_sync import after_protocol_voided
|
||||||
|
|
||||||
after_protocol_voided(
|
after_protocol_voided(
|
||||||
|
|||||||
@@ -1,16 +1,19 @@
|
|||||||
"""市场协议作废 ↔ 质检样本接收废弃双向联动。
|
"""市场协议无效态 ↔ 样本接收废弃 / 样本状态作废联动。
|
||||||
|
|
||||||
规则(细胞存储 / 科研捐赠):
|
规则(细胞存储 / 科研捐赠):
|
||||||
1. 协议变为已作废(yzf)时,协议下全部样本接收结论自动为废弃(bj)。
|
1. 协议变为已作废(yzf)或属地废弃(sdfq)时:
|
||||||
|
- 协议下全部样本接收结论自动为废弃(bj);
|
||||||
|
- 协议下全部有效样本 `sample_status` 置为已作废(yzf),并写入 `void_date`。
|
||||||
2. 协议下全部有效样本均已废弃/拒收(bj)时,协议自动已作废,作废类型为「实验室废弃」。
|
2. 协议下全部有效样本均已废弃/拒收(bj)时,协议自动已作废,作废类型为「实验室废弃」。
|
||||||
"""
|
"""
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from typing import List, Optional
|
from typing import List, Optional, Union
|
||||||
|
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
from app.core.protocol_status_display import INACTIVE_PROTOCOL_STATUSES
|
||||||
from app.core.utils import generate_uuid
|
from app.core.utils import generate_uuid
|
||||||
from app.models.models import (
|
from app.models.models import (
|
||||||
BizCollectionProtocol,
|
BizCollectionProtocol,
|
||||||
@@ -23,11 +26,24 @@ from app.models.research_donation import BizResearchDonation, BizResearchDonatio
|
|||||||
LAB_VOID_TYPE_CODE = "sysfq"
|
LAB_VOID_TYPE_CODE = "sysfq"
|
||||||
LAB_VOID_TYPE_LABEL = "实验室废弃"
|
LAB_VOID_TYPE_LABEL = "实验室废弃"
|
||||||
VOID_TYPE_DICT = "xyzflx"
|
VOID_TYPE_DICT = "xyzflx"
|
||||||
|
SAMPLE_VOID_STATUS = "yzf"
|
||||||
|
|
||||||
_AUTO_DISCARD_REMARK = "协议作废自动废弃"
|
_AUTO_DISCARD_REMARK = "协议作废自动废弃"
|
||||||
_AUTO_VOID_DESC = "全部样本接收废弃/拒收,系统自动作废"
|
_AUTO_VOID_DESC = "全部样本接收废弃/拒收,系统自动作废"
|
||||||
|
|
||||||
|
|
||||||
|
def _void_date_yyyymmdd(
|
||||||
|
*,
|
||||||
|
void_time: Optional[datetime] = None,
|
||||||
|
void_date: Optional[str] = None,
|
||||||
|
) -> str:
|
||||||
|
raw = (void_date or "").strip()
|
||||||
|
if len(raw) == 8 and raw.isdigit():
|
||||||
|
return raw
|
||||||
|
ts = void_time or datetime.now()
|
||||||
|
return ts.strftime("%Y%m%d")
|
||||||
|
|
||||||
|
|
||||||
def ensure_lab_void_type(db: Session, *, tenant_no: str) -> str:
|
def ensure_lab_void_type(db: Session, *, tenant_no: str) -> str:
|
||||||
"""确保租户字典 xyzflx 存在「实验室废弃」,返回 dict_value。"""
|
"""确保租户字典 xyzflx 存在「实验室废弃」,返回 dict_value。"""
|
||||||
tenant = (tenant_no or "").strip()
|
tenant = (tenant_no or "").strip()
|
||||||
@@ -204,7 +220,7 @@ def discard_receptions_for_voided_protocol(
|
|||||||
tenant_no: str,
|
tenant_no: str,
|
||||||
user_id: Optional[str] = None,
|
user_id: Optional[str] = None,
|
||||||
) -> int:
|
) -> int:
|
||||||
"""协议已作废后,将其下样本接收全部置为废弃。返回处理样本数。"""
|
"""协议无效后,将其下样本接收全部置为废弃。返回处理样本数。"""
|
||||||
src = (source or "").strip()
|
src = (source or "").strip()
|
||||||
pid = (protocol_id or "").strip()
|
pid = (protocol_id or "").strip()
|
||||||
tenant = (tenant_no or "").strip()
|
tenant = (tenant_no or "").strip()
|
||||||
@@ -242,6 +258,75 @@ def discard_receptions_for_voided_protocol(
|
|||||||
return len(samples)
|
return len(samples)
|
||||||
|
|
||||||
|
|
||||||
|
def void_samples_for_inactive_protocol(
|
||||||
|
db: Session,
|
||||||
|
*,
|
||||||
|
source: str,
|
||||||
|
protocol_id: str,
|
||||||
|
tenant_no: str,
|
||||||
|
user_id: Optional[str] = None,
|
||||||
|
void_time: Optional[datetime] = None,
|
||||||
|
void_date: Optional[str] = None,
|
||||||
|
) -> int:
|
||||||
|
"""协议无效后,将其下有效样本状态一律置为已作废并写入 void_date。返回处理样本数。"""
|
||||||
|
src = (source or "").strip()
|
||||||
|
pid = (protocol_id or "").strip()
|
||||||
|
tenant = (tenant_no or "").strip()
|
||||||
|
if src not in ("cell_storage", "research_donation") or not pid or not tenant:
|
||||||
|
return 0
|
||||||
|
|
||||||
|
date_s = _void_date_yyyymmdd(void_time=void_time, void_date=void_date)
|
||||||
|
now = datetime.now()
|
||||||
|
if src == "cell_storage":
|
||||||
|
samples: List[Union[BizProtocolSample, BizResearchDonationSample]] = list(
|
||||||
|
_list_cell_samples(db, protocol_id=pid, tenant_no=tenant)
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
samples = list(_list_donation_samples(db, donation_id=pid, tenant_no=tenant))
|
||||||
|
|
||||||
|
for sample in samples:
|
||||||
|
sample.sample_status = SAMPLE_VOID_STATUS
|
||||||
|
sample.void_date = date_s
|
||||||
|
sample.update_by = user_id
|
||||||
|
sample.update_time = now
|
||||||
|
db.add(sample)
|
||||||
|
db.flush()
|
||||||
|
return len(samples)
|
||||||
|
|
||||||
|
|
||||||
|
def _resolve_protocol_void_time(
|
||||||
|
db: Session,
|
||||||
|
*,
|
||||||
|
source: str,
|
||||||
|
protocol_id: str,
|
||||||
|
tenant_no: str,
|
||||||
|
) -> Optional[datetime]:
|
||||||
|
src = (source or "").strip()
|
||||||
|
pid = (protocol_id or "").strip()
|
||||||
|
tenant = (tenant_no or "").strip()
|
||||||
|
if src == "cell_storage":
|
||||||
|
obj = (
|
||||||
|
db.query(BizCollectionProtocol)
|
||||||
|
.filter(
|
||||||
|
BizCollectionProtocol.id == pid,
|
||||||
|
BizCollectionProtocol.tenant_no == tenant,
|
||||||
|
BizCollectionProtocol.del_flag == 0,
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
return obj.void_time if obj else None
|
||||||
|
obj = (
|
||||||
|
db.query(BizResearchDonation)
|
||||||
|
.filter(
|
||||||
|
BizResearchDonation.id == pid,
|
||||||
|
BizResearchDonation.tenant_no == tenant,
|
||||||
|
BizResearchDonation.del_flag == 0,
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
return obj.void_time if obj else None
|
||||||
|
|
||||||
|
|
||||||
def _all_samples_discarded(
|
def _all_samples_discarded(
|
||||||
db: Session,
|
db: Session,
|
||||||
*,
|
*,
|
||||||
@@ -299,7 +384,7 @@ def maybe_void_protocol_when_all_samples_discarded(
|
|||||||
if not obj:
|
if not obj:
|
||||||
return False
|
return False
|
||||||
status = (obj.protocol_status or "").strip()
|
status = (obj.protocol_status or "").strip()
|
||||||
if status in ("yzf", "sdfq"):
|
if status in INACTIVE_PROTOCOL_STATUSES:
|
||||||
return False
|
return False
|
||||||
from app.core.protocol_status_display import assert_protocol_status_transition
|
from app.core.protocol_status_display import assert_protocol_status_transition
|
||||||
from app.crud.collection_protocol import update_collection_protocol
|
from app.crud.collection_protocol import update_collection_protocol
|
||||||
@@ -319,7 +404,8 @@ def maybe_void_protocol_when_all_samples_discarded(
|
|||||||
void_desc=_AUTO_VOID_DESC,
|
void_desc=_AUTO_VOID_DESC,
|
||||||
void_type=void_type,
|
void_type=void_type,
|
||||||
commit=False,
|
commit=False,
|
||||||
sync_reception_discard=False,
|
# 接收已全部废弃;仍需同步样本状态为已作废
|
||||||
|
sync_reception_discard=True,
|
||||||
)
|
)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
@@ -335,7 +421,7 @@ def maybe_void_protocol_when_all_samples_discarded(
|
|||||||
if not obj:
|
if not obj:
|
||||||
return False
|
return False
|
||||||
status = (obj.donation_status or "").strip()
|
status = (obj.donation_status or "").strip()
|
||||||
if status in ("yzf", "sdfq"):
|
if status in INACTIVE_PROTOCOL_STATUSES:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
# 捐赠 change_status 默认 commit;此处内联等价逻辑避免提前提交。
|
# 捐赠 change_status 默认 commit;此处内联等价逻辑避免提前提交。
|
||||||
@@ -374,6 +460,14 @@ def maybe_void_protocol_when_all_samples_discarded(
|
|||||||
)
|
)
|
||||||
db.add(obj)
|
db.add(obj)
|
||||||
db.flush()
|
db.flush()
|
||||||
|
# 接收已全部废弃;仍需同步样本状态为已作废
|
||||||
|
after_protocol_voided(
|
||||||
|
db,
|
||||||
|
source="research_donation",
|
||||||
|
protocol_id=pid,
|
||||||
|
tenant_no=tenant,
|
||||||
|
user_id=user_id,
|
||||||
|
)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
@@ -411,7 +505,7 @@ def after_protocol_voided(
|
|||||||
tenant_no: str,
|
tenant_no: str,
|
||||||
user_id: Optional[str] = None,
|
user_id: Optional[str] = None,
|
||||||
) -> None:
|
) -> None:
|
||||||
"""协议作废后:同步废弃其下全部样本接收。"""
|
"""协议作废/属地废弃后:同步废弃样本接收,并将样本状态置为已作废。"""
|
||||||
discard_receptions_for_voided_protocol(
|
discard_receptions_for_voided_protocol(
|
||||||
db,
|
db,
|
||||||
source=source,
|
source=source,
|
||||||
@@ -419,3 +513,13 @@ def after_protocol_voided(
|
|||||||
tenant_no=tenant_no,
|
tenant_no=tenant_no,
|
||||||
user_id=user_id,
|
user_id=user_id,
|
||||||
)
|
)
|
||||||
|
void_samples_for_inactive_protocol(
|
||||||
|
db,
|
||||||
|
source=source,
|
||||||
|
protocol_id=protocol_id,
|
||||||
|
tenant_no=tenant_no,
|
||||||
|
user_id=user_id,
|
||||||
|
void_time=_resolve_protocol_void_time(
|
||||||
|
db, source=source, protocol_id=protocol_id, tenant_no=tenant_no
|
||||||
|
),
|
||||||
|
)
|
||||||
@@ -23,6 +23,7 @@ from app.models.research_donation import (
|
|||||||
)
|
)
|
||||||
from app.services.protocol_reception_discard_sync import (
|
from app.services.protocol_reception_discard_sync import (
|
||||||
LAB_VOID_TYPE_CODE,
|
LAB_VOID_TYPE_CODE,
|
||||||
|
SAMPLE_VOID_STATUS,
|
||||||
after_protocol_voided,
|
after_protocol_voided,
|
||||||
after_sample_reception_saved,
|
after_sample_reception_saved,
|
||||||
ensure_lab_void_type,
|
ensure_lab_void_type,
|
||||||
@@ -77,6 +78,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
|||||||
id="p1",
|
id="p1",
|
||||||
protocol_no="CP-1",
|
protocol_no="CP-1",
|
||||||
protocol_status="sxz",
|
protocol_status="sxz",
|
||||||
|
void_time=now,
|
||||||
tenant_no="tenant-a",
|
tenant_no="tenant-a",
|
||||||
create_dept_id="",
|
create_dept_id="",
|
||||||
create_time=now,
|
create_time=now,
|
||||||
@@ -89,6 +91,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
|||||||
id="s1",
|
id="s1",
|
||||||
collection_protocol_id="p1",
|
collection_protocol_id="p1",
|
||||||
sample_code="ZK001",
|
sample_code="ZK001",
|
||||||
|
sample_status="yrk",
|
||||||
tenant_no="tenant-a",
|
tenant_no="tenant-a",
|
||||||
create_dept_id="",
|
create_dept_id="",
|
||||||
create_time=now,
|
create_time=now,
|
||||||
@@ -101,6 +104,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
|||||||
id="s2",
|
id="s2",
|
||||||
collection_protocol_id="p1",
|
collection_protocol_id="p1",
|
||||||
sample_code="ZK002",
|
sample_code="ZK002",
|
||||||
|
sample_status="jcz",
|
||||||
tenant_no="tenant-a",
|
tenant_no="tenant-a",
|
||||||
create_dept_id="",
|
create_dept_id="",
|
||||||
create_time=now,
|
create_time=now,
|
||||||
@@ -152,6 +156,16 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
|||||||
self.assertEqual(by_code["ZK001"], "bj")
|
self.assertEqual(by_code["ZK001"], "bj")
|
||||||
self.assertEqual(by_code["ZK002"], "bj")
|
self.assertEqual(by_code["ZK002"], "bj")
|
||||||
|
|
||||||
|
samples = (
|
||||||
|
db.query(BizProtocolSample)
|
||||||
|
.filter(BizProtocolSample.collection_protocol_id == "p1")
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
self.assertEqual(len(samples), 2)
|
||||||
|
for s in samples:
|
||||||
|
self.assertEqual(s.sample_status, SAMPLE_VOID_STATUS)
|
||||||
|
self.assertEqual(s.void_date, "20261105")
|
||||||
|
|
||||||
def test_all_samples_discarded_auto_voids_protocol_with_lab_type(self):
|
def test_all_samples_discarded_auto_voids_protocol_with_lab_type(self):
|
||||||
db = _session()
|
db = _session()
|
||||||
now = _now()
|
now = _now()
|
||||||
@@ -172,6 +186,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
|||||||
id="s3",
|
id="s3",
|
||||||
collection_protocol_id="p2",
|
collection_protocol_id="p2",
|
||||||
sample_code="ZK003",
|
sample_code="ZK003",
|
||||||
|
sample_status="ycj",
|
||||||
tenant_no="tenant-a",
|
tenant_no="tenant-a",
|
||||||
create_dept_id="",
|
create_dept_id="",
|
||||||
create_time=now,
|
create_time=now,
|
||||||
@@ -212,6 +227,9 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
|||||||
self.assertEqual(proto.protocol_status, "yzf")
|
self.assertEqual(proto.protocol_status, "yzf")
|
||||||
self.assertEqual(proto.void_type, LAB_VOID_TYPE_CODE)
|
self.assertEqual(proto.void_type, LAB_VOID_TYPE_CODE)
|
||||||
self.assertIn("全部样本接收", proto.void_desc or "")
|
self.assertIn("全部样本接收", proto.void_desc or "")
|
||||||
|
sample = db.query(BizProtocolSample).filter(BizProtocolSample.id == "s3").one()
|
||||||
|
self.assertEqual(sample.sample_status, SAMPLE_VOID_STATUS)
|
||||||
|
self.assertTrue((sample.void_date or "").strip())
|
||||||
|
|
||||||
def test_partial_discard_does_not_void_protocol(self):
|
def test_partial_discard_does_not_void_protocol(self):
|
||||||
db = _session()
|
db = _session()
|
||||||
@@ -282,6 +300,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
|||||||
id="d1",
|
id="d1",
|
||||||
donation_no="RD-1",
|
donation_no="RD-1",
|
||||||
donation_status="sxz",
|
donation_status="sxz",
|
||||||
|
void_time=now,
|
||||||
tenant_no="tenant-a",
|
tenant_no="tenant-a",
|
||||||
create_dept_id="",
|
create_dept_id="",
|
||||||
create_time=now,
|
create_time=now,
|
||||||
@@ -294,6 +313,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
|||||||
id="ds1",
|
id="ds1",
|
||||||
research_donation_id="d1",
|
research_donation_id="d1",
|
||||||
sample_code="RD001",
|
sample_code="RD001",
|
||||||
|
sample_status="yrk",
|
||||||
tenant_no="tenant-a",
|
tenant_no="tenant-a",
|
||||||
create_dept_id="",
|
create_dept_id="",
|
||||||
create_time=now,
|
create_time=now,
|
||||||
@@ -322,6 +342,62 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
|||||||
)
|
)
|
||||||
self.assertEqual(rec.accept_conclusion, "bj")
|
self.assertEqual(rec.accept_conclusion, "bj")
|
||||||
self.assertEqual(rec.research_donation_id, "d1")
|
self.assertEqual(rec.research_donation_id, "d1")
|
||||||
|
sample = (
|
||||||
|
db.query(BizResearchDonationSample)
|
||||||
|
.filter(BizResearchDonationSample.id == "ds1")
|
||||||
|
.one()
|
||||||
|
)
|
||||||
|
self.assertEqual(sample.sample_status, SAMPLE_VOID_STATUS)
|
||||||
|
self.assertEqual(sample.void_date, "20261105")
|
||||||
|
|
||||||
|
def test_sdfq_also_voids_sample_status(self):
|
||||||
|
db = _session()
|
||||||
|
now = _now()
|
||||||
|
db.add(
|
||||||
|
BizCollectionProtocol(
|
||||||
|
id="p-sdfq",
|
||||||
|
protocol_no="CP-SDFQ",
|
||||||
|
protocol_status="sdfq",
|
||||||
|
tenant_no="tenant-a",
|
||||||
|
create_dept_id="",
|
||||||
|
create_time=now,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
db.add(
|
||||||
|
BizProtocolSample(
|
||||||
|
id="s-sdfq",
|
||||||
|
collection_protocol_id="p-sdfq",
|
||||||
|
sample_code="ZKSDFQ",
|
||||||
|
sample_status="ycj",
|
||||||
|
tenant_no="tenant-a",
|
||||||
|
create_dept_id="",
|
||||||
|
create_time=now,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
after_protocol_voided(
|
||||||
|
db,
|
||||||
|
source="cell_storage",
|
||||||
|
protocol_id="p-sdfq",
|
||||||
|
tenant_no="tenant-a",
|
||||||
|
user_id="u1",
|
||||||
|
)
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
sample = db.query(BizProtocolSample).filter(BizProtocolSample.id == "s-sdfq").one()
|
||||||
|
self.assertEqual(sample.sample_status, SAMPLE_VOID_STATUS)
|
||||||
|
self.assertTrue((sample.void_date or "").strip())
|
||||||
|
rec = (
|
||||||
|
db.query(BizSampleReception)
|
||||||
|
.filter(BizSampleReception.sample_code == "ZKSDFQ")
|
||||||
|
.one()
|
||||||
|
)
|
||||||
|
self.assertEqual(rec.accept_conclusion, "bj")
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|||||||
@@ -0,0 +1,54 @@
|
|||||||
|
-- Issue #127:已作废 / 属地废弃协议下样本状态回刷为已作废
|
||||||
|
-- 细胞存储 + 科研捐赠;可重复执行。
|
||||||
|
-- 规则:协议 status 为 yzf/sdfq 且样本未删除时,sample_status 置 yzf,
|
||||||
|
-- void_date 为空时按协议 void_time / update_time 补齐 YYYYMMDD。
|
||||||
|
|
||||||
|
-- 细胞存储协议样本
|
||||||
|
UPDATE biz_protocol_sample s
|
||||||
|
INNER JOIN biz_collection_protocol p
|
||||||
|
ON p.id = s.collection_protocol_id
|
||||||
|
AND p.tenant_no = s.tenant_no
|
||||||
|
AND p.del_flag = 0
|
||||||
|
SET
|
||||||
|
s.sample_status = 'yzf',
|
||||||
|
s.void_date = CASE
|
||||||
|
WHEN s.void_date IS NOT NULL AND TRIM(s.void_date) <> '' THEN s.void_date
|
||||||
|
WHEN p.void_time IS NOT NULL THEN DATE_FORMAT(p.void_time, '%Y%m%d')
|
||||||
|
WHEN p.update_time IS NOT NULL THEN DATE_FORMAT(p.update_time, '%Y%m%d')
|
||||||
|
ELSE DATE_FORMAT(NOW(), '%Y%m%d')
|
||||||
|
END,
|
||||||
|
s.update_time = NOW()
|
||||||
|
WHERE s.del_flag = 0
|
||||||
|
AND p.protocol_status IN ('yzf', 'sdfq')
|
||||||
|
AND (
|
||||||
|
s.sample_status IS NULL
|
||||||
|
OR TRIM(s.sample_status) = ''
|
||||||
|
OR s.sample_status <> 'yzf'
|
||||||
|
OR s.void_date IS NULL
|
||||||
|
OR TRIM(s.void_date) = ''
|
||||||
|
);
|
||||||
|
|
||||||
|
-- 科研捐赠样本
|
||||||
|
UPDATE biz_research_donation_sample s
|
||||||
|
INNER JOIN biz_research_donation d
|
||||||
|
ON d.id = s.research_donation_id
|
||||||
|
AND d.tenant_no = s.tenant_no
|
||||||
|
AND d.del_flag = 0
|
||||||
|
SET
|
||||||
|
s.sample_status = 'yzf',
|
||||||
|
s.void_date = CASE
|
||||||
|
WHEN s.void_date IS NOT NULL AND TRIM(s.void_date) <> '' THEN s.void_date
|
||||||
|
WHEN d.void_time IS NOT NULL THEN DATE_FORMAT(d.void_time, '%Y%m%d')
|
||||||
|
WHEN d.update_time IS NOT NULL THEN DATE_FORMAT(d.update_time, '%Y%m%d')
|
||||||
|
ELSE DATE_FORMAT(NOW(), '%Y%m%d')
|
||||||
|
END,
|
||||||
|
s.update_time = NOW()
|
||||||
|
WHERE s.del_flag = 0
|
||||||
|
AND d.donation_status IN ('yzf', 'sdfq')
|
||||||
|
AND (
|
||||||
|
s.sample_status IS NULL
|
||||||
|
OR TRIM(s.sample_status) = ''
|
||||||
|
OR s.sample_status <> 'yzf'
|
||||||
|
OR s.void_date IS NULL
|
||||||
|
OR TRIM(s.void_date) = ''
|
||||||
|
);
|
||||||
@@ -25,6 +25,17 @@ export function fetchCreateReceiveAccount(data) {
|
|||||||
return post('/web/admin/oa-approval/receive-accounts', data)
|
return post('/web/admin/oa-approval/receive-accounts', data)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function fetchUpdateReceiveAccount(id, data) {
|
||||||
|
return put(`/web/admin/oa-approval/receive-accounts/${id}`, data)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function fetchDeleteReceiveAccount(id) {
|
||||||
|
return request({
|
||||||
|
url: `/web/admin/oa-approval/receive-accounts/${id}`,
|
||||||
|
method: 'DELETE'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
export function fetchRelatedCandidates(params) {
|
export function fetchRelatedCandidates(params) {
|
||||||
return get('/web/admin/oa-approval/related-candidates', params)
|
return get('/web/admin/oa-approval/related-candidates', params)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,6 +52,24 @@
|
|||||||
<div class="oa-sheet-row__title">{{ a.label }}</div>
|
<div class="oa-sheet-row__title">{{ a.label }}</div>
|
||||||
<div v-if="a.sub" class="oa-sheet-row__meta">{{ a.sub }}</div>
|
<div v-if="a.sub" class="oa-sheet-row__meta">{{ a.sub }}</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="oa-sheet-row__actions" @click.stop>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="oa-sheet-row__icon is-edit"
|
||||||
|
aria-label="编辑"
|
||||||
|
@click="openEdit(a.id)"
|
||||||
|
>
|
||||||
|
<van-icon name="edit" />
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="oa-sheet-row__icon is-delete"
|
||||||
|
aria-label="删除"
|
||||||
|
@click="confirmDelete(a.id)"
|
||||||
|
>
|
||||||
|
<van-icon name="delete-o" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</van-checkbox-group>
|
</van-checkbox-group>
|
||||||
<van-empty v-if="!loading && !filtered.length" description="暂无本人的收款账户" />
|
<van-empty v-if="!loading && !filtered.length" description="暂无本人的收款账户" />
|
||||||
@@ -63,17 +81,17 @@
|
|||||||
</div>
|
</div>
|
||||||
</van-popup>
|
</van-popup>
|
||||||
|
|
||||||
<van-popup v-model:show="createVisible" position="bottom" round>
|
<van-popup v-model:show="formVisible" position="bottom" round>
|
||||||
<div class="oa-recv__sheet oa-recv__sheet--create">
|
<div class="oa-recv__sheet oa-recv__sheet--create">
|
||||||
<div class="oa-recv__hd">
|
<div class="oa-recv__hd">
|
||||||
<span @click="createVisible = false">取消</span>
|
<span @click="formVisible = false">取消</span>
|
||||||
<strong>新增收款账户</strong>
|
<strong>{{ formTitle }}</strong>
|
||||||
<span
|
<span
|
||||||
class="oa-recv__ok"
|
class="oa-recv__ok"
|
||||||
:class="{ 'is-busy': createLoading }"
|
:class="{ 'is-busy': formLoading }"
|
||||||
@click="submitCreate"
|
@click="submitForm"
|
||||||
>
|
>
|
||||||
{{ createLoading ? '提交中' : '确定' }}
|
{{ formLoading ? '提交中' : '确定' }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="oa-recv__form">
|
<div class="oa-recv__form">
|
||||||
@@ -87,45 +105,45 @@
|
|||||||
<label class="oa-recv-field">
|
<label class="oa-recv-field">
|
||||||
<span class="oa-recv-field__label">户名<b>*</b></span>
|
<span class="oa-recv-field__label">户名<b>*</b></span>
|
||||||
<span class="oa-recv-field__box">
|
<span class="oa-recv-field__box">
|
||||||
<input v-model="createForm.accountName" maxlength="128" placeholder="请输入户名" />
|
<input v-model="formModel.accountName" maxlength="128" placeholder="请输入户名" />
|
||||||
</span>
|
</span>
|
||||||
</label>
|
</label>
|
||||||
<label class="oa-recv-field">
|
<label class="oa-recv-field">
|
||||||
<span class="oa-recv-field__label">账号<b>*</b></span>
|
<span class="oa-recv-field__label">账号<b>*</b></span>
|
||||||
<span class="oa-recv-field__box">
|
<span class="oa-recv-field__box">
|
||||||
<input v-model="createForm.accountNo" maxlength="128" placeholder="请输入账号" />
|
<input v-model="formModel.accountNo" maxlength="128" placeholder="请输入账号" />
|
||||||
</span>
|
</span>
|
||||||
</label>
|
</label>
|
||||||
<template v-if="createForm.accountType !== 'alipay'">
|
<template v-if="formModel.accountType !== 'alipay'">
|
||||||
<label class="oa-recv-field">
|
<label class="oa-recv-field">
|
||||||
<span class="oa-recv-field__label">银行<b>*</b></span>
|
<span class="oa-recv-field__label">银行<b>*</b></span>
|
||||||
<span class="oa-recv-field__box">
|
<span class="oa-recv-field__box">
|
||||||
<input v-model="createForm.bankName" maxlength="128" placeholder="如:中国工商银行" />
|
<input v-model="formModel.bankName" maxlength="128" placeholder="如:中国工商银行" />
|
||||||
</span>
|
</span>
|
||||||
</label>
|
</label>
|
||||||
<label class="oa-recv-field">
|
<label class="oa-recv-field">
|
||||||
<span class="oa-recv-field__label">银行所在省<b>*</b></span>
|
<span class="oa-recv-field__label">银行所在省<b>*</b></span>
|
||||||
<span class="oa-recv-field__box">
|
<span class="oa-recv-field__box">
|
||||||
<input v-model="createForm.bankProvince" maxlength="64" placeholder="如:安徽省" />
|
<input v-model="formModel.bankProvince" maxlength="64" placeholder="如:安徽省" />
|
||||||
</span>
|
</span>
|
||||||
</label>
|
</label>
|
||||||
<label class="oa-recv-field">
|
<label class="oa-recv-field">
|
||||||
<span class="oa-recv-field__label">银行所在市<b>*</b></span>
|
<span class="oa-recv-field__label">银行所在市<b>*</b></span>
|
||||||
<span class="oa-recv-field__box">
|
<span class="oa-recv-field__box">
|
||||||
<input v-model="createForm.bankCity" maxlength="64" placeholder="如:合肥市" />
|
<input v-model="formModel.bankCity" maxlength="64" placeholder="如:合肥市" />
|
||||||
</span>
|
</span>
|
||||||
</label>
|
</label>
|
||||||
<label class="oa-recv-field">
|
<label class="oa-recv-field">
|
||||||
<span class="oa-recv-field__label">银行支行<b>*</b></span>
|
<span class="oa-recv-field__label">银行支行<b>*</b></span>
|
||||||
<span class="oa-recv-field__box">
|
<span class="oa-recv-field__box">
|
||||||
<input v-model="createForm.bankBranch" maxlength="256" placeholder="请输入开户支行全称" />
|
<input v-model="formModel.bankBranch" maxlength="256" placeholder="请输入开户支行全称" />
|
||||||
</span>
|
</span>
|
||||||
</label>
|
</label>
|
||||||
</template>
|
</template>
|
||||||
<label class="oa-recv-field">
|
<label class="oa-recv-field">
|
||||||
<span class="oa-recv-field__label">备注</span>
|
<span class="oa-recv-field__label">备注</span>
|
||||||
<span class="oa-recv-field__box oa-recv-field__box--area">
|
<span class="oa-recv-field__box oa-recv-field__box--area">
|
||||||
<textarea v-model="createForm.remark" maxlength="512" rows="2" placeholder="选填" />
|
<textarea v-model="formModel.remark" maxlength="512" rows="2" placeholder="选填" />
|
||||||
</span>
|
</span>
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
@@ -135,7 +153,7 @@
|
|||||||
<van-popup v-model:show="typePickerVisible" position="bottom" round>
|
<van-popup v-model:show="typePickerVisible" position="bottom" round>
|
||||||
<van-picker
|
<van-picker
|
||||||
:columns="accountTypeColumns"
|
:columns="accountTypeColumns"
|
||||||
:model-value="[createForm.accountType]"
|
:model-value="[formModel.accountType]"
|
||||||
@confirm="onTypeConfirm"
|
@confirm="onTypeConfirm"
|
||||||
@cancel="typePickerVisible = false"
|
@cancel="typePickerVisible = false"
|
||||||
/>
|
/>
|
||||||
@@ -145,8 +163,13 @@
|
|||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { computed, onMounted, ref } from 'vue'
|
import { computed, onMounted, ref } from 'vue'
|
||||||
import { showToast } from 'vant'
|
import { showConfirmDialog, showToast } from 'vant'
|
||||||
import { fetchCreateReceiveAccount, fetchReceiveAccountOptions } from '../../api/oa.js'
|
import {
|
||||||
|
fetchCreateReceiveAccount,
|
||||||
|
fetchDeleteReceiveAccount,
|
||||||
|
fetchReceiveAccountOptions,
|
||||||
|
fetchUpdateReceiveAccount
|
||||||
|
} from '../../api/oa.js'
|
||||||
import {
|
import {
|
||||||
ACCOUNT_TYPE_LABEL,
|
ACCOUNT_TYPE_LABEL,
|
||||||
formatReceiveAccountLine,
|
formatReceiveAccountLine,
|
||||||
@@ -170,17 +193,19 @@ const keyword = ref('')
|
|||||||
const pendingIds = ref([])
|
const pendingIds = ref([])
|
||||||
const snapshotMap = ref(new Map())
|
const snapshotMap = ref(new Map())
|
||||||
const accountOptions = ref([])
|
const accountOptions = ref([])
|
||||||
const createVisible = ref(false)
|
const formVisible = ref(false)
|
||||||
const createLoading = ref(false)
|
const formLoading = ref(false)
|
||||||
|
const formMode = ref('create')
|
||||||
|
const editingId = ref('')
|
||||||
const typePickerVisible = ref(false)
|
const typePickerVisible = ref(false)
|
||||||
const accountTypeColumns = [
|
const accountTypeColumns = [
|
||||||
{ text: '支付宝', value: 'alipay' },
|
{ text: '支付宝', value: 'alipay' },
|
||||||
{ text: '个人银行卡', value: 'personal' },
|
{ text: '个人银行卡', value: 'personal' },
|
||||||
{ text: '对公银行账户', value: 'corporate' }
|
{ text: '对公银行账户', value: 'corporate' }
|
||||||
]
|
]
|
||||||
const createForm = ref(emptyCreateForm())
|
const formModel = ref(emptyForm())
|
||||||
|
|
||||||
function emptyCreateForm() {
|
function emptyForm() {
|
||||||
return {
|
return {
|
||||||
accountType: 'alipay',
|
accountType: 'alipay',
|
||||||
accountName: '',
|
accountName: '',
|
||||||
@@ -193,8 +218,12 @@ function emptyCreateForm() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const formTitle = computed(() =>
|
||||||
|
formMode.value === 'edit' ? '编辑收款账户' : '新增收款账户'
|
||||||
|
)
|
||||||
|
|
||||||
const accountTypeLabel = computed(
|
const accountTypeLabel = computed(
|
||||||
() => ACCOUNT_TYPE_LABEL[createForm.value.accountType] || ''
|
() => ACCOUNT_TYPE_LABEL[formModel.value.accountType] || ''
|
||||||
)
|
)
|
||||||
|
|
||||||
const normalized = computed(() => normalizeReceiveAccountModelValue(props.modelValue))
|
const normalized = computed(() => normalizeReceiveAccountModelValue(props.modelValue))
|
||||||
@@ -260,26 +289,78 @@ function optionFromSnap(snap) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function upsertLocalSnap(snap) {
|
||||||
|
if (!snap.id) return
|
||||||
|
const map = new Map(snapshotMap.value)
|
||||||
|
map.set(snap.id, snap)
|
||||||
|
snapshotMap.value = map
|
||||||
|
const opt = optionFromSnap(snap)
|
||||||
|
const idx = accountOptions.value.findIndex((x) => x.id === snap.id)
|
||||||
|
if (idx >= 0) {
|
||||||
|
const next = [...accountOptions.value]
|
||||||
|
next[idx] = opt
|
||||||
|
accountOptions.value = next
|
||||||
|
} else {
|
||||||
|
accountOptions.value = [...accountOptions.value, opt]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function fillFormFromSnap(snap) {
|
||||||
|
const form = {
|
||||||
|
accountType: snap.accountType || 'alipay',
|
||||||
|
accountName: snap.accountName || '',
|
||||||
|
accountNo: snap.accountNo || '',
|
||||||
|
bankName: snap.bankName || '',
|
||||||
|
bankProvince: snap.bankProvince || '',
|
||||||
|
bankCity: snap.bankCity || '',
|
||||||
|
bankBranch: snap.bankBranch || '',
|
||||||
|
remark: snap.remark || ''
|
||||||
|
}
|
||||||
|
if (form.accountType === 'alipay') {
|
||||||
|
form.bankName = ''
|
||||||
|
form.bankProvince = ''
|
||||||
|
form.bankCity = ''
|
||||||
|
form.bankBranch = ''
|
||||||
|
}
|
||||||
|
formModel.value = form
|
||||||
|
}
|
||||||
|
|
||||||
function openCreate() {
|
function openCreate() {
|
||||||
createForm.value = emptyCreateForm()
|
formMode.value = 'create'
|
||||||
|
editingId.value = ''
|
||||||
|
formModel.value = emptyForm()
|
||||||
typePickerVisible.value = false
|
typePickerVisible.value = false
|
||||||
createVisible.value = true
|
formVisible.value = true
|
||||||
|
}
|
||||||
|
|
||||||
|
function openEdit(id) {
|
||||||
|
const tid = String(id || '').trim()
|
||||||
|
const snap = snapshotMap.value.get(tid)
|
||||||
|
if (!snap) {
|
||||||
|
showToast('账户不存在或已删除')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
formMode.value = 'edit'
|
||||||
|
editingId.value = tid
|
||||||
|
fillFormFromSnap(snap)
|
||||||
|
typePickerVisible.value = false
|
||||||
|
formVisible.value = true
|
||||||
}
|
}
|
||||||
|
|
||||||
function onTypeConfirm({ selectedOptions }) {
|
function onTypeConfirm({ selectedOptions }) {
|
||||||
const next = selectedOptions?.[0]?.value || 'alipay'
|
const next = selectedOptions?.[0]?.value || 'alipay'
|
||||||
const form = { ...createForm.value, accountType: next }
|
const form = { ...formModel.value, accountType: next }
|
||||||
if (next === 'alipay') {
|
if (next === 'alipay') {
|
||||||
form.bankName = ''
|
form.bankName = ''
|
||||||
form.bankProvince = ''
|
form.bankProvince = ''
|
||||||
form.bankCity = ''
|
form.bankCity = ''
|
||||||
form.bankBranch = ''
|
form.bankBranch = ''
|
||||||
}
|
}
|
||||||
createForm.value = form
|
formModel.value = form
|
||||||
typePickerVisible.value = false
|
typePickerVisible.value = false
|
||||||
}
|
}
|
||||||
|
|
||||||
function validateCreate(form) {
|
function validateForm(form) {
|
||||||
if (!form.accountName.trim()) return '请输入户名'
|
if (!form.accountName.trim()) return '请输入户名'
|
||||||
if (!form.accountNo.trim()) return '请输入账号'
|
if (!form.accountNo.trim()) return '请输入账号'
|
||||||
if (form.accountType !== 'alipay') {
|
if (form.accountType !== 'alipay') {
|
||||||
@@ -291,14 +372,7 @@ function validateCreate(form) {
|
|||||||
return ''
|
return ''
|
||||||
}
|
}
|
||||||
|
|
||||||
async function submitCreate() {
|
function buildPayload(form) {
|
||||||
if (createLoading.value) return
|
|
||||||
const form = createForm.value
|
|
||||||
const invalid = validateCreate(form)
|
|
||||||
if (invalid) {
|
|
||||||
showToast(invalid)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const payload = {
|
const payload = {
|
||||||
accountType: form.accountType,
|
accountType: form.accountType,
|
||||||
accountName: form.accountName.trim(),
|
accountName: form.accountName.trim(),
|
||||||
@@ -316,36 +390,80 @@ async function submitCreate() {
|
|||||||
payload.bankCity = form.bankCity.trim()
|
payload.bankCity = form.bankCity.trim()
|
||||||
payload.bankBranch = form.bankBranch.trim()
|
payload.bankBranch = form.bankBranch.trim()
|
||||||
}
|
}
|
||||||
createLoading.value = true
|
return payload
|
||||||
|
}
|
||||||
|
|
||||||
|
async function submitForm() {
|
||||||
|
if (formLoading.value) return
|
||||||
|
const form = formModel.value
|
||||||
|
const invalid = validateForm(form)
|
||||||
|
if (invalid) {
|
||||||
|
showToast(invalid)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const payload = buildPayload(form)
|
||||||
|
formLoading.value = true
|
||||||
try {
|
try {
|
||||||
const created = await fetchCreateReceiveAccount(payload)
|
const row =
|
||||||
const snap = snapshotFromRow(created)
|
formMode.value === 'edit' && editingId.value
|
||||||
|
? await fetchUpdateReceiveAccount(editingId.value, payload)
|
||||||
|
: await fetchCreateReceiveAccount(payload)
|
||||||
|
const snap = snapshotFromRow(row)
|
||||||
if (!snap.id) {
|
if (!snap.id) {
|
||||||
showToast('创建成功但未返回账户 ID')
|
showToast(formMode.value === 'edit' ? '更新成功但未返回账户 ID' : '创建成功但未返回账户 ID')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
await loadOptions()
|
await loadOptions()
|
||||||
if (!snapshotMap.value.has(snap.id)) {
|
upsertLocalSnap(snap)
|
||||||
const map = new Map(snapshotMap.value)
|
if (formMode.value === 'edit') {
|
||||||
map.set(snap.id, snap)
|
const selected = normalized.value.map((x) => x.id)
|
||||||
snapshotMap.value = map
|
if (selected.includes(snap.id)) {
|
||||||
if (!accountOptions.value.some((x) => x.id === snap.id)) {
|
emitItems(selected.map((id) => snapshotMap.value.get(id)).filter(Boolean))
|
||||||
accountOptions.value = [...accountOptions.value, optionFromSnap(snap)]
|
|
||||||
}
|
}
|
||||||
|
showToast('更新成功')
|
||||||
|
} else {
|
||||||
|
const selected = new Set(normalized.value.map((x) => x.id))
|
||||||
|
selected.add(snap.id)
|
||||||
|
emitItems([...selected].map((id) => snapshotMap.value.get(id)).filter(Boolean))
|
||||||
|
if (!pendingIds.value.includes(snap.id)) {
|
||||||
|
pendingIds.value = [...pendingIds.value, snap.id]
|
||||||
|
}
|
||||||
|
keyword.value = ''
|
||||||
|
showToast('创建成功')
|
||||||
}
|
}
|
||||||
const selected = new Set(normalized.value.map((x) => x.id))
|
formVisible.value = false
|
||||||
selected.add(snap.id)
|
|
||||||
emitItems([...selected].map((id) => snapshotMap.value.get(id)).filter(Boolean))
|
|
||||||
if (!pendingIds.value.includes(snap.id)) {
|
|
||||||
pendingIds.value = [...pendingIds.value, snap.id]
|
|
||||||
}
|
|
||||||
keyword.value = ''
|
|
||||||
createVisible.value = false
|
|
||||||
showToast('创建成功')
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
showToast(e?.message || '新增收款账户失败')
|
showToast(e?.message || (formMode.value === 'edit' ? '编辑收款账户失败' : '新增收款账户失败'))
|
||||||
} finally {
|
} finally {
|
||||||
createLoading.value = false
|
formLoading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function confirmDelete(id) {
|
||||||
|
const tid = String(id || '').trim()
|
||||||
|
const snap = snapshotMap.value.get(tid)
|
||||||
|
const name = snap?.accountName || tid
|
||||||
|
try {
|
||||||
|
await showConfirmDialog({
|
||||||
|
title: '删除收款账户',
|
||||||
|
message: `确定删除收款账户「${name}」吗?删除后不可再选;已提交单据中的账户快照仍保留。`
|
||||||
|
})
|
||||||
|
} catch {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
await fetchDeleteReceiveAccount(tid)
|
||||||
|
await loadOptions()
|
||||||
|
const nextSelected = normalized.value
|
||||||
|
.map((x) => x.id)
|
||||||
|
.filter((x) => x !== tid)
|
||||||
|
.map((x) => snapshotMap.value.get(x))
|
||||||
|
.filter(Boolean)
|
||||||
|
emitItems(nextSelected)
|
||||||
|
pendingIds.value = pendingIds.value.filter((x) => x !== tid)
|
||||||
|
showToast('删除成功')
|
||||||
|
} catch (e) {
|
||||||
|
showToast(e?.message || '删除收款账户失败')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -411,6 +529,39 @@ onMounted(() => {
|
|||||||
line-height: 1.5;
|
line-height: 1.5;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.oa-sheet-row__actions {
|
||||||
|
display: inline-flex;
|
||||||
|
flex: none;
|
||||||
|
gap: 6px;
|
||||||
|
align-items: center;
|
||||||
|
margin-left: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.oa-sheet-row__icon {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 36px;
|
||||||
|
height: 36px;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
border: 0;
|
||||||
|
border-radius: 8px;
|
||||||
|
background: transparent;
|
||||||
|
font-size: 18px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.oa-sheet-row__icon.is-edit {
|
||||||
|
background: #ecfdf5;
|
||||||
|
color: var(--brand-green-dark, #16a34a);
|
||||||
|
}
|
||||||
|
|
||||||
|
.oa-sheet-row__icon.is-delete {
|
||||||
|
background: #fef2f2;
|
||||||
|
color: #dc2626;
|
||||||
|
}
|
||||||
|
|
||||||
.oa-recv__add {
|
.oa-recv__add {
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: 6px;
|
gap: 6px;
|
||||||
|
|||||||
@@ -40,17 +40,39 @@
|
|||||||
class="oa-receive-account-select__search"
|
class="oa-receive-account-select__search"
|
||||||
/>
|
/>
|
||||||
<div class="oa-receive-account-select__list">
|
<div class="oa-receive-account-select__list">
|
||||||
<label
|
<div
|
||||||
v-for="a in filteredOptions"
|
v-for="a in filteredOptions"
|
||||||
:key="a.id"
|
:key="a.id"
|
||||||
class="oa-receive-account-select__row"
|
class="oa-receive-account-select__row"
|
||||||
>
|
>
|
||||||
<el-checkbox
|
<label class="oa-receive-account-select__row-main">
|
||||||
:model-value="pendingIds.includes(a.id)"
|
<el-checkbox
|
||||||
@change="(v: boolean | string | number) => onNarrowCheck(a.id, !!v)"
|
:model-value="pendingIds.includes(a.id)"
|
||||||
/>
|
@change="(v: boolean | string | number) => onNarrowCheck(a.id, !!v)"
|
||||||
<span class="oa-receive-account-select__row-label">{{ a.label }}</span>
|
/>
|
||||||
</label>
|
<span class="oa-receive-account-select__row-label">{{ a.label }}</span>
|
||||||
|
</label>
|
||||||
|
<div class="oa-receive-account-select__row-actions">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="oa-receive-account-select__icon-btn is-edit"
|
||||||
|
title="编辑"
|
||||||
|
aria-label="编辑"
|
||||||
|
@click="openEditDialog(a.id)"
|
||||||
|
>
|
||||||
|
<el-icon><Edit /></el-icon>
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="oa-receive-account-select__icon-btn is-delete"
|
||||||
|
title="删除"
|
||||||
|
aria-label="删除"
|
||||||
|
@click="confirmDelete(a.id)"
|
||||||
|
>
|
||||||
|
<el-icon><Delete /></el-icon>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div v-if="!filteredOptions.length" class="oa-receive-account-select__empty">
|
<div v-if="!filteredOptions.length" class="oa-receive-account-select__empty">
|
||||||
暂无本人的收款账户
|
暂无本人的收款账户
|
||||||
</div>
|
</div>
|
||||||
@@ -92,7 +114,31 @@
|
|||||||
:key="a.id"
|
:key="a.id"
|
||||||
:label="a.label"
|
:label="a.label"
|
||||||
:value="a.id"
|
:value="a.id"
|
||||||
/>
|
>
|
||||||
|
<div class="oa-receive-account-select__option">
|
||||||
|
<span class="oa-receive-account-select__option-label">{{ a.label }}</span>
|
||||||
|
<span class="oa-receive-account-select__option-actions" @mousedown.prevent @click.stop>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="oa-receive-account-select__icon-btn is-edit"
|
||||||
|
title="编辑"
|
||||||
|
aria-label="编辑"
|
||||||
|
@click="openEditDialog(a.id)"
|
||||||
|
>
|
||||||
|
<el-icon><Edit /></el-icon>
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="oa-receive-account-select__icon-btn is-delete"
|
||||||
|
title="删除"
|
||||||
|
aria-label="删除"
|
||||||
|
@click="confirmDelete(a.id)"
|
||||||
|
>
|
||||||
|
<el-icon><Delete /></el-icon>
|
||||||
|
</button>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</el-option>
|
||||||
<template #empty>
|
<template #empty>
|
||||||
<div class="oa-receive-account-select__empty">
|
<div class="oa-receive-account-select__empty">
|
||||||
{{ accountOptions.length === 0 ? '暂无本人的收款账户' : '无匹配数据' }}
|
{{ accountOptions.length === 0 ? '暂无本人的收款账户' : '无匹配数据' }}
|
||||||
@@ -120,8 +166,8 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<el-dialog
|
<el-dialog
|
||||||
v-model="createVisible"
|
v-model="formVisible"
|
||||||
title="新增收款账户"
|
:title="formTitle"
|
||||||
width="720px"
|
width="720px"
|
||||||
class="dialog-form-layout"
|
class="dialog-form-layout"
|
||||||
align-center
|
align-center
|
||||||
@@ -131,9 +177,9 @@
|
|||||||
:close-on-click-modal="false"
|
:close-on-click-modal="false"
|
||||||
>
|
>
|
||||||
<el-form
|
<el-form
|
||||||
ref="createFormRef"
|
ref="formRef"
|
||||||
:model="createForm"
|
:model="formModel"
|
||||||
:rules="createRules"
|
:rules="formRules"
|
||||||
label-position="top"
|
label-position="top"
|
||||||
scroll-to-error
|
scroll-to-error
|
||||||
:scroll-into-view-options="{ behavior: 'smooth', block: 'center' }"
|
:scroll-into-view-options="{ behavior: 'smooth', block: 'center' }"
|
||||||
@@ -141,9 +187,9 @@
|
|||||||
<div class="form-grid-2">
|
<div class="form-grid-2">
|
||||||
<el-form-item label="账户类型" prop="accountType" class="form-col-span-2">
|
<el-form-item label="账户类型" prop="accountType" class="form-col-span-2">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="createForm.accountType"
|
v-model="formModel.accountType"
|
||||||
placeholder="请选择"
|
placeholder="请选择"
|
||||||
@change="onCreateTypeChange"
|
@change="onFormTypeChange"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="(label, value) in ACCOUNT_TYPE_LABEL"
|
v-for="(label, value) in ACCOUNT_TYPE_LABEL"
|
||||||
@@ -154,22 +200,22 @@
|
|||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="户名" prop="accountName">
|
<el-form-item label="户名" prop="accountName">
|
||||||
<el-input v-model="createForm.accountName" placeholder="请输入户名" maxlength="128" />
|
<el-input v-model="formModel.accountName" placeholder="请输入户名" maxlength="128" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="账号" prop="accountNo">
|
<el-form-item label="账号" prop="accountNo">
|
||||||
<el-input v-model="createForm.accountNo" placeholder="请输入账号" maxlength="128" />
|
<el-input v-model="formModel.accountNo" placeholder="请输入账号" maxlength="128" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<template v-if="createForm.accountType !== 'alipay'">
|
<template v-if="formModel.accountType !== 'alipay'">
|
||||||
<el-form-item label="银行" prop="bankName">
|
<el-form-item label="银行" prop="bankName">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="createForm.bankName"
|
v-model="formModel.bankName"
|
||||||
placeholder="如:中国工商银行"
|
placeholder="如:中国工商银行"
|
||||||
maxlength="128"
|
maxlength="128"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="银行所在省" prop="bankProvince">
|
<el-form-item label="银行所在省" prop="bankProvince">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="createForm.bankProvince"
|
v-model="formModel.bankProvince"
|
||||||
placeholder="如:安徽省"
|
placeholder="如:安徽省"
|
||||||
maxlength="64"
|
maxlength="64"
|
||||||
clearable
|
clearable
|
||||||
@@ -177,7 +223,7 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="银行所在市" prop="bankCity">
|
<el-form-item label="银行所在市" prop="bankCity">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="createForm.bankCity"
|
v-model="formModel.bankCity"
|
||||||
placeholder="如:合肥市"
|
placeholder="如:合肥市"
|
||||||
maxlength="64"
|
maxlength="64"
|
||||||
clearable
|
clearable
|
||||||
@@ -185,7 +231,7 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="银行支行" prop="bankBranch" class="form-col-span-2">
|
<el-form-item label="银行支行" prop="bankBranch" class="form-col-span-2">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="createForm.bankBranch"
|
v-model="formModel.bankBranch"
|
||||||
placeholder="请输入开户支行全称"
|
placeholder="请输入开户支行全称"
|
||||||
maxlength="256"
|
maxlength="256"
|
||||||
/>
|
/>
|
||||||
@@ -193,7 +239,7 @@
|
|||||||
</template>
|
</template>
|
||||||
<el-form-item label="备注" class="form-col-span-2">
|
<el-form-item label="备注" class="form-col-span-2">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="createForm.remark"
|
v-model="formModel.remark"
|
||||||
type="textarea"
|
type="textarea"
|
||||||
:rows="2"
|
:rows="2"
|
||||||
placeholder="选填"
|
placeholder="选填"
|
||||||
@@ -203,15 +249,15 @@
|
|||||||
</div>
|
</div>
|
||||||
</el-form>
|
</el-form>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<el-button class="btn-ghost" @click="createVisible = false">
|
<el-button class="btn-ghost" @click="formVisible = false">
|
||||||
<el-icon><Close /></el-icon>
|
<el-icon><Close /></el-icon>
|
||||||
取消
|
取消
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
class="btn-main"
|
class="btn-main"
|
||||||
type="primary"
|
type="primary"
|
||||||
:loading="createLoading"
|
:loading="formLoading"
|
||||||
@click="submitCreate"
|
@click="submitForm"
|
||||||
>
|
>
|
||||||
<el-icon><Check /></el-icon>
|
<el-icon><Check /></el-icon>
|
||||||
确定
|
确定
|
||||||
@@ -223,11 +269,13 @@
|
|||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, nextTick, onBeforeUnmount, onMounted, reactive, ref } from 'vue'
|
import { computed, nextTick, onBeforeUnmount, onMounted, reactive, ref } from 'vue'
|
||||||
import { Check, Close, Plus } from '@element-plus/icons-vue'
|
import { Check, Close, Delete, Edit, Plus } from '@element-plus/icons-vue'
|
||||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||||
import {
|
import {
|
||||||
fetchCreateOaReceiveAccount,
|
fetchCreateOaReceiveAccount,
|
||||||
fetchOaReceiveAccountOptions
|
fetchDeleteOaReceiveAccount,
|
||||||
|
fetchOaReceiveAccountOptions,
|
||||||
|
fetchUpdateOaReceiveAccount
|
||||||
} from '@/api/oaApproval'
|
} from '@/api/oaApproval'
|
||||||
import {
|
import {
|
||||||
ACCOUNT_TYPE_LABEL,
|
ACCOUNT_TYPE_LABEL,
|
||||||
@@ -253,6 +301,7 @@
|
|||||||
}>()
|
}>()
|
||||||
|
|
||||||
type AccountOpt = { id: string; label: string }
|
type AccountOpt = { id: string; label: string }
|
||||||
|
type FormMode = 'create' | 'edit'
|
||||||
|
|
||||||
const snapshotMap = ref(new Map<string, ReceiveAccountSnapshot>())
|
const snapshotMap = ref(new Map<string, ReceiveAccountSnapshot>())
|
||||||
const accountOptions = ref<AccountOpt[]>([])
|
const accountOptions = ref<AccountOpt[]>([])
|
||||||
@@ -263,10 +312,12 @@
|
|||||||
const selectRef = ref<{ blur?: () => void } | null>(null)
|
const selectRef = ref<{ blur?: () => void } | null>(null)
|
||||||
let mql: MediaQueryList | null = null
|
let mql: MediaQueryList | null = null
|
||||||
|
|
||||||
const createVisible = ref(false)
|
const formVisible = ref(false)
|
||||||
const createLoading = ref(false)
|
const formLoading = ref(false)
|
||||||
const createFormRef = ref()
|
const formMode = ref<FormMode>('create')
|
||||||
const createForm = reactive({
|
const editingId = ref('')
|
||||||
|
const formRef = ref()
|
||||||
|
const formModel = reactive({
|
||||||
accountType: 'alipay' as ReceiveAccountType,
|
accountType: 'alipay' as ReceiveAccountType,
|
||||||
accountName: '',
|
accountName: '',
|
||||||
accountNo: '',
|
accountNo: '',
|
||||||
@@ -277,8 +328,12 @@
|
|||||||
remark: ''
|
remark: ''
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const formTitle = computed(() =>
|
||||||
|
formMode.value === 'edit' ? '编辑收款账户' : '新增收款账户'
|
||||||
|
)
|
||||||
|
|
||||||
const requireWhenBank = (_rule: any, value: string, callback: (e?: Error) => void) => {
|
const requireWhenBank = (_rule: any, value: string, callback: (e?: Error) => void) => {
|
||||||
if (createForm.accountType === 'alipay') {
|
if (formModel.accountType === 'alipay') {
|
||||||
callback()
|
callback()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -289,7 +344,7 @@
|
|||||||
callback()
|
callback()
|
||||||
}
|
}
|
||||||
|
|
||||||
const createRules = computed(() => ({
|
const formRules = computed(() => ({
|
||||||
accountType: [{ required: true, message: '请选择账户类型', trigger: 'change' }],
|
accountType: [{ required: true, message: '请选择账户类型', trigger: 'change' }],
|
||||||
accountName: [{ required: true, message: '请输入户名', trigger: 'blur' }],
|
accountName: [{ required: true, message: '请输入户名', trigger: 'blur' }],
|
||||||
accountNo: [{ required: true, message: '请输入账号', trigger: 'blur' }],
|
accountNo: [{ required: true, message: '请输入账号', trigger: 'blur' }],
|
||||||
@@ -358,90 +413,161 @@
|
|||||||
drawerVisible.value = false
|
drawerVisible.value = false
|
||||||
}
|
}
|
||||||
|
|
||||||
function clearCreateBankFields() {
|
function clearBankFields() {
|
||||||
createForm.bankName = ''
|
formModel.bankName = ''
|
||||||
createForm.bankProvince = ''
|
formModel.bankProvince = ''
|
||||||
createForm.bankCity = ''
|
formModel.bankCity = ''
|
||||||
createForm.bankBranch = ''
|
formModel.bankBranch = ''
|
||||||
}
|
}
|
||||||
|
|
||||||
function resetCreateForm() {
|
function resetFormModel() {
|
||||||
createForm.accountType = 'alipay'
|
formModel.accountType = 'alipay'
|
||||||
createForm.accountName = ''
|
formModel.accountName = ''
|
||||||
createForm.accountNo = ''
|
formModel.accountNo = ''
|
||||||
clearCreateBankFields()
|
clearBankFields()
|
||||||
createForm.remark = ''
|
formModel.remark = ''
|
||||||
}
|
}
|
||||||
|
|
||||||
function onCreateTypeChange() {
|
function fillFormFromSnap(snap: ReceiveAccountSnapshot) {
|
||||||
if (createForm.accountType === 'alipay') clearCreateBankFields()
|
formModel.accountType = snap.accountType
|
||||||
createFormRef.value?.clearValidate?.()
|
formModel.accountName = snap.accountName
|
||||||
|
formModel.accountNo = snap.accountNo
|
||||||
|
formModel.bankName = snap.bankName
|
||||||
|
formModel.bankProvince = snap.bankProvince
|
||||||
|
formModel.bankCity = snap.bankCity
|
||||||
|
formModel.bankBranch = snap.bankBranch
|
||||||
|
formModel.remark = snap.remark
|
||||||
|
if (formModel.accountType === 'alipay') clearBankFields()
|
||||||
|
}
|
||||||
|
|
||||||
|
function onFormTypeChange() {
|
||||||
|
if (formModel.accountType === 'alipay') clearBankFields()
|
||||||
|
formRef.value?.clearValidate?.()
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildPayload() {
|
||||||
|
const payload: Record<string, unknown> = {
|
||||||
|
accountType: formModel.accountType,
|
||||||
|
accountName: formModel.accountName.trim(),
|
||||||
|
accountNo: formModel.accountNo.trim(),
|
||||||
|
remark: formModel.remark?.trim() || undefined
|
||||||
|
}
|
||||||
|
if (formModel.accountType === 'alipay') {
|
||||||
|
payload.bankName = ''
|
||||||
|
payload.bankProvince = ''
|
||||||
|
payload.bankCity = ''
|
||||||
|
payload.bankBranch = ''
|
||||||
|
} else {
|
||||||
|
payload.bankName = formModel.bankName.trim()
|
||||||
|
payload.bankProvince = formModel.bankProvince.trim()
|
||||||
|
payload.bankCity = formModel.bankCity.trim()
|
||||||
|
payload.bankBranch = formModel.bankBranch.trim()
|
||||||
|
}
|
||||||
|
return payload
|
||||||
|
}
|
||||||
|
|
||||||
|
function upsertLocalSnap(snap: ReceiveAccountSnapshot) {
|
||||||
|
if (!snap.id) return
|
||||||
|
const map = new Map(snapshotMap.value)
|
||||||
|
map.set(snap.id, snap)
|
||||||
|
snapshotMap.value = map
|
||||||
|
const label = optionLabelFromRow(snap)
|
||||||
|
const idx = accountOptions.value.findIndex((x) => x.id === snap.id)
|
||||||
|
if (idx >= 0) {
|
||||||
|
const next = [...accountOptions.value]
|
||||||
|
next[idx] = { id: snap.id, label }
|
||||||
|
accountOptions.value = next
|
||||||
|
} else {
|
||||||
|
accountOptions.value = [...accountOptions.value, { id: snap.id, label }]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function openCreateDialog() {
|
function openCreateDialog() {
|
||||||
selectRef.value?.blur?.()
|
selectRef.value?.blur?.()
|
||||||
resetCreateForm()
|
formMode.value = 'create'
|
||||||
createVisible.value = true
|
editingId.value = ''
|
||||||
nextTick(() => createFormRef.value?.clearValidate?.())
|
resetFormModel()
|
||||||
|
formVisible.value = true
|
||||||
|
nextTick(() => formRef.value?.clearValidate?.())
|
||||||
}
|
}
|
||||||
|
|
||||||
async function submitCreate() {
|
function openEditDialog(id: string) {
|
||||||
|
const tid = String(id || '').trim()
|
||||||
|
const snap = snapshotMap.value.get(tid)
|
||||||
|
if (!snap) {
|
||||||
|
ElMessage.error('账户不存在或已删除')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
selectRef.value?.blur?.()
|
||||||
|
formMode.value = 'edit'
|
||||||
|
editingId.value = tid
|
||||||
|
fillFormFromSnap(snap)
|
||||||
|
formVisible.value = true
|
||||||
|
nextTick(() => formRef.value?.clearValidate?.())
|
||||||
|
}
|
||||||
|
|
||||||
|
async function submitForm() {
|
||||||
try {
|
try {
|
||||||
await createFormRef.value?.validate?.()
|
await formRef.value?.validate?.()
|
||||||
} catch {
|
} catch {
|
||||||
ElMessageBox.alert('请完善必填项后再提交', '提示', { type: 'warning' })
|
ElMessageBox.alert('请完善必填项后再提交', '提示', { type: 'warning' })
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
createLoading.value = true
|
formLoading.value = true
|
||||||
try {
|
try {
|
||||||
const payload: Record<string, unknown> = {
|
const payload = buildPayload()
|
||||||
accountType: createForm.accountType,
|
let row: any
|
||||||
accountName: createForm.accountName.trim(),
|
if (formMode.value === 'edit' && editingId.value) {
|
||||||
accountNo: createForm.accountNo.trim(),
|
row = await fetchUpdateOaReceiveAccount(editingId.value, payload)
|
||||||
remark: createForm.remark?.trim() || undefined
|
|
||||||
}
|
|
||||||
if (createForm.accountType === 'alipay') {
|
|
||||||
payload.bankName = ''
|
|
||||||
payload.bankProvince = ''
|
|
||||||
payload.bankCity = ''
|
|
||||||
payload.bankBranch = ''
|
|
||||||
} else {
|
} else {
|
||||||
payload.bankName = createForm.bankName.trim()
|
row = await fetchCreateOaReceiveAccount(payload)
|
||||||
payload.bankProvince = createForm.bankProvince.trim()
|
|
||||||
payload.bankCity = createForm.bankCity.trim()
|
|
||||||
payload.bankBranch = createForm.bankBranch.trim()
|
|
||||||
}
|
}
|
||||||
const created = await fetchCreateOaReceiveAccount(payload)
|
const snap = snapshotFromRow(row)
|
||||||
const snap = snapshotFromRow(created)
|
|
||||||
if (!snap.id) {
|
if (!snap.id) {
|
||||||
ElMessage.error('创建成功但未返回账户 ID')
|
ElMessage.error(formMode.value === 'edit' ? '更新成功但未返回账户 ID' : '创建成功但未返回账户 ID')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
await loadOptions()
|
await loadOptions()
|
||||||
// 确保新账户在 map 中(options 可能短暂未刷新)
|
upsertLocalSnap(snap)
|
||||||
if (!snapshotMap.value.has(snap.id)) {
|
if (formMode.value === 'edit') {
|
||||||
const map = new Map(snapshotMap.value)
|
if (selectModel.value.includes(snap.id)) {
|
||||||
map.set(snap.id, snap)
|
emitFromIds(selectModel.value)
|
||||||
snapshotMap.value = map
|
}
|
||||||
if (!accountOptions.value.some((x) => x.id === snap.id)) {
|
} else {
|
||||||
accountOptions.value = [
|
const nextIds = [...selectModel.value]
|
||||||
...accountOptions.value,
|
if (!nextIds.includes(snap.id)) nextIds.push(snap.id)
|
||||||
{ id: snap.id, label: optionLabelFromRow(snap) }
|
emitFromIds(nextIds)
|
||||||
]
|
if (drawerVisible.value && !pendingIds.value.includes(snap.id)) {
|
||||||
|
pendingIds.value = [...pendingIds.value, snap.id]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const nextIds = [...selectModel.value]
|
formVisible.value = false
|
||||||
if (!nextIds.includes(snap.id)) nextIds.push(snap.id)
|
|
||||||
emitFromIds(nextIds)
|
|
||||||
if (drawerVisible.value && !pendingIds.value.includes(snap.id)) {
|
|
||||||
pendingIds.value = [...pendingIds.value, snap.id]
|
|
||||||
}
|
|
||||||
createVisible.value = false
|
|
||||||
} finally {
|
} finally {
|
||||||
createLoading.value = false
|
formLoading.value = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function confirmDelete(id: string) {
|
||||||
|
const tid = String(id || '').trim()
|
||||||
|
const snap = snapshotMap.value.get(tid)
|
||||||
|
const name = snap?.accountName || tid
|
||||||
|
try {
|
||||||
|
await ElMessageBox.confirm(
|
||||||
|
`确定删除收款账户「${name}」吗?删除后不可再选;已提交单据中的账户快照仍保留。`,
|
||||||
|
'删除收款账户',
|
||||||
|
{ type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消' }
|
||||||
|
)
|
||||||
|
} catch {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
selectRef.value?.blur?.()
|
||||||
|
await fetchDeleteOaReceiveAccount(tid)
|
||||||
|
await loadOptions()
|
||||||
|
const nextSelected = selectModel.value.filter((x) => x !== tid)
|
||||||
|
emitFromIds(nextSelected)
|
||||||
|
pendingIds.value = pendingIds.value.filter((x) => x !== tid)
|
||||||
|
}
|
||||||
|
|
||||||
async function loadOptions() {
|
async function loadOptions() {
|
||||||
try {
|
try {
|
||||||
const res = await fetchOaReceiveAccountOptions()
|
const res = await fetchOaReceiveAccountOptions()
|
||||||
@@ -512,6 +638,53 @@
|
|||||||
min-height: 40px;
|
min-height: 40px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.oa-receive-account-select__option {
|
||||||
|
display: flex;
|
||||||
|
gap: 8px;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
width: 100%;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.oa-receive-account-select__option-label {
|
||||||
|
flex: 1;
|
||||||
|
min-width: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.oa-receive-account-select__option-actions,
|
||||||
|
.oa-receive-account-select__row-actions {
|
||||||
|
display: inline-flex;
|
||||||
|
flex-shrink: 0;
|
||||||
|
gap: 4px;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.oa-receive-account-select__icon-btn {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 28px;
|
||||||
|
height: 28px;
|
||||||
|
padding: 0;
|
||||||
|
border: 0;
|
||||||
|
border-radius: 6px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.oa-receive-account-select__icon-btn.is-edit {
|
||||||
|
background: var(--mint-primary-bg, #ecfdf5);
|
||||||
|
color: var(--mint-primary-dark, #059669);
|
||||||
|
}
|
||||||
|
|
||||||
|
.oa-receive-account-select__icon-btn.is-delete {
|
||||||
|
background: #fef2f2;
|
||||||
|
color: #dc2626;
|
||||||
|
}
|
||||||
|
|
||||||
.oa-receive-account-select__add-footer {
|
.oa-receive-account-select__add-footer {
|
||||||
padding: 4px 8px 8px;
|
padding: 4px 8px 8px;
|
||||||
border-top: 1px solid var(--mint-border, #d9e8e2);
|
border-top: 1px solid var(--mint-border, #d9e8e2);
|
||||||
@@ -597,6 +770,14 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
min-height: 44px;
|
min-height: 44px;
|
||||||
padding: 6px 4px;
|
padding: 6px 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.oa-receive-account-select__row-main {
|
||||||
|
display: flex;
|
||||||
|
flex: 1;
|
||||||
|
gap: 8px;
|
||||||
|
align-items: center;
|
||||||
|
min-width: 0;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -630,5 +811,10 @@
|
|||||||
.oa-receive-account-select__trigger {
|
.oa-receive-account-select__trigger {
|
||||||
min-height: 44px;
|
min-height: 44px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.oa-receive-account-select__icon-btn {
|
||||||
|
width: 36px;
|
||||||
|
height: 36px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
Reference in new issue
Block a user