提交

ruoyi-ui/src/components/FlowChartShow/index.vue

@@ -217,18 +217,18 @@ export default {
       let id = this.instanceId?this.instanceId:this.$route.query.instanceId
       addGenflowshow({instanceId:id})
         .then(res => {
-          if(res.data.resultCode === 0){
-            let guiStyle = res.data.data.guiStyle?JSON.parse(res.data.data.guiStyle):{}
-            let approvalHistory = res.data.data.guiValue?res.data.data.guiValue:[]
+          if(res.resultCode === 0){
+            let guiStyle = res.data.guiStyle?JSON.parse(res.data.guiStyle):{}
+            let approvalHistory = res.data.guiValue?res.data.guiValue:[]
             this.myDiagram = Object.assign(this.myDiagram,guiStyle)
             this.approvalHistory = approvalHistory
-            if(res.data.data.showNodes.indexOf(res.data.data.currentNode) >= 0){
-              res.data.data.showNodes.splice(res.data.data.showNodes.findIndex(item => item === res.data.data.currentNode), 1)
+            if(res.data.showNodes.indexOf(res.data.currentNode) >= 0){
+              res.data.showNodes.splice(res.data.showNodes.findIndex(item => item === res.data.data.currentNode), 1)
             }
-            res.data.data.showNodes.push(res.data.data.currentNode)
-            this.showNodes = res.data.data.showNodes
-            this.processStatus = res.data.data.processStatus
-            switch(res.data.data.processStatus){
+            res.data.showNodes.push(res.data.currentNode)
+            this.showNodes = res.data.showNodes
+            this.processStatus = res.data.processStatus
+            switch(res.data.processStatus){
               case 0:
                 this.processStyle = {
                   color:'#C8C8C8'
@@ -257,9 +257,9 @@ export default {
                 };
                 break;
             }
-            this.processStatusName = res.data.data.processStatusName
+            this.processStatusName = res.data.processStatusName
             this.myDisplay = new FlowDisplay('myFlowDesignerDiv');
-            this.showFlowPath(this.myDisplay,res.data.data.currentNode)
+            this.showFlowPath(this.myDisplay,res.data.currentNode)
           }
         });
 

ruoyi-ui/src/components/MutipleSelectPop/index.vue

@@ -690,8 +690,8 @@ export default {
       this.tableLoading = true;
       addGenmutiporuder( param).then(res => {
         this.tableLoading = false;
-        let data = res.data;
-        if (data.code === 0) {
+        let data = res;
+        if (res.code === 0) {
           if (data.data) {
             this.transferTbody(data.data);
           }
@@ -721,12 +721,14 @@ export default {
       this.tree_loading = true;
       addGenmutiportree().then(res => {
         this.tree_loading = false;
-        if (res.data.resultCode === 0) {
+        if (res.resultCode === 0) {
+          console.log(345678)
           this.treeNewData = [];
           let newArr = [];
           let root = {};
-          if (res.data.data.records.length > 0) {
-            res.data.data.records.forEach(item => {
+          if (res.data.records.length > 0) {
+            console.log(3456788)
+            res.data.records.forEach(item => {
               let tem = Object.assign(item);
               newArr.push(tem);
               if (
@@ -737,6 +739,7 @@ export default {
               }
             });
             this.treeNewData = this.arrayTransTree(newArr, "CP_C_ORGUP_ID");
+            console.log(this.treeNewData)
           }
           this.findUser({}); //显示所有的用户
         }

ruoyi-ui/src/components/mutipleSelectPop/index.vue

@@ -690,8 +690,8 @@ export default {
       this.tableLoading = true;
       addGenmutiporuder( param).then(res => {
         this.tableLoading = false;
-        let data = res.data;
-        if (data.code === 0) {
+        let data = res;
+        if (res.code === 0) {
           if (data.data) {
             this.transferTbody(data.data);
           }
@@ -721,12 +721,14 @@ export default {
       this.tree_loading = true;
       addGenmutiportree().then(res => {
         this.tree_loading = false;
-        if (res.data.resultCode === 0) {
+        if (res.resultCode === 0) {
+          console.log(345678)
           this.treeNewData = [];
           let newArr = [];
           let root = {};
-          if (res.data.data.records.length > 0) {
-            res.data.data.records.forEach(item => {
+          if (res.data.records.length > 0) {
+            console.log(3456788)
+            res.data.records.forEach(item => {
               let tem = Object.assign(item);
               newArr.push(tem);
               if (
@@ -737,6 +739,7 @@ export default {
               }
             });
             this.treeNewData = this.arrayTransTree(newArr, "CP_C_ORGUP_ID");
+            console.log(this.treeNewData)
           }
           this.findUser({}); //显示所有的用户
         }

ruoyi-ui/src/components/todoProcess/index.vue

@@ -340,10 +340,10 @@ export default {
     //业务关系下拉数据
     getselectOption() {
       addGendefini().then(res => {
-        if (res.data.resultCode === 0) {
+        if (res.resultCode === 0) {
           this.formLists.forEach(outer => {
             if (outer.item.filed === "businessType") {
-              outer.item.options = res.data.data.relations.map(item => {
+              outer.item.options = res.data.relations.map(item => {
                 item.value = item.businesskey;
                 item.label = item.businessName;
                 return item;
@@ -423,7 +423,7 @@ export default {
       }
       // sendData.userId = this.userInfo.userId;
       addGendefinideal(sendData).then(res => {
-        let data = res.data;
+        let data = res;
         if (data.resultCode === 0) {
           this.queryLists();
           this.msgSuccess(data.resultMsg);

ruoyi-ui/src/views/system/editing/index.vue

@@ -50,7 +50,7 @@
     inject: ['reload'],
     data() {
       return {
-        activeNames: ['1'],
+        activeNames: [0],
         title: '单表1',
         // 查询参数
         queryParams: {},

ruoyi-ui/src/views/system/form/index.vue

@@ -92,7 +92,7 @@
         loading:true,
         tabList: {},
         currentPage3: 0,
-        activeNames: [1],
+        activeNames: [0],
         title: '列表',
         objParams: {
           table: '',

ruoyi-ui/src/views/system/table/index.vue

@@ -198,11 +198,11 @@
           // this.init()
           this.reload()
         } else if (index == '返回') {
-          if (this.xidugje == 0) {
-            this.$router.go(-2)
-          } else {
+          // if (this.xidugje == 0) {
+          //   this.$router.go(-2)
+          // } else {
             this.$router.go(-1)
-          }
+          // }
         } else if (index == '刷新') {
           this.xidugje = 1
           this.reload()