no message

src/components/FinancialModule/OPExtraReward/CommissionRule.vue

@@ -62,7 +62,7 @@
           >
             <tr>
               <td :rowspan="item.FProfitList&&item.FProfitList.length>0?4:2" width="150" style="min-width: 150px;">当月负责线路毛利金额<p>当月提成比例</p> </td>
-              <th v-if="item.FProfitList&&item.FProfitList.length>0" width="80" style="min-width:80px;" rowspan="2">总公司OP</th>
+              <th v-if="item.FProfitList&&item.FProfitList.length>0" width="80" class="opTitle" rowspan="2">总公司OP</th>
               <th style="min-width: 220px;"
                 v-for="( son , sIndex ) in item.ProfitList"
                 :key="sIndex"
@@ -75,7 +75,7 @@
             </tr>
             <template v-if="item.FProfitList&&item.FProfitList.length>0">
               <tr>
-                <th width="80" style="min-width:80px;" rowspan="2">分公司OP</th>
+                <th width="80" class="opTitle" rowspan="2">分公司OP</th>
                 <th style="min-width: 220px;"
                   v-for="( son , sIndex ) in item.FProfitList"
                   :key="sIndex"
@@ -96,7 +96,7 @@
         >
           <tr>
             <td :rowspan="item.FExtraList&&item.FExtraList.length>0?4:2" width="150" style="min-width: 150px;">当月负责团数<p>当月奖励</p> </td>
-            <th v-if="item.FExtraList&&item.FExtraList.length>0" width="80" style="min-width:80px;" rowspan="2">总公司OP</th>
+            <th v-if="item.FExtraList&&item.FExtraList.length>0" width="80" class="opTitle" rowspan="2">总公司OP</th>
             <th style="min-width: 220px;"
               v-for="( son , sIndex ) in item.ExtraList"
               :key="sIndex"
@@ -109,7 +109,7 @@
           </tr>
           <template v-if="item.FExtraList&&item.FExtraList.length>0">
             <tr>
-              <th width="80" style="min-width:80px;" rowspan="2">分公司OP</th>
+              <th width="80" class="opTitle" rowspan="2">分公司OP</th>
               <th style="min-width: 220px;"
                 v-for="( son , sIndex ) in item.FExtraList"
                 :key="sIndex"
@@ -843,4 +843,7 @@
     padding: 0 0 10px 0;
     font-weight: bold;
   }
+  .opTitle{
+    min-width:80px;background: #fff;border-top: 1px solid #E6E6E6;border-right: 1px solid #E6E6E6;
+  }
 </style>

src/components/SalesModule/productOrderList.vue

@@ -533,7 +533,7 @@
       this.userInfo = this.getLocalStorage();
       this.CurrentUserInfo = this.userInfo ;
       this.userId = this.userInfo.EmployeeId;
-      this.msg.BranchId = this.userInfo.RB_Branch_id.toString();
+      this.msg.BranchId = '-1'//this.userInfo.RB_Branch_id.toString();
       if (this.$route.query.id) {
         this.msg.BranchId = "-1";
         this.msg.TCID = this.$route.query.id;