|
|
@@ -212,6 +212,7 @@ Ext.define('saas.view.money.verification.FormPanelController', {
|
|
|
getDefaultCondition: function(idx) {
|
|
|
var me = this,
|
|
|
form = me.getView(),
|
|
|
+ formItems = form.formItems,
|
|
|
viewModel = me.getViewModel(),
|
|
|
acitveType = form.acitveType,
|
|
|
etc = form.etc,
|
|
|
@@ -220,10 +221,12 @@ Ext.define('saas.view.money.verification.FormPanelController', {
|
|
|
|
|
|
var reg = /(.*){(.*)}(.*)/g;
|
|
|
var fieldName = defaultConditionMode.match(/(.*){(.*)}(.*)/)[2];
|
|
|
+ var fieldLabel = Ext.Array.findBy(formItems, function(f) {
|
|
|
+ return f.name == fieldName;
|
|
|
+ }).fieldLabel;
|
|
|
var fieldValue = viewModel.get(fieldName);
|
|
|
if(!fieldValue) {
|
|
|
- // TODO 这里可以分情况提示具体字段
|
|
|
- saas.util.BaseUtil.showErrorToast('请先录入主表必填字段');
|
|
|
+ saas.util.BaseUtil.showErrorToast('请先录入主表字段【' + '<span style="color: red;">' + fieldLabel + '</span>】');
|
|
|
return null;
|
|
|
}
|
|
|
var defaultCondition = defaultConditionMode.replace(reg, '$1' + fieldValue + '$3');
|