Преглед изворни кода

产品要求的样式修改

cxmo пре 11 месеци
родитељ
комит
40ce923696

+ 6 - 1
src/routes/modules/approveRoutes.js

@@ -15,7 +15,12 @@ export default [
             path:'approveDetail',
             name:'审批详情',
             component:()=>import('@/views/approve_manage/approveDetail.vue'),
-            hidden:false
+            hidden:false,
+            meta: {
+                pathFrom: "approveList",
+                pathName: "审批列表",
+                keepAlive: false,
+              },
         }
         ]
     }

+ 5 - 4
src/views/approve_manage/approveDetail.vue

@@ -140,9 +140,10 @@ export default {
                 if(i.ReportApproveNodeId===Approve.CurrNodeId){
                     currentIndex = index
                 }
+                const strApproveType = `(${ApproveType[i.ApproveType]})`
                 const node = {
                     nodeType:2,
-                    nodeText:'审批人:'+i.Users.length+'人('+ApproveType[i.ApproveType]+')',
+                    nodeText:'审批人:'+i.Users.length+'人'+(i.Users.length>1?strApproveType:''),
                     nodeStatus:i.ReportApproveNodeId===Approve.CurrNodeId?'process':'future',
                     approveType:ApproveType[i.ApproveType]
                 }
@@ -303,14 +304,14 @@ export default {
                 box-sizing: border-box;
                 margin:0;
                 padding:10px;
-                border:1px solid #C8CDD9;
+                border:none !important;
                 border-radius: 4px;
             }
         }
         #reportdtl{
-            margin:0;
+            margin:0 auto;
             padding:10px;
-            border:1px solid #C8CDD9;
+            border:none !important;
             border-radius: 4px;
         }
     }

+ 2 - 2
src/views/approve_manage/components/timeLineItem.vue

@@ -106,9 +106,9 @@ export default {
                     }
                 }
                 .approve-reason{
-                    margin-left: -40px;
+                   /*  margin-left: -40px; */
                     padding:10px;
-                    padding-left: 40px;
+                    /* padding-left: 40px; */
                     color:#AD352F;
                     background-color: #FFF0ED;
                 }