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

src/components/SalesVisa/components/OneClickDocumentPreparation.vue

@@ -47,7 +47,7 @@
           <el-tooltip class="item" effect="dark" content="只有签证、保险、服务共用凭证" placement="top">
             <i class="el-icon-info" style="margin-left: 2px;cursor: pointer;"></i>
           </el-tooltip>
-          开启凭证共用：
+          开启共用：
           </span>
           <el-switch
             style="margin-left: 15px;"
@@ -265,13 +265,15 @@ export default {
         OrderIdStr:'',
         AuditId:'',
         detailList:[],
-        vorcherInos:[]
+        vorcherInos:[],
+        Is_Merge:0
       },
       addMsg:{
         OrderIdStr:'',
         AuditId:'',
         detailList:[],
-        vorcherInos:[]
+        vorcherInos:[],
+        Is_Merge:0
       },
       ClientTypeList: [],
       ClientAccountListS: [],
@@ -370,8 +372,10 @@ export default {
             OrderIdStr: this.addMsg.OrderIdStr,
             AuditId: this.addMsg.AuditId,
             detailList: [],
-            vorcherInos: []
+            vorcherInos: [],
+            Is_Merge: 0
           }
+          msg.Is_Merge = this.SwitchStatus==true?1:0
           this.addMsg.detailList.forEach(x=>{
             let obj = {
               TemplateId: x.TemplateId,
@@ -676,8 +680,8 @@ export default {
 .proofList-box{
   display: flex;
   flex-direction: column;
-  margin-left: 5px;
-  margin-bottom: 3px;
+  padding: 5px 0 0 0;
+  border-bottom: 1px dashed #eee;
 }
 .d-flex{
   min-width: 240px;

src/components/busManagement/BookAcar/CharterPreview.vue

@@ -278,7 +278,7 @@
             </h3>
             <div class="listone-form">
               <el-image v-if="detailsObj.ImageList" class="listone-img" :src="detailsObj.ImageList[0]" fit="cover"
-              style="max-height: 50px;">
+              style="max-height: 88px;">
                   <div slot="placeholder" class="image-slot">
                       <span>
                           加载中<span class="dot">...</span>