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

src/assets/utils/AuthCode.js

@@ -27,5 +27,6 @@ var AuthCode = {
     LookOPCommission:"LookOPCommission",//查看OP提成
     IsSanKeTicket:"IsSanKeTicket",//是否有散客票权限
     F_Disbursement_Schedule:'F_Disbursement_Schedule',//财务团队用款计划权限
+    F_Advance_Match:'F_Advance_Match',//预付款冲抵
 };
 export default AuthCode;
\ No newline at end of file

src/components/FinancialModule/FinancialDocuments.vue

@@ -117,6 +117,47 @@
     .boss_btn span{
         color: #2BB87C;
     }
+    .cdForm .el-form-item{
+        display: inline-block;
+    }
+      .leaderPayTable {
+    width: 100%;
+    margin: 10px auto;
+    text-align: center;
+    font-size: 12px;
+    color: #333;
+    border-collapse: collapse;
+    background-color: #fff;
+    border: 1px solid #d1d1d1;
+  }
+
+  .leaderPayTable th {
+    background: #e6e6e6;
+    padding: 8px 0;
+    color: #333;
+    border: 1px solid #d1d1d1;
+    font-weight: bold;
+  }
+
+  .leaderPayTable tr td {
+    background-color: #fff;
+    padding: 8px 0;
+    height: 32px;
+    border: 1px solid #d1d1d1;
+    text-align:center;
+  }
+
+  .leaderPayTable2 tr td {
+    border: 1px solid #ccc;
+    line-height: 17px;
+    height: 25px;
+    font-size: 12px;
+    background: #fff;
+    text-align: center;
+    padding: 0;
+    ;
+    margin: 0;
+  }
 </style>
 
 <template >
@@ -399,10 +440,13 @@
                     <button v-if="active==3 && hbState" class="hollowFixedBtn" @click="hbState=false,getPageList">关闭合并审批</button>
                     <button v-loading="hbBtn" v-if="active==3 && hbState" class="hollowFixedBtn" @click="HebingSPLast">审批</button>                    
                     <button v-if="HandShow" class="hollowFixedBtn" @click="Handwithfee">手配费收入</button>
+                    <button  class="hollowFixedBtn" @click="ZhiDanChongDi"> 预付款冲抵</button>
+<!-- v-if="F_Advance_Match" -->
                     <button class="hollowFixedBtn" @click="BOSSBtn = !BOSSBtn, checkList = [], getPageList(1), BOSSBtn2 = false" v-if="msg.Conditon === 3 && userMenuCode">{{BOSSBtn ? '关闭一键审批' : '一键审批'}}</button>
                     <button class="hollowFixedBtn" v-if="msg.Conditon === 3 && BOSSBtn" @click="BOSSBtnClick(1)">{{$t('ios.shenpi')}}</button>
                     <button class="hollowFixedBtn" @click="BOSSBtn2 = !BOSSBtn2, checkList = [], getPageList(1), BOSSBtn = false" v-if="msg.Conditon === 3">{{BOSSBtn2 ? '关闭一键转交' : '一键转交'}}</button>
                     <button class="hollowFixedBtn" v-if="msg.Conditon === 3 && BOSSBtn2" @click="BOSSBtnClick(2)">转交</button>
+                   
                 </li>
             </ul>
         </div>
@@ -737,6 +781,74 @@
                 </div>
             </template>
         </el-dialog>
+
+         <el-dialog title="预付款冲抵" width="860px" :visible.sync="yfcdState" center>
+            <el-form class="cdForm" label-width="90px">
+                <el-form-item label="单号" prop="FrID">
+                <el-input class="w220" @keyup.native="checkInteger(czMsg,'FrID')" v-model="czMsg.FrID"></el-input>
+                </el-form-item>
+                <el-form-item label="费用类型">
+                <el-select filterable v-model='czMsg.CostTypeID' class="">
+                    <el-option label="不限" value=''></el-option>
+                    <el-option v-for="(item,index) in costList" :key="index" :label="item.Name" :value='item.ID'></el-option>
+                </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <input type="button" value="查询" class="hollowFixedBtn" @click="czgetList">
+                </el-form-item>
+                <el-form-item label="交易日期">
+                <el-date-picker
+                    v-model="czdateList"
+                    type="daterange"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期">
+                </el-date-picker>
+                </el-form-item>
+                
+            </el-form>
+            <table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0">
+                <tr>
+                <th></th>
+                <th>单号</th>
+                <th>公司</th>
+                <th>费用类型</th>
+                <th>币种</th>
+                <th>汇率</th>
+                <th>金额</th>
+                <th>冲抵金额</th>
+                <th>状态</th>
+                <th>付款对象</th>
+                </tr>
+                <tr v-for="(item,index) in czList" :key="index">
+                <td><input type="checkbox" :value="item" v-model="yfcheckList" @change="ckeckOne"></td>
+                <td>{{item.FrID}}</td>
+                <td>{{item.BranchName}}</td>
+                <td>{{item.CostTypeName}}</td>
+                <td>{{item.CurrencyName}}</td>
+                <td>{{item.Rate}}</td>
+                <td>{{item.Money}}</td>
+                <td>{{item.MatchMoney}}</td>
+                <td>{{item.StatusStr}}</td>
+                <td>
+                    <el-tooltip class="item" effect="dark" :content="item.ClientTypeName+':'+item.RemitterName+'('+item.AccountNumber+')'" placement="top-start">
+                    <div style="width:250px;overflow:hidden">{{item.ClientTypeName}}:{{item.RemitterName}}</div>
+                    </el-tooltip>
+                    </td>
+                </tr>
+                <tr v-if="czList.length==0">
+          <td colspan="12">暂无数据</td>
+        </tr>
+      </table> 
+      <el-pagination background @current-change="handleCurrentChange2"
+        layout="total,prev, pager, next, jumper" :page-size="czMsg.pageSize" :total='total2'>
+      </el-pagination> 
+      <div slot="footer" class="dialog-footer">
+        <button class="hollowFixedBtn" @click="cdState=false">{{$t('pub.cancelBtn')}}</button>
+        <button class="normalBtn" type="primary" @click="goUrlZD">{{$t('pub.sureBtn')}}</button>
+      </div>
+    </el-dialog>
+
     </div>
 </template>
 <script>
@@ -892,6 +1004,34 @@ export default {
             userMenuCode: false,
             BOSSDialogText: false,
             HandShow:false,
+
+            F_Advance_Match:false,
+            yfcdState:false,
+            yfcheckList:[],
+            yfOutBranchId:'',
+            yfHandmsg:{
+                OtherType:7,
+                ReFinanceId:0,
+                Rate:0,
+                czState:true,
+            },
+            czList:[],
+            total2:0,
+            czdateList:[],
+            czMsg:{
+                pageIndex:1,
+                pageSize:8,
+                FrID:'',
+                CostTypeID:'',
+                sTradeDate:'',
+                eTradeDate:'',
+                IsAdvanceFinance:1,
+            },
+            costList:[],
+
+
+
+
         }
     },
     created(){
@@ -933,7 +1073,10 @@ export default {
         "my-GZ-Bill": myGZBill,
     },
     mounted(){
+        this.GetAuth();
+        this.getCostTypeList();
         let userInfo=this.getLocalStorage();
+        this.yfOutBranchId=userInfo.RB_Branch_id;
         let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
         this.userMenuCode = userMenuCode.indexOf(',C_Batch_AuditFinance,') != -1 ? true : false;
         this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id;    //集团ID
@@ -953,8 +1096,93 @@ export default {
         this.FinancialFlowTemplate_post_GetStatusList();
         this.getPageList();
         this.AccountType_post_GetList();    
+        this.czgetList();    
     },
     methods:{
+        GetAuth() {
+            var actionCode = this.$AuthCode.F_Advance_Match;
+            this.CheckUserAuth(actionCode, res => {
+            if (res.data.resultCode == 1 && res.data.data == 1) {
+                this.F_Advance_Match = true;
+            }
+            });
+            
+        },
+        ZhiDanChongDi(){
+            this.yfcdState=true;
+            this.yfcheckList=[];
+        },
+        goUrlZD(){
+            let that=this;
+            let yfcheckList=JSON.parse(JSON.stringify(this.yfcheckList))
+
+            if(this.yfcheckList.length>1){
+            this.Error("只能选择一项！");
+            return;
+            }
+            if(this.yfcheckList.length==0){
+            this.Error("至少选择一项");
+            return;
+            }
+        
+            let arr=[];
+            // var TCArr = [this.yfHandmsg.TCNUM];
+            let orderObj = {
+            OrderID: 0,
+            OrderSource: 8,
+            Obj: {},
+            // TCIDList: TCArr
+            }
+            that.yfHandmsg.ReFinanceId=this.yfcheckList[0].FrID;
+            that.yfHandmsg.Rate=this.yfcheckList[0].Rate;
+            var msg=JSON.stringify(that.yfHandmsg);
+            let routeData = this.$router.resolve({
+            name: 'ChoiceAddFinancialDocuments',
+            query: {czmsg:msg,'orderObj': JSON.stringify(orderObj),companyID: this.OutBranchId,Type: 2,searchTitle:'分摊'}
+            })
+            window.open(routeData.href, '_blank')
+        },
+        ckeckOne(){
+            if(this.yfcheckList.length==2){
+            this.yfcheckList.splice(0,1);
+            }
+            if(this.yfcheckList.length>1){
+            this.Error("只能选择一项！");
+            }
+        },
+        handleCurrentChange2(val) {
+            this.czMsg.pageIndex = val;
+            this.czgetList();
+        },
+        getCostTypeList() {
+            this.apipost("Financial_get_GetAdvanceCostTypeList", {}, res => {
+            if (res.data.resultCode === 1) {
+                this.costList = res.data.data
+            }else{
+                this.Error(res.data.message)
+            }
+            }, null)
+        },
+        czgetList(){
+            if(this.czdateList && this.czdateList.length>0){
+            this.czMsg.sTradeDate=this.czdateList[0];
+            this.czMsg.eTradeDate=this.czdateList[1];
+            }else{
+            this.czMsg.sTradeDate='';
+            this.czMsg.eTradeDate='';
+            }
+            let msg=Object.assign({},this.czMsg);
+            if(msg.FrID==''){
+                msg.FrID=0;
+            }
+            this.apipost("Financial_get_GetAdvanceFinancePageList", msg, res => {
+            if (res.data.resultCode === 1) {
+                this.czList = res.data.data.pageData;
+                this.total2=res.data.data.count;
+            }
+            }, null)
+        },
+
         HebingSPLast(){
             if(this.checkList.length==0){
                 this.Error("请选择单据！");