代收代付修改

src/components/FinancialModule/HelpBranch/components/bindListData.vue

@@ -5,17 +5,21 @@
       :visible.sync="showDialog" center @close="close"
       width="1000px">
       <div >
+        <span style="padding-bottom:20px;color:red;height:30px;display:inherit">选择一条单据的时候可查询关联多个调拨单，并可分配对应调拨单的分摊金额。多个单据的时候只能关联一个调拨单。 </span>
         <el-form class="_info_box clearfix"  label-width="110px">
               <el-row >
                   <el-col :span="6">
                       <el-form-item label="单号：">
+                          <!-- <el-input placeholder="完成后按Enter查询" class="" v-model="bindMsg.FrID"  maxlength="8"  
+                          @keyup.enter.native="checkInteger(bindMsg,'FrID'),clicksubmit()"></el-input> -->
                           <el-input placeholder="" class="" v-model="bindMsg.FrID"  maxlength="8"  
-                          @keyup.enter.native="checkInteger(bindMsg,'FrID'),clicksubmit()"></el-input>
+                          @keyup.native="checkInteger(bindMsg,'FrID')"></el-input>
                       </el-form-item>
                   </el-col>
+                  <el-col :span="2"> <el-form-item label=""><input type="button" class="normalBtn" value="查询" @click="clicksubmit()"/>  </el-form-item></el-col>
+                 
                 </el-row>
               </el-form>
-
               <div style="margin-bottom:30px;border-top:1px  solid #EBEEF5;border-right:1px  solid #EBEEF5;border-left:1px  solid #EBEEF5;">
                 <p style="text-align:center;margin-top:5px;">调拨单信息</p>
                 <el-table
@@ -177,6 +181,12 @@
           </div> 
         </div>-->
         <div slot="footer" class="dialog-footer">
+          <span>调拨单类型：</span>
+          <el-select  v-model='Type'  class="w100 _border_b_1">
+            <el-option label='请选择' :value='0' :key='0'></el-option> 
+            <el-option label='收入' :value='1' :key='1'></el-option>
+              <el-option label='支出' :value='2' :key='2'></el-option>
+            </el-select>
           <el-button class="hollowFixedBtn" @click="close">{{$t('pub.cancelBtn')}}</el-button>
           <input type="button" class="normalBtn" value="确认关联" @click="SureAllot"/>
           <!-- <el-button class="normalBtn" type="primary" @click="clicksubmit">{{$t('pub.sureBtn')}}生成</el-button> -->
@@ -204,6 +214,7 @@
         HandlingChargeMoney: null,//手续费
         HandlingChargeMoneyThe: null,//手续费支
         HandlingChargeMoneyClosed: null,//手续费付
+        Type:0,
         bindMsg:{
           FrID:0,
                 }
@@ -295,14 +306,22 @@
 
       SureAllot(){
         let tempMsg=[];
-
+        if(this.Type<=0){
+          this.$message.error("请选择调拨单类型");
+          return;
+        }
+        if(!this.selectDataList||this.selectDataList.length<=0){
+          this.$message.error("请选择需要关联的调拨单");
+          return;
+        }
         if(this.dataList&&this.dataList.length==1)//只有一条的时候可以绑定多个数据
         {
           this.selectDataList.forEach(item => {
             let obj={
               ReFinanceId:item.FrID,
               Money:item.NowMoney,
-              FrID:this.dataList[0].FrID
+              FrID:this.dataList[0].FrID,
+              ReType:this.Type
             }
             tempMsg.push(obj);
           });
@@ -312,7 +331,8 @@
             let obj={
               ReFinanceId:this.selectDataList[0].FrID,
               Money:item.NowMoney,
-              FrID:item.FrID
+              FrID:item.FrID,
+              ReType:this.Type
             }
             tempMsg.push(obj);
           });

src/components/FinancialModule/HelpBranch/components/selectListData.vue

@@ -114,15 +114,21 @@
             </div>
           </template>
         </div>
-        <div class="totalMoney-box" v-if="isHandlingChargeThe">
+        <!-- <div class="totalMoney-box" v-if="isHandlingChargeThe">
           <div>
             <span>手续费差额：</span>
             <div>
               <el-input v-model="balanceMoney" type="Number" placeholder="请输入手续费差额"></el-input>
             </div>
           </div>
-        </div>
+        </div> -->
         <div slot="footer" class="dialog-footer">
+          <span>调拨单类型：</span>
+          <el-select  v-model='Type'  class="w100 _border_b_1">
+            <el-option label='请选择' :value='0' :key='0'></el-option> 
+            <el-option label='收入' :value='1' :key='1'></el-option>
+              <el-option label='支出' :value='2' :key='2'></el-option>
+            </el-select>
           <el-button class="hollowFixedBtn" @click="close">{{$t('pub.cancelBtn')}}</el-button>
           <input type="button" class="normalBtn" value="日本资金调拨" @click="goAddurl('addCapitalAllocation',1)"/>
           <input type="button" class="normalBtn" value="台湾资金调拨" @click="goAddurl('addCapitalAllocation',2)"/>
@@ -141,6 +147,7 @@
         showDialog: true,
         dataList: [],
         frIds:'',
+        Type:0,//1-收2-支
         OriginalMoney: 0,//原币合计
         OriginalMoneyThe: 0,//原币合计支
         OriginalMoneyClosed: 0,//原币合计付
@@ -169,7 +176,6 @@
           let OriginalMoneyClosed = 0
           let HandlingChargeMoneyClosed = 0
           this.frIds= this.dataList.map(row => row.FrID).join(',')
-          console.log("  this.frIds",this.frIds);
           this.dataList.forEach(x=>{
            
             if(x.Type==2){
@@ -209,16 +215,24 @@
     methods: {
 
       goAddurl(url,type){
+        if(this.Type<=0){
+          this.$message.error("请选择调拨单类型");
+          return;
+        }
         this.isCapitalAllocation = false
         if(type==1){
-          this.$router.push({ name: url,query:{fengs: 1,blank: 'y', frIds:this.frIds,tab: '新增资金调拨'}})
+          this.$router.push({ name: url,query:{fengs: 1,blank: 'y', frIds:this.frIds,ReType:this.Type,tab: '新增资金调拨'}})
         }else{
-          this.$router.push({ name: url,query:{fengs: 2,blank: 'y', frIds:this.frIds,tab: '新增资金调拨'}})
+          this.$router.push({ name: url,query:{fengs: 2,blank: 'y', frIds:this.frIds,ReType:this.Type,tab: '新增资金调拨'}})
         }
     },
     goURL: function (url, edit, id) {
+      if(this.Type<=0){
+          this.$message.error("请选择调拨单类型");
+          return;
+        }
        this.isCapitalAllocation = false
-       this.$router.push({ name: url,query:{edit: edit, id: id, blank: 'y',frIds:this.frIds, tab: '新增资金调拨'}})
+       this.$router.push({ name: url,query:{edit: edit, id: id, blank: 'y',frIds:this.frIds,ReType:this.Type, tab: '新增资金调拨'}})
     },
       clicksubmit(){
         let ids

src/components/FinancialModule/addCapitalAllocation.vue

@@ -385,7 +385,8 @@ export default {
         IsHave: 1,
         emList: [],
         BankList: [],
-        FrIDs:''
+        FrIDs:'',
+        ImportType:0,
       },
       queryAccMsg: {
         pageIndex: 1,
@@ -493,7 +494,19 @@ export default {
       this.msg.BankList.forEach(x=>{
         delete x.shouAccNumList
       })
-      this.msg.FrIDs=this.$route.query.frIds;
+
+      if(this.$route.query.frIds){
+        this.msg.FrIDs=this.$route.query.frIds;
+      }
+      else{
+        this.msg.FrIDs='';
+      }
+      if(this.$route.query.ReType){
+        this.msg.ImportType=this.$route.query.ReType;
+      }else{
+        this.msg.ImportType=0;
+      }
+    
       // return;
       this.apipost('Financial_post_SetFundTransfer', this.msg, res=>{
         if(res.data.resultCode==1){