no message

src/components/FinancialModule/DataAnalysis/allEchart.vue

@@ -4,13 +4,14 @@
       <el-tab-pane label="线路经营情况" name="1"></el-tab-pane>
       <el-tab-pane label="公司经营情况" name="2"></el-tab-pane>
       <el-tab-pane label="日本小包OR常规" name="3"></el-tab-pane>
+      <!-- <el-tab-pane label="购物佣金情况" name="4"></el-tab-pane> -->
     </el-tabs>
     <div class="query-box">
       <el-form class="_info_box clearfix" label-width="90px">
         <el-row style="padding: 15px 0px 0 0">
-          <el-col :span="4">
+          <el-col v-if="activeName!=4" :span="4">
             <el-form-item :label="$t('system.table_company')">
-              <template v-if="activeName==1">
+              <template v-if="activeName!=2">
                 <el-select
                   filterable
                   v-model="msg.OutBranchId"
@@ -29,17 +30,19 @@
                   ></el-option>
                 </el-select>
               </template>
-              <div v-if="activeName==2">
+              <div v-else>
                 <el-select
                 filterable
                 multiple
+                collapse-tags
+                clearable
                 v-model="msg.OutBranchIdList"
                 @change="getChange"
               >
-                <el-option
+                <!-- <el-option
                   :value="-1"
                   :label="$t('pub.unlimitedSel')"
-                ></el-option>
+                ></el-option> -->
                 <el-option
                   v-for="item in CompanyList"
                   :label="item.BName"
@@ -51,6 +54,48 @@
 
             </el-form-item>
           </el-col>
+          <template v-else>
+            <el-col :span="4">
+              <el-form-item label="购物店">
+                <el-select
+                  filterable
+                  clearable
+                  v-model="shopMsg.PlaceId"
+                >
+                  <!-- <el-option
+                    value=""
+                    :label="$t('pub.unlimitedSel')"
+                  ></el-option> -->
+                  <el-option
+                    v-for="item in ShoppingStores"
+                    :label="item.Name"
+                    :value="item.ID"
+                    :key="item.ID"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="类型">
+                <el-select
+                  filterable
+                  clearable
+                  v-model="shopMsg.Type"
+                >
+                  <!-- <el-option
+                    value=""
+                    :label="$t('pub.unlimitedSel')"
+                  ></el-option> -->
+                  <el-option
+                    v-for="item in shopType"
+                    :label="item.Name"
+                    :value="item.Id"
+                    :key="item.Id"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </template>
           <el-col :span="4">
             <el-form-item :label="$t('fnc.bweibi')">
               <el-select :disabled="coinGetShow" filterable v-model="msg.StandardCurrencyId"  @change="getStatement">
@@ -64,12 +109,13 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="msg.LineIdList.length<2?4:'8'">
+          <el-col v-if="activeName!=4" :span="msg.LineIdList.length<2?4:'4'">
             <el-form-item label="线路">
               <el-select
-              style="width: 100%;" filterable multiple v-model="msg.LineIdList" @change="getStatement"
+              style="width: 100%;" filterable multiple collapse-tags
+              v-model="msg.LineIdList" @change="getStatement"
               clearable>
-                <el-option
+                <el-option  v-if="activeName!=2"
                   :value="0"
                   :label="$t('pub.unlimitedSel')"
                 ></el-option>
@@ -140,35 +186,60 @@
     <!-- height: 78%;overflow: auto; -->
     <div v-loading="loading" style="height: 80%;overflow: auto; ">
       <template v-if="activeName=='1'">
-        <div style="display: flex;flex-direction: row;flex-wrap: wrap;">
+        <div class="allEchartRow">
           <IncomeChange :msgData="msg" :StatisticalData="StatisticalData"></IncomeChange>
           <IncomeShare :msgData="msg" :StatisticalData="StatisticalData"></IncomeShare>
           <ChangeProportion :msgData="msg" :StatisticalData="StatisticalData"></ChangeProportion>
         </div>
-        <div style="display: flex;flex-direction: row;flex-wrap: wrap;">
+        <div class="allEchartRow">
           <WoolRateColumnar :msgData="msg" :StatisticalData="StatisticalData"></WoolRateColumnar>
           <ActualRateColumnar :msgData="msg" :StatisticalData="StatisticalData"></ActualRateColumnar>
         </div>
-        <div style="display: flex;flex-direction: row;flex-wrap: wrap;">
+        <div class="allEchartRow">
           <WoolRateChange :msgData="msg" :StatisticalData="StatisticalData"></WoolRateChange>
           <ActualRateChange :msgData="msg" :StatisticalData="StatisticalData"></ActualRateChange>
         </div>
       </template>
 
       <template v-if="activeName=='2'">
-        <div style="display: flex;flex-direction: row;flex-wrap: wrap;">
+        <div class="allEchartRow">
           <twoIncomeChange :msgData="msg" :StatisticalData="StatisticalData"></twoIncomeChange>
           <twoChangeProportion :msgData="msg" :StatisticalData="StatisticalData"></twoChangeProportion>
-          <!-- <twoIncomeShare :msgData="msg" :StatisticalData="StatisticalData"></twoIncomeShare> -->
         </div>
-        <div style="display: flex;flex-direction: row;flex-wrap: wrap;">
+        <div class="allEchartRow">
           <twoWoolRateColumnar :msgData="msg" :StatisticalData="StatisticalData"></twoWoolRateColumnar>
           <twoActualRateColumnar :msgData="msg" :StatisticalData="StatisticalData"></twoActualRateColumnar>
         </div>
-        <div style="display: flex;flex-direction: row;flex-wrap: wrap;">
-          <!-- <twoWoolRateChange :msgData="msg" :StatisticalData="StatisticalData"></twoWoolRateChange> -->
-          <!-- <twoActualRateChange :msgData="msg" :StatisticalData="StatisticalData"></twoActualRateChange> -->
+      </template>
+
+      <template v-if="activeName=='3'">
+        <div class="allEchartRow">
+          <threeIncomeChange :msgData="msg" :StatisticalData="StatisticalData"></threeIncomeChange>
+          <threeIncomeShare :msgData="msg" :StatisticalData="StatisticalData"></threeIncomeShare>
+          <threeChangeProportion :msgData="msg" :StatisticalData="StatisticalData"></threeChangeProportion>
+        </div>
+        <div class="allEchartRow">
+          <threeWoolRateColumnar :msgData="msg" :StatisticalData="StatisticalData"></threeWoolRateColumnar>
+          <threeActualRateColumnar :msgData="msg" :StatisticalData="StatisticalData"></threeActualRateColumnar>
+          <threeActualRateColumnar2 :msgData="msg" :StatisticalData="StatisticalData"></threeActualRateColumnar2>
         </div>
+        <div class="allEchartRow">
+          <threeWoolRateChange :msgData="msg" :StatisticalData="StatisticalData"></threeWoolRateChange>
+          <threeActualRateChange :msgData="msg" :StatisticalData="StatisticalData"></threeActualRateChange>
+          <threeActualRateChange2 :msgData="msg" :StatisticalData="StatisticalData"></threeActualRateChange2>
+        </div>
+        <div class="allEchartRow">
+          <threeIncomeChange2 :msgData="msg" :StatisticalData="StatisticalData"></threeIncomeChange2>
+          <threeIncomeShare2 :msgData="msg" :StatisticalData="StatisticalData"></threeIncomeShare2>
+          <threeChangeProportion2 :msgData="msg" :StatisticalData="StatisticalData"></threeChangeProportion2>
+        </div>
+      </template>
+
+      <template v-if="activeName=='4'">
+        <!-- <fourIncomeChange :msgData="msg" :StatisticalData="StatisticalData"></fourIncomeChange>
+        <fourIncomeShare></fourIncomeShare>
+        <fourWoolRateChange></fourWoolRateChange>
+        <fourActualRateChange></fourActualRateChange> -->
       </template>
 
     </div>
@@ -186,12 +257,27 @@ import WoolRateColumnar from "./components/oneEchart/WoolRateColumnar.vue";
 import ActualRateColumnar from "./components/oneEchart/ActualRateColumnar.vue";
 
 import twoIncomeChange from "./components/twoEchart/IncomeChange.vue";
-import twoIncomeShare from "./components/twoEchart/IncomeShare.vue";
-import twoWoolRateChange from "./components/twoEchart/WoolRateChange.vue";
-import twoActualRateChange from "./components/twoEchart/ActualRateChange.vue";
 import twoChangeProportion from "./components/twoEchart/ChangeProportion.vue";
 import twoWoolRateColumnar from "./components/twoEchart/WoolRateColumnar.vue";
 import twoActualRateColumnar from "./components/twoEchart/ActualRateColumnar.vue";
+
+import threeIncomeChange from "./components/threeEchart/IncomeChange.vue";
+import threeIncomeShare from "./components/threeEchart/IncomeShare.vue";
+import threeWoolRateChange from "./components/threeEchart/WoolRateChange.vue";
+import threeActualRateChange from "./components/threeEchart/ActualRateChange.vue";
+import threeActualRateChange2 from "./components/threeEchart/ActualRateChange2.vue";
+import threeChangeProportion from "./components/threeEchart/ChangeProportion.vue";
+import threeWoolRateColumnar from "./components/threeEchart/WoolRateColumnar.vue";
+import threeActualRateColumnar from "./components/threeEchart/ActualRateColumnar.vue";
+import threeActualRateColumnar2 from "./components/threeEchart/ActualRateColumnar2.vue";
+import threeIncomeChange2 from "./components/threeEchart/IncomeChange2.vue";
+import threeIncomeShare2 from "./components/threeEchart/IncomeShare2.vue";
+import threeChangeProportion2 from "./components/threeEchart/ChangeProportion2.vue";
+
+import fourIncomeChange from "./components/fourEchart/IncomeChange.vue";
+import fourIncomeShare from "./components/fourEchart/IncomeShare.vue";
+import fourWoolRateChange from "./components/fourEchart/WoolRateChange.vue";
+import fourActualRateChange from "./components/fourEchart/ActualRateChange.vue";
 export default {
   components: {
     IncomeChange,IncomeShare,
@@ -199,10 +285,19 @@ export default {
     ChangeProportion,
     WoolRateColumnar,ActualRateColumnar,
 
-    twoIncomeChange,twoIncomeShare,
-    twoWoolRateChange,twoActualRateChange,
-    twoChangeProportion,
+    twoIncomeChange,twoChangeProportion,
     twoWoolRateColumnar,twoActualRateColumnar,
+
+    threeIncomeChange,threeIncomeShare,
+    threeWoolRateChange,
+    threeActualRateChange,threeActualRateChange2,
+    threeChangeProportion,
+    threeWoolRateColumnar,
+    threeActualRateColumnar,threeActualRateColumnar2,
+    threeIncomeChange2,threeIncomeShare2,threeChangeProportion2,
+
+    fourIncomeChange,fourIncomeShare,
+    fourWoolRateChange,fourActualRateChange
   },
   data() {
     return {
@@ -224,6 +319,23 @@ export default {
         LineIdList: [14],
         LineIdStr: '14'
       },
+      shopMsg:{
+        startDate: '',
+        endDate: '',
+        PlaceId: '',
+        Type: '',
+        LossType: '0',
+        IsLastData: '1',
+        StandardCurrencyId: '1',
+        MaoLiRate: 0.049
+      },
+      ShoppingStores: [],
+      shopType: [
+        {Name: '不限',Id:''},
+        {Name: '购物店统计',Id:1},
+        {Name: '领队导游排名',Id:2},
+        {Name: '佣金占比统计',Id:3},
+      ],
       dateTime: [],
       CompanyList: [],
       getCompanyMsg: {
@@ -263,16 +375,25 @@ export default {
     this.getCompanyMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id
     const end = new Date();
     const start = new Date();
-    start.setMonth(start.getMonth() - 7);
-    end.setMonth(end.getMonth() - 1);
+    start.setMonth(start.getMonth() - 6);
     this.dateTime = [this.$commonUtils.getFormatDateM(start),this.$commonUtils.getFormatDateM(end)]
     this.msg.startDate = this.dateTime[0]
     this.msg.endDate = this.dateTime[1]
     this.financeinfo_post_GetList()
     this.getQueryData()
+    this.getShops()
     this.getStatement()
   },
   methods: {
+    getShops() {
+      this.apipost('Shopping_Post_GetList', {}, res => {
+        if (res.data.resultCode === 1) {
+          this.ShoppingStores = res.data.data;
+        } else {
+          this.$message.error(res.data.message);
+        }
+      }, null)
+    },
     getChange(val){
       if(this.msg.Type!='2'){
         if(this.msg.OutBranchId == -1){
@@ -323,14 +444,26 @@ export default {
       }
       this.msg.LineIdStr = this.msg.LineIdList.join(',')
       if(this.msg.Type==2) this.msg.StandardBranchIds = this.msg.OutBranchIdList.join(',')
+
       this.loading = true
+      let msg = this.msg
       let url ='financestatistics_post_GetDataAnalysisStat'
-      // if(this.activeName=='2'){ url = ''}
+
+      if(this.activeName=='4'){
+        if(this.msg.StandardCurrencyId==1||!this.msg.StandardCurrencyId){
+          this.shopMsg.MaoLiRate = 0.049
+        }
+        this.shopMsg.startDate = this.msg.startDate
+        this.shopMsg.endDate = this.msg.endDate
+        msg = this.shopMsg
+        url = 'financestatistics_post_GetCommissionAnalysisStat'
+      }
       this.apipost(
         url,
-        this.msg,
+        msg,
         res => {
           if (res.data.resultCode == 1) {
+            console.log(this.StatisticalData,'=---------')
             this.StatisticalData = res.data.data
           } else {
             this.Error(res.data.message);
@@ -346,8 +479,8 @@ export default {
       this.activeName = e._props.name
       this.msg.Type = this.activeName
       if(this.msg.Type==2) {
-        this.msg.LineIdList = [0],
-        this.msg.LineIdStr = '0'
+        this.msg.LineIdList = [],
+        this.msg.LineIdStr = ''
         this.msg.IsLastData = 2
         this.msg.OutBranchIdList = [0]
         this.msg.StandardBranchIds =  '0'
@@ -356,7 +489,8 @@ export default {
       }else {
         this.msg.LineIdList = [14]
         this.msg.LineIdStr = '14'
-        this.msg.IsLastData = 1
+        if(this.msg.Type==1)this.msg.IsLastData = 1
+        else this.msg.IsLastData = 3
         this.msg.OutBranchId = -1
         this.msg.OutBranchIdList = [0]
         this.msg.StandardBranchIds =  '0'
@@ -416,18 +550,23 @@ export default {
 </script>
 
 <style>
+  .allEchartRow{
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+  }
 .titleBox{
   padding: 10px 10px 0 10px;
   display: flex;
 }
 .echartsBox{
   flex: 1;
-  min-width: 430px;
+  /* min-width: 430px; */
   margin: 5px;
   background: #fff;
 }
 .echartsBox:nth-child(2){
- min-width: 458px;
+ /* min-width: 458px; */
 }
 .allMyEchartBox{
   height: 270px;

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -926,10 +926,17 @@
         let leaderIds=[];
         this.shopDataList.forEach((item) => {
             if (item.IsCheck){
-              leaderIds.push(item.LeaderGuideIds);
+              item.PriceShopList.forEach(x=>{
+                x.ShopDetailsList.forEach(y=>{
+                  let filter = leaderIds.filter(z=>{return z==y.LeaderId})
+                  if(!y.LeaderCommissionFrId&&filter.length==0) leaderIds.push(y.LeaderId);
+                })
+              })
+              // leaderIds.push(item.LeaderGuideIds);
             }
           })
-
+          console.log(leaderIds,'----1111')
+          if(leaderIds.length>0){
             this.loading = true;
             this.IsLGCommissionAccount=true;
             this.apipost(
@@ -960,6 +967,13 @@
                 },
                 err => {}
               );
+
+          }else{
+            this.IsJapan = this.nMsg.IsHaveFee = 0
+            this.saveMsg = [];
+            this.BOSSDialog = false;
+            this.BOSSDialogText = true;
+          }
         },
       MoreSureCreateBill() {