Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/sale/backbill-form.vue

@@ -53,7 +53,7 @@
           <div class="classStatus">{{setingObj.AuditStatusName}}</div>
         </div>
       </div>
-      <q-tabs style="margin-bottom:20px;" v-model="tabCheck" narrow-indicator dense align="left" class="text-primary">
+      <q-tabs style="margin:15px;" v-model="tabCheck" narrow-indicator dense align="left" class="text-primary">
         <q-tab :ripple="false" name="first" label="详细信息" />
         <q-tab :ripple="false" name="second" label="审批记录" />
       </q-tabs>

src/components/sale/backflow-form.vue

@@ -79,9 +79,32 @@
     top:-48px;
     left:15px;
   }
+  .backflowContent{
+    padding-bottom:40px;
+    height:770px;
+    overflow: auto;
+  }
+  .backflowContent::-webkit-scrollbar {
+    width: 3px;
+    height: 3px;
+    background-color: #F5F5F5;
+  }
+  /*!*定义滚动条轨道 内阴影+圆角*!*/
+  .backflowContent::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+    border-radius: 10px;
+    background-color: #F5F5F5;
+  }
+  /*!*定义滑块 内阴影+圆角*!*/
+  .backflowContent::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    -webkit-box-shadow: -webkit-gradient(linear, 0 0, 0 100%, color-stop(.5, rgba(255, 255, 255, .2)), color-stop(.5, transparent), to(transparent));
+    background-color: #0ae;
+  }
+
 </style>
 <template>
-  <div style="padding-bottom:120px;">
+  <div class="backflowContent">
     <div class="backflowMain" v-for="(item,index) in DataList" :key="index">
       <div class="backflow_Top">
         <div class="back_Circle">{{item.AduitStatus==2?'通过':item.AduitStatus}}</div>