采纳
驳回
@@ -1408,7 +1411,17 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
+
+ {{ decideDlg.row.qty }} 股预计金额 {{ propAmount(decideDlg.row) }}
+
+
+ {{ decideDlg.row.judge_reason || propWhy(decideDlg.row) }}
+
+ 正在核对采纳条件；依据有变化时会重新研判，可能需要一至两分钟。请勿重复提交。
+
选一个理由记进评审账本。选「其他」时补充必填。
{{ label }}
@@ -1416,9 +1429,9 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
- 取消
-
- {{ decideDlg.decision==='ACCEPTED'?'确认采纳':'确认驳回' }}
+ 关闭
+
+ {{ decideDlg.busy ? '正在处理' : (decideDlg.updated ? '确认更新后的建议' : (decideDlg.decision==='ACCEPTED' ? (((decideDlg.row||{}).hard_numbers||{}).last_accept_check ? '重新核验' : '确认采纳') : '确认驳回')) }}
@@ -3704,9 +3717,9 @@ createApp({
// ===================== /交易员视图 =====================
- async function call(method, url, body) {
+ async function call(method, url, body, options) {
try {
- const r = await api[method](url, body);
+ const r = await api[method](url, body, options);
if (r.data && r.data.ok === false) { err.value = r.data.error || '请求失败'; }
return r.data;
} catch (e) {
@@ -3716,7 +3729,7 @@ createApp({
const m = (e.response && e.response.data && e.response.data.error) || '无权限: 需要系统管理员';
ElementPlus.ElMessage.error(m); return { ok: false, error: m };
}
- err.value = url + ' → ' + e.message; return { ok: false, error: e.message };
+ err.value = url + ' → ' + e.message; return { ok: false, error: e.message, uncertain: !e.response || st >= 500 };
}
}
@@ -4365,38 +4378,60 @@ createApp({
DECLINE_WAIT_PULLBACK:'等待回调再议', DECLINE_MARKET_RISK:'大盘风险偏高', DECLINE_OTHER:'其他' },
};
const decideReasons = reactive({ accept:{}, decline:{} });
+ let decideTimeoutMs = 180000;
async function loadDecideReasons() {
const d = await call('get', '/api/proposals/decide-reasons');
const src = (d && d.ok !== false) ? d : DECIDE_REASONS_FALLBACK;
decideReasons.accept = src.accept || DECIDE_REASONS_FALLBACK.accept;
decideReasons.decline = src.decline || DECIDE_REASONS_FALLBACK.decline;
+ if (Number(src.request_timeout_ms) > 0) decideTimeoutMs = Number(src.request_timeout_ms);
}
- const decideDlg = reactive({ visible:false, busy:false, row:null, decision:'', code:'', note:'' });
+ const decideDlg = reactive({ visible:false, busy:false, row:null, decision:'', code:'', note:'', message:'', updated:false, uncertain:false });
// 采纳/驳回都从预设理由里选一条 (选「其他」再补一句), 不再手写整段 (三源合议自决后剩的都是真交人的)。
function decide(row, decision) {
+ if (decideDlg.busy) return;
if (!Object.keys(decideReasons.accept).length) loadDecideReasons();
- Object.assign(decideDlg, { visible:true, busy:false, row, decision, code:'', note:'' });
+ Object.assign(decideDlg, { visible:true, busy:false, row, decision, code:'', note:'',
+ message:((row.hard_numbers||{}).last_accept_check||{}).message || '', updated:false, uncertain:false });
}
const decideCodes = computed(() =>
decideDlg.decision === 'ACCEPTED' ? decideReasons.accept : decideReasons.decline);
async function submitDecide() {
const dd = decideDlg;
+ if (dd.busy || dd.uncertain) return;
if (!dd.code && !dd.note.trim()) { ElementPlus.ElMessage.warning('选一个理由，或补一句说明'); return; }
if (dd.code && dd.code.endsWith('_OTHER') && !dd.note.trim()) {
ElementPlus.ElMessage.warning('选「其他」时必须填补充说明'); return; }
dd.busy = true;
- const d = await call('post', '/api/proposals/' + dd.row.proposal_id + '/decide',
- { decision: dd.decision, reason_code: dd.code || null, reason_note: dd.note.trim() || null,
- proposal_revision: (dd.row.hard_numbers || {}).proposal_revision || null });
- dd.busy = false;
- if (d.ok) {
- ElementPlus.ElMessage.success(dd.decision === 'ACCEPTED'
- ? ('已采纳, 指令 ' + d.instruction_id) : '已驳回');
- if (d.warning) ElementPlus.ElMessage.warning(d.warning);
- dd.visible = false;
- await Promise.all([loadProposals(), loadInstructions(), loadLedger()]);
- } else { ElementPlus.ElMessage.error(d.error); if (d.proposal) { dd.visible = false; await loadProposals(); } }
+ dd.message = '';
+ try {
+ const d = await call('post', '/api/proposals/' + dd.row.proposal_id + '/decide',
+ { decision: dd.decision, reason_code: dd.code || null, reason_note: dd.note.trim() || null,
+ proposal_revision: (dd.row.hard_numbers || {}).proposal_revision || null },
+ { timeout: decideTimeoutMs });
+ if (d.ok) {
+ ElementPlus.ElMessage.success(dd.decision === 'ACCEPTED' ? '已采纳，请查看当日指令' : '已驳回');
+ if (d.warning) ElementPlus.ElMessage.warning(d.warning);
+ dd.visible = false;
+ await Promise.all([loadProposals(), loadInstructions(), loadLedger()]);
+ } else {
+ dd.uncertain = !!d.uncertain;
+ dd.message = dd.uncertain
+ ? '尚未收到处理结果。请关闭后刷新，先核对待确认提议和当日指令，勿立即重复提交。'
+ : (d.error || '本次未能采纳，请稍后再试');
+ if (d.proposal) {
+ dd.row = { ...dd.row, ...d.proposal };
+ dd.updated = !((d.proposal.hard_numbers||{}).last_accept_check);
+ if (dd.updated) { dd.code = ''; dd.note = ''; }
+ await loadProposals();
+ }
+ }
+ } catch (e) {
+ dd.uncertain = true;
+ dd.message = '尚未收到处理结果。请关闭后刷新，先核对待确认提议和当日指令，勿立即重复提交。';
+ } finally { dd.busy = false; }
}
+
async function loadStrategies() {
const q = '/api/strategies' + (showAllStrategies.value ? '?include_archived=1' : '');
const d = await call('get', q);
diff --git a/scripts/run_tests.py b/scripts/run_tests.py
index d7850cf..92bae90 100644
--- a/scripts/run_tests.py
+++ b/scripts/run_tests.py
@@ -7,7 +7,7 @@
包含 (例数按 2026-10-12 隔离回归实跑校正):
test_batch40_units.py 逐笔历史修复、进度暂停、并发与事务回滚与均价失效 (22 例)
test_batch39_units.py 成交双来源归属、迟到、部分成交与失败守成 (12 例)
- test_batch38_units.py 每日计划顺序、版本核验、重新确认、并发采纳、历史保留 (18 例)
+ test_batch38_units.py 每日计划顺序、版本核验、重新确认、并发采纳、历史保留及采纳失败说明 (24 例)
含在途报价变化不重复确认、真实承诺变化仍重核。
test_core_units.py 仓位规划器 / 安全垫与成本账 (14 例)
test_batch2_units.py 命令状态机 / 方案生成器 / 回放对账纯逻辑 (35 例)
diff --git a/scripts/test_batch38_units.py b/scripts/test_batch38_units.py
index 1427e88..0325d98 100644
--- a/scripts/test_batch38_units.py
+++ b/scripts/test_batch38_units.py
@@ -148,6 +148,83 @@ class DailyPlanTest(unittest.TestCase):
self.assertTrue(route.call_args.kwargs['review_only'])
self.assertTrue(c['_plan_recheck'])
+ def test_rejected_recheck_preserves_reason_without_accepting_or_upgrading_basis(self):
+ from app.services import plan_recheck as rc, proposal_service as ps, param_store
+ from app.repo import pms_repo
+ p = {'proposal_id': 'p1', 'action': 'OPEN', 'ts_code': '600001.SH', 'qty': 300,
+ 'hard_numbers_json': '{}', 'hard_numbers': {'proposal_revision': 'old', 'plan_basis': {'old': True}}}
+ c = {'qty': 100, 'ts_code': p['ts_code'], 'hard_numbers': {'price': 10, 'plan_basis': {'new': True}}}
+ def reject(*args, **kw):
+ args[7]['rejected'].append({'ts_code': p['ts_code'], 'by': 'judge', 'failed': ['资金净流出，短期看空']})
+ with patch.object(rc, 'current_basis', return_value={'material': True, 'view': {'held': []}, 'params': {}, 'stock': {}}), \
+ patch.object(ps, '_scan_open', return_value=[c]), patch.object(ps, '_route_one', side_effect=reject), \
+ patch.object(param_store, 'get_int', return_value=0), \
+ patch.object(pms_repo, 'record_proposal_check', return_value=1) as record, \
+ patch.object(pms_repo, 'revise_pending_proposal', side_effect=AssertionError('不得升级原批准依据')), \
+ patch.object(pms_repo, 'insert_instruction', side_effect=AssertionError('不得生成指令')):
+ out = rc.before_accept(p, 'old')
+ self.assertFalse(out['ok'])
+ self.assertIn('最新研判不建议建仓：资金净流出，短期看空', out['error'])
+ hard = record.call_args.args[1]
+ self.assertEqual(hard['plan_basis'], {'old': True})
+ self.assertEqual(hard['proposal_revision'], 'old')
+ self.assertEqual(out['proposal']['qty'], 300)
+ self.assertEqual(hard['last_accept_check']['stage'], 'judge')
+
+ def test_blocked_recheck_distinguishes_rule_strategy_and_scan(self):
+ from app.services import plan_recheck as rc
+ from app.repo import pms_repo
+ p = {'proposal_id': 'p1', 'ts_code': '600001.SH', 'hard_numbers': {}}
+ examples = [({'rejected': [{'by': 'rule', 'failed': ['CASH: 可用资金不足']}]}, '交易条件不满足：可用资金不足'),
+ ({'rejected': [{'by': 'system', 'why': '逻辑存疑'}]}, '当前策略不建议建仓：逻辑存疑'),
+ ({'skipped': [{'why': '没有可用名额'}]}, '暂不满足建仓条件：没有可用名额')]
+ with patch.object(pms_repo, 'record_proposal_check', return_value=1):
+ for details, reason in examples:
+ out = rc._failed_recheck(p, details)
+ self.assertEqual(out['error'], reason)
+ self.assertFalse(out['ok'])
+
+ def test_failed_recheck_does_not_overwrite_concurrent_proposal(self):
+ from app.services import plan_recheck as rc
+ from app.repo import pms_repo
+ with patch.object(pms_repo, 'record_proposal_check', return_value=0):
+ out = rc._failed_recheck({'proposal_id': 'p1', 'ts_code': '600001.SH'}, {})
+ self.assertFalse(out['ok'])
+ self.assertNotIn('proposal', out)
+ self.assertIn('已被更新', out['error'])
+
+ def test_record_check_is_conditional_and_keeps_quantity_status_and_verdict(self):
+ import sqlite3
+ from app.repo import pms_repo
+ db = sqlite3.connect(':memory:')
+ self.addCleanup(db.close)
+ db.execute('CREATE TABLE pms_proposal(proposal_id TEXT, status TEXT, qty INTEGER, judge_verdict TEXT, hard_numbers_json TEXT)')
+ db.execute("INSERT INTO pms_proposal VALUES ('p1','WAIT_USER',300,'UNAVAILABLE','old')")
+ with patch.object(pms_repo, 'execute', side_effect=lambda q, p: db.execute(q,p).rowcount):
+ old = {'proposal_id':'p1','hard_numbers_json':'old'}
+ self.assertEqual(pms_repo.record_proposal_check(old, {'check':'blocked'}), 1)
+ self.assertEqual(pms_repo.record_proposal_check(old, {'check':'stale'}), 0)
+ self.assertEqual(db.execute('SELECT qty,status,judge_verdict FROM pms_proposal').fetchone(), (300,'WAIT_USER','UNAVAILABLE'))
+
+ def test_previous_rejection_cannot_reuse_old_approval_when_context_returns(self):
+ from app.services import plan_recheck as rc, proposal_service as ps
+ p = {'proposal_id': 'p1', 'action': 'OPEN', 'ts_code': '600001.SH',
+ 'hard_numbers': {'proposal_revision': 'old', 'last_accept_check': {'status': 'blocked'}}}
+ with patch.object(rc, 'current_basis', return_value={'ok': True, 'material': False,
+ 'view': {'held': []}, 'params': {}, 'stock': {}}), \
+ patch.object(ps, '_scan_open', return_value=[]) as scan, \
+ patch.object(rc, '_failed_recheck', return_value={'ok': False}) as blocked:
+ self.assertFalse(rc.before_accept(p, 'old')['ok'])
+ scan.assert_called_once()
+ blocked.assert_called_once()
+
+ def test_browser_wait_covers_effective_judge_timeout(self):
+ from app.web import main
+ with patch.object(main.param_store, 'get_int', return_value=240):
+ out = main.api_decide_reasons()
+ self.assertGreater(out['request_timeout_ms'], 240000)
+ self.assertTrue(out['accept'])
+
def test_version_unavailable_and_qualification_loss_preserve_proposal(self):
from app.services import plan_recheck as rc
p = {'action': 'OPEN', 'ts_code': '600001.SH', 'hard_numbers': {}}
diff --git a/scripts/test_proposal_dialog.cjs b/scripts/test_proposal_dialog.cjs
new file mode 100644
index 0000000..6803789
--- /dev/null
+++ b/scripts/test_proposal_dialog.cjs
@@ -0,0 +1,29 @@
+// 本地：node scripts/test_proposal_dialog.cjs。内存替身，不发网络请求。
+const fs=require('fs'),vm=require('vm'),assert=require('assert');
+const html=fs.readFileSync(require('path').join(__dirname,'../app/web/static/index.html'),'utf8');
+const block=html.slice(html.indexOf(' const decideDlg = reactive('),html.indexOf(' async function loadStrategies()'));
+function make(response){
+ let n=0,resolve;
+ const ctx={reactive:x=>x,computed:f=>f,decideReasons:{accept:{a:'why'},decline:{}},loadDecideReasons:()=>{},
+ ElementPlus:{ElMessage:{warning:()=>{},success:()=>{},error:()=>{throw Error('failure must stay visible')}}},
+ loadProposals:async()=>{},loadInstructions:async()=>{},loadLedger:async()=>{},decideTimeoutMs:150000,
+ call:async(m,u,p,c)=>{n++;assert.equal(c.timeout,150000);return typeof response==='function'?response(p):response}};
+ vm.createContext(ctx);vm.runInContext(block+';this.t={decideDlg,decide,submitDecide}',ctx);
+ return {...ctx.t,count:()=>n};
+}
+(async()=>{
+ const row={proposal_id:'p1',qty:300,hard_numbers:{proposal_revision:'old'}};
+ let t=make({ok:false,error:'最新研判不建议建仓：资金净流出',proposal:{...row,hard_numbers:{...row.hard_numbers,last_accept_check:{message:'资金净流出'}}}});
+ t.decide(row,'ACCEPTED');t.decideDlg.code='ACCEPT_CONSENSUS';await t.submitDecide();
+ assert(t.decideDlg.visible);assert(!t.decideDlg.busy);assert(t.decideDlg.message.includes('资金净流出'));assert(!t.decideDlg.updated);
+ t=make({ok:false,error:'请确认更新后的建议',proposal:{...row,qty:100,judge_reason:'新理由',hard_numbers:{proposal_revision:'new'}}});
+ t.decide(row,'ACCEPTED');t.decideDlg.code='ACCEPT_CONSENSUS';await t.submitDecide();
+ assert(t.decideDlg.visible);assert(t.decideDlg.updated);assert.equal(t.decideDlg.row.qty,100);assert.equal(t.decideDlg.code,'');
+ t=make({ok:false,error:'timeout',uncertain:true});t.decide(row,'ACCEPTED');t.decideDlg.code='ACCEPT_CONSENSUS';await t.submitDecide();await t.submitDecide();
+ assert.equal(t.count(),1);assert(t.decideDlg.message.includes('尚未收到'));assert(!t.decideDlg.busy);
+ let done;t=make(()=>new Promise(r=>{done=r}));t.decide(row,'ACCEPTED');t.decideDlg.code='ACCEPT_CONSENSUS';const pending=t.submitDecide();await t.submitDecide();
+ t.decide({...row,proposal_id:'p2'},'DECLINED');assert.equal(t.decideDlg.row.proposal_id,'p1');assert.equal(t.count(),1);done({ok:true,instruction_id:'i1'});await pending;assert(!t.decideDlg.visible);
+ t=make(()=>{throw new Error('unexpected')});t.decide(row,'ACCEPTED');t.decideDlg.code='ACCEPT_CONSENSUS';await t.submitDecide();assert(!t.decideDlg.busy);assert(t.decideDlg.uncertain);
+ const script=html.match(/