Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -109,7 +109,7 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" >
 @import "~@/styles/mixin.scss";
-@import "./dialogBox.scss";
+@import "~@/styles/dialogBox.scss";
 </style>
 <style rel="stylesheet/scss" scoped lang="scss" >
 /deep/.is-fullscreen {

-.dialogBox {
-    border-radius: 8px;
-    overflow: hidden;
-    background: #FFFFFF;
-    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.10);
-
-    .dialog_title {
-        display: flex;
-        position: relative;
-        top: -2px;
-
-        b {
-            @include flex-center;
-            flex: 1;
-            width: 100%;
-        }
-    }
-
-    .dialog_full {
-        position: absolute;
-        top: 0;
-        right: 30px;
-    }
-
-    .el-dialog__body {
-        max-height: 88vh;
-        overflow-x: hidden;
-        overflow-y: hidden;
-    }
-
-    .dialog_footer {
-        margin-top: 8px;
-        @include flex-center;
-    }
-
-
-}
-
-.dialog_title {
-    @include flex;
-    justify-content: space-between;
-    width: 100%;
-}
-
-.el-dialog__header {
-    margin-bottom: 10px;
-    color: #4A4A4A;
-    background-color: #FCFDFD;
-    border-bottom: 1px solid #E4EBF4;
-}
-
-.el-dialog__body {
-    padding-top: 10px;
-    padding-bottom: 0;
-}
-
-.el-dialog__headerbtn .el-dialog__close {
-    color: #6B7A99 !important;
-    position: relative;
-    top: -2px;
-}
-
-
-.el-form-item {
-    @include flex;
-    width: 100%;
-}
-
-.el-dialog__wrapper {
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-}
-
-.contentCenter {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(calc(-50% + 85px), -50%);
-}
-
-.mainCenter {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-}
\ No newline at end of file

@@ -109,7 +109,7 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" >
 @import "~@/styles/mixin.scss";
-@import "./dialogBox.scss";
+@import "~@/styles/dialogBox.scss";
 </style>
 <style rel="stylesheet/scss" scoped lang="scss" >
 /deep/.is-fullscreen {

 .dialogBox {
-    border-radius: 8px;
-    overflow: hidden;
-    background: #FFFFFF;
-    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.10);
-
-    .dialog_title {
-        display: flex;
-        position: relative;
-        top: -2px;
-
-        b {
-            @include flex-center;
-            flex: 1;
-            width: 100%;
-        }
-    }
+  border-radius: 8px;
+  overflow: hidden;
+  background: #FFFFFF;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.10);
 
-    .dialog_full {
-        position: absolute;
-        top: 0;
-        right: 30px;
-    }
+  .dialog_title {
+    display: flex;
+    position: relative;
+    top: -2px;
 
-    .el-dialog__body {
-        max-height: 88vh;
-        overflow-x: hidden;
-        overflow-y: hidden;
+    b {
+      @include flex-center;
+      flex: 1;
+      width: 100%;
     }
+  }
 
-    .dialog_footer {
-        margin-top: 8px;
-        @include flex-center;
-    }
+  .dialog_full {
+    position: absolute;
+    top: 0;
+    right: 30px;
+  }
+
+  .el-dialog__body {
+    max-height: 88vh;
+    overflow-x: hidden;
+    overflow-y: hidden;
+  }
+
+  .dialog_footer {
+    margin-top: 8px;
+    @include flex-center;
+  }
 
 
 }
 
 .dialog_title {
-    @include flex;
-    justify-content: space-between;
-    width: 100%;
+  @include flex;
+  justify-content: space-between;
+  width: 100%;
 }
 
 .el-dialog__header {
-    margin-bottom: 10px;
-    color: #4A4A4A;
-    background-color: #FCFDFD;
-    border-bottom: 1px solid #E4EBF4;
+  margin-bottom: 10px;
+  color: #4A4A4A;
+  background-color: #FCFDFD;
+  border-bottom: 1px solid #E4EBF4;
 }
 
 .el-dialog__body {
-    padding-top: 10px;
-    padding-bottom: 0;
+  padding-top: 10px;
+  padding-bottom: 0;
 }
 
 .el-dialog__headerbtn .el-dialog__close {
-    color: #6B7A99 !important;
-    position: relative;
-    top: -2px;
+  color: #6B7A99 !important;
+  position: relative;
+  top: -2px;
 }
 
 
 .el-form-item {
-    @include flex;
-    width: 100%;
+  @include flex;
+  width: 100%;
 }
 
 .el-dialog__wrapper {
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
 }
 
 .contentCenter {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(calc(-50% + 85px), -50%);
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(calc(-50% + 85px), -50%);
 }
 
 .mainCenter {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
 }
\ No newline at end of file

@@ -93,7 +93,7 @@
           <i class="el-icon-s-unfold pointer"></i>
         </div>
         <ul>
-          <li v-for="(item, index) in doneList" :key="index" class="flexst dynamicInfo">
+          <li v-for="(item, index) in doneList.slice(0, 10)" :key="index" class="flexst dynamicInfo">
             <p class="right15">{{ item.dealTime.substring(0, 10) }}</p>
             <p class="list-title">{{ item.dealBusiness }} ({{ item.dealStep + '环节' }})</p>
           </li>

@@ -243,7 +243,7 @@ export default {
   }
 }
 </script>
-<style lang='scss'>
+<style lang='scss' scoped>
 .djqxsd {
   .repeat {
     .el-input__inner {