简易报表、签证订单op查询

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -911,9 +911,10 @@ export default {
       }
 
       if(rowIndex<15){
-        if(BranchId == 1245){
-          that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} })
-        }else if(rowData.ZhaiYao=="联运收入"){
+        // if(BranchId == 1245){
+        //   that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} })
+        // }
+        if(rowData.ZhaiYao=="联运收入"){
           that.goUrl("CombinedRevenueReport",startDate,endDate,BranchId,"联运收入")
         }
         // 跳转到应收团款查询

src/components/Hotel/reservation/correlationOP.vue

@@ -24,13 +24,13 @@
           </div>
     </el-dialog>
   </template>
-  
+
   <script>
-    
+
   export default {
     props: ["Type","isShowCorrelation","CorrelationObj"],
     components: {
-      
+
     },
     data() {
       return {
@@ -76,7 +76,7 @@
                     this.Title = '关联OP'
                 }
             },
-            deep:true, 
+            deep:true,
         },
         isShowCorrelation:{
             handler(newValue,onldValue) {
@@ -104,14 +104,13 @@
                 }
             if(this.CorrelationObj.TypeNum==1){
                 url = 'dict_post_SetCustomerOrderOP'
-            }
-            if(this.CorrelationObj.TypeNum===2){
+            }else if(this.CorrelationObj.TypeNum===2){
                 url = 'ticket_post_SetTicketOrderOP'
-            }
-            if(this.CorrelationObj.TypeNum===3){
+            }else if(this.CorrelationObj.TypeNum===3){
                 url = 'CarSingle_post_SetCarOrderOP'
-            }
-            if(this.CorrelationObj.TypeNum===4){
+            }else if(this.CorrelationObj.TypeNum===7){//签证op
+                url = ''
+            }else if(this.CorrelationObj.TypeNum===4){
                 msg = {
                     OrderId: this.msg.OrderId,
                     Money: this.msg.Money
@@ -155,11 +154,11 @@
             this.isShow = false
             this.$emit('close')
         },
-        
+
     }
   }
   </script>
-  
+
   <style>
-    
-  </style>
\ No newline at end of file
+
+  </style>

src/components/SalesVisa/components/VisaProductOrder.vue

@@ -358,6 +358,19 @@
               </el-select>
             </span>
           </li>
+          <li>
+            <span>
+              <em>OP</em>
+              <el-select filterable  v-model='msg.OpEmpId'>
+                <el-option :value="0" label="不限"></el-option>
+                <el-option v-for='item in EmployeeList'
+                    :label='item.EmName'
+                    :value='item.EmployeeId'
+                    :key='item.EmployeeId'>
+              </el-option>
+              </el-select>
+            </span>
+          </li>
           <li v-if="pagesTitle!='销售'">
             <span>
               <em>公司</em>
@@ -529,6 +542,7 @@
             RB_Branch_Id: -1,
             OrderId: 0,
             IsFinish: '0',
+            OpEmpId: 0,
           },
           addMsg: {
             Id: 0,

src/components/SalesVisa/components/visaOrderList.vue

@@ -582,6 +582,7 @@
                       </template>
                     </template>
                   </el-table-column>
+                  <el-table-column label="OP" prop="opEmName" min-width="100" style="background:#EAEAEA"></el-table-column>
                   <el-table-column label="出发日期" min-width="100" style="background:#EAEAEA">
                     <template slot-scope="scope">
                       <template>
@@ -767,6 +768,13 @@
                           v-if="scope.row.VisaPlanIdStr!=''&&pagesTitle!='销售'">
                               <span class="c059FF6">签证详情</span>
                             </div>
+                            <!-- <div
+                            v-if="pagesTitle=='OP'"
+                            class="row-c cursor-pointer radius5 change py5"
+                            @click="clickCorrelation(item, 1)"
+                          >
+                            <span class="c059FF6">编辑关联OP</span>
+                          </div> -->
                             <div class="row-c cursor-pointer radius5 change py5" @click="getDetail(scope.row,false)"
                             v-if="scope.row.income<=0&&(scope.row.visaOrderStatus==1||scope.row.visaOrderStatus==3)&&scope.row.visaStatus==1&&pagesTitle=='销售'">
                               <span class="c059FF6">{{$t('system.table_edit')}}订单</span>
@@ -1056,6 +1064,10 @@ export default {
     }
   },
   methods: {
+    clickCorrelation(item,){
+      this.CorrelationObj = JSON.parse(JSON.stringify(item));
+      this.CorrelationObj.TypeNum = 7;
+    },
     DetailsOfRoyalty(){
 
     },