Merge branch 'blueBranch' into allTestUrgent

src/HDrpManagement/projectChange/modules/modules/andEnterprise/index.vue

@@ -15,7 +15,7 @@
       </el-input>
     </div>
     <div style="margin-top: 15px">
-      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  height="calc(100vh - 490px)" fixedName="operation">
+      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  height="calc(100vh - 465px)" fixedName="operation">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname === 'province'">
             <p>{{ scope.column.data.province + '-' + scope.column.data.city + '-' + scope.column.data.county}}</p>

src/HDrpManagement/projectChange/modules/modules/clue/index.vue

@@ -15,7 +15,7 @@
       </el-input>
     </div>
     <div style="margin-top: 15px">
-      <tableLayout :layout="tablecols" :data="list" :opwidth="200"  :custom="true" :width="false"  height="calc(100vh - 490px)" fixedName="operation">
+      <tableLayout :layout="tablecols" :data="list" :opwidth="200"  :custom="true" :width="false"  height="calc(100vh - 465px)" fixedName="operation">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'status'">
             <span style="color:#999999" v-if="scope.column.data[[scope.column.columnname]] == '已过期'">{{$t(scope.column.data[[scope.column.columnname]])}}</span>

src/HDrpManagement/projectChange/modules/modules/contacts/index.vue

@@ -15,7 +15,7 @@
       </el-input>
     </div>
     <div style="margin-top: 15px">
-      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  fixedName="operation" height="calc(100vh - 490px)">
+      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  fixedName="operation" height="calc(100vh - 465px)">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname === 'operation'">
             <span>{{$t(scope.column.data[scope.column.columnname])}}</span>

src/HDrpManagement/projectChange/modules/modules/contract/index.vue

@@ -15,7 +15,7 @@
       </el-input>
     </div>
     <div style="margin-top: 15px">
-      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  fixedName="operation" height="calc(100vh - 490px)">
+      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  fixedName="operation" height="calc(100vh - 465px)">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname === 'status'">
             <span style="color:#3874f6" v-if="scope.column.data[[scope.column.columnname]] == '新建'">{{$t(scope.column.data[[scope.column.columnname]])}}</span>

src/HDrpManagement/projectChange/modules/modules/quotation/index.vue

@@ -16,7 +16,7 @@
       </el-input>
     </div>
     <div style="margin-top: 15px">
-      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  height="calc(100vh - 490px)" fixedName="operation">
+      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  height="calc(100vh - 465px)" fixedName="operation">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname === 'invaliddate'">
             {{scope.column.data.begdate?scope.column.data.begdate + $t('至') + scope.column.data.enddate:'--'}}

src/views/mediaStatistics/modules/drawerDetail.vue

@@ -51,4 +51,31 @@ export default {
   color:#666;
   height:100vh;
 }
+.stage__panel{
+  padding: 0px 10px 0px 10px ;
+  height: 32px;
+  line-height: 32px;
+  min-width:85px;
+  border-radius: 2px;
+  transform: skewX(-20deg);
+  margin-left:15px;
+  margin-bottom: 10px;
+  text-align: center;
+  cursor: pointer;
+  background: #EEEEEE;
+}
+.stage__panel > div {
+  transform: skewX(45deg);
+}
+/deep/ .el-drawer__header {
+  padding: 0px !important;
+  margin-bottom: 0 !important;
+  font-size: 16px !important;
+  font-family: PingFang SC-Bold, PingFang SC;
+  font-weight: bold !important;
+  color: #333333 !important;
+}
+/deep/ header{
+  height: 0 !important;
+}
 </style>