Browse Source

付款单保存提示

zhuth 7 years ago
parent
commit
f515a3e555

+ 2 - 1
frontend/saas-web/app/view/core/form/FormPanel.js

@@ -29,7 +29,6 @@ Ext.define('saas.view.core.form.FormPanel', {
         labelAlign: 'right',
         labelWidth: 90,
         columnWidth: 0.25,
-        blankText: '该字段不能为空'
     },
 
     items: [],
@@ -38,6 +37,8 @@ Ext.define('saas.view.core.form.FormPanel', {
     toolBtns: [], // 自定义按钮
     codeInHeader: true, // 单据编号显示在toolbar
     closeConfirm: true, // 关闭确认
+    invalidText: '表单校验有误,请检查', // 校验未通过提示内容
+    dirtyAuditText: '表单数据有修改,是否先保存修改?', // 有修改时点击审核提示内容
 
     auditTexts: {
         auditCode: 'AUDITED',

+ 8 - 8
frontend/saas-web/app/view/core/form/FormPanelController.js

@@ -57,23 +57,23 @@ Ext.define('saas.view.core.form.FormPanelController', {
 
         var valid = form.isValid();
         if(!valid) {
-            showToast('表单校验有误,请检查');
+            showToast(form.invalidText);
             return false;
         }
 
-        //form里面数据
-        var formData = form.getFormData();
-        
-        me.save(formData);
+        me.save();
     },
 
-    save:function(formData){
+    save:function(){
         var me = this,
         form = this.getView(),
         detailCount = form.detailCount,
         viewModel = me.getViewModel(),
         modelData = viewModel.getData();
 
+        //form里面数据
+        var formData = form.getFormData();
+
         var params = {
             main:formData.main
         };
@@ -126,7 +126,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
         var dirty = form.isDirty();
 
         if(dirty) {
-            showConfirm('提示', '表单数据有修改,是否先保存修改?')
+            showConfirm('提示', form.dirtyAuditText)
             .then(function(yes) {
                 if(yes == 'yes') {
                     me.onSave();
@@ -138,7 +138,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
         var valid = form.isValid();
 
         if(!valid) {
-            showToast('表单校验有误,请检查');
+            showToast(form.invalidText);
             return false;
         }
         

+ 27 - 1
frontend/saas-web/app/view/money/payBalance/FormPanelController.js

@@ -201,5 +201,31 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
             console.error(res);
             showToast('转单失败: ' + res.message);
         });
-     }
+     },
+
+     onSave: function() {
+        var me = this,
+        viewModel = me.getViewModel(),
+        store1 = viewModel.get('detail0').detailStore,
+        store2 = viewModel.get('detail1').detailStore;
+
+        var sum_pd_amount = store1.sum('pd_amount'); // 付款金额合计
+        var pb_discounts = viewModel.get('pb_discounts'); // 折扣金额
+        var sum_pbd_nowbalance = store2.sum('pbd_nowbalance'); // 本次核销金额合计
+
+        var flag = sum_pd_amount + pb_discounts - sum_pbd_nowbalance;
+
+        if(flag != 0) {
+            var t = flag > 0 ? '大' : '小';
+
+            showConfirm('提示', '付款金额' + t + '于本次折扣后核销金额,是否仍要保存?')
+            .then(function(y) {
+                if(y == 'yes') {
+                    me.save();
+                }
+            });
+        }else {
+            me.save();
+        }
+    },
 });