1

src/assets/common/lang/en.js

@@ -1122,6 +1122,8 @@ export const fnc = {
   zhidanInfo:'Document preparation information',
   zhidanDate:'Production time',
   nowmonthMoney:'Current amortization amount',
+  tanxiaoinfo: 'Amortization situation',
+  tanxiaomoney: 'Amortization amount',
   monthMoney: 'Monthly amortization amount',
   onlyseebalance:'Only look at those with balances',
   yuanbi: 'original currency',

src/assets/common/lang/jp.js

@@ -1066,6 +1066,8 @@ export const fnc = {
   zhidanInfo:'請求情報',
   zhidanDate:'請求時間',
   nowmonthMoney:'当期配賦金額',
+  tanxiaoinfo: '償却状況',
+  tanxiaomoney: '償却額',
   monthMoney: '月償却額',
   onlyseebalance:'残高のあるものだけを見る',
   yuanbi:'原貨',

src/assets/common/lang/zh-tw.js

@@ -1113,6 +1113,8 @@ export const fnc = {
   zhidanInfo:'制單資訊',
   zhidanDate:'制單時間',
   nowmonthMoney:'當期分攤金額',
+  tanxiaoinfo: '攤銷情况',
+  tanxiaomoney: '攤銷金額',
   onlyseebalance:'只看有餘額的',
   yuanbi: '原幣',
   sfjine: '實付金額',

src/assets/common/lang/zh.js

@@ -1119,6 +1119,8 @@ export const fnc = {
   qishimonth: '起始月份',
   tanxiaomonth: '摊销月数',
   monthMoney: '月摊金额',
+  tanxiaoinfo: '摊销情况',
+  tanxiaomoney: '摊销金额',
   nowmonthMoney:'当期分摊金额',
   zhidanInfo:'制单信息',
   zhidanDate:'制单时间',

src/components/FinancialModule/JumpReport.vue

@@ -103,10 +103,13 @@
     .JumpSpan{
         margin:0 20px;
     }
+    /deep/._fnDm_contenteltable .el-table tr th{
+        background-color: #e6e6e6
+    }
 </style>
 
 <template >
-    <div class="page_fnDm page_RecPayQuery"  @keyup.enter="resetPageIndex(),getPageList()">
+    <div class="page_fnDm page_RecPayQuery"  @keyup.enter="resetPageIndex(),getPageList(), getAmortizationList()">
         <div class="query-box">
             <el-form class="_info_box clearfix"  label-width="110px">
                 <el-row style="padding:15px 20px 0 0;">
@@ -315,19 +318,29 @@
                     <!-- <span>
                         <em @click.stop="heightQueryBox=!heightQueryBox">{{$t('visa.v_gjchaxun')}} <i class="iconfont icon-gengduo"></i></em>
                     </span> -->
-                    <button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
+                    <button class="hollowFixedBtn" @click="resetPageIndex(),getPageList(),getAmortizationList()">{{$t('pub.searchBtn')}}</button>
                     <!-- <button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button> -->
                     <button class="normalBtn" @click="DownLoadAll()">{{$t('visa.v_daochu')}}</button>
                 </li>
             </ul>
+            <div style="width:100%;display:flex;">
+            <div style="width:25%;display:inline-block;border:1px solid #E5e5e5;margin-right:20px;padding:5px 0px;">
+                <div  class="JumpDivTitleOne" style="margin-bottom:15px;">常规单据</div>
                 <div class="JumpDivTitleOne">{{$t('fnc.ysjine')}}：{{SumYingShou}} <span class="JumpSpan">{{$t('objFill.shishoujine')}}：{{SumShiShou}}</span> {{$t('Operation.Op_daishou')}}：{{SumDaiShou}}</div>
                 <div class="JumpDivTitleTwo">{{$t('objFill.yingfujine')}}：{{SumYingFu}} <span class="JumpSpan">{{$t('fnc.sfjine')}}：{{SumShiFu}}</span> {{$t('objFill.v101.FinancialModule.daifuje')}}：{{SumDaiFu}}</div>
             </div>
-        <div class="_fnDm_content" v-loading='loading'>
+           <div style="border:1px solid #E5e5e5; width:15%;padding:5px 0px;">
+            <div  class="JumpDivTitleOne" style="margin-bottom:15px;">{{$t('fnc.tanxiaoinfo')}}</div>
+            <div class="JumpDivTitleOne">{{$t('fnc.tanxiaomoney')}}：{{TotalAmortization}}  </div>
+           </div>
+        </div>
+        </div>
+        <div class="_fnDm_content" v-loading='loading' >
+            <p style="margin-bottom:5px;">常规单据</p>
             <v-table
                 is-horizontal-resize
                 column-width-drag
-                style="width:100%;height:600px;"
+                style="width:100%;max-height:600px;"
                 :columns="columns"
                 :table-data="DataList"
                 :filter-method="filterMethod"
@@ -341,6 +354,115 @@
                 multiple-sort><!-- 多个排序 -->
             </v-table>
         </div>
+
+  <div class="_fnDm_content _fnDm_contenteltable" v-loading='loading' style="margin-top:10px;">
+    <p style="margin-bottom:5px;">摊账单据</p>
+      <el-table ref="multipleTable" :data="AmortizationDataList" tooltip-effect="dark" style="width: 100%"  row-key="BaseFinanceId">
+        <el-table-column prop="address" :label="$t('fnc.danhao')" width="70">
+          <template slot-scope="scope">
+            <span 
+                style="text-decoration: underline;cursor: pointer;font-weight: bold"  @click="goUrlDetail('FinancialDocumentsDetail',scope.row)">{{scope.row.BaseFinanceId}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="" :label="$t('system.query_company')" width="100">
+          <template slot-scope="scope">
+            <span>{{scope.row.BranchName}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="" :label="$t('fnc.feiyongleixing')" >
+          <template slot-scope="scope">
+            <div>
+              <template v-for="(s,si) in scope.row.CostTypeList">
+                <span
+                  style="background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;">{{s}}</span></br>
+              </template>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="" :label="$t('tips.jiaoyifangshi')" show-overflow-tooltip >
+          <template slot-scope="scope">
+            <div>
+              <template v-if="scope.row.TradeWayList&&scope.row.TradeWayList.length>0">
+                <div class="_TradeWayList" v-for="(tw,twIn) in scope.row.TradeWayList"
+                  style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width:230px">
+                  <p><span style="font-weight: bold;color:#333333">{{tw.Alias}}</span><span class="_bank_name"
+                      style="height:20px;;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;margin-letf:10px">
+                      {{scope.row.TradeWayList[0].TypeName}}</span>
+                    <span
+                      style="height:20px;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;"
+                      :style="{'background-color':tw.AccountType=='私'?'#2AAEF2':'#FF9C01'}">{{tw.AccountType==""?$t('fnc.no'):tw.AccountType}}</span>
+                  </p>
+                  <p style="color:#333333">{{tw.BankNo}}</p>
+                </div>
+              </template>
+              <template v-else>
+                <div class="_pad5">
+                  {{$t('fnc.no')}}
+                </div>
+              </template>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="" :label="$t('fnc.jine')" >
+          <template slot-scope="scope">
+                <p style="line-height:20px">{{$t('fnc.yuanbi')}}：<span>{{scope.row.OriginalMoney}}</span></p>
+              <p style="line-height:20px">{{$t('fnc.bweibi')}}：<span>{{scope.row.Money}}</span></p>
+          </template>
+        </el-table-column>
+        <el-table-column prop="" :label="$t('fnc.fkduixiang')">
+          <template slot-scope="scope">
+            <span>
+              <span
+                style="color: gray">{{scope.row.Type==2?scope.row.ClientTypeName+'：':$t('fnc.huikuanren')+'：'}}</span><span>{{scope.row.RemitterName}}</span>
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="" :label="$t('fnc.qishimonth')" width="100">
+          <template slot-scope="scope">
+            <span style="color: gray">{{scope.row.StartDate}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="" :label="$t('fnc.tanxiaomonth')" width="100">
+          <template slot-scope="scope">
+            <span style="color: gray">{{scope.row.RelevanceFrId2}}{{ $t('fnc.monthUnit')}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="" :label="$t('fnc.monthMoney')" width="100">
+          <template slot-scope="scope">
+            <span style="color: gray">{{scope.row.ShareMoney}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="" :label="$t('fnc.nowmonthMoney')" width="130">
+          <template slot-scope="scope">
+            <span style="color: gray">{{scope.row.Remain}}</span>
+          </template>
+        </el-table-column> 
+        <el-table-column prop="" :label="$t('pub.pubRemark')" >
+          <template slot-scope="scope">
+            <el-tooltip class="item" effect="dark" :content="scope.row.Remark" placement="top-start"
+                popper-class="max-w250">
+                <p class="d12p"  :title="scope.row.Remark">
+                  {{scope.row.Remark}}
+                </p>
+              </el-tooltip>
+            <span style="color: gray"></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="" :label="$t('fnc.zhidanInfo')" >
+          <template slot-scope="scope">
+          
+                <p style="line-height:20px">{{$t('fnc.zhidanren')}}：<span>{{scope.row.FCreateByName}}</span></p>
+              <p style="line-height:20px">{{$t('fnc.zhidanDate')}}：<span>{{scope.row.FCreateDate}}</span></p>
+             
+          </template>
+        </el-table-column>
+        <!-- <el-table-column prop="" :label="$t('admin.admin_czPerson')" width="100">
+          <template slot-scope="scope">
+              <div>{{scope.row.CreateByName}}</div>
+          </template>
+        </el-table-column> -->
+      </el-table>
+  </div>
     </div>
 </template>
 <script>
@@ -740,6 +862,21 @@ export default {
                 EmployeeId:'',
                 StandardCurrencyId: -1,
             },
+            msgAmortization: {//摊销查询条件
+                BaseFinanceId: '',
+                RB_Branch_Id: '',
+                RB_Group_Id:0,
+                sTradeDate: '',
+                eTradeDate: '',
+                Remark: '', //备注查询
+                CostTypeID: '',
+                IsSelectRemain:0,
+                CostTypeIDs: '',
+                Status:'-1',
+                StandardCurrencyId: -1,
+             },
+             AmortizationDataList: [],//摊销列表
+             TotalAmortization:0,//摊销总金额
             getCompanyMsg:{  // 公司
                 RB_Group_Id:'0',
                 Status:'0',
@@ -833,7 +970,8 @@ export default {
             coinGetList: [],
             coinGetShow: false,
         }
-    },created(){
+    },
+    created(){
         if(this.$route.query.returnCode){
             this.active = this.$route.query.returnCode;
             this.msg.Conditon = this.$route.query.returnCode;
@@ -914,6 +1052,16 @@ export default {
 
         this.AccountType_post_GetList();
     },methods:{
+        goUrlDetail(path, rowData) {
+        this.$router.push({
+          path: path,
+          query: {
+            id: rowData.BaseFinanceId,
+            blank: 'y',
+            tab: rowData.BaseFinanceId + this.$t('objFill.documentparticulars')
+          }
+        })
+      },
         getChange(val){
             if(this.msg.RB_Branch_Id == -1){
                 this.coinGetShow = false
@@ -935,6 +1083,7 @@ export default {
                         this.msg.StandardCurrencyId = -1
                     }
                     this.getPageList();
+                    this.getAmortizationList();
                 }
             })
         },
@@ -1035,6 +1184,40 @@ export default {
                 this.currentPage = parseInt(this.msg.pageIndex);
             },err=>{})
         },
+        getAmortizationList(){  // 获取列表数据
+            if(!this.msgAmortization.CostTypeID)this.msgAmortization.CostTypeID=0;
+            if(!this.msgAmortization.RB_Branch_Id)this.msgAmortization.RB_Branch_Id=-1;
+            if(!this.msgAmortization.Status)this.msgAmortization.Status=0;
+            if(!this.msgAmortization.BaseFinanceId)this.msgAmortization.BaseFinanceId=0;
+            if(this.msg.CostTypeIDslist.length) {
+                this.msgAmortization.CostTypeIDs = this.msg.CostTypeIDslist.toString();
+            }
+            this.msgAmortization.BaseFinanceId=this.msg.FrID;
+            this.msgAmortization.RB_Branch_Id=this.msg.RB_Branch_Id;
+            this.msgAmortization.RB_Group_Id=this.msg.RB_Group_Id;
+            this.msgAmortization.sTradeDate=this.msg.sTradeDate;
+            this.msgAmortization.eTradeDate=this.msg.eTradeDate;
+            this.msgAmortization.Remark=this.msg.Remark;
+            this.msgAmortization.Status=this.msg.Status;
+            this.msgAmortization.StandardCurrencyId=this.msg.StandardCurrencyId;
+            this.loading= true;
+            this.apipost('Financial_post_GetFinanceRelevanceList',this.msgAmortization,res=>{
+                if(res.data.resultCode == 1) {
+                    let data = res.data.data.List;
+                    this.TotalAmortization = res.data.data.TotalAmortization;
+                   
+                    if( res.data.data.List&& res.data.data.List.length>0){
+                        this.AmortizationDataList = data;
+                    }else{
+                        this.AmortizationDataList=[];
+                    }
+                    this.loading=false;
+                }else{
+                    this.loading= false;
+                    this.$message.error(res.data.message);
+                }
+            },err=>{})
+        },
         method5: function() {
         if(!this.msg.ClientID)this.msg.ClientID=0;
         if(!this.msg.ClientType)this.msg.ClientType=0;