UPS功能迁移：1.0.39 修复loading的bug。

src/client/MenuNode.vue

@@ -212,7 +212,9 @@ export default {
       var _self = this;
       if (_self.model.subMenus == undefined || _self.model.subMenus.length == 0) {
         UserMenuClickCountResource.changeUserMenuClickCount(_self.model.no).then(successData => {
-
+          if(successData.errorCode != 0){
+            Notify.error('Error', successData.errorMessage, false);
+          }
         }, errorData => {
           Common.processException(errorData);
         });

src/window/tabFormView/TabFormEdit.vue

@@ -689,9 +689,7 @@ export default {
     initCreateView: function () {
       var _self = this;
 
-      if (_self.$refs.loading != undefined) {
-        _self.loading = true;
-      }
+      _self.loading = true;
       DataRecoveryResource.queryDataRecoveryDtoByUserId(
         _self.windowNo,
         _self.type,
@@ -711,6 +709,7 @@ export default {
       WindowServerUtil.getWindowById(
         _self.windowNo,
         function (window) {
+          _self.loading = false;
           WindowClientUtil.parseFilterSchema(window);
           var tab = WindowClientUtil.getTab(window, _self.tabIndex);
           WindowClientUtil.parseSubTab(window, tab);
@@ -732,9 +731,7 @@ export default {
             _self.tabIndex,
             null,
             function (response) {
-              if (_self.$refs.loading != undefined) {
-                _self.loading = false;
-              }
+              _self.loading = false;
               if(response.errorCode != 0){
                 Notify.error('数据新建异常', response.errorMessage, false);
                 return;
@@ -750,16 +747,12 @@ export default {
               _self.autoClickMenu();
             },
             function () {
-              if (_self.$refs.loading != undefined) {
-                _self.loading = false;
-              }
+              _self.loading = false;
             },
           );
         },
         function () {
-          if (_self.$refs.loading != undefined) {
-            _self.loading = false;
-          }
+          _self.loading = false;
         },
       );
     },
@@ -777,6 +770,7 @@ export default {
           _self.windowNo,
         ).then(
           successData => {
+            _self.loading = false;
             if (successData.errorCode == 0) {
               initWindowAfterLoaded(successData.data);
             }else{
@@ -794,6 +788,7 @@ export default {
         WindowServerUtil.getWindowById(
           _self.windowNo,
           function (window) {
+            _self.loading = false;
             initWindowAfterLoaded(window);
           },
           function () {
@@ -878,6 +873,7 @@ export default {
       WindowServerUtil.getWindowById(
         _self.windowNo,
         function (window) {
+          _self.loading = false;
           WindowClientUtil.parseFilterSchema(window);
           var tab = WindowClientUtil.getTab(window, _self.tabIndex);
           WindowClientUtil.parseSubTab(window, tab);
@@ -898,7 +894,6 @@ export default {
             _self.processDefinitionId = _self.window.workflow.deploymentId;
           }
 
-          _self.loading = false;
           if (_self.isRestoreData == 1) {
             DataRecoveryResource.queryDataRecoveryDtoByUserId(
               _self.windowNo,
@@ -1242,6 +1237,7 @@ export default {
       WindowServerUtil.loadTabSingleData(
         tabLoadParam,
         function (modelData) {
+          _self.loading = false;
           _self.modelData = modelData;
 
           // 判断是否有属性
@@ -1282,7 +1278,6 @@ export default {
             _self.processInstanceId = '';
           }
 
-          _self.loading = false;
         },
         function () {
           _self.loading = false;
@@ -2058,6 +2053,7 @@ export default {
         tabQueryParam,
         function (response) {
           
+          _self.loading = false;
           if(response.errorCode != 0){
             Notify.error('Error', response.errorMessage, false);
             return;
@@ -2067,7 +2063,6 @@ export default {
           if (dataLists != undefined && dataLists.length > 0) {
             _self.modelData = dataLists[0];
           }
-          _self.loading = false;
         },
         function () {
           _self.loading = false;

src/window/tabFormView/TabFormView.vue

@@ -1092,6 +1092,7 @@ export default {
           _self.windowNo,
         ).then(
           successData => {
+            _self.loading = false;
             if (successData.errorCode == 0) {
               initWindowAfterLoaded(successData.data);
               _self.uniqueByNoAccessControl();
@@ -1108,6 +1109,7 @@ export default {
         WindowServerUtil.getWindowById(
           _self.windowNo,
           function (window) {
+            _self.loading = false;
             initWindowAfterLoaded(window);
             _self.uniqueByNoAccessControl();
           },
@@ -1172,6 +1174,7 @@ export default {
       WindowServerUtil.getWindowById(
         _self.windowNo,
         function (window) {
+          _self.loading = false;
           WindowClientUtil.parseFilterSchema(window);
           var tab = WindowClientUtil.getTab(window, _self.tabIndex);
           WindowClientUtil.parseSubTab(window, tab);
@@ -1235,7 +1238,6 @@ export default {
           if (_self.window.workflow != undefined) {
             _self.processDefinitionId = _self.window.workflow.deploymentId;
           }
-          _self.loading = false;
         },
         function () {
           _self.loading = false;
@@ -1402,6 +1404,7 @@ export default {
       WindowServerUtil.loadTabSingleData(
         tabLoadParam,
         function (modelData) {
+          _self.loading = false;
           _self.modelData = modelData;
 
           // 判断是否显示审批状态
@@ -1449,7 +1452,6 @@ export default {
             }
           }
 
-          _self.loading = false;
         },
         function () {
           _self.loading = false;
@@ -1924,6 +1926,7 @@ export default {
         tabQueryParam,
         function (response) {
           
+          _self.loading = false;
           if(response.errorCode != 0){
             Notify.error('Error', response.errorMessage, false);
             return;
@@ -1945,7 +1948,6 @@ export default {
               }
             }
           }
-          _self.loading = false;
         },
         function () {
           _self.loading = false;

src/window/tabGridView/TabGridEdit.vue

@@ -781,6 +781,7 @@ export default {
         tabQueryParam,
         function (response) {
           
+          _self.loading=false;
           if(response.errorCode != 0){
             Notify.error('Error', response.errorMessage, false);
             return;
@@ -801,7 +802,6 @@ export default {
 
           _self.loadHeaderAndFooterContent(tabQueryParam);
 
-          _self.loading=false;
           _self.refreshCommand = false;
 
           _self.fixedTableHeader();
@@ -1175,6 +1175,7 @@ export default {
         WindowServerUtil.deleteTabData(
           tabDeleteData,
           function (result) {
+            _self.loading=false;
             for (var index = 0; index < dataPrepareDelete.length; index++) {
               if (dataPrepareDelete[index].id > 0) {
                 var index1 = _self.modelDatas.indexOf(dataPrepareDelete[index]);
@@ -1184,7 +1185,6 @@ export default {
               }
             }
             _self.queryGridData(false);
-            _self.loading=false;
           },
           function () {
             _self.loading=false;
@@ -1256,9 +1256,9 @@ export default {
         WindowServerUtil.deleteTabData(
           tabDeleteData,
           function (result) {
+            _self.loading=false;
             _self.modelDatas.splice(index, 1);
             _self.queryGridData(false);
-            _self.loading=false;
           },
           function () {
             _self.loading=false;
@@ -1565,6 +1565,7 @@ export default {
             WindowServerUtil.loadTabSingleData(
               tabLoadParam,
               function (modelDataSaved) {
+                _self.loading=false;
                 Notify.success(_self.$t('lang.tabGridEdit.describe14'), _self.$t('lang.tabGridEdit.describe15'), 1500);
 
                 var index = _self.modelDatas.indexOf(modelData);
@@ -1576,7 +1577,6 @@ export default {
                   _self.modelDatas[index]=modelDataSaved;
                 }
 
-                _self.loading=false;
                 _self.dataChanged = false;
               },
               function () {

src/window/tabView/TabButton.vue

@@ -711,9 +711,9 @@ export default {
         contentType: 'application/json',
         data: JSON.stringify(processResultData),
         success: function (successData) {
+          _self.loading=false;
           if(successData.errorCode == 0) {
             _self.modal = true;
-            _self.loading=false;
             _self.processReportResult = successData.data;
 
             if (

src/window1/tabFormEdit/TabFormEdit.vue

@@ -689,9 +689,7 @@ export default {
     initCreateView: function () {
       var _self = this;
 
-      if (_self.$refs.loading != undefined) {
-        _self.loading = true;
-      }
+      _self.loading = true;
       DataRecoveryResource.queryDataRecoveryDtoByUserId(
         _self.windowNo,
         _self.type,
@@ -732,9 +730,7 @@ export default {
             _self.tabIndex,
             null,
             function (response) {
-              if (_self.$refs.loading != undefined) {
-                _self.loading = false;
-              }
+              _self.loading = false;
 
               if(response.errorCode != 0){
                 Notify.error('数据新建异常', response.errorMessage, false);
@@ -751,16 +747,12 @@ export default {
               _self.autoClickMenu();
             },
             function () {
-              if (_self.$refs.loading != undefined) {
-                _self.loading = false;
-              }
+              _self.loading = false;
             },
           );
         },
         function () {
-          if (_self.$refs.loading != undefined) {
-            _self.loading = false;
-          }
+          _self.loading = false;
         },
       );
     },
@@ -778,6 +770,7 @@ export default {
           _self.windowNo,
         ).then(
           successData => {
+            _self.loading = false;
             if (successData.errorCode == 0) {
               initWindowAfterLoaded(successData.data);
             }else{
@@ -793,6 +786,7 @@ export default {
         WindowServerUtil.getWindowById(
           _self.windowNo,
           function (window) {
+            _self.loading = false;
             initWindowAfterLoaded(window);
           },
           function () {
@@ -877,6 +871,7 @@ export default {
       WindowServerUtil.getWindowById(
         _self.windowNo,
         function (window) {
+          _self.loading = false;
           WindowClientUtil.parseFilterSchema(window);
           var tab = WindowClientUtil.getTab(window, _self.tabIndex);
           WindowClientUtil.parseSubTab(window, tab);
@@ -897,7 +892,6 @@ export default {
             _self.processDefinitionId = _self.window.workflow.deploymentId;
           }
 
-          _self.loading = false;
           if (_self.isRestoreData == 1) {
             DataRecoveryResource.queryDataRecoveryDtoByUserId(
               _self.windowNo,
@@ -1241,6 +1235,7 @@ export default {
       WindowServerUtil.loadTabSingleData(
         tabLoadParam,
         function (modelData) {
+          _self.loading = false;
           _self.modelData = modelData;
 
           // 判断是否有属性
@@ -1281,7 +1276,6 @@ export default {
             _self.processInstanceId = '';
           }
 
-          _self.loading = false;
         },
         function () {
           _self.loading = false;
@@ -2056,6 +2050,7 @@ export default {
       WindowServerUtil.queryTabData(
         tabQueryParam,
         function (response) {
+          _self.loading = false;
           
           if(response.errorCode != 0){
             Notify.error('Error', response.errorMessage, false);
@@ -2066,7 +2061,6 @@ export default {
           if (dataLists != undefined && dataLists.length > 0) {
             _self.modelData = dataLists[0];
           }
-          _self.loading = false;
         },
         function () {
           _self.loading = false;

src/window1/tabFormEdit/TabFormEditModal.vue

@@ -795,9 +795,7 @@ export default {
     initCreateView: function () {
       var _self = this;
 
-      if (_self.$refs.loading != undefined) {
-        _self.loading = true;
-      }
+      _self.loading = true;
       DataRecoveryResource.queryDataRecoveryDtoByUserId(
         _self.windowNo,
         _self.type,
@@ -839,9 +837,7 @@ export default {
             _self.tabIndex,
             _self.modelDataCreate,
             function (response) {
-              if (_self.$refs.loading != undefined) {
-                _self.loading = false;
-              }
+              _self.loading = false;
 
               if(response.errorCode != 0){
                 Notify.error('数据新建异常', response.errorMessage, false);
@@ -858,16 +854,12 @@ export default {
               _self.autoClickMenu();
             },
             function () {
-              if (_self.$refs.loading != undefined) {
-                _self.loading = false;
-              }
+              _self.loading = false;
             },
           );
         },
         function () {
-          if (_self.$refs.loading != undefined) {
-            _self.loading = false;
-          }
+          _self.loading = false;
         },
       );
     },
@@ -885,6 +877,7 @@ export default {
           _self.windowNo,
         ).then(
           successData => {
+            _self.loading = false;
             if (successData.errorCode == 0) {
               initWindowAfterLoaded(successData.data);
             }else{
@@ -900,6 +893,7 @@ export default {
         WindowServerUtil.getWindowById(
           _self.windowNo,
           function (curdWindow) {
+            _self.loading = false;
             initWindowAfterLoaded(curdWindow);
           },
           function () {
@@ -985,6 +979,7 @@ export default {
       WindowServerUtil.getWindowById(
         _self.windowNo,
         function (curdWindow) {
+          _self.loading = false;
           WindowClientUtil.parseFilterSchema(curdWindow);
           var tab = WindowClientUtil.getTab(curdWindow, _self.tabIndex);
           WindowClientUtil.parseSubTab(curdWindow, tab);
@@ -1006,7 +1001,6 @@ export default {
             _self.processDefinitionId = _self.curdWindow.workflow.deploymentId;
           }
 
-          _self.loading = false;
           if (_self.isRestoreData == true) {
             DataRecoveryResource.queryDataRecoveryDtoByUserId(
               _self.windowNo,
@@ -1350,6 +1344,7 @@ export default {
       WindowServerUtil.loadTabSingleData(
         tabLoadParam,
         function (modelData) {
+          _self.loading = false;
           _self.modelData = modelData;
 
           // 判断是否有属性
@@ -1390,7 +1385,6 @@ export default {
             _self.processInstanceId = '';
           }
 
-          _self.loading = false;
         },
         function () {
           _self.loading = false;
@@ -2164,6 +2158,7 @@ export default {
       WindowServerUtil.queryTabData(
         tabQueryParam,
         function (response) {
+          _self.loading = false;
           
           if(response.errorCode != 0){
             Notify.error('Error', response.errorMessage, false);
@@ -2174,7 +2169,6 @@ export default {
           if (dataLists != undefined && dataLists.length > 0) {
             _self.modelData = dataLists[0];
           }
-          _self.loading = false;
         },
         function () {
           _self.loading = false;

src/window1/tabFormView/TabFormView.vue

@@ -1092,6 +1092,7 @@ export default {
           _self.windowNo,
         ).then(
           successData => {
+            _self.loading = false;
             if (successData.errorCode == 0) {
               initWindowAfterLoaded(successData.data);
               _self.uniqueByNoAccessControl();
@@ -1108,6 +1109,7 @@ export default {
         WindowServerUtil.getWindowById(
           _self.windowNo,
           function (window) {
+            _self.loading = false;
             initWindowAfterLoaded(window);
             _self.uniqueByNoAccessControl();
           },
@@ -1172,6 +1174,7 @@ export default {
       WindowServerUtil.getWindowById(
         _self.windowNo,
         function (window) {
+          _self.loading = false;
           WindowClientUtil.parseFilterSchema(window);
           var tab = WindowClientUtil.getTab(window, _self.tabIndex);
           WindowClientUtil.parseSubTab(window, tab);
@@ -1235,7 +1238,6 @@ export default {
           if (_self.window.workflow != undefined) {
             _self.processDefinitionId = _self.window.workflow.deploymentId;
           }
-          _self.loading = false;
         },
         function () {
           _self.loading = false;
@@ -1402,6 +1404,7 @@ export default {
       WindowServerUtil.loadTabSingleData(
         tabLoadParam,
         function (modelData) {
+          _self.loading = false;
           _self.modelData = modelData;
 
           // 判断是否显示审批状态
@@ -1449,7 +1452,6 @@ export default {
             }
           }
 
-          _self.loading = false;
         },
         function () {
           _self.loading = false;
@@ -1924,6 +1926,7 @@ export default {
       WindowServerUtil.queryTabData(
         tabQueryParam,
         function (response) {
+          _self.loading = false;
           
           if(response.errorCode != 0){
             Notify.error('Error', response.errorMessage, false);
@@ -1946,7 +1949,6 @@ export default {
               }
             }
           }
-          _self.loading = false;
         },
         function () {
           _self.loading = false;

src/window1/tabFormView/TabFormViewModal.vue

@@ -1156,6 +1156,7 @@ export default {
           _self.windowNo,
         ).then(
           successData => {
+            _self.loading = false;
             if (successData.errorCode == 0) {
               initWindowAfterLoaded(successData.data);
               _self.uniqueByNoAccessControl();
@@ -1172,6 +1173,7 @@ export default {
         WindowServerUtil.getWindowById(
           _self.windowNo,
           function (curdWindow) {
+            _self.loading = false;
             initWindowAfterLoaded(curdWindow);
             _self.uniqueByNoAccessControl();
           },
@@ -1468,6 +1470,7 @@ export default {
       WindowServerUtil.loadTabSingleData(
         tabLoadParam,
         function (modelData) {
+          _self.loading = false;
           _self.modelData = modelData;
 
           // 判断是否显示审批状态
@@ -1515,7 +1518,6 @@ export default {
             }
           }
 
-          _self.loading = false;
         },
         function () {
           _self.loading = false;
@@ -1947,6 +1949,7 @@ export default {
       WindowServerUtil.queryTabData(
         tabQueryParam,
         function (response) {
+          _self.loading = false;
           
           if(response.errorCode != 0){
             Notify.error('Error', response.errorMessage, false);
@@ -1969,7 +1972,6 @@ export default {
               }
             }
           }
-          _self.loading = false;
         },
         function () {
           _self.loading = false;

src/window1/tabGridView/TabGridEdit.vue

@@ -798,6 +798,7 @@ export default {
       WindowServerUtil.queryTabData(
         tabQueryParam,
         function (response) {
+          _self.loading = false;
           
           if(response.errorCode != 0){
             Notify.error('Error', response.errorMessage, false);
@@ -820,7 +821,6 @@ export default {
           _self.loadHeaderAndFooterContent(tabQueryParam);
           _self.selectModelDatas = [];
           _self.isSelectAllInput = false;
-          _self.loading = false;
           _self.refreshCommand = false;
         },
         function () {
@@ -1351,6 +1351,7 @@ export default {
         WindowServerUtil.deleteTabData(
           tabDeleteData,
           function (result) {
+            _self.loading = false;
             for (var index = 0; index < dataPrepareDelete.length; index++) {
               if (dataPrepareDelete[index].id > 0) {
                 var index1 = _self.modelDatas.indexOf(dataPrepareDelete[index]);
@@ -1360,7 +1361,6 @@ export default {
               }
             }
             _self.queryGridData(false);
-            _self.loading = false;
           },
           function () {
             _self.loading = false;
@@ -1438,9 +1438,9 @@ export default {
         WindowServerUtil.deleteTabData(
           tabDeleteData,
           function (result) {
+            _self.loading = false;
             _self.modelDatas.splice(index, 1);
             _self.queryGridData(false);
-            _self.loading = false;
           },
           function () {
             _self.loading = false;
@@ -1802,6 +1802,7 @@ export default {
             WindowServerUtil.loadTabSingleData(
               tabLoadParam,
               function (modelDataSaved) {
+                _self.loading = false;
                 Notify.success(
                   _self.$t('lang.tabGridEdit.describe14'),
                   _self.$t('lang.tabGridEdit.describe15'),
@@ -1817,7 +1818,6 @@ export default {
                   _self.modelDatas[index] = modelDataSaved;
                 }
 
-                _self.loading = false;
                 _self.dataChanged = false;
               },
               function () {

src/window1/tabView/TabButton.vue

@@ -830,9 +830,9 @@ export default {
         contentType: 'application/json',
         data: JSON.stringify(processResultData),
         success: function (successData) {
+          _self.loading = false;
           if (successData.errorCode == 0) {
             _self.modal = true;
-            _self.loading = false;
             _self.processReportResult = successData.data;
 
             if (

src/window1/tabView/TabButton1.vue

@@ -716,9 +716,9 @@ export default {
         contentType: 'application/json',
         data: JSON.stringify(processResultData),
         success: function (successData) {
+          _self.loading=false;
           if(successData.errorCode == 0) {
             _self.modal = true;
-            _self.loading=false;
             _self.processReportResult = successData.data;
 
             if (

src/workflow/ReportApprove.vue

@@ -337,6 +337,7 @@ export default {
           _self.windowNo,
         ).then(
           successData => {
+            _self.loading = false;
             if (successData.errorCode == 0) {
               initWindowAfterLoaded(successData.data);
             }else{
@@ -352,6 +353,7 @@ export default {
         WindowServerUtil.getWindowById(
           _self.windowNo,
           function (window) {
+            _self.loading = false;
             initWindowAfterLoaded(window);
           },
           function () {
@@ -403,6 +405,7 @@ export default {
       WindowServerUtil.loadTabSingleData(
         tabLoadParam,
         function (modelData) {
+          _self.loading = false;
           _self.modelData = modelData;
           _self.processInstanceId = '';
           // 判断是否显示审批状态
@@ -417,7 +420,6 @@ export default {
               _self.processInstanceId = displayValue[0];
             }
           }
-          _self.loading = false;
         },
         function () {
           _self.loading = false;