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

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

@@ -4456,6 +4456,7 @@ export const obj = {
       ribenxborcg: 'Japanese small bag OR regular ',
       gouwuyjqk: 'Shopping Commission Situation ',
       yushiduibiqk: 'pre-real contrast case ',
+      cashqk: 'Cash flow situation',
       jiduhuiz: 'Quarterly Summary ',
       yongjtj: 'Commission Statistics ',
       xuanzheyf: 'Choose a month ',

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

@@ -4456,6 +4456,7 @@ export const obj = {
       ribenxborcg: '日本小包ORレギュラー',
       gouwuyjqk: 'ショッピングコミッションの状況',
       yushiduibiqk: '予実比較状況',
+      cashqk: 'キャッシュフローの状況',
       jiduhuiz: '四半期要約',
       yongjtj: 'コミッション統計',
       xuanzheyf: '月を選択して',

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

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

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

@@ -4456,6 +4456,7 @@ export const obj = {
       ribenxborcg: '日本小包OR常規',
       gouwuyjqk: '購物佣金情況',
       yushiduibiqk: '預實對比情況',
+      cashqk: '現金流水情况',
       jiduhuiz: '季度彙總',
       yongjtj: '佣金統計',
       xuanzheyf: '選擇月份',

src/components/FinancialModule/DataAnalysis/components/cashflow.vue

+<template>
+  <div style="margin-bottom: 20px; ">
+    <div style="display: flex;align-items: center;">
+      <h3 class="text-center" style="margin-bottom: 5px;">{{$t('objFill.v101.FinancialModule.gongstj')}}</h3>
+    </div>
+
+    <el-table
+    :data="BranchAnalysisData"
+    style="width: 100%;"
+    class="LineAnalysisDataBJ">
+      <el-table-column
+      fixed
+      align="center"
+        prop="Name"
+        :label="$t('system.ph_jgName')"
+        width="150">
+      </el-table-column>
+      <el-table-column align="center" :label="title" v-for="(title,i) in MonthList" :key="i" :prop="`${i}`">
+        <el-table-column
+          prop=""
+          :label="$t('restaurant.res_income')"
+          min-width="120" align="center">
+          <template slot-scope="scope">
+              {{scope.row.DetailList[i].Income.toFixed(2)}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop=""
+          :label="$t('salesModule.ZB')"
+          min-width="120" align="center">
+          <template slot-scope="scope">
+              {{scope.row.DetailList[i].IncomeRate}}%
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop=""
+          :label="$t('objFill.maoli')"
+          min-width="120" align="center">
+          <template slot-scope="scope">
+            {{scope.row.DetailList[i].MaoLi.toFixed(2)}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop=""
+          :label="$t('objFill.maolilv')"
+          min-width="120" align="center">
+          <template slot-scope="scope">
+            {{scope.row.DetailList[i].MaoLiRate.toFixed(2)}}%
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop=""
+          :label="$t('objFill.shijilirun')"
+          min-width="120" align="center">
+          <template slot-scope="scope">
+            {{scope.row.DetailList[i].Profit.toFixed(2)}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop=""
+          :label="$t('objFill.v101.FinancialModule.shijill')"
+          min-width="120" align="center">
+          <template slot-scope="scope">
+            {{scope.row.DetailList[i].ProfitRate.toFixed(2)}}%
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop=""
+          :label="$t('objFill.v101.FinancialModule.lianyunsr')"
+          min-width="120" align="center">
+          <template slot-scope="scope">
+            {{scope.row.DetailList[i].TransportIncome.toFixed(2)}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop=""
+          :label="$t('objFill.v101.FinancialModule.yinyelirun')"
+          min-width="120" align="center">
+          <template slot-scope="scope">
+            {{scope.row.DetailList[i].FinalProfit.toFixed(2)}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop=""
+          :label="$t('objFill.v101.FinancialModule.guangxfy')"
+          min-width="120" align="center">
+          <template slot-scope="scope">
+            {{scope.row.DetailList[i].GXFY.toFixed(2)}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop=""
+          :label="$t('objFill.v101.FinancialModule.jinlirun')"
+          min-width="120" align="center">
+          <template slot-scope="scope">
+            {{scope.row.DetailList[i].JLR.toFixed(2)}}
+          </template>
+        </el-table-column>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['StatisticalData'],
+  data() {
+    return {
+      MonthList: [],//月份列表
+      BranchAnalysisData: [],
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+
+  },
+  watch: {
+    StatisticalData:{
+      handler(n,o){
+        this.MonthList = n.MonthList//月份列表
+        this.BranchAnalysisData = n.BranchAnalysisData
+      },
+      deep: true,
+      immediate: false,
+    }
+  },
+}
+</script>
+
+<style scoped>
+/deep/.LineAnalysisDataBJ tr td:nth-child(1n){
+  background: #F5F7FA;
+}
+/deep/.LineAnalysisDataBJ tr td:nth-child(2n){
+  background: #fff;
+}
+/deep/.LineAnalysisDataBJ tr th{
+  background: #F5F7FA;
+}
+/deep/.el-table.LineAnalysisDataBJ tr:first-child th:first-child{
+  background: #F5F7FA;
+}
+/deep/.el-table.LineAnalysisDataBJ tr:nth-child(2) th:nth-child(1n){
+  /* background: #fff; */
+}
+/deep/.el-table.LineAnalysisDataBJ tr:nth-child(2) th:nth-child(2n){
+  background: #F5F7FA;
+}
+/deep/.el-table.LineAnalysisDataBJ tr:first-child th{
+  background: #fff;
+}
+/deep/.el-table.LineAnalysisDataBJ2 tr:first-child th:nth-child(1n){
+  background: #F5F7FA;
+}
+/deep/.el-table.LineAnalysisDataBJ2 tr:first-child th:nth-child(2n){
+  background: #fff;
+}
+/deep/.el-table.LineAnalysisDataBJ tr th{
+  height: 20px;
+  line-height: 20px;
+  padding: 5px 0;
+}
+/deep/.el-table.LineAnalysisDataBJ2 tr th{
+  height: 20px;
+  line-height: 20px;
+  padding: 5px 0;
+}
+/deep/.el-table.LineAnalysisDataBJ tr td{
+  height: 20px;
+  line-height: 20px;
+  padding: 5px 0;
+}
+/deep/.el-table.LineAnalysisDataBJ2 tr td{
+  height: 20px;
+  line-height: 20px;
+  padding: 5px 0;
+}
+.corporatioBox{
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 10px;
+  margin-left: 15px;
+}
+.corporatioBox div{
+  /* display: flex;
+  flex-direction: column; */
+  background: #fff;
+  padding: 5px 10px;
+  margin-right: 10px;
+}
+.corporatioBox div span:first-child{
+  text-align: left;
+  font-size: 14px;
+}
+.corporatioBox div span:last-child{
+  color: red;
+  margin-left: 10px;
+}
+</style>

src/components/FinancialModule/DataAnalysis/index.vue

@@ -6,6 +6,7 @@
       <el-tab-pane v-if="PermissionState!=3&&PermissionState!=4" :label="$t('objFill.v101.FinancialModule.ribenxborcg')" name="3"></el-tab-pane>
       <el-tab-pane v-if="PermissionState!=2&&PermissionState!=4" :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-tab-pane v-if="PermissionState!=3" :label="$t('objFill.v101.FinancialModule.cashqk')" name="6"></el-tab-pane>
     </el-tabs>
     <div class="query-box">
       <el-form class="_info_box clearfix" label-width="90px">
@@ -177,6 +178,7 @@
       <Packets v-if="activeName=='3'" :StatisticalData="StatisticalData"></Packets>
       <ShoppingCommission v-if="activeName=='4'" :StatisticalData="StatisticalData"></ShoppingCommission>
       <PrerealContrast v-if="activeName=='5'" :StatisticalData="StatisticalData"></PrerealContrast>
+      <Cashflows v-if="activeName=='6'" :StatisticalData="StatisticalData"></Cashflows>
     </div>
   </div>
 </template>
@@ -185,12 +187,13 @@
 import moment from 'moment';
 import Lines from "./components/line.vue";
 import Corporations from "./components/corporation.vue";
+import Cashflows from "./components/cashflow.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,PrerealContrast,StartYMDateLimit},
+  components: {Lines,Corporations,Cashflows,Packets,ShoppingCommission,PrerealContrast,StartYMDateLimit},
   data() {
     return {
       coinGetShow: false,
@@ -349,6 +352,9 @@ export default {
       if(this.activeName=='5'){
         url = 'financestatistics_post_GetExpectedCostAnalysisStat'
       }
+      if(this.activeName=='6'){
+        url = 'financestatistics_post_GetCashFlowAnalysisStat'
+      }
       this.loading = true
       this.apipost(
         url,