merge

src/pages/main/leader/components/form.vue

@@ -127,43 +127,6 @@
 export default {
   data() {
     return {
-      lists: [
-        {
-          taskDefinitionKey: "sid-09F872E1-C03F-47C3-BF4A-D391F497E73B",
-          taskName: "起草",
-          startTime: "2022-12-01 09:37:08",
-          endTime: "2022-12-01 09:37:22",
-          assignee: "fanyan",
-          taskId: "ab130f2f-7118-11ed-910f-062df75a3193",
-          content: " 同意 ",
-          id: 1,
-        },
-
-        {
-          taskDefinitionKey: "sid-BBF96B67-E5C1-40ED-AC33-7FD17941D769",
-          taskName: "部门领导审核123",
-          startTime: "2022-12-01 09:37:22",
-          endTime: "2022-12-01 09:52:04",
-          assignee: "qiuyu",
-          taskId: "b380a6ff-7118-11ed-910f-062df75a3193",
-          content: " 同意 ",
-          id: 2,
-          children: [
-            {
-              dealtime: null,
-              procinstid: "aaff8710-7118-11ed-910f-062df75a3193",
-              createtime: "2022-12-01 01:37:25",
-              preman: "qiuyu",
-              sts: "0",
-              taskName: "起草",
-              id:23,
-              dealman: "qiuyu",
-              content: null,
-              taskid: "b380a6ff-7118-11ed-910f-062df75a3193",
-            },
-          ],
-        },
-      ],
       page: 1,
     };
   },

src/pages/main/leader/demand/demandHomes.vue

@@ -1331,22 +1331,23 @@ export default {
 
       let res = await this.common.httpPost(obj, success);
       function success(data) {
-        console.log(data);
         let list = [];
         list = data.data.data;
-        if (data.data.lastManList.length > 0) {
+        if (data.data.lastmandata.length!=0) {
           data.data.lastmandata.map((item, index) => {
             item.id = index + 22;
           });
-          list.map((item, index) => {
-            item.startTime = _this.$util.datetimeFormat(item.startTime);
-            item.endTime = _this.$util.datetimeFormat(item.endTime);
-            item.id = index + 1;
+        }
+        list.map((item, index) => {
+          item.startTime = _this.$util.datetimeFormat(item.startTime);
+          item.endTime = _this.$util.datetimeFormat(item.endTime);
+          item.id = index + 1;
+          if (data.data.lastmandata.length!=0) {
             if (item.taskId == data.data.lastmandata[0].taskId) {
               item.children = data.data.lastmandata;
             }
-          });
-        }
+          }
+        });
         _this.lables.data = list;
         _this.abc = true;
       }