现金 银行日报表

src/pages/financial/accDetail/newCashReport.vue

+<style scoped>
+    @import "../css/cssReset.css";
+  
+    .page_fnDm {
+      background-color: white
+    }
+  
+    .query-box {
+      overflow: inherit
+    }
+  
+    .query-box {
+      border: none
+    }
+  
+    .query-box ul {
+      overflow: initial;
+    }
+  
+    .query-box li:last-child {
+      float: left
+    }
+  
+    .query-box>ul>li:last-child {
+      float: right;
+    }
+  
+    .query-box .hight_query ul .el-input {
+      width: inherit
+    }
+  
+    .page_CashReport .query-box li:last-child {
+      top: 35px;
+    }
+  
+    .page_CashReport ._fnDm_content {
+      width: 100%;
+    }
+  
+    .page_CashReport .singeRowTable tr th {
+      border: 1px solid #d2d2d2;
+    }
+  
+  </style>
+  <template>
+    <div class="page_fnDm page_CashReport page-body" @keyup.enter="getList()">
+      <div class="query-box">
+        <el-form class="_info_box clearfix" label-width="110px">
+          <el-row style="padding:15px 20px 0 0;">
+            <el-col :span="6">
+              <el-form-item label="交易日期：">
+                <el-date-picker class="h34" v-model="transactionDate" @change="timeAdd(3)" type="daterange"
+                  value-format="yyyy-MM-dd">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+                <el-form-item label="校区">
+                    <el-select filterable v-model='msg.RB_Branch_Id'>
+                        <el-option :value="-1" label="不限"></el-option>
+                        <el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'>
+                        </el-option>
+                      </el-select>
+                </el-form-item>
+              </el-col>
+          </el-row>
+        </el-form>
+        <ul class="clearfix" style="position: absolute;right: 20px;top: 20px;">
+          <div>
+            <span>
+            </span>
+            <!-- <button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button> -->
+            <q-btn color="primary" size="11px" :label="$t('pub.searchBtn')" @click="getList()" style="marginRight:10px"/>
+            <!-- <button class="normalBtn" @click="method5()">导出</button> -->
+            <q-btn color="primary" size="11px" label="导出" @click="method5()"/>
+          </div>
+        </ul>
+      </div>
+      <div class="_fnDm_content" v-loading='loading'>
+        <table class="singeRowTable" cellspacing="0" cellpadding="0" style="border: 1px solid rgb(230, 230, 230);">
+          <tr>
+            <th colspan="16">{{branchName}}资金日报表</th>
+          </tr>
+          <tr>
+            <!-- <th>校区</th> -->
+            <th>银行</th>
+            <th colspan="2">上期余额</th>
+            <th colspan="2">本期借方发生额</th>
+            <th colspan="2">本期贷方发生额</th>
+            <th colspan="2">本期收据</th>
+            <th colspan="2">本期余额</th>
+            <th>借方笔数</th>
+            <th>贷方笔数</th>
+          </tr>
+          <template v-for="item in dataObj.resultList">
+            <tr>
+              <th >{{item.AName}}</th>
+              <th>外币</th>
+              <th>本位币</th>
+              <th>外币</th>
+              <th>本位币</th>
+              <th>外币</th>
+              <th>本位币</th>
+              <th>外币</th>
+              <th>本位币</th>
+              <th>外币</th>
+              <th>本位币</th>
+              <th></th>
+              <th></th>
+            </tr>
+            <tr v-for="(subItem, index) in item.SubList">
+              <!-- <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.BName}}</td> -->
+              <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.Alias}}</td>
+              <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.WBAgoMoney}}</td>
+              <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.AgoMoney}}</td>
+              <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.AgoIncome}}</td>
+              <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.Income}}</td>
+              <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.AgoOutCome}}</td>
+              <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.OutCome}}</td>
+              <td>{{subItem.ReceiptWBMoney}}</td>
+              <td>{{subItem.ReceiptMoney}}</td>
+              <!-- <td @click="goUrlNew(subItem)" style="cursor: pointer">{{subItem.ReceiptWBMoney}}</td>
+              <td @click="goUrlNew(subItem)" style="cursor: pointer">{{subItem.ReceiptMoney}}</td> -->
+              <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.AgoIncom}}</td>
+              <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.NowIncome}}</td>
+              <!-- <a style="cursor:pointer;" @click="goUrl('CashAccDetail',subItem.BankID,subItem.TradeWay)"> -->
+              <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.IncomeCount}}</td>
+              <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.OutComeCount}}</td>
+            </tr>
+            <tr v-if="item.TotalList">
+              <td >{{item.AName}}合计</td>
+              <td>{{item.TotalList.WBAgoMoney}}</td>
+              <td>{{item.TotalList.AgoMoney}}</td>
+              <td>{{item.TotalList.AgoIncome}}</td>
+              <td>{{item.TotalList.Income}}</td>
+              <td>{{item.TotalList.AgoOutCome}}</td>
+              <td>{{item.TotalList.OutCome}}</td>
+              <td>{{item.TotalList.ReceiptWBMoney}}</td>
+              <td>{{item.TotalList.ReceiptMoney}}</td>
+              <td>{{item.TotalList.AgoIncom}}</td>
+              <td>{{item.TotalList.NowIncome}}</td>
+              <td>{{item.TotalList.IncomeCount}}</td>
+              <td>{{item.TotalList.OutComeCount}}</td>
+            </tr>
+          </template>
+          <tr v-for="item in dataObj.sumList">
+            <td >{{item.BName}}总计</td>
+            <td>{{item.WBAgoMoney}}</td>
+            <td>{{item.AgoMoney}}</td>
+            <td>{{item.AgoIncome}}</td>
+            <td>{{item.Income}}</td>
+            <td>{{item.AgoOutCome}}</td>
+            <td>{{item.OutCome}}</td>
+            <td>{{item.ReceiptWBMoney}}</td>
+            <td>{{item.ReceiptMoney}}</td>
+            <td>{{item.AgoIncom}}</td>
+            <td>{{item.NowIncome}}</td>
+            <td>{{item.IncomeCount}}</td>
+            <td>{{item.OutComeCount}}</td>
+          </tr>
+          <tr v-if="dataObj.sumObj">
+            <td >总计</td>
+            <td>{{dataObj.sumObj.WBAgoMoney}}</td>
+            <td> {{dataObj.sumObj.AgoMoney}}</td>
+            <td>{{dataObj.sumObj.AgoIncome}}</td>
+            <td>{{dataObj.sumObj.Income}}</td>
+            <td>{{dataObj.sumObj.AgoOutCome}}</td>
+            <td>{{dataObj.sumObj.OutCome}}</td>
+            <td>{{dataObj.sumObj.ReceiptWBMoney}}</td>
+            <td>{{dataObj.sumObj.ReceiptMoney}}</td>
+            <td>{{dataObj.sumObj.AgoIncom}}</td>
+            <td>{{dataObj.sumObj.NowIncome}}</td>
+            <td>{{dataObj.sumObj.IncomeCount}}</td>
+            <td>{{dataObj.sumObj.OutComeCount}}</td>
+          </tr>
+        </table>
+      </div>
+    </div>
+  </template>
+  <script>
+    // 自定义列组件
+    import {
+        getSchoolDropdown
+        
+    } from '../../../api/school/index'
+    export default {
+      data() {
+        return {
+          showID: false,
+          active: 1,
+          userId: 0,
+          msg: {
+            BankID: -1,
+            TradeWay: -1,
+            sTradeDate: new Date().Format('yyyy-MM-dd'),
+            eTradeDate: new Date().Format('yyyy-MM-dd'),
+            EmployeeId: 0,
+            //1-银行，2-现金
+            IsBank: 2,
+            RB_Branch_Id:-1,
+
+          },
+          accountList: [],
+          BranchAccountList: [],
+          transactionDate: [new Date().Format('yyyy-MM-dd'), new Date().Format('yyyy-MM-dd')],
+          AccList: [],
+          loading: false,
+          currentPage: 1,
+          total: 0,
+          dataList: [],
+          dataObj: {},
+          branchName: '',
+          CompanyList:[],
+
+        }
+      },
+      created() {
+  
+      },
+      components: {},
+      mounted() {
+        let userInfo = this.getLocalStorage();
+        this.getList();
+        this.getBranchList()
+        this.branchName = userInfo.GroupName
+  
+        this.msg.EmployeeId = userInfo.EmployeeId;
+      },
+      methods: {
+        goUrlNew(obj) {
+          this.$router.push({
+            path: "DocumentStatistics",
+            query: {
+              "AccountId": obj.BankID,
+              "StartTime": this.msg.sTradeDate,
+              "EndTime": this.msg.eTradeDate,
+              "blank": 'y',
+              "tab": '财务收据'
+            }
+          })
+        },
+        goUrl(obj) {
+          this.$router.push({
+            path: "CashAccDetail",
+            query: {
+              "Is_Cashier": 1,
+              "TypeId": obj.TypeId,
+              "BankID": obj.BankID,
+              "sTradeDate": this.msg.sTradeDate,
+              "eTradeDate": this.msg.eTradeDate,
+              "DayReport": 1,
+              "blank": 'y',
+              "tab": '现金账户明细'
+            }
+          })
+        },
+        getList: function () {
+          this.loading = true;
+          this.dataObj = {};
+          this.apipost('Financial_post_GetReportListForEdu', this.msg, res => {
+            if (res.data.resultCode == 1) {
+              this.dataObj = res.data.data;
+            } else {
+              this.$message.error(res.data.message);
+            }
+            this.loading = false;
+          }, err => {})
+        },
+        AccountType_post_GetList() { //获取账户类型下拉
+          this.apipost('AccountType_post_GetList', this.queryAccMsg, res => {
+            if (res.data.resultCode == 1) {
+              this.AccList = res.data.data;
+            } else {
+              this.$message.error(res.data.message);
+            }
+          }, err => {})
+        },
+        timeAdd(t) { // 日期格式
+          if (!this.transactionDate) {
+            this.msg.sTradeDate = '';
+            this.msg.eTradeDate = '';
+            return
+          }
+          this.msg.sTradeDate = this.transactionDate[0];
+          this.msg.eTradeDate = this.transactionDate[1];
+        },
+        queryInfoInit() { // 初始化msg
+  
+        },
+        getBranchList() {//获取校区
+            getSchoolDropdown({}).then(res => {
+                this.CompanyList = res.Data;
+            }).catch(() => {
+
+            })
+        },
+        resetPageIndex() { // 重置页码
+          this.msg.pageIndex = 1;
+          this.currentPage = 1;
+        },
+        method5: function () {
+          this.GetErpLocalFile("Financial_post_CashOutToGetReportListForEdu", this.msg, "现金日报表.xls");
+        },
+      }
+    }
+  
+  </script>
+  
\ No newline at end of file

src/pages/financial/accDetail/newTransferReport.vue

+<style scoped>
+    @import "../css/cssReset.css";
+  
+    .page_fnDm{background-color: white}
+    .query-box{overflow: inherit}
+    .query-box{border: none}
+    .query-box ul {overflow: initial;}
+    .query-box li:last-child{float: left}
+    .query-box>ul>li:last-child{float: right;}
+    .query-box .hight_query ul .el-input{width: inherit  }
+    .page_CashReport ._fnDm_content{
+      width: 100%;
+    }
+    .page_CashReport .singeRowTable tr th{
+      border: 1px solid #d2d2d2;
+    }
+  </style>
+  <template>
+    <div class="page_fnDm page_CashReport page-body" @keyup.enter="getList()">
+      <div class="query-box">
+        <el-form class="_info_box clearfix" label-width="110px">
+          <el-row style="padding:15px 20px 0 0;">
+            <!-- <el-col :span="4">
+              <el-form-item label="交易方式：">
+                <el-select filterable v-model='msg.TradeWay' @change="getAccountList(msg.AccountType,msg.TradeWay),msg.ClientID=''">
+                  <el-option :value="-1" label="不限"></el-option>
+                  <el-option v-for='item in BranchAccountList' :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 v-model='msg.BankID'>
+                  <el-option :value="-1" label="不限"></el-option>
+                  <el-option v-for='item in accountList' :label='item.Name' :value='item.ID' :key='item.ID'>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col> -->
+            <el-col :span="6">
+              <el-form-item :label="$t('fnc.jiaoyiriqi')+'：'">
+                <el-date-picker class="h34" v-model="transactionDate" @change="timeAdd(3)" type="daterange" value-format="yyyy-MM-dd">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+                <el-form-item label="校区">
+                    <el-select filterable v-model='msg.RB_Branch_Id'>
+                        <el-option :value="-1" label="不限"></el-option>
+                        <el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'>
+                        </el-option>
+                      </el-select>
+                </el-form-item>
+              </el-col>
+          </el-row>
+        </el-form>
+        <ul class="clearfix" style="position: absolute;right: 20px;top: 20px;">
+          <div class="hight_query">
+            <span>
+            </span>
+            <!-- <button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button> -->
+            <q-btn color="primary" size="11px" :label="$t('pub.searchBtn')" @click="getList()" style="marginRight:10px"/>
+            <!-- <button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button> -->
+            <q-btn color="primary" size="11px" :label="$t('visa.v_daochu')"@click="method5()" />
+          </div>
+        </ul>
+      </div>
+      <div class="_fnDm_content" v-loading='loading'>
+        <table class="singeRowTable" cellspacing="0" cellpadding="0" style="border: 1px solid rgb(230, 230, 230);">
+          <tr>
+            <th colspan="10">{{branchName}}{{$t('fnc.a_xjrbaobiao')}}</th>
+          </tr>
+          <tr>
+            <!-- <th>{{$t('system.table_company')}}</th> -->
+            <th>{{$t('fnc.yinhang')}}</th>
+            <th>{{$t('fnc.a_sqyue')}}</th>
+            <th>{{$t('fnc.a_bqjffshenge')}}</th>
+            <th>{{$t('fnc.a_bqdffshenge')}}</th>
+            <th>本期收据</th>
+            <th>本期未付账</th>
+            <th>{{$t('fnc.a_bqyue')}}</th>
+            <th>{{$t('fnc.a_jfbishu')}}</th>
+            <th>{{$t('fnc.a_dfbishu')}}</th>
+          </tr>
+          <template v-for="item in dataObj.resultList">
+            <tr>
+              <th >{{item.AName}}</th>
+              <th></th>
+              <th></th>
+              <th></th>
+              <th></th>
+              <th></th>
+              <th></th>
+              <th></th>
+              <th></th>
+            </tr>
+            <tr v-for="(subItem, index) in item.SubList">
+              <!-- <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.BName}}</td> -->
+              <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.Alias}}</td>
+              <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.AgoMoney}}</td>
+              <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.Income}}</td>
+              <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.OutCome}}</td>
+              <td>{{subItem.ReceiptMoney}}</td>
+              <td>{{subItem.NONPaymentMoney}}</td>
+              <!-- <td @click="goUrlNew('Manfunds',subItem)" style="cursor: pointer">{{subItem.ReceiptMoney}}</td>
+              <td @click="goUrlNew('OutstandingAccounts',subItem)" style="cursor: pointer">{{subItem.NONPaymentMoney}}</td> -->
+              <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.NowIncome}}</td>
+              <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.IncomeCount}}</td>
+              <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.OutComeCount}}</td>
+            </tr>
+            <tr v-if="item.TotalList">
+              <td>{{item.AName}}合计</td>
+              <td>{{item.TotalList.AgoMoney}}</td>
+              <td>{{item.TotalList.Income}}</td>
+              <td>{{item.TotalList.OutCome}}</td>
+              <td >{{item.TotalList.ReceiptMoney}}</td>
+              <td >{{item.TotalList.NONPaymentMoney}}</td>
+              <td>{{item.TotalList.NowIncome}}</td>
+              <td>{{item.TotalList.IncomeCount}}</td>
+              <td>{{item.TotalList.OutComeCount}}</td>
+            </tr>
+          </template>
+          <tr v-for="item in dataObj.sumList">
+            <td >{{item.BName}}总计</td>
+            <td>{{item.AgoMoney}}</td>
+            <td>{{item.Income}}</td>
+            <td>{{item.OutCome}}</td>
+            <td>{{item.ReceiptMoney}}</td>
+            <td>{{item.NONPaymentMoney}}</td>
+  
+            <td>{{item.NowIncome}}</td>
+            <td>{{item.IncomeCount}}</td>
+            <td>{{item.OutComeCount}}</td>
+          </tr>
+          <tr v-if="dataObj.sumObj">
+            <td >总计</td>
+            <td>{{dataObj.sumObj.AgoMoney}}</td>
+            <td>{{dataObj.sumObj.Income}}</td>
+            <td>{{dataObj.sumObj.OutCome}}</td>
+            <td>{{dataObj.sumObj.ReceiptMoney}}</td>
+            <td>{{dataObj.sumObj.NONPaymentMoney}}</td>
+  
+            <td>{{dataObj.sumObj.NowIncome}}</td>
+            <td>{{dataObj.sumObj.IncomeCount}}</td>
+            <td>{{dataObj.sumObj.OutComeCount}}</td>
+          </tr>
+        </table>
+      </div>
+    </div>
+  </template>
+  <script>
+    // 自定义列组件
+    import {
+        getSchoolDropdown
+        
+    } from '../../../api/school/index'
+    export default {
+      data() {
+        return {
+          showID: false,
+          active: 1,
+          userId: 0,
+          msg: {
+            BankID: -1,
+            TradeWay: -1,
+            sTradeDate: new Date().Format('yyyy-MM-dd'),
+            eTradeDate: new Date().Format('yyyy-MM-dd'),
+            //1-银行，2-现金
+            IsBank: 1,
+            EmployeeId:0,
+            RB_Branch_Id:-1,
+          },
+          accountList: [],
+          BranchAccountList: [],
+          transactionDate: [new Date().Format('yyyy-MM-dd'), new Date().Format('yyyy-MM-dd')],
+          AccList: [],
+          loading: false,
+          currentPage: 1,
+          total: 0,
+          GZAllList: [],
+          SZAllList: [],
+          PZAllList: [],
+          GZAll: {},
+          SZAll: {},
+          PZAll: {},
+          comPanyALLList: [],
+          ALLMoney: [],
+          dataObj: {},
+          branchName: '',
+          CompanyList:[],
+        }
+      },
+      created() {
+  
+      },
+      components: {},
+      mounted() {
+        let userInfo = this.getLocalStorage();
+        this.branchName = userInfo.GroupName
+        this.getList();
+        this.getBranchList()
+        this.msg.EmployeeId= userInfo.EmployeeId;
+      },
+      methods: {
+        goUrlNew(path,obj){
+          let name = path;
+          this.$router.push({
+            path: name,
+            query:{
+              "BankType": obj.TradeWay,
+              "BankID": obj.BankID,
+              "StartTime": this.msg.sTradeDate,
+              "EndTime": this.msg.eTradeDate,
+              "blank": 'y',
+              "tab": '未认款'
+            }
+          })
+        },
+        goUrl: function(obj) {
+          let name = '';
+          let type = 0;
+          if (obj.TradeWay === 2) { // 平台
+            name = 'PlatformAccDetail';
+            type=1;
+          } else if (obj.TradeWay === 1) { // 银行
+            name = 'CompanyAccDetail';
+            type=1;
+          } else if (obj.TradeWay === 3) {  //资金池
+            name = 'PoolAccDetail'
+          }
+          this.$router.push({
+            path: name,
+            query:{
+              "Is_Cashier":1,
+              "TypeId": obj.TypeId,
+              "BankID": obj.BankID,
+              "sTradeDate": this.msg.sTradeDate,
+              "eTradeDate": this.msg.eTradeDate,
+              "DayReport":type,
+              "blank": 'y',
+              "tab": '现金账户明细'
+            }
+          })
+        },
+        getList: function () {
+          this.loading=true;
+          this.dataObj={};
+          this.apipost('Financial_post_GetReportListForEdu', this.msg, res => {
+            if (res.data.resultCode == 1) {
+              this.dataObj = res.data.data;
+            } else {
+              this.$message.error(res.data.message);
+            }
+            this.loading = false;
+          }, err => {})
+        },
+        AccountType_post_GetList() { //获取账户类型下拉
+          this.apipost('AccountType_post_GetList', this.queryAccMsg, res => {
+            if (res.data.resultCode == 1) {
+              this.AccList = res.data.data;
+            } else {
+              this.$message.error(res.data.message);
+            }
+          }, err => {})
+        },
+        timeAdd(t) { // 日期格式
+          if (!this.transactionDate) {
+            this.msg.sTradeDate = '';
+            this.msg.eTradeDate = '';
+            return
+          }
+          this.msg.sTradeDate = this.transactionDate[0];
+          this.msg.eTradeDate = this.transactionDate[1];
+        },
+        resetPageIndex() { // 重置页码
+          this.msg.pageIndex = 1;
+          this.currentPage = 1;
+        },
+        getBranchList() {//获取校区
+            getSchoolDropdown({}).then(res => {
+                this.CompanyList = res.Data;
+            }).catch(() => {
+
+            })
+        },
+        method5: function() {
+          this.GetErpLocalFile("Financial_post_OutToGetReportListForEdu", this.msg,"银行日报表.xls");
+        },
+      }
+    }
+  
+  </script>
+  
\ No newline at end of file

src/router/routes.js

@@ -426,14 +426,19 @@ const routes = [{
     component: () =>
       import("pages/financial/accDetail/TransferReport.vue")
   },
+  {
+    path: "/financial/accDetail/newTransferReport", //新银行日报表
+    component: () =>
+      import("pages/financial/accDetail/newTransferReport.vue")
+  },
   {
     path: "/financial/accDetail/CashReport", //现金日报表
     component: () =>
       import("pages/financial/accDetail/CashReport.vue")
   }, {
-    path: "/financial/accDetail/CashReport", //现金日报表
+    path: "/financial/accDetail/newCashReport", //新现金日报表
     component: () =>
-      import("pages/financial/accDetail/CashReport.vue")
+      import("pages/financial/accDetail/newCashReport.vue")
   },
   {
     path: "/financial/financalDocument/ChoiceAddFinancialDocuments",