/api/CurdWindowResource/uniqueByNo

/api/CurdWindowResource/uniqueByNoWithRole
/api/CurdWindowResource/uniqueByNoWithRoleNew
/api/CurdWindowResource/uniqueByNoWithWorkflow   ---
/api/CurdWindowResource/oneToOneTabData
/api/CurdWindowResource/uniqueByNoVersionNumber

src/client/MenuNode.vue

@@ -131,8 +131,13 @@ export default {
           if(successData.errorCode === 0){
             CurdWindowResourceV2.uniqueByNoVersionNumber(
               _self.model.curdWindowNo,
-            ).then(successData => {
-              if(successData === -1){
+            ).then(response => {
+              if(response.errorCode != 0){
+                Notify.error('获取CURD版本号错误', response.errorMessage, false);
+                return;
+              }
+
+              if(response.data === -1){
                 _self.$router.push(
                   '/desktop/window/' +
                 _self.model.curdWindowNo +

src/role/RoleCurdField.vue

@@ -278,9 +278,8 @@ export default {
       if (windowNo != undefined || windowNo != null) {
         CurdWindowResource.uniqueByNo(windowNo).then(
           successData => {
-            if (successData) {
-              // console.log(successData);
-              _self.curdWindowDto = successData;
+            if (successData.errorCode == 0) {
+              _self.curdWindowDto = successData.data;
               length = _self.curdWindowDto.tabs.length;
               for (var i = 0; i < length; i++) {
                 if (
@@ -297,6 +296,8 @@ export default {
               }
               _self.loadRoleIdWindowNo(roleId, windowNo);
               // console.log(_self.tabFormViewDto.tabFormFields);
+            } else {
+              Notify.error(_self.$t('lang.Notify.error'), successData.errorMessage, true);
             }
           },
           errorData => {

src/sheetWindow/CurdWindowService.js

@@ -23,7 +23,14 @@ export default {
     //  从后台加载CURD窗口的定义
 
     return new Promise((resolve, reject) => {
-      CurdWindowResource.uniqueByNo(windowNo).then(curdWindowDto => {
+      CurdWindowResource.uniqueByNo(windowNo).then(response => {
+
+        if (response.errorCode != 0) {
+          reject(response.errorMessage);
+          return;
+        }
+
+        const curdWindowDto = response.data;
         if (curdWindowDto != null && curdWindowDto.tabs != null) {
           _self.initGridColumns(curdWindowDto, tabIndex).then(successData => {
             successData.curdWindowDto = curdWindowDto;

src/window/tabFormView/TabFormEdit.vue

@@ -777,8 +777,13 @@ export default {
           _self.windowNo,
         ).then(
           successData => {
+            if (successData.errorCode == 0) {
+              initWindowAfterLoaded(successData.data);
+            }else{
+              Notify.error(_self.$t('lang.Notify.error'), successData.errorMessage, true);
+            }
 
-            initWindowAfterLoaded(successData);
+            
           },
           errorData => {
             _self.loading = false;

src/window/tabFormView/TabFormView.vue

@@ -1092,8 +1092,12 @@ export default {
           _self.windowNo,
         ).then(
           successData => {
-            initWindowAfterLoaded(successData);
-            _self.uniqueByNoAccessControl();
+            if (successData.errorCode == 0) {
+              initWindowAfterLoaded(successData.data);
+              _self.uniqueByNoAccessControl();
+            }else{
+              Notify.error(_self.$t('lang.Notify.error'), successData.errorMessage, true);
+            }
           },
           errorData => {
             _self.loading = false;

src/window1/tabFormEdit/SubOneToOneTabEdit.vue

@@ -134,8 +134,12 @@ const getOneToOneTabData = function () {
     beforeSend: function (request) {
       Common.addTokenToRequest(request);
     },
-    success: function (data) {
-      mModelData.value = data;
+    success: function (response) {
+      if(response.errorCode == 0){
+        mModelData.value = response.data;
+      }else{
+        Notify.error('错误', response.errorMessage, false);
+      }
     },
     error: function (XMLHttpRequest, textStatus, errorThrown) {
       Common.processException(XMLHttpRequest, textStatus, errorThrown);

src/window1/tabFormEdit/TabFormEdit.vue

@@ -778,8 +778,11 @@ export default {
           _self.windowNo,
         ).then(
           successData => {
-
-            initWindowAfterLoaded(successData);
+            if (successData.errorCode == 0) {
+              initWindowAfterLoaded(successData.data);
+            }else{
+              Notify.error(_self.$t('lang.Notify.error'), successData.errorMessage, true);
+            }
           },
           errorData => {
             _self.loading = false;

src/window1/tabFormEdit/TabFormEditModal.vue

@@ -885,8 +885,11 @@ export default {
           _self.windowNo,
         ).then(
           successData => {
-
-            initWindowAfterLoaded(successData);
+            if (successData.errorCode == 0) {
+              initWindowAfterLoaded(successData.data);
+            }else{
+              Notify.error(_self.$t('lang.Notify.error'), successData.errorMessage, true);
+            }
           },
           errorData => {
             _self.loading = false;

src/window1/tabFormView/SubOneToOneTabView.vue

@@ -45,6 +45,7 @@ import Language from '../../common/Language.js';
 import ProcessReportResource from '../../api/dic/ProcessReportResource.js';
 import { ref, reactive, defineEmits, defineProps, watch } from 'vue';
 import { debounce } from 'lodash';
+import { Notify } from 'pc-component-v3';
 
 
 // 接受父组件传递的数据
@@ -110,8 +111,12 @@ const getOneToOneTabData = function () {
     beforeSend: function (request) {
       Common.addTokenToRequest(request);
     },
-    success: function (data) {
-      mModelData.value = data;
+    success: function (response) {
+      if(response.errorCode == 0){
+        mModelData.value = response.data;
+      }else{
+        Notify.error('错误', response.errorMessage, false);
+      }
     },
     error: function (XMLHttpRequest, textStatus, errorThrown) {
       Common.processException(XMLHttpRequest, textStatus, errorThrown);

src/window1/tabFormView/TabFormView.vue

@@ -1092,8 +1092,12 @@ export default {
           _self.windowNo,
         ).then(
           successData => {
-            initWindowAfterLoaded(successData);
-            _self.uniqueByNoAccessControl();
+            if (successData.errorCode == 0) {
+              initWindowAfterLoaded(successData.data);
+              _self.uniqueByNoAccessControl();
+            }else{
+              Notify.error(_self.$t('lang.Notify.error'), successData.errorMessage, true);
+            }
           },
           errorData => {
             _self.loading = false;

src/window1/tabFormView/TabFormViewModal.vue

@@ -1156,8 +1156,12 @@ export default {
           _self.windowNo,
         ).then(
           successData => {
-            initWindowAfterLoaded(successData);
-            _self.uniqueByNoAccessControl();
+            if (successData.errorCode == 0) {
+              initWindowAfterLoaded(successData.data);
+              _self.uniqueByNoAccessControl();
+            }else{
+              Notify.error(_self.$t('lang.Notify.error'), successData.errorMessage, true);
+            }
           },
           errorData => {
             _self.loading = false;

src/workflow/ApproveComment.vue

@@ -776,17 +776,17 @@ export default {
 
       CustomerWindowResource.getById(customerWindowId).then(
         successData => {
-          if (successData == null) {
+          if (successData.errorCode != 0) {
             
             notification.error({
               message: '操作失败',
-              description: '自定义窗口已经被删除。',
+              description: successData.errorMessage,
             });
           
             return;
           }
           var routeDate = {
-            path: successData.routeUrl,
+            path: successData.data.routeUrl,
             params: {
               modelData: _self.modelData,
             },

src/workflow/ReportApprove.vue

@@ -337,7 +337,11 @@ export default {
           _self.windowNo,
         ).then(
           successData => {
-            initWindowAfterLoaded(successData);
+            if (successData.errorCode == 0) {
+              initWindowAfterLoaded(successData.data);
+            }else{
+              Notify.error(_self.$t('lang.Notify.error'), successData.errorMessage, true);
+            }
           },
           errorData => {
             _self.loading = false;