1

src/components/SalesVisa/components/VisaProductOrder.vue

@@ -390,6 +390,7 @@
           </span>
         </li>
         <li>
+           <input v-if="userInfo.SimpleEasy==1" type="button" class="hollowFixedBtn" :value="$t('pub.addBtn')" @click="addOrders"/>
           <button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button>
         </li>
       </ul>
@@ -519,19 +520,33 @@
         </el-row>
       </el-form>
     </div>
+      <pinkDrawer ref="addOrders"
+    :drawer-config="drawerConfig">
+      <template slot="drawer" slot-scope="{ visible, close }">
+        <cruiseShipInfo v-if="visible" :isDrawerMode="true" 
+        :details="selectedSpotData"
+        @close="close" @save-success="handleSaveSuccess"></cruiseShipInfo>
+      </template>
+    </pinkDrawer>
   </div>
 </template>
 <script>
   import visaOrderList from './visaOrderList.vue';
+  import pinkDrawer from '../../common/pinkDrawer.vue';
   import DateLimit from '../../public/DateLimit.vue';
+  import cruiseShipInfo from './cruiseShipInfo.vue';
+  import addConfig from "./addConfig.js";
   export default {
     props: ['pagesTitle'],
     components: {
       visaOrderList,
-      DateLimit
+      DateLimit,
+      pinkDrawer,
+      cruiseShipInfo,
     },
     data() {
       return {
+        selectedSpotData: null,
         pickerStartDate: {
           disabledDate: time => {
             let startTime = new Date(this.msg.StartDate);
@@ -633,7 +648,21 @@
         layerCompanyList: []
       }
     },
+    computed: {
+      // 抽屉配置
+      drawerConfig() {
+        return addConfig.drawerConfig;
+      },
+    },
     methods: {
+       addOrders() {
+        this.$refs.addOrders.openDrawer();
+      },
+      handleSaveSuccess() {
+        this.$refs.addOrders.handleDrawerClose();
+        this.getList();
+        this.$message.success('保存成功');
+      },
       pickerEnd(){
         if (this.msg.FinishSDate > this.msg.FinishEDate && this.msg.FinishEDate !== "") {
           this.$message.error(this.$t('tips.jsrqbndyksriqi'));

src/components/SalesVisa/components/addConfig.js

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

src/components/SalesVisa/components/visaOrderList.vue

@@ -586,7 +586,25 @@
                   </template>
                 </template>
               </el-table-column>
+              <template v-if="userInfo.SimpleEasy===1">
+            <el-table-column label="OP"  min-width="100" style="background:#EAEAEA">
+               <template slot-scope="scope" >
+                  <template>
+                    <div class="row flex-wrap mb" v-if="scope.row.appointOPList&&scope.row.appointOPList.length>0">
+                   
+                      <div class="row wrap orderNo fz12 ml">
+                        <span class="cursor-pointer radius5 mr px5 bgf5 c3FC4FF" style="margin: 3px;"
+                          v-for="(x, i) in scope.row.appointOPList" :key="i+10000">{{ x.opName }}</span>
+                      </div>
+                    </div>
+                  </template>
+                </template>
+            </el-table-column>
+              </template>
+              <template v-else>
             <el-table-column label="OP" prop="opEmName" min-width="100" style="background:#EAEAEA"></el-table-column>
+              </template>
+             
               <el-table-column :label="$t('hotel.hotel_StarDate')" min-width="100" style="background:#EAEAEA">
                 <template slot-scope="scope">
                   <template>
@@ -1037,17 +1055,31 @@
     <offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
     <TransferOrder v-if="showTransferOrder" :isShow="showTransferOrder" :obj="queryObj"
       @success="showTransferOrder=false,$emit('success')" @close="showTransferOrder=false"></TransferOrder>
+  
+  <pinkDrawer ref="addOrders"
+    :drawer-config="drawerConfig">
+      <template slot="drawer" slot-scope="{ visible, close }">
+        <cruiseShipInfo v-if="visible" :isDrawerMode="true" 
+        :details="selectedSpotData"
+        @close="close" @save-success="handleSaveSuccess"></cruiseShipInfo>
+      </template>
+    </pinkDrawer>
   </div>
 </template>
 <script>
   import offset from '../../public/offset.vue';
   import TransferOrder from './TransferOrder.vue';
   import commissionDialog from "../../FinancialModule/TradeCommission/commissionDialog"
+ import pinkDrawer from '../../common/pinkDrawer.vue';
+  import cruiseShipInfo from './cruiseShipInfo.vue';
+  import addConfig from "./addConfig.js";
  export default {
     components: {
       offset,
       TransferOrder,
-      commissionDialog
+      commissionDialog,
+        pinkDrawer,
+      cruiseShipInfo,
     },
     props: ["OrderList", "pagesTitle"],
     data() {
@@ -1159,7 +1191,8 @@
         EditOPVisible: false,
         OPEmpId: 0,
         OPOrderId: 0,
-        OPEmpList: []
+        OPEmpList: [],
+        selectedSpotData: null,
       };
     },
     watch: {
@@ -1172,7 +1205,17 @@
         }
       }
     },
+    computed: {
+      // 抽屉配置
+      drawerConfig() {
+        return addConfig.drawerConfig;
+      },
+    },
     methods: {
+      handleSaveSuccess(){
+        this.$refs.addOrders.handleDrawerClose();
+        this.$emit('success')
+      },
         //提交
     submitForm(msg) {
       //提交创建、修改表单
@@ -1525,6 +1568,12 @@
         });
       },
       getDetail(obj, updateRStatus) {
+        console.log('-----')
+         if(this.userInfo.SimpleEasy==1){
+          this.selectedSpotData = obj;
+          this.$refs.addOrders.openDrawer(obj);
+          return;
+        }
         this.SendStartDate = obj.sendStartDate
         this.updateRemarksStatus = updateRStatus;
         this.visaManagementId = obj.visaManagementId