no message

src/components/customerManage/orderList.vue

@@ -277,6 +277,7 @@
 </el-drawer>
 <!-- 提成详情 -->
 <commissionPopUp v-if="commissionPopUpVisible" :parameters="parameters"></commissionPopUp>
+
 </div>
 </template>
 
@@ -284,6 +285,7 @@
 import customerInfoBox from "../guestManagement/customerInfoBox";
 import orderDetailsDrawer from "./orderDetailsDrawer";
 import commissionPopUp from "../dialogModel/commissionPopUp";
+
 export default {
   components: {
     customerInfoBox,
@@ -1271,6 +1273,10 @@ li {
   color: #f2c037;
 }
 
+.tatusText.cancel {
+  color: #c1c1c1;
+}
+
 .tatusText.Black {
   color: Black;
 }

src/components/dialogModel/commissionPopUp.vue

@@ -31,10 +31,21 @@
 }
 .addContacts .el-dialog__footer {
   padding: 0;
+}
+.cursor-p{
+  cursor: pointer;
+}
+.cursor-p:hover{
+  color: #409EFF;
 }
   </style>
   <template>
-    <el-dialog @closed="closedDialog" :modal="false" :visible.sync="dialogTableVisible" :close-on-click-modal="false" class="addContacts">
+    <div>
+    <el-dialog @closed="closedDialog" 
+    width="70%"
+    :modal="false" 
+    :visible.sync="dialogTableVisible" 
+    :close-on-click-modal="false" class="addContacts">
       <div class="add-tit" slot="title">
         <p><span></span>提成列表</p>
         <span icon="el-icon-close"></span>
@@ -65,13 +76,13 @@
                 label="部门"
                 show-overflow-tooltip>
             </el-table-column>
-            <el-table-column 
+            <!-- <el-table-column 
                 label="岗位"
                 show-overflow-tooltip>
                 <template slot-scope="scope">
                     {{scope.row.PostName?scope.row.PostName:'-'}}
                 </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column 
                 prop="EmName"
                 label="姓名"
@@ -87,6 +98,11 @@
                 label="订单利润"
                 show-overflow-tooltip>
             </el-table-column>
+            <el-table-column 
+                prop="YCommission"
+                label="应发"
+                show-overflow-tooltip>
+            </el-table-column>
             <el-table-column 
                 prop="Commission"
                 label="提成"
@@ -99,16 +115,28 @@
                     {{scope.row.CommissionRate}}%
                 </template>
             </el-table-column>
+            <el-table-column
+                label="依据类型"
+                show-overflow-tooltip min-width="90">
+                <template slot-scope="scope">
+                  <span
+                  :class="scope.row.WageReId?'cursor-p':''"
+                  @click="scope.row.WageType?GenerateScale(scope.row):''">{{scope.row.WageType==1?'新员工比例':scope.row.WageType==2?'上季度定档':'-'}}</span>
+                </template>
+            </el-table-column>
             <el-table-column 
                 prop="BonusMoney"
                 label="年终"
                 show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{scope.row.BranchName!='微途科技'?scope.row.BonusMoney:'-'}}
+                </template>
             </el-table-column>
             <el-table-column 
                 label="年终比例"
                 show-overflow-tooltip>
                 <template slot-scope="scope">
-                    {{scope.row.BonusRate}}%
+                  {{scope.row.BranchName!='微途科技'?scope.row.BonusRate+'%':'-'}}
                 </template>
             </el-table-column>
             <el-table-column 
@@ -118,7 +146,7 @@
             </el-table-column>
             <el-table-column 
                 label="备注"
-                show-overflow-tooltip>
+                show-overflow-tooltip min-width="200px">
                 <template slot-scope="scope">
                     {{scope.row.Remark?scope.row.Remark:'-'}}
                 </template>
@@ -144,8 +172,19 @@
         </el-button>
       </div>
     </el-dialog>
+    <!-- 查看生成比例 -->
+    <el-dialog custom-class='w1006' title="员工生成比例" :visible.sync="outerVisible" center>
+      <inAccordanceWith v-if="objNew" :msgNew="objNew"></inAccordanceWith>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" class="add-box-btn" @click="outerVisible = false">确 定</el-button>
+        <el-button class="add-box-btn add-box-cancel" @click="outerVisible = false">取 消
+        </el-button>
+      </div>
+    </el-dialog>
+    </div>
   </template>
   <script>
+    import inAccordanceWith from "./inAccordanceWithDialog"
     export default {
       props: {
         parameters:{
@@ -153,8 +192,11 @@
             default: true
         }
       },
+      components:{inAccordanceWith},
       data() {
         return {
+            outerVisible:false,
+            objNew:{},
             total:0,
             dataList:[],
             msg: {
@@ -179,6 +221,13 @@
         this.getList()
       },    
       methods: {
+        GenerateScale(item){
+          if(!item.WageReId){
+              return
+          }
+          this.objNew = item
+          this.outerVisible = true
+        },
         //获取数据
         getList() {
             this.loading = true;

src/components/guestManagement/Agreement.vue

@@ -38,6 +38,10 @@
         color: #F2C037;
     }
 
+    .tatusText.cancel {
+        color: #c1c1c1;
+    }
+
     .tatusText.Black {
         color: Black;
     }
@@ -285,7 +289,7 @@
                     <template slot-scope="scope">
                         <div class="agreement-IncomeMoney-box">
                             {{scope.row.IncomeMoney}}
-                            <i v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5"
+                            <i v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5&&scope.row.OrderStatus!=6"
                                 @click="makeAdocument(scope.row,scope.$index,1)" class="iconfont iconjia- numIcon">
                                 <div v-show="scope.row.actuallyReceived" class="agreement-IncomeMoney-pop">
                                     <div class="float-flag-shape"></div>
@@ -309,14 +313,14 @@
                 </el-table-column>
                 <el-table-column label="退款" :width="120">
                     <template slot-scope="scope">
-                        {{scope.row.BackMoney}}<i v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5"
+                        {{scope.row.BackMoney}}<i v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5&&scope.row.OrderStatus!=6"
                             @click="makeAdocument(scope.row,scope.$index,2)" class="iconfont iconjia- numIcon"></i>
                     </template>
                 </el-table-column>
                 <el-table-column label="成本" :width="120">
                     <template slot-scope="scope">
                         <div class="agreement-IncomeMoney-box">
-                            {{scope.row.PayMoney}}<i v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5"
+                            {{scope.row.PayMoney}}<i v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5&&scope.row.OrderStatus!=6"
                                 @click="makeAdocument(scope.row,scope.$index,3)" class="iconfont iconjia- numIcon">
                                 <div v-show="scope.row.cost" class="agreement-IncomeMoney-pop">
                                     <div class="float-flag-shape"></div>
@@ -330,11 +334,7 @@
                                         <span @click.stop="popClick(scope.row,scope.$index,3)">确定</span>
                                     </div>
                                 </div>
-
                             </i>
-
-
-
                         </div>
                     </template>
                 </el-table-column>
@@ -349,10 +349,12 @@
                 </el-table-column>
                 <el-table-column label="出票状态" :width="90">
                     <template slot-scope="scope">
-                        <span @click="modifyStatus(scope.row)" class="cp tatusText" :class="scope.row.TicketStatus==1?'grey':
+                        <span @click="modifyStatus(scope.row)" class="cp tatusText" 
+                        :class="scope.row.TicketStatus==1?'grey':
                         (scope.row.TicketStatus==2?'success':
                         (scope.row.TicketStatus==3?'error':
-                        (scope.row.TicketStatus==4?'Black':'')))">
+                        (scope.row.TicketStatus==4?'cancel':
+                        (scope.row.TicketStatus==5?'Black':''))))">
                             {{scope.row.TicketStatusName}}
                         </span>
                         <i v-if="scope.row.TicketStatus!=1&&