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

src/assets/common/lang/zhCN/fill.js

@@ -4442,6 +4442,7 @@ export const obj = {
       zuijinlgy: '最近六个月',
       ribenxborcg: '日本小包OR常规',
       gouwuyjqk: '购物佣金情况',
+      yushiduibiqk: '预实对比情况',
       jiduhuiz: '季度汇总',
       yongjtj: '佣金统计',
       xuanzheyf: '选择月份',

src/assets/common/lang/zhTW/fill.js

@@ -4442,6 +4442,7 @@ export const obj = {
       zuijinlgy: '最近六個月',
       ribenxborcg: '日本小包OR常規',
       gouwuyjqk: '購物佣金情況',
+      yushiduibiqk: '預實對比情況',
       jiduhuiz: '季度彙總',
       yongjtj: '佣金統計',
       xuanzheyf: '選擇月份',

src/components/FinancialModule/DataAnalysis/index.vue

@@ -5,6 +5,7 @@
       <el-tab-pane v-if="PermissionState!=3" :label="$t('objFill.v101.FinancialModule.gongsjyqk')" name="2"></el-tab-pane>
       <el-tab-pane v-if="PermissionState!=3" :label="$t('objFill.v101.FinancialModule.ribenxborcg')" name="3"></el-tab-pane>
       <el-tab-pane v-if="PermissionState!=2" :label="$t('objFill.v101.FinancialModule.gouwuyjqk')" name="4"></el-tab-pane>
+      <el-tab-pane v-if="PermissionState!=3" :label="$t('objFill.v101.FinancialModule.yushiduibiqk')" name="5"></el-tab-pane>
     </el-tabs>
     <div class="query-box">
       <el-form class="_info_box clearfix" label-width="90px">
@@ -73,7 +74,7 @@
               </el-form-item>
             </el-col>
           </template>
-          <el-col :span="4">
+          <el-col :span="4" v-if="activeName!=5">
             <el-form-item :label="$t('fnc.bweibi')">
               <el-select :disabled="coinGetShow" filterable v-model="msg.StandardCurrencyId"  @change="getChange">
                 <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
@@ -146,7 +147,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="2" v-if="activeName!=3">
+          <el-col :span="2" v-if="activeName!=3 && activeName!=5">
             <el-form-item :label="$t('objFill.v101.FinancialModule.jiduhuiz')">
               <el-checkbox v-model="msg.LossType" true-label="1" false-label="0" @change="getStatement"></el-checkbox>
             </el-form-item>
@@ -158,12 +159,15 @@
           <button class="hollowFixedBtn" @click="getStatement">
             {{ $t("pub.searchBtn") }}
           </button>
-          <button v-if="activeName!=4" class="normalBtn" @click="exportExcel">
+          <button v-if="activeName!=4 && activeName!=5" class="normalBtn" @click="exportExcel">
             {{$t('visa.v_daochu')}}
           </button>
           <button v-if="activeName==4" class="normalBtn" @click="exportExcel2">
             {{$t('visa.v_daochu')}}
           </button>
+          <button v-if="activeName==5" class="normalBtn" @click="exportExcel3">
+            {{$t('visa.v_daochu')}}
+          </button>
         </li>
       </ul>
     </div>
@@ -172,6 +176,7 @@
       <Corporations v-if="activeName=='2'" :StatisticalData="StatisticalData"></Corporations>
       <Packets v-if="activeName=='3'" :StatisticalData="StatisticalData"></Packets>
       <ShoppingCommission v-if="activeName=='4'" :StatisticalData="StatisticalData"></ShoppingCommission>
+      <PrerealContrast v-if="activeName=='5'" :StatisticalData="StatisticalData"></PrerealContrast>
     </div>
   </div>
 </template>
@@ -182,9 +187,10 @@ import Lines from "./components/line.vue";
 import Corporations from "./components/corporation.vue";
 import Packets from "./components/packet.vue";
 import ShoppingCommission from "./components/ShoppingCommission.vue";
+import PrerealContrast from "./components/PrerealContrast.vue";
 import StartYMDateLimit from '../../public/StartYMDateLimit.vue';
 export default {
-  components: {Lines,Corporations,Packets,ShoppingCommission,StartYMDateLimit},
+  components: {Lines,Corporations,Packets,ShoppingCommission,PrerealContrast,StartYMDateLimit},
   data() {
     return {
       coinGetShow: false,
@@ -336,6 +342,9 @@ export default {
         msg = this.shopMsg
         url = 'financestatistics_post_GetCommissionAnalysisStat'
       }
+      if(this.activeName=='5'){
+        url = 'financestatistics_post_GetExpectedCostAnalysisStat'
+      }
       this.loading = true
       this.apipost(
         url,
@@ -364,6 +373,25 @@ export default {
         this.msg.startDate = sDate
         this.msg.endDate = eDate
       }
+      if(this.activeName=='5'){
+        let sDate = moment().subtract(2, 'months').format('YYYY-MM');
+        let eDate = moment().subtract(2, 'months').format('YYYY-MM');
+
+        this.dateTime = [sDate,eDate]
+        this.msg.startDate = sDate
+        this.msg.endDate = eDate
+      }else{
+        let eDate = moment().subtract(1, 'months').format('YYYY-MM');
+        if(this.msg.startDate == this.msg.endDate && this.msg.startDate== eDate){
+          let sDate = moment().subtract(7, 'months').format('YYYY-MM');
+          let eDate = moment().subtract(1, 'months').format('YYYY-MM');
+
+          this.dateTime = [sDate,eDate]
+          this.msg.startDate = sDate
+          this.msg.endDate = eDate
+        }
+      }
+
       this.getStatement()
     },
     getDateTime(){
@@ -401,6 +429,13 @@ export default {
       }
       this.GetLocalFile("financestatistics_post_GetCommissionAnalysisStatToExcel", msg, this.$t('objFill.v101.FinancialModule.yongjtj')+this.$commonUtils.getCurrentDate() + ".xls");
     },
+    exportExcel3(){//导出报表
+      let msg = {
+        EmployeeId: this.getLocalStorage().EmployeeId,
+        ...this.msg
+      }
+      this.GetLocalFile("financestatistics_post_GetExpectedCostAnalysisStatToExcel", msg, '预实对比'+ this.$commonUtils.getCurrentDate() + ".xls");
+    },
     getQueryData() {
       //获取公司列表
       this.apipost(