update

src/components/FinancialModule/CashReport.vue

@@ -65,7 +65,7 @@
         <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="12">四川和平国际旅行社有限公司资金日报表</th>
+              <th colspan="14">四川和平国际旅行社有限公司资金日报表</th>
             </tr>
             <tr>
               <th>公司</th>
@@ -73,6 +73,7 @@
               <th colspan="2">上期余额</th>
               <th colspan="2">本期借方发生额</th>
               <th colspan="2">本期贷方发生额</th>
+              <th colspan="2">本期收据</th>
               <th colspan="2">本期余额</th>
               <th>借方笔数</th>
               <th>贷方笔数</th>
@@ -88,6 +89,8 @@
             <th>本位币</th>
             <th>外币</th>
             <th>本位币</th>
+            <th>外币</th>
+            <th>本位币</th>
             <th></th>
             <th></th>
           </tr>
@@ -100,6 +103,8 @@
             <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 style="cursor: pointer">{{subItem.ReceiptWBMoney}}</td>
+            <td 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)"> -->
@@ -114,6 +119,8 @@
             <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>
@@ -128,6 +135,8 @@
             <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>
@@ -141,6 +150,8 @@
           <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>

src/components/FinancialModule/DocumentStatistics.vue

@@ -4,19 +4,19 @@
       <ul style="overflow: initial!important">
          <li>
           <span>
-            <em>团号</em>
+            <em>团号：</em>
           </span>
           <el-input class="w180" v-model="obj.TCNUM"></el-input>
         </li>
         <li>
           <span>
-            <em>单据</em>
+            <em>单据：</em>
           </span>
-          <el-input class="w180" v-model="obj.FinanceId"></el-input>
+          <el-input @keyup.native="checkInteger(obj,'FinanceId')" class="w180" v-model="obj.FinanceId"></el-input>
         </li>
         <li>
             <span>
-                <em>账户</em>
+                <em>账户：</em>
             </span>
             <el-select  filterable  v-model='obj.AccountId' >
                 <el-option :value="-1" label="不限"></el-option>
@@ -40,7 +40,7 @@
           </el-select>
         </li> -->
         <li>
-          <em>时间</em>
+          <em>时间：</em>
           <el-date-picker
             v-model="dateList"
             type="daterange"
@@ -76,16 +76,15 @@
         <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>财务单据</th>
+        <th>单据状态</th>
+        <th>是否审核</th>
         <th>备注</th>
+        <th>操作人/时间</th>
         <th>操作</th>
         
       </tr>
@@ -99,24 +98,23 @@
             <span v-if="item.Type==4">资金池</span>
         </td>
         <td>{{item.AccountName}}</td>
+        <td>{{item.Money}}</td>
+        <td>{{item.Rate}}</td>
+        <td>{{item.WBMoney}}</td>
+        <td>{{item.Time}}</td>
+
         <td>{{item.FinanceId}}</td>
         <td>{{item.fStatusName}}</td>
         <td>
             <span v-if="item.Is_Cashier==1">是</span>
             <span v-if="item.Is_Cashier==0">否</span>
         </td>
-        <td>{{item.Money}}</td>
-        <td>{{item.Rate}}</td>
-        <td>{{item.WBMoney}}</td>
-        <td>{{item.Time}}</td>
-        <!-- <td>
-            <a v-for="(src,index) in item.VoucherList" :key="index" :href="src"></a>
-        </td> -->
-        <td>{{item.UpdateBy}}/{{item.UpdateDate}}</td>
         <td>{{item.Remark}}</td>
+        <td>{{item.UpdateBy}}/{{item.UpdateDate}}</td>
+        
         <td>
-            <el-button @click="SetRules(item)" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button>
-            <el-button @click="Delete(item)" style="padding:4px" type="danger" icon="el-icon-delete" circle></el-button>
+            <el-button v-if="item.FinanceId!=0 && EmployeeId == item.UpdateById" @click="SetRules(item)" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button>
+            <el-button v-if="item.FinanceId!=0 && EmployeeId == item.UpdateById" @click="Delete(item)" style="padding:4px" type="danger" icon="el-icon-delete" circle></el-button>
         </td>
       </tr>
       <tr v-if="dataList.length==0">
@@ -272,11 +270,13 @@ export default {
             picIsShow:false,
             picObj:[],
             dataInfo:{},
+            EmployeeId:-1,
         }
     },
     created(){
         let userInfo = this.getLocalStorage();
         this.form.groupId=userInfo.RB_Group_id;
+        this.EmployeeId=userInfo.EmployeeId;
     },
     mounted(){
        this.getList();

src/components/FinancialModule/TransferReport.vue

@@ -64,6 +64,7 @@
           <th>{{$t('fnc.a_sqyue')}}</th>
           <th>{{$t('fnc.a_bqjffshenge')}}</th>
           <th>{{$t('fnc.a_bqdffshenge')}}</th>
+          <th>本期收据</th>
           <th>{{$t('fnc.a_bqyue')}}</th>
           <th>{{$t('fnc.a_jfbishu')}}</th>
           <th>{{$t('fnc.a_dfbishu')}}</th>
@@ -77,6 +78,7 @@
             <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>
@@ -84,6 +86,7 @@
             <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 style="cursor: pointer">{{subItem.ReceiptMoney}}</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>
@@ -93,6 +96,7 @@
             <td>{{item.TotalList.AgoMoney}}</td>
             <td>{{item.TotalList.Income}}</td>
             <td>{{item.TotalList.OutCome}}</td>
+            <td style="cursor: pointer">{{item.TotalList.ReceiptMoney}}</td>
             <td>{{item.TotalList.NowIncome}}</td>
             <td>{{item.TotalList.IncomeCount}}</td>
             <td>{{item.TotalList.OutComeCount}}</td>
@@ -103,6 +107,7 @@
           <td>{{item.AgoMoney}}</td>
           <td>{{item.Income}}</td>
           <td>{{item.OutCome}}</td>
+          <td>{{item.ReceiptMoney}}</td>
           <td>{{item.NowIncome}}</td>
           <td>{{item.IncomeCount}}</td>
           <td>{{item.OutComeCount}}</td>
@@ -112,6 +117,7 @@
           <td>{{dataObj.sumObj.AgoMoney}}</td>
           <td>{{dataObj.sumObj.Income}}</td>
           <td>{{dataObj.sumObj.OutCome}}</td>
+          <td>{{dataObj.sumObj.ReceiptMoney}}</td>
           <td>{{dataObj.sumObj.NowIncome}}</td>
           <td>{{dataObj.sumObj.IncomeCount}}</td>
           <td>{{dataObj.sumObj.OutComeCount}}</td>