Parcourir la source

【bug】资金界面从表放大镜限制提示/Bom资料从表用量保存bug

zhuth il y a 7 ans
Parent
commit
bdb82508ff

+ 1 - 1
frontend/saas-web/app/model/document/bomdetail.js

@@ -7,7 +7,7 @@ Ext.define('saas.model.document.bomdetail', {
         { name: 'bd_sonid', type: 'int' },
         { name: 'bd_soncode', type: 'string' },
         { name: 'bd_unit', type: 'string' },
-        { name: 'bd_baseqty', type: 'string' },
+        { name: 'bd_baseqty', type: 'float' },
         { name: 'bd_replace', type: 'string' },
         { name: 'bd_remark', type: 'string' },
         { name: 'companyid', type: 'int' },

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

@@ -134,7 +134,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                     viewModel = me.getViewModel(),
                     pb_vendname = viewModel.get('pb_vendname');
                     if(!pb_vendname) {
-                        saas.util.BaseUtil.showErrorToast('请先录入主表字段【' + '<span style="color: red;">供应商名称</span>】');
+                        saas.util.BaseUtil.showErrorToast('请先选择【' + '<span style="color: red;">供应商名称</span>】');
                         return false;
                     }
                 },
@@ -143,7 +143,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                     viewModel = me.getViewModel(),
                     pb_vendname = viewModel.get('pb_vendname');
                     if(!pb_vendname) {
-                        saas.util.BaseUtil.showErrorToast('请先录入主表字段【' + '<span style="color: red;">供应商名称</span>】');
+                        saas.util.BaseUtil.showErrorToast('请先选择【' + '<span style="color: red;">供应商名称</span>】');
                         return false;
                     }
                 }
@@ -171,7 +171,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                     viewModel = me.getViewModel(),
                     rb_custname = viewModel.get('pb_vendname');
                     if(!rb_custname) {
-                        saas.util.BaseUtil.showErrorToast('请先录入主表字段【' + '<span style="color: red;">供应商名称</span>】');
+                        saas.util.BaseUtil.showErrorToast('请先选择【' + '<span style="color: red;">供应商名称</span>】');
                         return false;
                     }
                 },
@@ -180,7 +180,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                     viewModel = me.getViewModel(),
                     rb_custname = viewModel.get('pb_vendname');
                     if(!rb_custname) {
-                        saas.util.BaseUtil.showErrorToast('请先录入主表字段【' + '<span style="color: red;">供应商名称</span>】');
+                        saas.util.BaseUtil.showErrorToast('请先选择【' + '<span style="color: red;">供应商名称</span>】');
                         return false;
                     }
                 }

+ 4 - 4
frontend/saas-web/app/view/money/recBalance/FormPanelController.js

@@ -115,7 +115,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                     viewModel = me.getViewModel(),
                     rb_custname = viewModel.get('rb_custname');
                     if(!rb_custname) {
-                        saas.util.BaseUtil.showErrorToast('请先录入主表字段【' + '<span style="color: red;">客户名称</span>】');
+                        saas.util.BaseUtil.showErrorToast('请先选择【' + '<span style="color: red;">客户名称</span>】');
                         return false;
                     }
                 },
@@ -124,7 +124,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                     viewModel = me.getViewModel(),
                     rb_custname = viewModel.get('rb_custname');
                     if(!rb_custname) {
-                        saas.util.BaseUtil.showErrorToast('请先录入主表字段【' + '<span style="color: red;">客户名称</span>】');
+                        saas.util.BaseUtil.showErrorToast('请先选择【' + '<span style="color: red;">客户名称</span>】');
                         return false;
                     }
                 }
@@ -168,7 +168,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                     viewModel = me.getViewModel(),
                     rb_custname = viewModel.get('rb_custname');
                     if(!rb_custname) {
-                        saas.util.BaseUtil.showErrorToast('请先录入主表字段【' + '<span style="color: red;">客户名称</span>】');
+                        saas.util.BaseUtil.showErrorToast('请先选择【' + '<span style="color: red;">客户名称</span>】');
                         return false;
                     }
                 },
@@ -177,7 +177,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                     viewModel = me.getViewModel(),
                     rb_custname = viewModel.get('rb_custname');
                     if(!rb_custname) {
-                        saas.util.BaseUtil.showErrorToast('请先录入主表字段【' + '<span style="color: red;">客户名称</span>】');
+                        saas.util.BaseUtil.showErrorToast('请先选择【' + '<span style="color: red;">客户名称</span>】');
                         return false;
                     }
                 }

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

@@ -477,7 +477,7 @@ Ext.define('saas.view.money.verification.FormPanelController', {
         }).fieldLabel;
         var fieldValue = viewModel.get(fieldName);
         if(!fieldValue) {
-            saas.util.BaseUtil.showErrorToast('请先录入主表字段【' + '<span style="color: red;">' + fieldLabel + '</span>】');
+            saas.util.BaseUtil.showErrorToast('请先选择【' + '<span style="color: red;">' + fieldLabel + '</span>】');
             return null;
         }
         var defaultCondition = defaultConditionMode.replace(reg, '$1' + fieldValue + '$3');