no message

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -2503,8 +2503,13 @@ export default {
             return "column-cell-class-name-test-red"
       }
        if(rowData.ShiJiLiRun < 0 && columnName=="ShiJiLiRun"){
+          if(rowData.MaoLiRate >=15 && columnName=="ShiJiLiRun"){
+            return "column-cell-class-name-test-blue"
+          }else{
             return "column-cell-class-name-test-red"
+          } 
       }
+      
       if(rowData.TransportCD < 0 && columnName=="TransportCD"){
             return "column-cell-class-name-test-red"
       }

src/components/Hotel/reservation/correlationOP.vue

+<template>
+    <el-dialog title="关联OP" width="400px" :visible.sync="isShow" center @close="close">
+        <el-form class="cdForm" label-width="90px" :model="msg" :rules="rules" ref="msg">
+            <el-form-item label="OP" prop="OpEmpId">
+                <el-select filterable v-model='msg.OpEmpId' placeholder="请选择OP">
+                    <el-option v-for='item in EmployeeList'
+                        :label='item.EmName'
+                        :value='item.EmployeeId'
+                        :key='item.EmployeeId'>
+                  </el-option>
+                  </el-select>
+            </el-form-item>
+        </el-form>
+          <div slot="footer" class="dialog-footer">
+            <button class="hollowFixedBtn" @click="close">{{$t('pub.cancelBtn')}}</button>
+            <button class="normalBtn" type="primary" @click="sureBtn">{{$t('pub.sureBtn')}}</button>
+          </div>
+    </el-dialog>
+  </template>
+  
+  <script>
+    
+  export default {
+    props: ["Type","isShowCorrelation","CorrelationObj"],
+    components: {
+      
+    },
+    data() {
+      return {
+        msg:{
+            OrderId: 0,
+            OpEmpId: null,
+        },
+        rules:{
+            OpEmpId: [{
+                required: true,
+                message: '请选择需要关联的OP',
+                trigger: 'change'
+            }],
+        },
+        employeeMsg:{ // 员工
+            GroupId:'',
+            BranchId:-1,
+            DepartmentId:0,
+            PostId:0,
+            IsLeave:0,
+        },
+        EmployeeList:[],
+        isShow: false
+      }
+    },
+    watch: {
+        CorrelationObj: {
+            handler(newValue,onldValue) {
+                this.CorrelationObj = newValue
+                this.msg.OrderId = newValue.OrderId
+                this.msg.OpEmpId = newValue.OpEmpId?newValue.OpEmpId:null
+            },
+            deep:true, 
+        },
+        isShowCorrelation:{
+            handler(newValue,onldValue) {
+                this.isShow = newValue
+            },
+        },
+    },
+    mounted() {
+        this.msg.OrderId = this.CorrelationObj.OrderId
+        this.msg.OpEmpId = this.CorrelationObj.OpEmpId?this.CorrelationObj.OpEmpId:null
+        
+        this.getEmployee()
+    },
+    methods: {
+        sureBtn(){
+            let url
+            if(this.CorrelationObj.TypeNum==1){
+                url = 'dict_post_SetCustomerOrderOP'
+            }
+            if(this.CorrelationObj.TypeNum===2){
+                url = 'ticket_post_SetTicketOrderOP'
+            }
+            if(this.CorrelationObj.TypeNum===3){
+                url = 'CarSingle_post_SetCarOrderOP'
+            }
+            this.$refs['msg'].validate((valid) => {
+                if (valid) {
+                    
+                    this.apipost(url, this.msg, res => {
+                        if(res.data.resultCode == 1) {
+                            this.$emit('success')
+                        }
+                    }, err => {})
+                } else {
+                    return false;
+                }
+            });
+        },
+        getEmployee() { //员工
+            let userInfo=this.getLocalStorage();
+            this.employeeMsg.GroupId = userInfo.RB_Group_id;
+            this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
+                if(res.data.resultCode == 1) {
+                    this.EmployeeList = res.data.data;
+                }
+            }, err => {})
+        },
+        close(){
+            this.isShow = false
+            this.$emit('close')
+        },
+        
+    }
+  }
+  </script>
+  
+  <style>
+    
+  </style>
\ No newline at end of file