Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

# Conflicts:
#	src/HDrpManagement/projectStage/modules/stageDetail.vue

src/HDrpManagement/projectStage/modules/stageDetail.vue

@@ -2,19 +2,19 @@
   <div>
     <el-button type="text" size="small" @click="onShow">详情</el-button>
     <el-drawer
-      title="编辑模板"
+      title="我是标题"
       :visible.sync="dialogStageVisible"
       direction="rtl"
       :modal="true"
       :show-close="false"
-      :withHeader="save"
+      :withHeader="false"
       append-to-body
       @close="onClose"
       size="50%">
-      <div class="flex-align-center flex-between container" style="border-bottom:1px solid #f1f2f3">
-        <div style="font-size:20px" v-show="edit">{{data.stagetempname}}</div>
+      <div class="flex-align-center flex-between" style="border-bottom:1px solid #f1f2f3;padding:10px">
+        <div style="font-size:20px">{{data.stagetempname}}</div>
         <div>
-          <el-button class="inline-16" v-if="edit" size="mini" @click="onEdit">编 辑</el-button>
+          <el-button class="inline-16" size="mini" @click="onEdit">编 辑</el-button>
 <!--          <el-button  size="small">作 废</el-button>-->
           <to_void class="inline-16" v-if="edit" :data="form" @onSuccess="toVoidSuccess"></to_void>
           <is_used class="inline-16" v-if="edit" :data="form" @onSuccess="onSuccess"></is_used>
@@ -133,7 +133,7 @@
       </div>
       <div class="fixed__btn__panel" v-show="save">
         <el-button size="small" @click="onCancel" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width">确 定</el-button>
+        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
   </div>

src/style/style.css

@@ -177,7 +177,9 @@ ul{
   right:60px !important;
 }
 .el-drawer__header{
-  margin-bottom: 20px !important;
+  /* margin-bottom: 20px !important; */
+  padding: 10px !important;
+  margin-bottom: 0 !important;
 }
 .fixed__btn__panel{
   position: absolute;