From 08c9111f93e5abd7f4c59671597a691906052826 Mon Sep 17 00:00:00 2001 From: Yixian Date: Tue, 7 Dec 2021 13:50:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=B8=85=E7=AE=97=E5=AE=B9?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/analysis/settle_tasks.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/main/ui/static/analysis/settle_tasks.js b/src/main/ui/static/analysis/settle_tasks.js index 7ba893bc5..b8604ed57 100644 --- a/src/main/ui/static/analysis/settle_tasks.js +++ b/src/main/ui/static/analysis/settle_tasks.js @@ -95,6 +95,14 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) { size: 'lg' }).result.then(function (merchants) { let arr = $scope.editingTask.whitelist_clients || []; + if(!merchants){ + commonDialog.alert({ + type: 'error', + title: '未选择有效商户', + content: '未选择有效商户' + }); + return; + } for (let mch of merchants) { if (arr.filter(wMch => wMch.client_moniker === mch.client_moniker).length < 1) { arr.push(mch); @@ -161,6 +169,14 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) { submitTask.last_settle_date = task.last_settle_date; submitTask.disabled_clean_days = task.disabled_clean_days; submitTask.follow_sub_partner = task.follow_sub_partner; + if (task.whitelist_clients == null) { + commonDialog.alert({ + type: 'error', + title: '批次配置出错', + content: '批次[' + task.remark + ']未选择商户' + }) + return false + } submitTask.whitelist_clients = task.whitelist_clients.map(cli => cli.client_moniker) } tasks.push(submitTask)