跟团游新增订单

src/components/SalesModule/components/addConfig.js

+// 邮轮列表配置
+export const addConfig = {
+  // 抽屉配置
+  drawerConfig: {
+    title: '跟团游信息',
+    size: '90%',
+    direction: 'rtl'
+  },
+}
+
+// 导出默认配置
+export default addConfig

src/components/SalesModule/components/pinkDrawer.vue

+<template>
+    <div>
+        <el-drawer v-if="drawerConfig" :visible.sync="drawerVisible" v-bind="drawerConfig" @close="handleDrawerClose">
+            <slot name="drawer" :visible="drawerVisible" :data="drawerData" :close="handleDrawerClose">
+            </slot>
+        </el-drawer>
+    </div>
+</template>
+<script>
+export default {
+    props: {
+        // 抽屉配置
+        drawerConfig: {
+            type: Object,
+            default: null
+        },
+    },
+    data() {
+        return {
+            // 抽屉状态
+            drawerVisible: false,
+            drawerData: null,
+        }
+    },
+    mounted() {
+        
+    },
+    methods: {
+        // 抽屉相关方法
+        openDrawer(data = null) {
+            this.drawerData = data;
+            this.drawerVisible = true;
+        },
+
+        handleDrawerClose() {
+            this.drawerVisible = false;
+            this.drawerData = null;
+            this.$emit('drawer-close');
+        },
+    },
+
+
+
+}
+</script>
\ No newline at end of file

src/components/SalesModule/groupTourOrder.vue

 <style>
   @import "../../assets/css/newTravelManager.css";
-
+  @import '../common/BaseListManager.css';
   .color_red_order {
     color: #e95252 !important;
   }
@@ -1647,6 +1647,7 @@
           </el-popover>
         </li>
         <li>
+          <input v-if="userInfo.SimpleEasy==1" type="button" class="hollowFixedBtn" :value="$t('pub.addBtn')" @click="addOrders"/>
           <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="
               getList();
               resetPageIndex();
@@ -2685,6 +2686,14 @@
         </button>
       </div>
     </el-dialog> -->
+    <pinkDrawer ref="addOrders"
+    :drawer-config="drawerConfig">
+      <template slot="drawer" slot-scope="{ visible, close }">
+        <addOrder v-if="visible&&showType==1" :isDrawerMode="true" 
+        :details="selectedSpotData"
+        @close="close" @save-success="handleSaveSuccess"></addOrder>
+      </template>
+    </pinkDrawer>
   </div>
 </template>
 
@@ -2698,9 +2707,14 @@
   import orderRemark from "../orderCommon/order-remark.vue"; //订单备注
   import PriceDetail from '../orderCommon/PriceDetail.vue';
   import DateLimit from '../public/DateLimit.vue';
+  import pinkDrawer from './components/pinkDrawer.vue';
+  import addOrder from './components/addOrder.vue';
+  import addConfig from "./components/addConfig.js";
   export default {
     data() {
       return {
+        selectedSpotData: null,
+        showType: 1,
         pickerBeginDateAfter: {
           disabledDate: time => {
             let startTime = new Date(this.msg.QStartDate);
@@ -3046,7 +3060,9 @@
       commissionDialog,
       orderRemark: orderRemark,
       PriceDetail,
-      DateLimit
+      DateLimit,
+      pinkDrawer,
+      addOrder,
     },
     filters: {
       priceFormat(value) {
@@ -3062,12 +3078,26 @@
         return x1 + x2;
       },
     },
-    watch: {
+    watch: {  
       SQcheckdAll(val) {
         this.checkdAll(val);
       },
     },
+    computed: {
+      // 抽屉配置
+      drawerConfig() {
+        return addConfig.drawerConfig;
+      },
+    },
     methods: {
+      addOrders() {
+        this.$refs.addOrders.openDrawer();
+      },
+      handleSaveSuccess() {
+        this.$refs.addOrders.handleDrawerClose();
+        this.getList();
+        this.$message.success('保存成功');
+      },
       gotoProduct(item) {
         var path = "productQuery";
         if (item.teamType == 4) {

src/components/cruiseShip/components/editOP.vue

@@ -36,6 +36,7 @@
     flex-direction: column;
     border: none;
     box-shadow: none;
+    overflow: hidden;
   }
 
   .drawer-mode .hotel-tabs .el-tabs__header {
@@ -82,7 +83,6 @@
   }
 
   .drawer-mode .tab-content.hidden {
-    height: calc(100vh - 160px);
     overflow: hidden;
     display: flex;
     flex-direction: column;

src/components/cruiseShip/components/loss.vue

@@ -36,6 +36,7 @@
     flex-direction: column;
     border: none;
     box-shadow: none;
+    overflow: hidden;
   }
 
   .drawer-mode .hotel-tabs .el-tabs__header {
@@ -82,7 +83,6 @@
   }
 
   .drawer-mode .tab-content.hidden {
-    height: calc(100vh - 160px);
     overflow: hidden;
     display: flex;
     flex-direction: column;

src/components/cruiseShip/components/offset.vue

@@ -36,6 +36,7 @@
     flex-direction: column;
     border: none;
     box-shadow: none;
+    overflow: hidden;
   }
 
   .drawer-mode .hotel-tabs .el-tabs__header {
@@ -82,7 +83,6 @@
   }
 
   .drawer-mode .tab-content.hidden {
-    height: calc(100vh - 160px);
     overflow: hidden;
     display: flex;
     flex-direction: column;

src/components/cruiseShip/components/remarks.vue

@@ -36,6 +36,7 @@
     flex-direction: column;
     border: none;
     box-shadow: none;
+    overflow: hidden;
   }
 
   .drawer-mode .hotel-tabs .el-tabs__header {
@@ -82,7 +83,6 @@
   }
 
   .drawer-mode .tab-content.hidden {
-    height: calc(100vh - 160px);
     overflow: hidden;
     display: flex;
     flex-direction: column;

src/components/cruiseShip/components/totalAamount.vue

@@ -36,6 +36,7 @@
     flex-direction: column;
     border: none;
     box-shadow: none;
+    overflow: hidden;
   }
 
   .drawer-mode .hotel-tabs .el-tabs__header {
@@ -82,7 +83,6 @@
   }
 
   .drawer-mode .tab-content.hidden {
-    height: calc(100vh - 160px);
     overflow: hidden;
     display: flex;
     flex-direction: column;

src/components/cruiseShip/list/cruiseShipInfo.vue

@@ -36,6 +36,7 @@
     flex-direction: column;
     border: none;
     box-shadow: none;
+    overflow: hidden;
   }
 
   .drawer-mode .hotel-tabs .el-tabs__header {
@@ -82,7 +83,6 @@
   }
 
   .drawer-mode .tab-content.hidden {
-    height: calc(100vh - 160px);
     overflow: hidden;
     display: flex;
     flex-direction: column;