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

src/components/Hotel/reservation/OrderList.vue

@@ -769,6 +769,14 @@
             <i v-loading="msg.OrderId==item.OrderId&&loading2"></i>
             <span class="c20C997">收损</span>
           </div>
+          <div
+            v-if="item.OrderStatus >1 && item.OrderStatus != 3
+            &&pagesTitle=='OP'&&is_correlationOP"
+            class="row-c cursor-pointer radius5 change py5"
+            @click="clickCorrelation(item)"
+          >
+            <span class="c059FF6">关联OP</span>
+          </div>
         </div>
         <!-- <div v-if="item.OrderStatus==2" class="column-jac px15 bgE8F5E9 radius5 ml fz12 pa20 flex-s c20C997">
             <div class="mb5">已支付</div>
@@ -885,13 +893,17 @@
         </div>
       </el-dialog>
     <offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
+    <correlationOP :isShowCorrelation="isShowCorrelation" :CorrelationObj="CorrelationObj"
+    @close="isShowCorrelation=false"
+    @success="success"></correlationOP>
   </div>
 </template>
 <script>
   import offset from '../../public/offset.vue';
   import more from '../../public/more.vue';
+  import correlationOP from './correlationOP.vue';
 export default {
-  components: { offset, more },
+  components: { offset, more, correlationOP },
   props: ["OrderList","pagesTitle"],
   data() {
     return {
@@ -933,6 +945,9 @@ export default {
       loading: false,
       fileList:[],
       GuestFile: '',
+      isShowCorrelation: false,
+      CorrelationObj:{},
+      is_correlationOP: false
     };
   },
   watch: {
@@ -946,6 +961,18 @@ export default {
     }
   },
   methods: {
+    close(){
+      this.isShowCorrelation = false
+    },
+    success(){
+      this.close()
+      this.$emit('success')
+    },
+    clickCorrelation(item){
+      this.CorrelationObj = item
+      this.CorrelationObj.TypeNum = 1
+      this.isShowCorrelation = true
+    },
     isOffset(row, index, num,name){
       this.makeAdocument(row, index, num, name, 'Offset')
       setTimeout(()=>{
@@ -1308,6 +1335,10 @@ export default {
   },
   mounted() {
     this.userInfo = this.getLocalStorage();
+    let ActionMenuCode = this.userInfo.ActionMenuCode;
+    if (ActionMenuCode.indexOf('is_correlationOP') != -1 ){
+        this.is_correlationOP = true
+    }
     //自适应高度调节
     this.com_onresize();
     window.onresize = () => {

src/components/busManagement/BookAcar/components/orderList.vue

@@ -722,6 +722,14 @@
                 <i v-loading="msg.OrderId==item.OrderId&&loading2"></i>
                 <span class="c20C997">收损</span>
               </div>
+              <div
+                v-if="item.OrderStatus >1 && item.OrderStatus != 3
+                &&pagesTitle!='销售'&&is_correlationOP"
+                class="row-c cursor-pointer radius5 change py5"
+                @click="clickCorrelation(item)"
+              >
+                <span class="c059FF6">关联OP</span>
+              </div>
             </div>
           </div>
           <div class="mt mb20 bgf5 pa15 row-c" v-if="item.CancelRemark">
@@ -820,12 +828,16 @@
           </div>
         </el-dialog>
         <offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
+        <correlationOP :isShowCorrelation="isShowCorrelation" :CorrelationObj="CorrelationObj"
+        @close="isShowCorrelation=false"
+        @success="success"></correlationOP>
       </div>
     </template>
     <script>
       import offset from '../../../public/offset.vue';
+      import correlationOP from '../../../Hotel/reservation/correlationOP.vue';
     export default {
-      components: { offset },
+      components: { offset,correlationOP },
       props: ["OrderList","pagesTitle"],
       data() {
         return {
@@ -934,7 +946,10 @@
           ],
           items: null,
           typeState: '',
-          Title: ''
+          Title: '',
+          isShowCorrelation: false,
+          CorrelationObj:{},
+          is_correlationOP: false
         };
       },
       watch: {
@@ -948,6 +963,18 @@
         }
       },
       methods: {
+        close(){
+          this.isShowCorrelation = false
+        },
+        success(){
+          this.close()
+          this.$emit('success')
+        },
+        clickCorrelation(item){
+          this.CorrelationObj = item
+          this.CorrelationObj.TypeNum = 3
+          this.isShowCorrelation = true
+        },
         isOffset(row, index, num){
           this.makeAdocument(row, index, num,'Offset')
           setTimeout(()=>{
@@ -1361,6 +1388,10 @@
       },
       mounted() {
         this.userInfo = this.getLocalStorage();
+        let ActionMenuCode = this.userInfo.ActionMenuCode;
+        if (ActionMenuCode.indexOf('is_correlationOP') != -1 ){
+            this.is_correlationOP = true
+        }
         //自适应高度调节
         this.com_onresize();
         window.onresize = () => {

src/components/scenicSpot/reservation/OrderList.vue

@@ -812,6 +812,14 @@
             <i v-loading="msg.OrderId == item.OrderId && loading2"></i>
             <span class="c20C997">收损</span>
           </div>
+          <div
+            v-if="item.OrderStatus >1 && item.OrderStatus != 3
+            &&pagesTitle=='OP'&&is_correlationOP"
+            class="row-c cursor-pointer radius5 change py5"
+            @click="clickCorrelation(item)"
+          >
+            <span class="c059FF6">关联OP</span>
+          </div>
           <!-- <template v-if="item.OrderStatus==2">
             <div class="column-jac fz12 flex-s c20C997">
               <div class="mb5">已支付</div>
@@ -969,13 +977,17 @@
       </div>
     </el-dialog>
     <offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
+    <correlationOP :isShowCorrelation="isShowCorrelation" :CorrelationObj="CorrelationObj"
+    @close="isShowCorrelation=false"
+    @success="success"></correlationOP>
   </div>
 </template>
 <script>
   import offset from '../../public/offset.vue';
+  import correlationOP from '../../Hotel/reservation/correlationOP.vue';
 export default {
   components: {
-    offset
+    offset,correlationOP
     },
   props: ["OrderList", "pagesTitle"],
   data() {
@@ -1086,7 +1098,10 @@ export default {
       typeState: '',
       loadingDZP: false,
       uploadOrderId: 0,
-      GuestFile: ''
+      GuestFile: '',
+      isShowCorrelation: false,
+      CorrelationObj:{},
+      is_correlationOP: false
     };
   },
   watch: {
@@ -1100,6 +1115,18 @@ export default {
     }
   },
   methods: {
+    close(){
+      this.isShowCorrelation = false
+    },
+    success(){
+      this.close()
+      this.$emit('success')
+    },
+    clickCorrelation(item){
+      this.CorrelationObj = item
+      this.CorrelationObj.TypeNum = 2
+      this.isShowCorrelation = true
+    },
     isOffset(row, index, num){
       this.makeAdocument(row, index, num,'Offset')
       setTimeout(()=>{
@@ -1525,6 +1552,10 @@ export default {
   },
   mounted() {
     this.userInfo = this.getLocalStorage();
+    let ActionMenuCode = this.userInfo.ActionMenuCode;
+    if (ActionMenuCode.indexOf('is_correlationOP') != -1 ){
+        this.is_correlationOP = true
+    }
     //自适应高度调节
     this.com_onresize();
     window.onresize = () => {