zhuth 7 жил өмнө
parent
commit
c638fa4ee4

+ 26 - 24
frontend/saas-web/app/util/FormUtil.js

@@ -108,10 +108,12 @@ Ext.define('saas.util.FormUtil', {
 
 
     loadData: function(form) {
     loadData: function(form) {
         var me = this;
         var me = this;
+        form.setLoading(true);
         if(form.initId && form.initId!=0) {
         if(form.initId && form.initId!=0) {
-            var url = form._readUrl + form.initId,async=false;
-            me.BaseUtil.request({url,async })
+            var url = form._readUrl + form.initId;
+            me.BaseUtil.request({url })
             .then(function(response) {
             .then(function(response) {
+                form.setLoading(false);
                 var res = Ext.decode(response.responseText);
                 var res = Ext.decode(response.responseText);
                 if(res.success) {
                 if(res.success) {
                     form.setFormData({
                     form.setFormData({
@@ -121,39 +123,39 @@ Ext.define('saas.util.FormUtil', {
                 }
                 }
             })
             })
             .catch(function(response) {
             .catch(function(response) {
+                form.setLoading(false);
                 console.error(response);
                 console.error(response);
             });
             });
         }else{
         }else{
             //取后台编号
             //取后台编号
-            var code;
-            Ext.Ajax.request({
+            me.BaseUtil.request({
                 url: 'http://192.168.253.58:8900/number/getMaxnumber',
                 url: 'http://192.168.253.58:8900/number/getMaxnumber',
                 params: {
                 params: {
                     caller:form.caller
                     caller:form.caller
                 },
                 },
-                async:false,
                 method: 'POST',
                 method: 'POST',
-                success: function(response, opts) {
-                    var res = Ext.decode(response.responseText);
-                    if(res.success){
-                        code = res.data.code
+            }).then(function(response) {
+                form.setLoading(false);
+                var res = Ext.decode(response.responseText);
+                if(res.success){
+                    var code = res.data.code;
+                    var viewModel = form.getViewModel();
+                    var detailStore = viewModel.get('_detailStore');
+                    var detno = 0,datas=[];
+                    Ext.Array.each(new Array(10), function() {
+                        detno += 1;
+                        var data = {};
+                        data[form._detnoColumn] = detno;
+                        datas.push(data);
+                    })
+                    detailStore.loadData(datas);
+                    if(code){
+                        viewModel.set(form._codeField,code);
                     }
                     }
-                },
-                failure: function(response, opts) {}
-            }); 
-            var viewModel = form.getViewModel();
-            var detailStore = viewModel.get('_detailStore');
-            var detno = 0,datas=[];
-            Ext.Array.each(new Array(10), function() {
-                detno += 1;
-                var data = {};
-                data[form._detnoColumn] = detno;
-                datas.push(data);
+                }
+            }).catch(function() {
+                form.setLoading(false);
             })
             })
-            detailStore.loadData(datas);
-            if(code){
-                viewModel.set(form._codeField,code);
-            }
         }
         }
     }
     }
 });
 });