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

src/api/finance/index.js

@@ -129,4 +129,13 @@ export function setSellCommissionInfo(data) {
   });
 }
 
+// 财务工作台 获取周期提成  周期列表
+export function getSellCommissionStatistics(data) {
+  return request({
+    url: '/SellCommission/GetSellCommissionStatistics',
+    method: 'post',
+    data
+  });
+}
+
 

src/components/sale/orderlist.vue

@@ -100,12 +100,10 @@
                 报价单：<span class="order_OfferId" @click="goQuotation(item.OfferId)"
                   style="font-size:14px;">{{item.OfferId}}</span>
               </div>
-              <div style="color:red" v-if="item.YFCommissionMoney>0">应发提成：{{item.YFCommissionMoney}}</div>
               <template v-if="item.IsCommissionGive==1">
-                <div style="color:red;cursor: pointer;text-decoration: underline;" @click='gourltx(item.OrderId)'>提成：{{item.CommissionMoney}}</div>
+                <div style="color:red" v-if="item.YFCommissionMoney>0">应发提成：{{item.YFCommissionMoney}}</div>
+                <div style="color:red;cursor: pointer;text-decoration: underline;" @click='gourltx(item.OrderId)'>已发提成：{{item.CommissionMoney}}</div>
                 <div style="color:red" v-if="item.ExtraCommissionMoney>0">额外奖励实发：{{item.ExtraCommissionMoney}}</div>
-              </template>
-              <template>
                 <div style="color:red;" v-if="item.ExtraRewardMoney>0">额外奖励：{{item.ExtraRewardMoney}}</div>
                 <div style="color:red" v-if="item.ExtraDeductMoney>0">额外扣除：{{item.ExtraDeductMoney}}</div>
                 <div style="color:red" v-if="item.CommissionBack>0">补交提成：{{item.CommissionBack}}</div>
@@ -212,11 +210,11 @@
                     </q-item-section>
                   </q-item>
 
-                  <q-item clickable v-close-popup v-if="AuthorityObj.isShowCommissionEdit&&item.IsCommissionGive==1">
+                  <!-- <q-item clickable v-close-popup v-if="AuthorityObj.isShowCommissionEdit&&item.IsCommissionGive==1">
                     <q-item-section @click="upDateMoney(item,1)">
                       <q-item-label>修改提成</q-item-label>
                     </q-item-section>
-                  </q-item>
+                  </q-item> -->
                   <q-item clickable v-close-popup v-if="AuthorityObj.isShowRewardEdit&&isShowReward">
                     <q-item-section @click="upDateMoney(item,2)">
                       <q-item-label>额外奖励</q-item-label>
@@ -1291,11 +1289,8 @@
         });
       },
       gourltx(OrderId){
-        this.$router.push({
-          path: '/financial/cycleOrderList',
-          query: {
-            OrderId:OrderId
-          }
+        this.OpenNewUrl("/financial/cycleOrderList", {
+          OrderId: OrderId
         });
       }
     }

src/pages/financial/salesCommission.vue

@@ -185,7 +185,6 @@
             getSellCommissionPeriodsPageList(this.msg).then(res => {
               if (res.Code == 1) {
                 this.loading = false;
-
                 this.tableData = res.Data.PageData
                 this.total = res.Data.Count
               }
@@ -228,13 +227,9 @@
             })
         },
         gocaiwuxiangq(id){
-          this.$router.push({
-            path: '/financial/financalDocument/FinancialDocumentsDetail',
-            query: {
-                "id": id,
-                blank: 'y',
-            }
-            })
+            this.OpenNewUrl("/financial/financalDocument/FinancialDocumentsDetail", {
+              id: id
+            });
         },
         generalFinancacls(item) {
           if(this.msg.SchoolId == -1){

src/router/routes.js

@@ -262,7 +262,11 @@ const routes = [{
     component: () =>
       import("pages/financial/cycleOrderList.vue")
   },
-
+  {
+    path: "/financial/cycleList", //周期列表
+    component: () =>
+      import("pages/financial/cycleList.vue")
+  },
 
   {
     path: "/financial/TeamRevenueReport", //营收报表