代码提交

frontend/saas-web/app/view/core/base/ImportWindow.js

@@ -76,7 +76,40 @@ Ext.define('saas.view.core.base.ImportWindow', {
         name:'over',
         text:'完成',
         handler:function(b){
-            b.ownerCt.ownerCt.close()
+            var form = b.ownerCt.ownerCt;
+            var id = form.importId;
+            if(id){
+                form.setLoading(true);
+                Ext.Ajax.request({
+                    url: '/api/document/'+form.ownerCt.caller.toLocaleLowerCase()+'/saveToFormal',//这里是填写需要跨域访问的URL
+                    method: 'post',
+                    headers: {
+                        'Access-Control-Allow-Origin': '*',
+                        'Authorization':  saas.util.State.get('session').token,
+                        "Content-Type": 'application/x-www-form-urlencoded;charset=UTF-8'
+                    },
+                    params:{
+                        id:id,
+                        update:false
+                    },
+                    success: function (response, opts) {
+                        form.setLoading(false);
+                        var res = Ext.decode(response.responseText);
+                        if(!res.success){
+                            saas.util.BaseUtil.showErrorToast('导入数据失败:' + res.message);
+                        }else{
+                            form.close();
+                        }
+                    },
+                    failure: function (response, opts) {
+                        form.setLoading(false);
+                        var res = Ext.decode(response.responseText);
+                        saas.util.BaseUtil.showErrorToast('导入数据失败: ' + res.message);
+                    }
+                });
+            }else{
+                form.close();
+            }
         }
     },{
         name:'close',
@@ -133,7 +166,7 @@ Ext.define('saas.view.core.base.ImportWindow', {
                         handler:function(b){
                             var caller = b.ownerCt.ownerCt.ownerCt.ownerCt.caller;
                             //获取模版
-                            window.location.href = 'http://192.168.253.58:8560/api/commons/excel/import/templet?caller='+caller;
+                            window.location.href = '/api/commons/excel/import/templet?caller='+caller;
                         }
                     }
                 },{
@@ -149,15 +182,71 @@ Ext.define('saas.view.core.base.ImportWindow', {
                 },{
                     hidden:true,
                     margin:'15px 0 0 0',
-                    width: 180,
                     labelWidth:100,
+                    allowBlank : true, 
+                    width:180,
                     buttonOnly:true,
                     fieldLabel:'上传文件',
-                    name:'upload',
                     xtype: 'filefield',
+                    name:'upload',
                     buttonText: '选择文件',
-                    buttonConfig:{
-                        xtype:'button',
+                    createFileInput : function() {
+                            var me = this;
+                            me.fileInputEl = me.button.el.createChild({
+                            name: me.getName(),
+                            cls: Ext.baseCSSPrefix + 'form-file-input',
+                            tag: 'input',
+                            type: 'file',
+                            size: 1
+                        }).on('change', me.onFileChange, me);
+                    },
+                    listeners: {
+                        afterrender:function(field,ops){
+                            // var fileEl = field.fileInputEl.dom;
+                            // fileEl.setAttribute("accept","image/*");
+                        },
+                        change: function(field){
+                            var form = field.ownerCt.ownerCt;
+                            var myForm = field.ownerCt;
+                            var fileEl = field.fileInputEl.dom;
+                            var fd = new FormData();
+                            fd.append('file', fileEl.files[0]);
+                            fd.append('caller', myForm.ownerCt.ownerCt.caller);
+                            form.setLoading(true);
+                            Ext.Ajax.request({
+                                url: '/api/commons/excel/import/parse',//这里是填写需要跨域访问的URL
+                                cors: true,
+                                useDefaultXhrHeader: false,
+                                method: 'post',
+                                rawData: fd,
+                                headers: {
+                                    'Access-Control-Allow-Origin': '*',
+                                    'Authorization':  saas.util.State.get('session').token,
+                                    //"Content-Type": 'multipart/form-data'  //文件上传的格式， 
+                                    "Content-Type":null
+                                },
+                                success: function (response, opts) {
+                                    form.setLoading(false);
+                                    var res = Ext.decode(response.responseText);
+                                    if(res.success){
+                                        var id = res.data;
+                                        if(id){
+                                            saas.util.BaseUtil.showSuccessToast('上传成功');
+                                            form.importId = id;
+                                        }else{
+                                            saas.util.BaseUtil.showErrorToast('上传失败:后台未返回信息');
+                                        }
+                                    }else{
+                                        saas.util.BaseUtil.showErrorToast('上传失败: ' + res.message);
+                                    }
+                                },
+                                failure: function (response, opts) {
+                                    form.setLoading(false);
+                                    var res = Ext.decode(response.responseText);
+                                    saas.util.BaseUtil.showErrorToast('上传失败: ' + res.message);
+                                }
+                            });
+                        }
                     }
                 },{
                     hidden:true,

frontend/saas-web/app/view/sys/power/TreePanel.js

@@ -195,23 +195,27 @@ Ext.define('saas.view.sys.power.TreePanel', {
             return;
         }
         var me = this;
-        me.setLoading(true);
-        saas.util.BaseUtil.request({
-            url: me.deleteUrl + rec.get('id'),
-            params: '',
-            method: 'POST'
-        })
-        .then(function(localJson) {
-            me.setLoading(false);
-            if(localJson.success){
-                saas.util.BaseUtil.showSuccessToast('删除成功');
-                me.setTree();
+        saas.util.BaseUtil.deleteWarn('确定要删除该角色？',function(btn){
+            if(btn == 'yes'){
+                me.setLoading(true);
+                saas.util.BaseUtil.request({
+                    url: me.deleteUrl + rec.get('id'),
+                    params: '',
+                    method: 'POST'
+                })
+                .then(function(localJson) {
+                    me.setLoading(false);
+                    if(localJson.success){
+                        saas.util.BaseUtil.showSuccessToast('删除成功');
+                        me.setTree();
+                    }
+                })
+                .catch(function(res) {
+                    me.setLoading(false);
+                    console.error(res);
+                    saas.util.BaseUtil.showErrorToast('删除失败: ' + res.message);
+                });
             }
-        })
-        .catch(function(res) {
-            me.setLoading(false);
-            console.error(res);
-            saas.util.BaseUtil.showErrorToast('删除失败: ' + res.message);
         });
     }
 });