فهرست منبع

修改命名空间

zhuth 7 سال پیش
والد
کامیت
18a20f9fe2
59فایلهای تغییر یافته به همراه134 افزوده شده و 850 حذف شده
  1. 2 2
      frontend/pc-web/app.js
  2. 1 1
      frontend/pc-web/app.json
  3. 4 4
      frontend/pc-web/app/Application.js
  4. 1 1
      frontend/pc-web/app/model/Base.js
  5. 2 2
      frontend/pc-web/app/model/Session.js
  6. 0 18
      frontend/pc-web/app/model/cuservice/Feedback.js
  7. 0 16
      frontend/pc-web/app/model/statistical/CompanyInfo.js
  8. 0 10
      frontend/pc-web/app/model/statistical/LoginLog.js
  9. 0 17
      frontend/pc-web/app/model/statistical/PersonInfo.js
  10. 0 9
      frontend/pc-web/app/store/Company.js
  11. 4 4
      frontend/pc-web/app/util/BaseUtil.js
  12. 3 3
      frontend/pc-web/app/util/FormUtil.js
  13. 1 1
      frontend/pc-web/app/util/State.js
  14. 2 2
      frontend/pc-web/app/view/auth/Dialog.js
  15. 1 1
      frontend/pc-web/app/view/auth/Login.js
  16. 3 3
      frontend/pc-web/app/view/auth/LoginController.js
  17. 1 1
      frontend/pc-web/app/view/auth/ReLogin.js
  18. 5 5
      frontend/pc-web/app/view/auth/ReLoginController.js
  19. 1 1
      frontend/pc-web/app/view/core/List.js
  20. 1 1
      frontend/pc-web/app/view/core/base/BasePanel.js
  21. 3 3
      frontend/pc-web/app/view/core/base/BasePanelController.js
  22. 1 1
      frontend/pc-web/app/view/core/base/BasePanelModel.js
  23. 11 11
      frontend/pc-web/app/view/core/base/GridPanel.js
  24. 8 8
      frontend/pc-web/app/view/core/base/ImportWindow.js
  25. 3 3
      frontend/pc-web/app/view/core/form/FormPanel.js
  26. 38 38
      frontend/pc-web/app/view/core/form/FormPanelController.js
  27. 1 1
      frontend/pc-web/app/view/core/form/FormPanelModel.js
  28. 1 1
      frontend/pc-web/app/view/core/form/field/ConDateField.js
  29. 5 5
      frontend/pc-web/app/view/core/form/field/DetailGridField.js
  30. 1 1
      frontend/pc-web/app/view/core/form/field/SeparateField.js
  31. 1 1
      frontend/pc-web/app/view/core/tab/Controller.js
  32. 1 1
      frontend/pc-web/app/view/core/tab/Panel.js
  33. 1 1
      frontend/pc-web/app/view/core/window/Controller.js
  34. 1 1
      frontend/pc-web/app/view/core/window/Window.js
  35. 0 80
      frontend/pc-web/app/view/cuservice/Feedback.js
  36. 1 1
      frontend/pc-web/app/view/home/Home.js
  37. 1 1
      frontend/pc-web/app/view/home/HomeController.js
  38. 1 1
      frontend/pc-web/app/view/home/HomeModel.js
  39. 2 2
      frontend/pc-web/app/view/home/InfoCard.js
  40. 1 1
      frontend/pc-web/app/view/main/Main.js
  41. 1 1
      frontend/pc-web/app/view/main/MainContainerWrap.js
  42. 1 1
      frontend/pc-web/app/view/main/MainController.js
  43. 1 1
      frontend/pc-web/app/view/main/MainModel.js
  44. 3 3
      frontend/pc-web/app/view/main/Navigation.js
  45. 0 27
      frontend/pc-web/app/view/statistical/AccessLog.js
  46. 0 77
      frontend/pc-web/app/view/statistical/CompanyAnalysis.js
  47. 0 110
      frontend/pc-web/app/view/statistical/CompanyInfo.js
  48. 0 14
      frontend/pc-web/app/view/statistical/CompanyInfoModel.js
  49. 0 69
      frontend/pc-web/app/view/statistical/CompanyRegInfo.js
  50. 0 52
      frontend/pc-web/app/view/statistical/LoginLog.js
  51. 0 24
      frontend/pc-web/app/view/statistical/MonthInfo.js
  52. 0 109
      frontend/pc-web/app/view/statistical/PersonRegInfo.js
  53. 0 39
      frontend/pc-web/app/view/tools/ClearCache.js
  54. 0 45
      frontend/pc-web/app/view/tools/ResetAccount.js
  55. 1 1
      frontend/pc-web/app/view/viewport/Viewport.js
  56. 7 7
      frontend/pc-web/app/view/viewport/ViewportController.js
  57. 1 1
      frontend/pc-web/app/view/viewport/ViewportModel.js
  58. 4 4
      frontend/pc-web/overrides/data/Connection.js
  59. 1 1
      frontend/pc-web/overrides/form/field/Date.js

+ 2 - 2
frontend/pc-web/app.js

@@ -3,7 +3,7 @@
  * and launch() the Application class.
  */
 Ext.application({
-    extend: 'saas.Application',
+    extend: 'school.Application',
 
-    name: 'saas'
+    name: 'school'
 });

+ 1 - 1
frontend/pc-web/app.json

@@ -1,6 +1,6 @@
 {
     "name": "smartschool",
-    "namespace": "saas",
+    "namespace": "school",
     "version": "1.0.0.0",
     "framework": "ext",
     "toolkit": "classic",

+ 4 - 4
frontend/pc-web/app/Application.js

@@ -1,15 +1,15 @@
-Ext.define('saas.Application', {
+Ext.define('school.Application', {
     extend: 'Ext.app.Application',
 
-    name: 'saas',
+    name: 'school',
 
     requires: [
-        'saas.*',
+        'school.*',
         'Ext.window.MessageBox',
         'Ext.window.Toast'
     ],
 
-    mainView: 'saas.view.viewport.Viewport',
+    mainView: 'school.view.viewport.Viewport',
 
     defaultToken: 'main',
 

+ 1 - 1
frontend/pc-web/app/model/Base.js

@@ -1,3 +1,3 @@
-Ext.define('saas.model.Base', {
+Ext.define('school.model.Base', {
     extend: 'Ext.data.Model'
 });

+ 2 - 2
frontend/pc-web/app/model/Session.js

@@ -1,4 +1,4 @@
-Ext.define('saas.model.Session', {
+Ext.define('school.model.Session', {
     extend: 'Ext.data.Model',
 
     fields: [
@@ -22,7 +22,7 @@ Ext.define('saas.model.Session', {
                     success: function (response) {
                         var res = Ext.decode(response.responseText);
                         if (res.success) {
-                            var session = saas.model.Session.loadData(res.data.token), 
+                            var session = school.model.Session.loadData(res.data.token), 
                                 account = res.data.account, companyId = res.data.companyId;
                             account.companyId = companyId;
                             session.set('account', account);

+ 0 - 18
frontend/pc-web/app/model/cuservice/Feedback.js

@@ -1,18 +0,0 @@
-Ext.define('saas.model.cuservice.Feedback', {
-    extend: 'saas.model.Base',
-    fields: [
-        { name: 'cf_id', type: 'int' },
-        { name: 'cf_creator', type: 'string' },
-        { name: 'cf_creatime', type: 'date' },
-        { name: 'cf_creatorid', type: 'int' },
-        { name: 'cf_content', type: 'string' },
-        { name: 'cf_status', type: 'string' },
-        { name: 'cf_companyid', type: 'int' },
-        { name: 'cf_company', type: 'string' },
-        { name: 'cf_remark', type: 'string' },
-        { name: 'cr_mobile', type: 'string' },
-        { name: 'cr_name', type: 'string' },
-        { name: 'cr_qq', type: 'string' },
-        { name: 'cr_wechat', type: 'string' },
-    ]
-});

+ 0 - 16
frontend/pc-web/app/model/statistical/CompanyInfo.js

@@ -1,16 +0,0 @@
-Ext.define('saas.model.statistical.CompanyInfo', {
-    extend: 'saas.model.Base',
-    fields: [
-        { name: 'cd_id', type: 'int' },
-        { name: 'cd_companyid', type: 'int' },
-        { name: 'cd_accountnum', type: 'int' },
-        { name: 'cd_productnum', type: 'int' },
-        { name: 'cd_customernum', type: 'int' },
-        { name: 'cd_vendornum', type: 'int' },
-        { name: 'cd_salenum', type: 'int' },
-        { name: 'cd_purchasenum', type: 'int' },
-        { name: 'cd_prodionum', type: 'int' },
-        { name: 'cd_paynum', type: 'int' },
-        { name: 'cd_receivenum', type: 'int' },
-    ]
-});

+ 0 - 10
frontend/pc-web/app/model/statistical/LoginLog.js

@@ -1,10 +0,0 @@
-Ext.define('saas.model.statistical.LoginLog', {
-    extend: 'saas.model.Base',
-    fields: [
-        { name: 'account_id', type: 'int' },
-        { name: 'login_num', type: 'int' },
-        { name: 'username', type: 'string' },
-        { name: 'lastesttime', type: 'date' },
-        { name: 'mobile', type: 'string' },
-    ]
-});

+ 0 - 17
frontend/pc-web/app/model/statistical/PersonInfo.js

@@ -1,17 +0,0 @@
-Ext.define('saas.model.statistical.PersonInfo', {
-    extend: 'saas.model.Base',
-    fields: [
-        { name: 'id', type: 'int' },
-        { name: 'username', type: 'string' },
-        { name: 'realname', type: 'string' },
-        { name: 'email', type: 'string' },
-        { name: 'mobile', type: 'string' },
-        { name: 'type', type: 'int' },
-        { name: 'enabled', type: 'boolean' },
-        { name: 'createTime', type: 'date' },
-        { name: 'creatorId', type: 'int' },
-        { name: 'updateTime', type: 'date' },
-        { name: 'updaterId', type: 'int' },
-        { name: 'uu', type: 'int' },
-    ]
-});

+ 0 - 9
frontend/pc-web/app/store/Company.js

@@ -1,9 +0,0 @@
-Ext.define('saas.store.Company', {
-    extend: 'Ext.data.Store',
-
-    fields: [
-        { name: 'id', type: 'int' },
-        { name: 'name', type: 'string' },
-        { name: 'logoUrl', type: 'string' }
-    ]
-});

+ 4 - 4
frontend/pc-web/app/util/BaseUtil.js

@@ -1,4 +1,4 @@
-Ext.define('saas.util.BaseUtil', {
+Ext.define('school.util.BaseUtil', {
 
     statics: {
 
@@ -13,7 +13,7 @@ Ext.define('saas.util.BaseUtil', {
             var mainTab = Ext.getCmp('main-tab-panel');
             var panel = mainTab.query('[tabId="' + id + '"]')[0];
             if (!panel) {
-                panel = Ext.create('saas.view.core.tab.Panel', {
+                panel = Ext.create('school.view.core.tab.Panel', {
                     tabId: id,
                     title: title,
                     viewType: xtype,
@@ -33,7 +33,7 @@ Ext.define('saas.util.BaseUtil', {
             var mainTab = Ext.getCmp('main-tab-panel');
             var win = mainTab.query('[winId="' + id + '"]')[0];
             if (!win) {
-                win = Ext.create('saas.view.core.window.Window', {
+                win = Ext.create('school.view.core.window.Window', {
                     tabId: id,
                     title: title,
                     viewType: xtype,
@@ -149,7 +149,7 @@ Ext.define('saas.util.BaseUtil', {
         },
 
         getCurrentUser: function () {
-            return saas.util.State.get('session') ? (saas.util.State.get('session').account || {}) : {};
+            return school.util.State.get('session') ? (school.util.State.get('session').account || {}) : {};
         },
 
         /**

+ 3 - 3
frontend/pc-web/app/util/FormUtil.js

@@ -1,4 +1,4 @@
-Ext.define('saas.util.FormUtil', {
+Ext.define('school.util.FormUtil', {
 
     statics: {
 
@@ -313,7 +313,7 @@ Ext.define('saas.util.FormUtil', {
             form.setLoading(true);
             if(form.initId && form.initId!=0) {
                 let url = form._readUrl + '/' + form.initId;
-                saas.util.BaseUtil.request({url })
+                school.util.BaseUtil.request({url })
                 .then(function(res) {
                     form.setLoading(false);
                     if(res.success) {
@@ -336,7 +336,7 @@ Ext.define('saas.util.FormUtil', {
                 })
                 .catch(function(e) {
                     form.setLoading(false);
-                    saas.util.BaseUtil.showErrorToast('读取单据数据错误: ' + e.message);
+                    school.util.BaseUtil.showErrorToast('读取单据数据错误: ' + e.message);
                 });
             }
         }

+ 1 - 1
frontend/pc-web/app/util/State.js

@@ -1,4 +1,4 @@
-Ext.define('saas.util.State', {
+Ext.define('school.util.State', {
 
     singleton: true,
 

+ 2 - 2
frontend/pc-web/app/view/auth/Dialog.js

@@ -1,9 +1,9 @@
-Ext.define('saas.view.auth.Dialog', {
+Ext.define('school.view.auth.Dialog', {
     extend: 'Ext.form.Panel',
     xtype: 'authdialog',
 
     requires: [
-        'saas.view.auth.LoginController',
+        'school.view.auth.LoginController',
         'Ext.form.Panel'
     ],
 

+ 1 - 1
frontend/pc-web/app/view/auth/Login.js

@@ -1,7 +1,7 @@
 /**
  * 登录页面
  */
-Ext.define('saas.view.auth.Login', {
+Ext.define('school.view.auth.Login', {
     extend: 'Ext.container.Container',
     xtype: 'login',
 

+ 3 - 3
frontend/pc-web/app/view/auth/LoginController.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.auth.LoginController', {
+Ext.define('school.view.auth.LoginController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.login',
 
@@ -13,7 +13,7 @@ Ext.define('saas.view.auth.LoginController', {
             values = form.getValues();
         view.mask('请稍等...');
 
-        saas.model.Session.login(values.username, values.password)
+        school.model.Session.login(values.username, values.password)
             .then(function (session) {
                 view.isMasked() && view.unmask();
                 me.getViewModel().set('session', session);
@@ -21,7 +21,7 @@ Ext.define('saas.view.auth.LoginController', {
             })
             .catch(function (error) {
                 view.isMasked() && view.unmask();
-                saas.util.BaseUtil.showErrorToast('登录失败: ' + error.message);
+                school.util.BaseUtil.showErrorToast('登录失败: ' + error.message);
             });
     }
 });

+ 1 - 1
frontend/pc-web/app/view/auth/ReLogin.js

@@ -1,7 +1,7 @@
 /**
  * 重新登录弹窗
  */
-Ext.define('saas.view.auth.ReLogin', {
+Ext.define('school.view.auth.ReLogin', {
     extend: 'Ext.window.Window',
     xtype: 'relogin',
     id: 'relogin',

+ 5 - 5
frontend/pc-web/app/view/auth/ReLoginController.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.auth.ReLoginController', {
+Ext.define('school.view.auth.ReLoginController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.relogin',
 
@@ -25,7 +25,7 @@ Ext.define('saas.view.auth.ReLoginController', {
         var me = this,
             view = me.getView(),
             viewModel = me.getViewModel(),
-            companyId = saas.util.BaseUtil.getCurrentUser().companyId,
+            companyId = school.util.BaseUtil.getCurrentUser().companyId,
             form = me.lookup('reloginform'),
             values = form.getValues();
 
@@ -35,7 +35,7 @@ Ext.define('saas.view.auth.ReLoginController', {
 
         view.mask('请稍等...');
 
-        saas.model.Session.login(values.username, values.password, companyId)
+        school.model.Session.login(values.username, values.password, companyId)
         .then(function (session) {
             view.isMasked() && view.unmask();
             viewModel.set('session', session);
@@ -52,7 +52,7 @@ Ext.define('saas.view.auth.ReLoginController', {
             headers['Authorization'] = session.data.token;
             Ext.Ajax.setDefaultHeaders(headers);
 
-            saas.util.State.set('session', session.data);
+            school.util.State.set('session', session.data);
 
             // let sessionStr = session.data ? JSON.stringify(session.data) : '';
 
@@ -70,7 +70,7 @@ Ext.define('saas.view.auth.ReLoginController', {
         .catch(function (error) {
             view.isMasked() && view.unmask();
             console.error(error);
-            saas.util.BaseUtil.showErrorToast('登录失败: ' + error.message);
+            school.util.BaseUtil.showErrorToast('登录失败: ' + error.message);
             me.failureReLogin();
         });
     },

+ 1 - 1
frontend/pc-web/app/view/core/List.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.core.List', {
+Ext.define('school.view.core.List', {
     extend: 'Ext.grid.Panel',
     xtype: 'corelist',
 

+ 1 - 1
frontend/pc-web/app/view/core/base/BasePanel.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.core.base.BasePanel', {
+Ext.define('school.view.core.base.BasePanel', {
     extend: 'Ext.form.Panel',
     xtype: 'core-base-basepanel',
     

+ 3 - 3
frontend/pc-web/app/view/core/base/BasePanelController.js

@@ -1,11 +1,11 @@
-Ext.define('saas.view.core.base.BasePanelController', {
+Ext.define('school.view.core.base.BasePanelController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.core-base-basepanel',
 
     add: function(){
         var form = this.getView();
         var id = form.xtype + '_add';
-        saas.util.BaseUtil.openTab(form.xtype,'新增' + form._title,id);
+        school.util.BaseUtil.openTab(form.xtype,'新增' + form._title,id);
     },
 
     onColSetting: function() {
@@ -26,7 +26,7 @@ Ext.define('saas.view.core.base.BasePanelController', {
     },
 
     openSettingWindow: function(viewName, items, settype) {
-        var panel = saas.util.BaseUtil.getCurrentTab(),
+        var panel = school.util.BaseUtil.getCurrentTab(),
         box = panel.getBox(),
         refs = panel.getReferences() || {},
         win = refs.settingwin;

+ 1 - 1
frontend/pc-web/app/view/core/base/BasePanelModel.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.core.base.BasePanelModel', {
+Ext.define('school.view.core.base.BasePanelModel', {
     extend: 'Ext.app.ViewModel',
     alias: 'viewmodel.core-base-basepanel',
 

+ 11 - 11
frontend/pc-web/app/view/core/base/GridPanel.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.core.base.GridPanel', {
+Ext.define('school.view.core.base.GridPanel', {
     extend: 'Ext.grid.Panel',
     xtype: 'core-base-gridpanel',
 
@@ -54,11 +54,11 @@ Ext.define('saas.view.core.base.GridPanel', {
                         exception: function(proxy, response, operation, eOpts) {
                             if(operation.success) {
                                 if(response.timedout) {
-                                    saas.util.BaseUtil.showErrorToast('请求超时');
+                                    school.util.BaseUtil.showErrorToast('请求超时');
                                 }
                             }else {
                                 console.error('exception: ', response);
-                                saas.util.BaseUtil.showErrorToast('查询失败:' + (response.responseJson?response.responseJson.message:'请求超时'));
+                                school.util.BaseUtil.showErrorToast('查询失败:' + (response.responseJson?response.responseJson.message:'请求超时'));
                             }
                         }
                     }
@@ -118,7 +118,7 @@ Ext.define('saas.view.core.base.GridPanel', {
         var box = panelEl.getBox();
         var height = box.height;
         var width = box.width;
-        var win = form.add(Ext.create('saas.view.core.base.ImportWindow', {  
+        var win = form.add(Ext.create('school.view.core.base.ImportWindow', {  
             cls:'x-window-dbfind', 
             belong:form,  
             modal:true,
@@ -139,7 +139,7 @@ Ext.define('saas.view.core.base.GridPanel', {
         var grid = me.ownerCt.ownerCt;
         //导出接口权限设置
         var url = '/api/commons/'+grid.ownerCt.caller+'/export';
-        saas.util.BaseUtil.request({
+        school.util.BaseUtil.request({
             url: url,
             params: '',
             method: 'GET',
@@ -162,7 +162,7 @@ Ext.define('saas.view.core.base.GridPanel', {
             }
         })
         .catch(function(e) {
-            saas.util.BaseUtil.showErrorToast('导出失败: ' + e.message);
+            school.util.BaseUtil.showErrorToast('导出失败: ' + e.message);
         });
     },
 
@@ -171,27 +171,27 @@ Ext.define('saas.view.core.base.GridPanel', {
         var grid = this;
         var data = grid.getGridSelected(type);
         if(!data){
-            saas.util.BaseUtil.showErrorToast('请勾选符合条件的行进行操作。');
+            school.util.BaseUtil.showErrorToast('请勾选符合条件的行进行操作。');
             return false;
         }
         if(data&&data.length>0){
             var params = JSON.stringify({baseDTOs:data});
-            saas.util.BaseUtil.request({
+            school.util.BaseUtil.request({
                 url: url,
                 params: params,
                 method: 'POST',
                 async:false
             })
             .then(function() {
-                saas.util.BaseUtil.showSuccessToast('操作成功');
+                school.util.BaseUtil.showSuccessToast('操作成功');
                 grid.store.load();
                 grid.selModel.deselectAll();
             })
             .catch(function(e) {
-                saas.util.BaseUtil.showErrorToast('操作失败: ' + e.message);
+                school.util.BaseUtil.showErrorToast('操作失败: ' + e.message);
             });
         }else{
-            saas.util.BaseUtil.showErrorToast('请勾选至少一条明细');
+            school.util.BaseUtil.showErrorToast('请勾选至少一条明细');
         }
     },
 

+ 8 - 8
frontend/pc-web/app/view/core/base/ImportWindow.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.core.base.ImportWindow', {
+Ext.define('school.view.core.base.ImportWindow', {
     extend: 'Ext.window.Window',
     xtype: 'importwindow',
     layout:'fit',
@@ -86,7 +86,7 @@ Ext.define('saas.view.core.base.ImportWindow', {
                     method: 'post',
                     headers: {
                         'Access-Control-Allow-Origin': '*',
-                        'Authorization':  saas.util.State.get('session').token,
+                        'Authorization':  school.util.State.get('session').token,
                         "Content-Type": 'application/x-www-form-urlencoded;charset=UTF-8'
                     },
                     params:{
@@ -114,7 +114,7 @@ Ext.define('saas.view.core.base.ImportWindow', {
                         upload.reset();
                         form.dockedItems.items[1].down('[name=over]').setDisabled(true);
                         var res = Ext.decode(response.responseText);
-                        saas.util.BaseUtil.showErrorToast('导入数据失败: ' + res.message);
+                        school.util.BaseUtil.showErrorToast('导入数据失败: ' + res.message);
                         
                     }
                 });
@@ -221,7 +221,7 @@ Ext.define('saas.view.core.base.ImportWindow', {
                             var file = fileEl.files[0];
                             var type = file.name.substring(file.name.lastIndexOf('.'),file.name.length);
                             if(type.indexOf('xlsx')<0||type.indexOf('xls')<0){
-                                saas.util.BaseUtil.showErrorToast('文件格式不正确,只能选择xlsx或xls格式的文件进行上传');
+                                school.util.BaseUtil.showErrorToast('文件格式不正确,只能选择xlsx或xls格式的文件进行上传');
                                 field.reset();
                                 return;
                             }
@@ -241,7 +241,7 @@ Ext.define('saas.view.core.base.ImportWindow', {
                                 failure: function(response, opts) {}
                             }); 
                             if(!hasPower){
-                                saas.util.BaseUtil.showErrorToast('上传失败:没有 导入 权限');
+                                school.util.BaseUtil.showErrorToast('上传失败:没有 导入 权限');
                                 return false;
                             }
                             
@@ -257,7 +257,7 @@ Ext.define('saas.view.core.base.ImportWindow', {
                                 rawData: fd,
                                 headers: {
                                     'Access-Control-Allow-Origin': '*',
-                                    'Authorization':  saas.util.State.get('session').token,
+                                    'Authorization':  school.util.State.get('session').token,
                                     //"Content-Type": 'multipart/form-data'  //文件上传的格式, 
                                     "Content-Type":null
                                 },
@@ -272,7 +272,7 @@ Ext.define('saas.view.core.base.ImportWindow', {
                                             field.ownerCt.ownerCt.dockedItems.items[1].down('[name=over]').setDisabled(false)
                                         }else{
                                             field.reset();
-                                            saas.util.BaseUtil.showErrorToast('上传失败:后台未返回信息');
+                                            school.util.BaseUtil.showErrorToast('上传失败:后台未返回信息');
                                         }
                                     }else{
                                         field.reset();
@@ -283,7 +283,7 @@ Ext.define('saas.view.core.base.ImportWindow', {
                                     form.setLoading(false);
                                     field.reset();
                                     var res = Ext.decode(response.responseText);
-                                    saas.util.BaseUtil.showErrorToast('上传失败: ' + res.message);
+                                    school.util.BaseUtil.showErrorToast('上传失败: ' + res.message);
                                 }
                             });
                         }

+ 3 - 3
frontend/pc-web/app/view/core/form/FormPanel.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.core.form.FormPanel', {
+Ext.define('school.view.core.form.FormPanel', {
     extend: 'Ext.form.Panel',
     xtype: 'core-form-formpanel',
 
@@ -33,7 +33,7 @@ Ext.define('saas.view.core.form.FormPanel', {
 
     initFormItems: function() {
         let me = this;
-        saas.util.FormUtil.setItems(me);
+        school.util.FormUtil.setItems(me);
     },
 
     addItems: function (items) {
@@ -421,7 +421,7 @@ Ext.define('saas.view.core.form.FormPanel', {
         controller = me.getController();
 
         if(me.isDirty()) {
-            return saas.util.BaseUtil.showConfirm('提示', me.dirtyCloseText, {
+            return school.util.BaseUtil.showConfirm('提示', me.dirtyCloseText, {
                 buttons: Ext.Msg.YESNO
             }).then(function(yes) {
                 if(yes === 'yes') {

+ 38 - 38
frontend/pc-web/app/view/core/form/FormPanelController.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.core.form.FormPanelController', {
+Ext.define('school.view.core.form.FormPanelController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.core-form-formpanel',
 
@@ -19,7 +19,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
         _config = {
             initId: form.initId,
         },
-        currentTab = saas.util.BaseUtil.getCurrentTab();
+        currentTab = school.util.BaseUtil.getCurrentTab();
         
         var view = {
             _config: _config,
@@ -36,7 +36,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
     add: function(){
         var form = this.getView();
         var id = form.xtype + '-add';
-        saas.util.BaseUtil.openTab(form.xtype,'新增' + form._title, id);
+        school.util.BaseUtil.openTab(form.xtype,'新增' + form._title, id);
     },
 
     onCopy: function() {
@@ -46,7 +46,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
 
         var formData = me.initCopyData(form.getFormData());
 
-        saas.util.BaseUtil.openTab(form.xtype,'新增' + form._title, id, {initData: formData});
+        school.util.BaseUtil.openTab(form.xtype,'新增' + form._title, id, {initData: formData});
     },
 
     initCopyData: function(formData) {
@@ -63,11 +63,11 @@ Ext.define('saas.view.core.form.FormPanelController', {
         main[form._statusCodeField] = auditTexts.unAuditCode;
         main[form._statusField] = auditTexts.unAuditText;
         //重设录入人,录入日期,审核人,审核日期
-        main['creatorId'] = saas.util.BaseUtil.getCurrentUser().id;
-        main['creatorName'] = saas.util.BaseUtil.getCurrentUser().realname;
+        main['creatorId'] = school.util.BaseUtil.getCurrentUser().id;
+        main['creatorName'] = school.util.BaseUtil.getCurrentUser().realname;
         main['createTime'] = Ext.Date.format(new Date(), 'Y-m-d H:i:s');
-        main['updaterId'] = saas.util.BaseUtil.getCurrentUser().id;
-        main['updaterName'] = saas.util.BaseUtil.getCurrentUser().realname;
+        main['updaterId'] = school.util.BaseUtil.getCurrentUser().id;
+        main['updaterName'] = school.util.BaseUtil.getCurrentUser().realname;
         main['updateTime'] = Ext.Date.format(new Date(), 'Y-m-d H:i:s');
         main[form._auditmanField] = undefined;
         main[form._auditdateField] = undefined;
@@ -76,7 +76,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
 
         for(var k in main) {
             // 主表日期改为当前日期
-            if(saas.util.BaseUtil.isDateString(main[k])) {
+            if(school.util.BaseUtil.isDateString(main[k])) {
                 main[k] = Ext.Date.format(new Date, 'Y-m-d H:i:s');
             }
         }
@@ -90,7 +90,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
                     // 从表id清空
                     delete d['id'];
                     // 从表日期清空
-                    if(saas.util.BaseUtil.isDateString(d[k])) {
+                    if(school.util.BaseUtil.isDateString(d[k])) {
                         d[k] = '';
                     }
                 }
@@ -116,9 +116,9 @@ Ext.define('saas.view.core.form.FormPanelController', {
                 return false;
             }
 
-            saas.util.BaseUtil.deleteWarn(form._deleteMsg,function(btn){
+            school.util.BaseUtil.deleteWarn(form._deleteMsg,function(btn){
                 if(btn == 'yes'){
-                    saas.util.BaseUtil.request({
+                    school.util.BaseUtil.request({
                         url: form._deleteUrl+'/'+id,
                         method: 'POST',
                     })
@@ -127,11 +127,11 @@ Ext.define('saas.view.core.form.FormPanelController', {
                             var mainTab = Ext.getCmp('main-tab-panel');
                             mainTab.getActiveTab().close();
                             //解析参数
-                            saas.util.BaseUtil.showSuccessToast('删除成功');
+                            school.util.BaseUtil.showSuccessToast('删除成功');
                         }
                     })
                     .catch(function(e) {
-                        saas.util.BaseUtil.showErrorToast('删除失败: ' + e.message);
+                        school.util.BaseUtil.showErrorToast('删除失败: ' + e.message);
                     });
                 }
             });
@@ -144,12 +144,12 @@ Ext.define('saas.view.core.form.FormPanelController', {
 
         var valid = form.isValid();
         if(!valid) {
-            saas.util.BaseUtil.showErrorToast(form.invalidText);
+            school.util.BaseUtil.showErrorToast(form.invalidText);
             return false;
         }
         var dirty = form.isDirty();
         if(!dirty) {
-            saas.util.BaseUtil.showErrorToast(form.noDirtySaveText);
+            school.util.BaseUtil.showErrorToast(form.noDirtySaveText);
             return false;
         }
 
@@ -188,7 +188,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
         params.codeModified = codeModified;
 
         form.setLoading(true);
-        saas.util.BaseUtil.request({
+        school.util.BaseUtil.request({
             url: form._saveUrl,
             params: JSON.stringify(params),
             method: 'POST',
@@ -199,20 +199,20 @@ Ext.define('saas.view.core.form.FormPanelController', {
                 var id = localJson.data.id;
                 var code = localJson.data.code;
                 form.initId = id;
-                saas.util.FormUtil.loadData(form);
+                school.util.FormUtil.loadData(form);
 
                 var newId = form.xtype + '-' + id;
                 var newTitle = form._title + '(' + code + ')';
 
-                saas.util.BaseUtil.refreshTabTitle(newId, newTitle);
+                school.util.BaseUtil.refreshTabTitle(newId, newTitle);
 
-                saas.util.BaseUtil.showSuccessToast('保存成功');
+                school.util.BaseUtil.showSuccessToast('保存成功');
                 form.fireEvent('aftersave', true, form, localJson);
             }
         })
         .catch(function(e) {
             form.setLoading(false);
-            saas.util.BaseUtil.showErrorToast('保存失败: ' + e.message);
+            school.util.BaseUtil.showErrorToast('保存失败: ' + e.message);
             form.fireEvent('aftersave', false, form);
         });
     },
@@ -226,7 +226,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
         var dirty = form.isDirty();
 
         if(id && dirty) {
-            saas.util.BaseUtil.showConfirm('提示', form.dirtyAuditText)
+            school.util.BaseUtil.showConfirm('提示', form.dirtyAuditText)
             .then(function(yes) {
                 if(yes == 'yes') {
                     me.onSave();
@@ -238,7 +238,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
         var valid = form.isValid();
 
         if(!valid) {
-            saas.util.BaseUtil.showErrorToast(form.invalidText);
+            school.util.BaseUtil.showErrorToast(form.invalidText);
             return false;
         }
 
@@ -276,7 +276,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
         params.codeModified = codeModified;
 
         form.setLoading(true);
-        saas.util.BaseUtil.request({
+        school.util.BaseUtil.request({
             url: form._auditUrl,
             params: JSON.stringify(params),
             method: 'POST',
@@ -294,11 +294,11 @@ Ext.define('saas.view.core.form.FormPanelController', {
                     var newId = form.xtype + '-' + id;
                     var newTitle = form._title + '(' + code + ')';
 
-                    saas.util.BaseUtil.refreshTabTitle(newId, newTitle);
+                    school.util.BaseUtil.refreshTabTitle(newId, newTitle);
                 }
-                saas.util.FormUtil.loadData(form);
+                school.util.FormUtil.loadData(form);
                 form.setEditable(false);
-                saas.util.BaseUtil.showSuccessToast('审核成功' + (localJson.message ? ': ' + localJson.message : ''));
+                school.util.BaseUtil.showSuccessToast('审核成功' + (localJson.message ? ': ' + localJson.message : ''));
                 form.fireEvent('afteraudit', true, form, localJson);
             }
         })
@@ -317,7 +317,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
             //     smartschool.util.BaseUtil.refreshTabTitle(newId, newTitle);
             //     smartschool.util.FormUtil.loadData(form);
             // }
-            saas.util.BaseUtil.showErrorToast('审核失败: ' + e.message);
+            school.util.BaseUtil.showErrorToast('审核失败: ' + e.message);
             form.fireEvent('afteraudit', false, form);
         });
     },
@@ -346,7 +346,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
         var code = viewModel.get(form._codeField);
 
         form.setLoading(true);
-        saas.util.BaseUtil.request({
+        school.util.BaseUtil.request({
             url: form._unAuditUrl + '/' + id,
             method: 'POST',
         })
@@ -354,14 +354,14 @@ Ext.define('saas.view.core.form.FormPanelController', {
             form.setLoading(false);
             if(localJson.success){
                 //解析参数
-                saas.util.BaseUtil.showSuccessToast('反审核成功');
-                saas.util.FormUtil.loadData(form);
+                school.util.BaseUtil.showSuccessToast('反审核成功');
+                school.util.FormUtil.loadData(form);
             }
         })
         .catch(function(res) {
             form.setLoading(false);
             console.error(res);
-            saas.util.BaseUtil.showErrorToast('反审核失败: ' + res.message);
+            school.util.BaseUtil.showErrorToast('反审核失败: ' + res.message);
         });
     },
 
@@ -439,7 +439,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
             if(!flag) {
                 return false;
             }
-            saas.util.BaseUtil.request({
+            school.util.BaseUtil.request({
                 url: '/api/commons/jasperReport/printByDefault',
                 // url: 'http://192.168.253.58:8920/jasperReport/printByDefault',
                 method: 'POST',
@@ -459,13 +459,13 @@ Ext.define('saas.view.core.form.FormPanelController', {
                 title = data.title,
                 userName = data.userName,
                 whereCondition = data.whereCondition,
-                companyId = saas.util.BaseUtil.getCurrentUser().companyId;
+                companyId = school.util.BaseUtil.getCurrentUser().companyId;
                 var url = printurl + '?' + 'reportName=' + reportName + '&' + 'companyId=' + companyId + '&whereCondition=' + whereCondition + (userName ? '&userName=' + userName : "");
     
                 window.open(url);
             }).catch(function(res) {
                 console.error(res.message);
-                saas.util.BaseUtil.showErrorToast('获取打印报表错误:' + res.message);
+                school.util.BaseUtil.showErrorToast('获取打印报表错误:' + res.message);
             });
         });
     },
@@ -474,7 +474,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
      * 判断权限
      */
     beforePrint: function(caller) {
-        return saas.util.BaseUtil.request({
+        return school.util.BaseUtil.request({
             url: '/api/commons/' + caller + '/print',
             method: 'GET',
             headers: {
@@ -488,7 +488,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
             return res.success;
         }).catch(function(res) {
             console.error(res.message);
-            saas.util.BaseUtil.showErrorToast('未通过权限验证:' + res.message);
+            school.util.BaseUtil.showErrorToast('未通过权限验证:' + res.message);
         });
     },
 
@@ -535,7 +535,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
     },
 
     openSettingWindow: function(viewName, items, settype) {
-        var panel = saas.util.BaseUtil.getCurrentTab(),
+        var panel = school.util.BaseUtil.getCurrentTab(),
         box = panel.getBox(),
         refs = panel.getReferences() || {},
         win = refs.settingwin;

+ 1 - 1
frontend/pc-web/app/view/core/form/FormPanelModel.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.core.form.FormPanelModel', {
+Ext.define('school.view.core.form.FormPanelModel', {
     extend: 'Ext.app.ViewModel',
     alias: 'viewmodel.core-form-formpanel',
 

+ 1 - 1
frontend/pc-web/app/view/core/form/field/ConDateField.js

@@ -1,7 +1,7 @@
 /**
  * Created by UAS30 on 2018/10/11.
  */
-Ext.define('saas.view.core.form.field.ConDateField', {
+Ext.define('school.view.core.form.field.ConDateField', {
     extend: 'Ext.form.FieldContainer',
     alias: 'widget.condatefield',
     layout: 'hbox',

+ 5 - 5
frontend/pc-web/app/view/core/form/field/DetailGridField.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.core.form.field.DetailGridField', {
+Ext.define('school.view.core.form.field.DetailGridField', {
     extend: 'Ext.grid.Panel',
     xtype: 'detailGridField',
 
@@ -286,10 +286,10 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
         var id = selectedRecord.data.id;
 
         if(id&&id!=0&&(typeof id) == 'number') {
-            saas.util.BaseUtil.showConfirm('警告', '确定删除该条明细')
+            school.util.BaseUtil.showConfirm('警告', '确定删除该条明细')
             .then(function(yes) {
                 if(yes == 'yes') {
-                    saas.util.BaseUtil.request({
+                    school.util.BaseUtil.request({
                         url: me.deleteDetailUrl + '/' + id,
                         params: '',
                         method: 'POST',
@@ -298,12 +298,12 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
                         store.remove(selectedRecord);
                         me.fireEvent('validChange');
                         //解析参数
-                        saas.util.BaseUtil.showSuccessToast('删除成功');
+                        school.util.BaseUtil.showSuccessToast('删除成功');
                     })
                     .catch(function(e) {
                         me.fireEvent('validChange');
                         //失败
-                        saas.util.BaseUtil.showErrorToast('删除失败: ' + e.message);
+                        school.util.BaseUtil.showErrorToast('删除失败: ' + e.message);
                     });
                 }else {
                     throw new Error();

+ 1 - 1
frontend/pc-web/app/view/core/form/field/SeparateField.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.core.form.field.SeparateField', {
+Ext.define('school.view.core.form.field.SeparateField', {
     extend: 'Ext.container.Container',
     xtype: 'separatefield',
     userCls: 'x-field-separator',

+ 1 - 1
frontend/pc-web/app/view/core/tab/Controller.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.core.tab.Controller', {
+Ext.define('school.view.core.tab.Controller', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.core-tab-controller',
 

+ 1 - 1
frontend/pc-web/app/view/core/tab/Panel.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.core.tab.Panel', {
+Ext.define('school.view.core.tab.Panel', {
     extend: 'Ext.panel.Panel',
     xtype: 'core-tab-panel',
     controller: 'core-tab-controller',

+ 1 - 1
frontend/pc-web/app/view/core/window/Controller.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.core.window.Controller', {
+Ext.define('school.view.core.window.Controller', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.core-win-controller',
 

+ 1 - 1
frontend/pc-web/app/view/core/window/Window.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.core.window.Window', {
+Ext.define('school.view.core.window.Window', {
     extend: 'Ext.window.Window',
     xtype: 'core-win',
     controller: 'core-win-controller',

+ 0 - 80
frontend/pc-web/app/view/cuservice/Feedback.js

@@ -1,80 +0,0 @@
-/**
- * 在线反馈
- */
-Ext.define('saas.view.cuservice.Feedback', {
-    extend: 'saas.view.core.base.BasePanel',
-    xtype: 'cuservice-feedback',
-
-    initComponent: function () {
-        Ext.apply(this, {
-            searchField: [{
-                xtype: "textfield",
-                name: "cf_name",
-                width: 300,
-                emptyText: '反馈人/反馈内容',
-                getCondition: function (v) {
-                    return "(upper(CONCAT(cf_name, '#', cf_content) like '%" + v.toUpperCase() + "%' ))";
-                },
-            }, {
-                xtype: 'condatefield',
-                name: 'cf_creatime',
-                columnWidth: 0.4
-            }],
-
-            gridConfig: {
-                dataUrl: '/api/operation/customerFeedBack/list',
-                // dataUrl: 'http://10.1.80.35:9040/customerFeedBack/list',
-                columns: [{
-                    text: 'id',
-                    dataIndex: 'cf_id',
-                    hidden: true
-                }, {
-                    text: '反馈人',
-                    dataIndex: 'cf_name',
-                    width: 120
-                }, {
-                    text: '反馈时间',
-                    dataIndex: 'cf_creatime',
-                    width: 180,
-                    renderer: function(v, m, r) {
-                        return Ext.Date.format(new Date(v), 'Y-m-d H:i:s');
-                    }
-                }, {
-                    text: '反馈内容',
-                    width: 250,
-                    dataIndex: 'cf_content'
-                }, {
-                    text: '状态',
-                    dataIndex: 'cf_status',
-                    width: 80
-                }, {
-                    text: '企业id',
-                    dataIndex: 'cf_companyid',
-                    hidden: true
-                }, {
-                    text: '企业名',
-                    dataIndex: 'cf_company',
-                    width: 120
-                }, {
-                    text: '联系电话',
-                    dataIndex: 'cf_mobile',
-                    width: 120
-                }, {
-                    text: 'QQ',
-                    dataIndex: 'cf_qq',
-                    width: 120
-                }, {
-                    text: '微信',
-                    dataIndex: 'cf_wechat',
-                    width: 120
-                }, {
-                    text: '备注',
-                    dataIndex: 'cf_remark',
-                    width: 250
-                }]
-            },
-        });
-        this.callParent(arguments);
-    }
-
-});

+ 1 - 1
frontend/pc-web/app/view/home/Home.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.home.Home', {
+Ext.define('school.view.home.Home', {
     extend: 'Ext.container.Container',
     xtype: 'home',
     id: 'home',

+ 1 - 1
frontend/pc-web/app/view/home/HomeController.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.home.HomeController', {
+Ext.define('school.view.home.HomeController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.home'
     

+ 1 - 1
frontend/pc-web/app/view/home/HomeModel.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.home.HomeModel', {
+Ext.define('school.view.home.HomeModel', {
     extend: 'Ext.app.ViewModel',
     alias: 'viewmodel.home',
 

+ 2 - 2
frontend/pc-web/app/view/home/InfoCard.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.home.InfoCard', {
+Ext.define('school.view.home.InfoCard', {
     extend: 'Ext.panel.Panel',
     xtype: 'infocard',
 
@@ -110,7 +110,7 @@ Ext.define('saas.view.home.InfoCard', {
                 itemSelector: 'div.x-box',
                 listeners: {
                     itemclick: function(th, record, item, index, e, eOpts) {
-                        saas.util.BaseUtil.openTab(record.get('viewType'), record.get('title'), record.get('id'));
+                        school.util.BaseUtil.openTab(record.get('viewType'), record.get('title'), record.get('id'));
                     }
                 }
             });

+ 1 - 1
frontend/pc-web/app/view/main/Main.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.main.Main', {
+Ext.define('school.view.main.Main', {
     extend: 'Ext.container.Container',
     xtype: 'main',
 

+ 1 - 1
frontend/pc-web/app/view/main/MainContainerWrap.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.main.MainContainerWrap', {
+Ext.define('school.view.main.MainContainerWrap', {
     extend: 'Ext.container.Container',
     xtype: 'maincontainerwrap',
 

+ 1 - 1
frontend/pc-web/app/view/main/MainController.js

@@ -2,7 +2,7 @@
  * This class is the controller for the main view for the application. It is specified as
  * the "controller" of the Main view class.
  */
-Ext.define('saas.view.main.MainController', {
+Ext.define('school.view.main.MainController', {
     extend: 'Ext.app.ViewController',
 
     alias: 'controller.main',

+ 1 - 1
frontend/pc-web/app/view/main/MainModel.js

@@ -1,7 +1,7 @@
 /**
  * This class is the view model for the Main view of the application.
  */
-Ext.define('saas.view.main.MainModel', {
+Ext.define('school.view.main.MainModel', {
     extend: 'Ext.app.ViewModel',
 
     alias: 'viewmodel.main',

+ 3 - 3
frontend/pc-web/app/view/main/Navigation.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.main.Navigation', {
+Ext.define('school.view.main.Navigation', {
     extend: 'Ext.panel.Panel',
     xtype: 'main-navigation',
     ui: 'nav',
@@ -160,7 +160,7 @@ Ext.define('saas.view.main.Navigation', {
                                     
                                     menu.navItem.classList.remove(menu.navView.overItemCls);
                                     // smartschool.util.BaseUtil.openTab(viewType, tabTitle, tabId,config);
-                                    saas.util.BaseUtil['open' + componentType](viewType, tabTitle, tabId,config);
+                                    school.util.BaseUtil['open' + componentType](viewType, tabTitle, tabId,config);
                                     menu.hide();
                                 });
                             });
@@ -179,7 +179,7 @@ Ext.define('saas.view.main.Navigation', {
 
                                     menu.navItem.classList.remove(menu.navView.overItemCls);
                                     // smartschool.util.BaseUtil.openTab(viewType, tabTitle, tabId);
-                                    saas.util.BaseUtil['open' + componentType](viewType, tabTitle, tabId);
+                                    school.util.BaseUtil['open' + componentType](viewType, tabTitle, tabId);
                                     menu.hide();
                                 });
                             });

+ 0 - 27
frontend/pc-web/app/view/statistical/AccessLog.js

@@ -1,27 +0,0 @@
-/**
- * 用户访问日志
- */
-Ext.define('saas.view.statistical.AccessLog', {
-    extend: 'saas.view.core.List',
-    xtype: 'statistical-accesslog',
-
-    columns: [{
-        text: '用户名',
-        dataIndex: 'name'
-    }, {
-        text: '联系电话',
-        dataIndex: 'phone'
-    }, {
-        text: '最后访问时间',
-        dataIndex: 'lastTime'
-    }, {
-        text: '近三月访问次数',
-        dataIndex: 'count'
-    }],
-
-    store: Ext.create('Ext.data.Store', {
-        fields: ['name', 'phone', 'lastTime', 'count'],
-        data: [],
-    })
-
-});

+ 0 - 77
frontend/pc-web/app/view/statistical/CompanyAnalysis.js

@@ -1,77 +0,0 @@
-/**
- * 企业分析
- */
-Ext.define('saas.view.statistical.CompanyAnalysis', {
-    extend: 'saas.view.core.base.BasePanel',
-    xtype: 'statistical-companyanalysis',
-
-    initComponent: function () {
-        Ext.apply(this, {
-            searchField: [{
-                xtype: "textfield",
-                name: "ca_company",
-                emptyText: '企业名称'
-            }, {
-                xtype: 'textfield',
-                name: 'ca_admin',
-                emptyText: '管理员'
-            }],
-
-            gridConfig: {
-                dataUrl: '/api/operation/data/getConpanyAnalyze',
-                // dataUrl: 'http://10.1.80.35:9040/data/getConpanyAnalyze',
-                columns: [{
-                    text: 'ID',
-                    dataIndex: 'ca_id',
-                    hidden: true
-                }, {
-                    text: '企业ID',
-                    dataIndex: 'ca_companyid',
-                    hidden: true
-                }, {
-                    text: '企业名称',
-                    dataIndex: 'ca_company',
-                    width: 200,
-                    renderer: function(v, m, r) {
-                        return '<span style="cursor: pointer; color: #3e80f6;">' + v + '</span>';
-                    },
-                    listeners: {
-                        click: function(tableView, td, rowIdx, colIdx, e, model, tr) {
-                            var data = model.data;
-                            saas.util.BaseUtil.openTab('companyinfo', data.ca_company , data.ca_id, {
-                                initId: data.ca_companyid
-                            });
-                        }
-                    }
-                }, {
-                    text: '企业地址',
-                    dataIndex: 'ca_address',
-                    width: 200
-                }, {
-                    text: '管理员',
-                    dataIndex: 'ca_admin'
-                }, {
-                    text: '注册时间',
-                    dataIndex: 'ca_createtime',
-                    xtype: 'datecolumn',
-                    format: 'Y-m-d H:i:s',
-                    width: 150
-                }, {
-                    text: '最近操作时间',
-                    dataIndex: 'ca_newestlogtime',
-                    xtype: 'datecolumn',
-                    format: 'Y-m-d H:i:s',
-                    width: 150
-                }, {
-                    text: '目前阶段',
-                    dataIndex: 'ca_phase'
-                }, {
-                    text: '使用状态',
-                    dataIndex: 'ca_status'
-                }]
-            },
-        });
-        this.callParent(arguments);
-    }
-
-});

+ 0 - 110
frontend/pc-web/app/view/statistical/CompanyInfo.js

@@ -1,110 +0,0 @@
-Ext.define('saas.view.statistical.CompanyInfo', {
-    extend: 'saas.view.core.form.FormPanel',
-    xtype: 'companyinfo',
-
-    viewModel: 'companyinfo',
-
-    _readUrl: '/api/operation/data/companyAnalyzeRead',
-    codeInHeader: false,
-
-    initComponent: function () {
-        var me = this;
-        Ext.apply(this, {
-            defaultItems: [{
-                xtype: 'hidden',
-                name: 'ca_id',
-                fieldLabel: 'id'
-            }, {
-                xtype: 'textfield',
-                name: 'ca_companyid',
-                fieldLabel: '客户编号'
-            }, {
-                xtype: "textfield",
-                name: "ca_company",
-                fieldLabel: "客户名称",
-            }, {
-                xtype: "textfield",
-                name: "ca_address",
-                fieldLabel: "地址",
-            }, {
-                xtype: "textfield",
-                name: "ca_admin",
-                fieldLabel: "管理员",
-            }, {
-                xtype: "datefield",
-                name: "ca_createtime",
-                format: 'Y-m-d H:i:s',
-                fieldLabel: "注册时间",
-            }, {
-                xtype: "datefield",
-                name: "ca_newestlogtime",
-                format: 'Y-m-d H:i:s',
-                fieldLabel: "最后操作时间",
-            }, {
-                xtype: 'textfield',
-                name: 'ca_phase',
-                fieldLabel: '目前阶段',
-            }, {
-                xtype: 'textfield',
-                name: 'ca_status',
-                fieldLabel: '使用状态',
-            }, {
-                name: "detailGridField",
-                xtype: "detailGridField",
-                storeModel: 'saas.model.statistical.CompanyInfo',
-                detnoColumn: 'ord_detno',
-                deleteDetailUrl: '/api/money/othreceipts/deleteDetail',
-                showCount: false,
-                columns: [{
-                    text: "账户统计",
-                    dataIndex: "cd_accountnum",
-                    width: 140,
-                    align: 'end'
-                }, {
-                    text: "物料资料统计",
-                    dataIndex: "cd_productnum",
-                    width: 140,
-                    align: 'end'
-                }, {
-                    text: "客户资料统计",
-                    dataIndex: "cd_customernum",
-                    width: 140,
-                    align: 'end'
-                }, {
-                    text: "供应商资料统计",
-                    dataIndex: "cd_vendornum",
-                    width: 140,
-                    align: 'end'
-                }, {
-                    text: "销售订单统计",
-                    dataIndex: "cd_salenum",
-                    width: 140,
-                    align: 'end'
-                }, {
-                    text: "采购订单统计",
-                    dataIndex: "cd_purchasenum",
-                    width: 140,
-                    align: 'end'
-                }, {
-                    text: "出入库单据统计",
-                    dataIndex: "cd_prodionum",
-                    width: 140,
-                    align: 'end'
-                }, {
-                    text: "付款单统计",
-                    dataIndex: "cd_paynum",
-                    width: 140,
-                    align: 'end'
-                }, {
-                    text: "收款单统计",
-                    dataIndex: "cd_receivenum",
-                    width: 140,
-                    align: 'end'
-                }]
-            }],
-        });
-        this.callParent();
-        this.setEditable(false);
-    },
-
-});

+ 0 - 14
frontend/pc-web/app/view/statistical/CompanyInfoModel.js

@@ -1,14 +0,0 @@
-Ext.define('saas.view.statistical.CompanyInfoModel', {
-    extend: 'saas.view.core.form.FormPanelModel',
-    alias: 'viewmodel.companyinfo',
-
-    data: {
-        id: 0,
-        base: {
-            bindFields: [], // 绑定字段
-            editable: false, // 单据是否可编辑
-        },
-        detailBindeFields: [], // 从表绑定列
-        detailStore: null, // 从表store
-    },
-});

+ 0 - 69
frontend/pc-web/app/view/statistical/CompanyRegInfo.js

@@ -1,69 +0,0 @@
-/**
- * 企业注册数据
- */
-Ext.define('saas.view.statistical.CompanyRegInfo', {
-    extend: 'saas.view.core.base.BasePanel',
-    xtype: 'statistical-companyreginfo',
-
-    initComponent: function () {
-        Ext.apply(this, {
-            searchField: [{
-                xtype: "textfield",
-                name: "name",
-                emptyText: '企业名称'
-            }, {
-                xtype: 'textfield',
-                name: 'realname',
-                emptyText: '管理员'
-            }],
-
-            gridConfig: {
-                dataUrl: '/api/operation/data/getCompany',
-                // dataUrl: 'http://10.1.80.35:9040/data/getCompany',
-                columns: [{
-                    text: '注册时间',
-                    dataIndex: 'create_time',
-                    width: 180,
-                    xtype: 'datecolumn',
-                    renderer: function(v, m, r) {
-                        return Ext.Date.format(new Date(v), 'Y-m-d H:i:s');
-                    }
-                }, {
-                    text: '企业编号',
-                    width: 200,
-                    dataIndex: 'business_code'
-                }, {
-                    text: '企业名称',
-                    width: 200,
-                    dataIndex: 'name'
-                }, {
-                    text: 'UU号',
-                    width: 120,
-                    dataIndex: 'uu'
-                }, {
-                    text: '企业地址',
-                    width: 250,
-                    dataIndex: 'address'
-                }, {
-                    text: '电话',
-                    width: 120,
-                    dataIndex: 'tel'
-                }, {
-                    text: '传真',
-                    width: 150,
-                    dataIndex: 'fax'
-                }, {
-                    text: '管理员',
-                    width: 100,
-                    dataIndex: 'realname'
-                }, {
-                    text: '联系方式',
-                    width: 150,
-                    dataIndex: 'mobile'
-                }]
-            },
-        });
-        this.callParent(arguments);
-    }
-
-});

+ 0 - 52
frontend/pc-web/app/view/statistical/LoginLog.js

@@ -1,52 +0,0 @@
-/**
- * 登录日志
- */
-Ext.define('saas.view.statistical.LoginLog', {
-    extend: 'saas.view.core.base.BasePanel',
-    xtype: 'statistical-loginlog',
-
-    initComponent: function () {
-        Ext.apply(this, {
-            searchField: [{
-                xtype: "textfield",
-                name: "username",
-                emptyText: '用户名/手机号',
-                getCondition: function (v) {
-                    return "(upper(CONCAT(username, '#', mobile) like '%" + v.toUpperCase() + "%' )";
-                },
-            }],
-
-            gridConfig: {
-                dataUrl: '/api/operation/data/getLogin',
-                // dataUrl: 'http://10.1.80.35:9040/data/getLogin',
-                columns: [{
-                    text: 'id',
-                    dataIndex: 'account_id',
-                    hidden: true
-                }, {
-                    text: '用户名',
-                    dataIndex: 'username',
-                    width: 120
-                }, {
-                    text: '手机号',
-                    dataIndex: 'mobile',
-                    width: 120
-                }, {
-                    text: '近三月登录次数',
-                    dataIndex: 'login_num',
-                    width: 120
-                }, {
-                    text: '最后登录时间',
-                    dataIndex: 'lastesttime',
-                    width: 180,
-                    xtype: 'datecolumn',
-                    renderer: function(v, m, r) {
-                        return Ext.Date.format(new Date(v), 'Y-m-d H:i:s');
-                    }
-                }]
-            },
-        });
-        this.callParent(arguments);
-    }
-
-});

+ 0 - 24
frontend/pc-web/app/view/statistical/MonthInfo.js

@@ -1,24 +0,0 @@
-/**
- * 月注册分析
- */
-Ext.define('saas.view.statistical.MonthInfo', {
-    extend: 'saas.view.core.List',
-    xtype: 'statistical-monthinfo',
-
-    columns: [{
-        text: '姓名',
-        dataIndex: 'name'
-    }, {
-        text: '手机号',
-        dataIndex: 'phone'
-    }, {
-        text: '注册时间',
-        dataIndex: 'registeTime'
-    }],
-
-    store: Ext.create('Ext.data.Store', {
-        fields: ['name', 'phone', 'registeTime'],
-        data: [],
-    })
-
-});

+ 0 - 109
frontend/pc-web/app/view/statistical/PersonRegInfo.js

@@ -1,109 +0,0 @@
-/**
- * 个人注册数据
- */
-Ext.define('saas.view.statistical.PersonRegInfo', {
-    extend: 'saas.view.core.base.BasePanel',
-    xtype: 'statistical-personreginfo',
-
-    initComponent: function () {
-        Ext.apply(this, {
-            searchField: [{
-                xtype: "textfield",
-                name: "username",
-                emptyText: '用户名/手机号',
-                getCondition: function (v) {
-                    return "(upper(CONCAT(username, '#', mobile) like '%" + v.toUpperCase() + "%'))";
-                },
-            }, {
-                xtype: 'combobox',
-                name: 'bind',
-                fieldLabel: '绑定企业',
-                queryMode: 'local',
-                displayField: 'name',
-                valueField: 'value',
-                emptyText :'全部',
-                editable:false,
-                store: Ext.create('Ext.data.ArrayStore', {
-                fields: ['value', 'name'],
-                data: [
-                    ["ALL", "全部"],
-                    ["Y", "是"],
-                    ["N", "否"]
-                ]
-                }),
-                getCondition: function(value) {
-                    if(value == 'ALL') {
-                        return '1=1';
-                    }else if(value == 'Y') {
-                        return 'bind > 0';
-                    }else if(value == 'N') {
-                        return 'bind = 0';
-                    }
-                }
-            }],
-
-            gridConfig: {
-                dataUrl: '/api/operation/data/getAccount',
-                // dataUrl: 'http://10.1.80.35:9040/data/getAccount',
-                columns: [{
-                    text: 'id',
-                    dataIndex: 'id',
-                    hidden: true
-                }, {
-                    text: '账号',
-                    dataIndex: 'username',
-                    width: 120
-                }, {
-                    text: '姓名',
-                    dataIndex: 'realname',
-                    width: 120
-                }, {
-                    text: '邮箱',
-                    dataIndex: 'email',
-                    width: 180
-                }, {
-                    text: '手机号',
-                    dataIndex: 'mobile',
-                    width: 120
-                }, {
-                    text: '类型',
-                    dataIndex: 'type',
-                    width: 140,
-                    renderer: function(v, m, r) {
-                        return v == 1 ? '<span style="font-weight: bold;">管理员</span>' : '普通用户';
-                    }
-                }, {
-                    text: '状态',
-                    dataIndex: 'enabled',
-                    align: 'center',
-                    width: 80,
-                    renderer: function(v, m, r) {
-                        return v == true ? '<span style="color: #81CB31;">启用</span>' : '<span style="color: #DD6550;">未启用</span>';
-                    }
-                }, {
-                    text: '绑定企业',
-                    dataIndex: 'bind',
-                    align: 'center',
-                    width: 80,
-                    renderer: function(v, m, r) {
-                        return v > 0 ? '是' : '否';
-                    }
-                }, {
-                    text: '注册时间',
-                    xtype: 'datecolumn',
-                    dataIndex: 'createTime',
-                    width: 180,
-                    renderer: function(v, m, r) {
-                        return Ext.Date.format(new Date(v), 'Y-m-d H:i:s'); 
-                    }
-                }, {
-                    text: 'UU号',
-                    dataIndex: 'uu',
-                    width: 120
-                }]
-            },
-        });
-        this.callParent(arguments);
-    }
-
-});

+ 0 - 39
frontend/pc-web/app/view/tools/ClearCache.js

@@ -1,39 +0,0 @@
-Ext.define('saas.view.tools.ClearCache', {
-    extend: 'Ext.form.Panel',
-    xtype: 'tools-clearcache',
-
-    requires: ['Ext.form.field.Display'],
-
-    layout: 'column',
-    width: 350,
-    bodyPadding: 10,
-
-    items: [{
-        xtype: 'displayfield',
-        value: '确定执行清除缓存操作吗?',
-        columnWidth: 1
-    }],
-
-    buttonAlign: 'center',
-    buttons: [{
-        text: '确定',
-        handler: function() {
-            var win = this.up('core-win');
-            win.setLoading(true);
-            saas.util.BaseUtil.request({
-                url: '/api/account/account/cache/clearAll',
-            }).then(function(res) {
-                saas.util.BaseUtil.showSuccessToast('清除缓存成功');
-                win.setLoading(false);
-                win.close();
-            }).catch(function(e) {
-                saas.util.BaseUtil.showErrorToast('清除缓存失败: ' + e.message);
-                win.setLoading(false);
-                win.close();
-            });
-        }
-    }, {
-        text: '取消',
-        handler: 'closeWin'
-    }]
-})

+ 0 - 45
frontend/pc-web/app/view/tools/ResetAccount.js

@@ -1,45 +0,0 @@
-Ext.define('saas.view.tools.ResetAccount', {
-    extend: 'Ext.form.Panel',
-    xtype: 'tools-resetaccount',
-
-    requires: ['Ext.layout.container.Column'],
-
-    layout: 'column',
-    width: 350,
-    bodyPadding: 10,
-
-    items: [{
-        xtype: 'textfield',
-        name: 'userName',
-        emptyText: '输入账号',
-        columnWidth: 1,
-        allowBlank: false
-    }],
-
-    buttonAlign: 'center',
-    buttons: [{
-        text: '确定',
-        formBind: true,
-        handler: function() {
-            var win = this.up('core-win'),
-            form = this.up('tools-resetaccount'),
-            userName = form.getValues().userName;
-
-            win.setLoading(true);
-            saas.util.BaseUtil.request({
-                url: '/api/oper_auth/clearAuthorizeCount?username=' + userName,
-            }).then(function(res) {
-                saas.util.BaseUtil.showSuccessToast('账号[' + userName + ']已重置');
-                win.setLoading(false);
-                win.close();
-            }).catch(function(e) {
-                saas.util.BaseUtil.showErrorToast('账号[' + userName + ']重置失败: ' + e.message);
-                win.setLoading(false);
-                win.close();
-            });
-        }
-    }, {
-        text: '取消',
-        handler: 'closeWin'
-    }]
-})

+ 1 - 1
frontend/pc-web/app/view/viewport/Viewport.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.viewport.Viewport', {
+Ext.define('school.view.viewport.Viewport', {
     extend: 'Ext.container.Viewport',
 
     controller: 'viewport',

+ 7 - 7
frontend/pc-web/app/view/viewport/ViewportController.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.viewport.ViewportController', {
+Ext.define('school.view.viewport.ViewportController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.viewport',
 
@@ -18,7 +18,7 @@ Ext.define('saas.view.viewport.ViewportController', {
 
     init: function() {
         var me = this;
-        me.originalRoute = saas.getApplication().getDefaultToken();
+        me.originalRoute = school.getApplication().getDefaultToken();
         me.restoreSession();
     },
 
@@ -70,7 +70,7 @@ Ext.define('saas.view.viewport.ViewportController', {
         }
 
         // There is an authenticated user, so let's simply redirect to the default token.
-        var target = saas.getApplication().getDefaultToken();
+        var target = school.getApplication().getDefaultToken();
         Ext.log.warn('Route unknown: ', route);
         if (route !== target) {
             me.redirectTo(target, {replace: true});
@@ -90,8 +90,8 @@ Ext.define('saas.view.viewport.ViewportController', {
     // SESSION MANAGEMENT
 
     restoreSession: function() {
-        var data = saas.util.State.get('session'),
-            session = data? saas.model.Session.loadData(data) : null;
+        var data = school.util.State.get('session'),
+            session = data? school.model.Session.loadData(data) : null;
 
         if (session && session.isValid()) {
             this.initiateSession(session);
@@ -115,7 +115,7 @@ Ext.define('saas.view.viewport.ViewportController', {
     },
 
     saveSession: function(session) {
-        saas.util.State.set('session', session && session.getData(true));
+        school.util.State.set('session', session && session.getData(true));
         this.getViewModel().set('account', session && session.get('account'));
         this.session = session;
     },
@@ -141,7 +141,7 @@ Ext.define('saas.view.viewport.ViewportController', {
 
         view.mask();
         session.logout().catch(function(error) {
-            saas.util.BaseUtil.showErrorToast(error.message);
+            school.util.BaseUtil.showErrorToast(error.message);
         }).then(function() {
             me.originalRoute = Ext.History.getToken();
             me.terminateSession();

+ 1 - 1
frontend/pc-web/app/view/viewport/ViewportModel.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.viewport.ViewportModel', {
+Ext.define('school.view.viewport.ViewportModel', {
     extend: 'Ext.app.ViewModel',
     alias: 'viewmodel.viewport',
 

+ 4 - 4
frontend/pc-web/overrides/data/Connection.js

@@ -2,7 +2,7 @@
  * 在 ajax request 前修改url,增加服务端`basePath`
  * `basePath`在`app.json`配置
  */
-Ext.define('saas.override.data.Connection', {
+Ext.define('school.override.data.Connection', {
     override: 'Ext.data.Connection',
  
     urlRegexp: /(http|ftp|https):\/\//,
@@ -60,14 +60,14 @@ Ext.define('saas.override.data.Connection', {
 
         if(res && res.code == 40001) {
             // 如果token超时则显示重新登陆弹窗
-            saas.util.BaseUtil.showLoginWin();
+            school.util.BaseUtil.showLoginWin();
             throw new Error('会话已过期');
         }
 
         if(Authorization) {
             // 如果返回了token则刷新token
             let headers = Ext.Ajax.getDefaultHeaders() || {};
-            let session = saas.util.State.get('session');
+            let session = school.util.State.get('session');
             
             headers['Authorization'] = Authorization;
             Ext.Ajax.setDefaultHeaders(headers);
@@ -75,7 +75,7 @@ Ext.define('saas.override.data.Connection', {
             session.token = Authorization;
             session.timestamp = Ext.now();
 
-            saas.util.State.set('session', session);
+            school.util.State.set('session', session);
 
             let sessionStr = JSON.stringify(session.data);
             const frame = window.frames[window.frames.length - 1];

+ 1 - 1
frontend/pc-web/overrides/form/field/Date.js

@@ -1,4 +1,4 @@
-Ext.define('saas.override.form.field.Date', {
+Ext.define('school.override.form.field.Date', {
     override: 'Ext.form.field.Date',
     formatText: '',