...

src/views/approve_manage/approveDetail.vue

@@ -140,6 +140,7 @@ export default {
                 if(i.ReportApproveNodeId===Approve.CurrNodeId){
                     currentIndex = index
                 }
+                //审批节点只有一个人时不显示是什么审批流
                 const strApproveType = `（${ApproveType[i.ApproveType]}）`
                 const node = {
                     nodeType:2,

src/views/approve_manage/components/flowNode/approveNode.vue

@@ -147,7 +147,6 @@ export default {
             this.$emit('removeNode', this.flowNode);
         },
         showDrawer() {
-            //设置一下里面的文字啥的
             this.drawerShow = true;
         },
         getChoosedList(){

src/views/approve_manage/components/timeLine.vue

@@ -19,6 +19,7 @@ export default {
     },
     data() {
         return {
+            //时间线数据格式
             mockTimeLine:[
                 {
                     nodeType:1,
@@ -27,13 +28,13 @@ export default {
                         approverName:'张三',
                         approveTime:'2023-10-10 10:10:10'
                     }],
-                    nodeStatus:'passed',//节点已通过,withdraw:节点已撤回
+                    nodeStatus:'passed',//passed节点已通过,return节点已撤回，reject节点已驳回，future节点未进行到
                 },{
                     nodeType:2,
                     nodeText:'审批人:', //需要拼接成 审批人:2人(会签)
                     nodeStatus:'process',//节点正在进行中
                     approveType:'会签',
-                    approveList:[
+                    approveList:[//参与审批的人员
                         {
                             approverName:'李四',
                             approveTime:'2023-10-10 10:15:10',
@@ -45,57 +46,6 @@ export default {
                             approveReason:'就是驳回'
                         }
                     ]
-                },
-                {
-                    nodeType:2,
-                    nodeText:'审批人:', //需要拼接
-                    nodeStatus:'reject',//节点驳回
-                    approveType:'依次审批',
-                    approveList:[
-                        {
-                            approverName:'李四',
-                            approveTime:'',
-                            approveStatus:'待处理'
-                        },{
-                            approverName:'王五',
-                            approveTime:'',
-                            approveStatus:'待处理'
-                        }
-                    ]
-                },
-                {
-                    nodeType:2,
-                    nodeText:'审批人:', //需要拼接
-                    nodeStatus:'return',//节点撤回
-                    approveType:'依次审批',
-                    approveList:[
-                        {
-                            approverName:'李四',
-                            approveTime:'',
-                            approveStatus:'待处理'
-                        },{
-                            approverName:'王五',
-                            approveTime:'',
-                            approveStatus:'待处理'
-                        }
-                    ]
-                },
-                {
-                    nodeType:2,
-                    nodeText:'审批人:', //需要拼接
-                    nodeStatus:'future',//节点未进行到
-                    approveType:'依次审批',
-                    approveList:[
-                        {
-                            approverName:'李四',
-                            approveTime:'',
-                            approveStatus:'待处理'
-                        },{
-                            approverName:'王五',
-                            approveTime:'',
-                            approveStatus:'待处理'
-                        }
-                    ]
                 }
             ]
         };

src/views/report_manage/reportEn/reportlist.vue

@@ -694,7 +694,7 @@ export default {
     },
     //撤销提交报告
     cancelApprove(item){
-        this.$confirm("你确定要撤销申请吗?","提示",{
+        this.$confirm("确定要撤销审批吗?","提示",{
             confirmButtonText:'确定',
             cancelButtonText:'取消'
         }).then(()=>{

src/views/report_manage/reportlist.vue

@@ -1058,7 +1058,7 @@ export default {
     },
     //撤销提交报告
     cancelReport(item){
-        this.$confirm("你确定要撤销申请吗?","提示",{
+        this.$confirm("确定要撤销审批吗?","提示",{
             confirmButtonText:'确定',
             cancelButtonText:'取消'
         }).then(()=>{

src/views/smartReport/reportList.vue

@@ -629,7 +629,7 @@ export default {
             })
         },
         cancelReport(item){
-            this.$confirm("你确定要撤销申请吗?","提示",{
+            this.$confirm("确定要撤销审批吗?","提示",{
                 confirmButtonText:'确定',
                 cancelButtonText:'取消',
                 type:'warning',