代收代付修改

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

@@ -15,14 +15,55 @@
                   </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
+        :data="selectDataList"
+        tooltip-effect="dark"
+        style="width: 100%;"
+      >
+        <el-table-column label="单号">
+          <template slot-scope="scope">
+            <span>{{ scope.row.FrID }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="总金额">
+          <template slot-scope="scope">
+            <span>{{ scope.row.Money }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="币种">
+          <template slot-scope="scope">
+            <span>{{ scope.row.CurrencyName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column  label="剩余金额">
+          <template slot-scope="scope">
+            <span>{{ scope.row.SurplusMoney }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column  label="分配金额" v-if="dataList&&dataList.length==1">
+          <template slot-scope="scope">
+            <el-input placeholder="" class="" v-model="scope.row.NowMoney"  maxlength="8"  
+            @keyup.native="checkPrice(scope.row,'NowMoney')"></el-input>
+            <!-- <span>{{ scope.row.SurplusMoney }}</span> -->
+          </template>
+        </el-table-column>
+      </el-table>
+              </div>
+
       </div>
 
       <div style="max-height: 400px;overflow: auto;">
+        <p style="text-align:center;">待关联的财务单据</p>
         <el-table
         :data="dataList"
         tooltip-effect="dark"
         style="width: 100%;"
       >
+
+     
         <el-table-column
           label="单号"
           width="120">
@@ -127,17 +168,17 @@
             </div>
           </template>
         </div>
-        <div class="totalMoney-box" v-if="isHandlingChargeThe">
+       <!--  <div class="totalMoney-box" v-if="isHandlingChargeThe" style="display:visible;">
           <div>
             <span>手续费差额：</span>
             <div>
               <el-input v-model="balanceMoney" type="Number" placeholder="请输入手续费差额"></el-input>
             </div>
-          </div>
-        </div>
+          </div> 
+        </div>-->
         <div slot="footer" class="dialog-footer">
           <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="SureAllot"/>
           <!-- <el-button class="normalBtn" type="primary" @click="clicksubmit">{{$t('pub.sureBtn')}}生成</el-button> -->
         </div>
       </el-dialog>
@@ -151,6 +192,7 @@
       return {
         showDialog: true,
         dataList: [],
+        selectDataList:[],
         frIds:'',
         OriginalMoney: 0,//原币合计
         OriginalMoneyThe: 0,//原币合计支
@@ -221,22 +263,77 @@
       }
     },
     methods: {
+      clicksubmit(){
+        //先判断selectDataList里面是否有，没有再去调用接口
+        this.selectDataList.forEach(item => {
+          if(item.FrID==this.bindMsg.FrID){
+            return;
+          }
+        });
+        this.apipost(
+          "Financial_post_SelectAllotFinan",
+          this.bindMsg,
+          res => {
+            if (res.data.resultCode == 1) {
+              let data = res.data.data;
+              if(this.dataList.length>1){
+                this.selectDataList=[];
+              }
+              let obj= {
+                FrID:data.FrID,
+                Money:data.Money,
+                CurrencyName:data.CurrencyName,
+                SurplusMoney:data.SurplusMoney,
+                NowMoney:0
+              }
+              this.selectDataList.push(obj);
+            }
+          },
+          err => {}
+        );
+      },
+
+      SureAllot(){
+        let tempMsg=[];
 
-      goAddurl(url,type){
-        this.isCapitalAllocation = false
-        if(type==1){
-          this.$router.push({ name: url,query:{fengs: 1,blank: 'y', frIds:this.frIds,tab: '新增资金调拨'}})
-        }else{
-          this.$router.push({ name: url,query:{fengs: 2,blank: 'y', frIds:this.frIds,tab: '新增资金调拨'}})
+        if(this.dataList&&this.dataList.length==1)//只有一条的时候可以绑定多个数据
+        {
+          this.selectDataList.forEach(item => {
+            let obj={
+              ReFinanceId:item.FrID,
+              Money:item.NowMoney,
+              FrID:this.dataList[0].FrID
+            }
+            tempMsg.push(obj);
+          });
         }
-    },
-    goURL: function (url, edit, id) {
-       this.isCapitalAllocation = false
-       this.$router.push({ name: url,query:{edit: edit, id: id, blank: 'y',frIds:this.frIds, tab: '新增资金调拨'}})
-    },
-      clicksubmit(){
-       
-       console.log("我进来啦，没刷新页面");
+        else {
+          this.dataList.forEach(item => {
+            let obj={
+              ReFinanceId:this.selectDataList[0].FrID,
+              Money:item.NowMoney,
+              FrID:item.FrID
+            }
+            tempMsg.push(obj);
+          });
+        }
+
+        this.apipost(
+          "Financial_post_BindingAllot",
+          {BindInfo:tempMsg},
+          res => {
+            if (res.data.resultCode == 1) {
+              this.dataList=[];
+              this.selectDataList=[];
+              this.$message.success("关联成功");
+              this.$emit('success');
+            }
+            else{
+              this.$message.error(res.data.message);
+            }
+          },
+          err => {}
+        );
       },
       close(){
         this.$emit('close')

src/components/FinancialModule/HelpBranch/index.vue

@@ -6,7 +6,8 @@
 </style>
 
 <template >
-  <div class="page_fnDm page_RecPayQuery"  @keyup.enter="resetPageIndex()">
+  <div>
+    <div class="page_fnDm page_RecPayQuery"  @keyup.enter="resetPageIndex()">
       <div class="query-box" style="margin-bottom: 0px;">
           <el-form class="_info_box clearfix"  label-width="110px">
               <el-row style="padding:15px 20px 0 0;">
@@ -222,7 +223,7 @@
                   <button class="hollowFixedBtn" @click="resetPageIndex()">{{$t('pub.searchBtn')}}</button>
                   <button class="normalBtn" @click="method5()">导出</button>
                   <button class="normalBtn" @click="GenerateDocuments()">生成调拨单</button>
-                  <!-- <button class="normalBtn" @click="BindingAllot()">关联调拨单</button> -->
+                  <button class="normalBtn" @click="BindingAllot()">关联调拨单</button>
               </li>
           </ul>
       </div>
@@ -248,6 +249,20 @@
           <div style="margin-left: 20px;flex-shrink: 0;">
             总金额：{{getMoney()}}
           </div>
+
+          <div style="display: flex;flex-wrap: wrap;margin-left:10px;color:red;" v-if="allotDataList.length>0">
+            <span>调拨单：</span>
+            <template >
+              <span size="mini" closable
+              style="margin-right: 5px;margin-bottom: 5px;"
+              v-for="(x,index) in allotDataList"
+              :key="x.FrID" 
+              :type="x.Type==2?'danger':'success'">
+              {{x.FrID}}，币种：{{x.CurrencyName}}，总金额：{{x.Money}}，剩余金额：{{x.SurplusMoney}}
+            </span>
+            </template>
+          
+          </div>
       </div>
       <div class="_fnDm_content" v-loading='loading'>
         <el-table
@@ -266,7 +281,7 @@
           </el-table-column>
           <el-table-column
             label="单号"
-            width="120">
+            width="80">
             <template slot-scope="scope">
               <span style="cursor: pointer;color: #00C6FF;"
               @click="openDetails(scope.row.FrID,1)">{{ scope.row.FrID }}</span>
@@ -275,7 +290,7 @@
           <el-table-column
             prop="name"
             label="单据类型"
-            width="120">
+            width="80">
             <template slot-scope="scope">
           <span v-if="scope.row.Type==2" style="display: inline-block;
               padding: 2px 8px;
@@ -322,10 +337,18 @@
           </el-tooltip>
             </template>
           </el-table-column>
+          <el-table-column
+            label="所属公司"
+            width="80">
+            <template slot-scope="scope">
+              <span style="cursor: pointer;color: #00C6FF;"
+             >{{ scope.row.BranchName }}</span>
+            </template>
+          </el-table-column>
 
           <el-table-column
             label="代收/代付公司"
-            width="140">
+            width="120">
             <template slot-scope="scope">
               <span style="cursor: pointer;color: #00C6FF;"
              >{{ scope.row.HelpBranchName }}</span>
@@ -383,7 +406,7 @@
             <el-table-column
             prop=""
             label="原币金额"
-            show-overflow-tooltip width="150">
+            show-overflow-tooltip width="120">
             <template slot-scope="scope">
               {{scope.row.WBMoney?scope.row.WBMoney+'/'+scope.row.CurrencyName:''}}
             </template>
@@ -391,7 +414,7 @@
             <el-table-column
             prop=""
             label="本位币金额"
-            show-overflow-tooltip width="150">
+            show-overflow-tooltip width="120">
             <template slot-scope="scope">
               {{scope.row.Money}}
               <!-- <p style="line-height:20px" v-if="scope.row.Money>0">{{scope.row.Type==1?'应收':'应付'}}：<span>{{scope.row.Money}}</span></p>
@@ -419,7 +442,7 @@
             <el-table-column
             prop=""
             label="当前状态"
-            show-overflow-tooltip width="120">
+            show-overflow-tooltip width="100">
             <template slot-scope="scope">
               <i v-if="scope.row.Status==1" class="iconfont icon-daiqueren" style="color: #4BCA81"></i>
               <i v-if="scope.row.Status==4" class="iconfont icon-yiquxiao" style="color: #4BCA81"></i>
@@ -452,11 +475,11 @@
             <el-table-column
             prop=""
             label="关联调拨单付款单"
-            show-overflow-tooltip width="140">
+            show-overflow-tooltip width="165">
             <template slot-scope="scope" v-if="scope.row.ReFinanceIdList">
               <div v-for="(x,index) in scope.row.ReFinanceIdList" >
-                <span  style="cursor: pointer;color: #00C6FF;"
-                @click="openDetails(x.RelevanceFrId,2)">{{x.RelevanceFrId}}{{x.ShareMoney>0?("分摊金额："+x.ShareMoney):""}}</span>
+                <p  style="cursor: pointer;color: #00C6FF;"
+                @click="openDetails(x.RelevanceFrId,2)">{{x.RelevanceFrId}}{{x.ShareMoney>0?("分摊金额："+x.ShareMoney):""}}</p>
               </div>
             </template>
             <template v-else>-</template>
@@ -478,12 +501,16 @@
           :multipleSelection="multipleSelection"
           @close="showDialog=false"></selectListData>
       </template>
-      <!-- <template v-if="showBindDialog">
+      
+  </div>
+  <template v-if="showBindDialog">
         <bindListData
           :multipleSelection="multipleSelection"
+          @success="closeshowBindDialog()"
           @close="showBindDialog=false"></bindListData>
-      </template> -->
+      </template>
   </div>
+  
 </template>
 <script>
 import Vue from 'vue'
@@ -498,6 +525,7 @@ export default {
       return{
         showDialog: false,
         multipleSelection: [],
+        allotDataList:[],
         SelectAduitingList:[
           {Name:'不限',Id:'0'},
           {Name:'已结算',Id:'1'},
@@ -652,6 +680,13 @@ export default {
       var that = this;
   },
   methods:{
+    closeshowBindDialog(){
+      this.msg.pageIndex=1,
+      this.getPageList()
+      this.multipleSelection=[]
+      this.$refs.multipleTable.clearSelection();
+      this.showBindDialog=false
+    },
     GetClientAccountListByKeyWord(query) {
         if (query !== '') {
         // 获取对象类型
@@ -712,7 +747,6 @@ export default {
           }
         },
       selectable(row, index){
-        console.log("ReFinanceIds",this.DataList[index].ReFinanceIds);
         if (!this.DataList[index].ReFinanceIds) {
           return true;
         } else {
@@ -764,6 +798,28 @@ export default {
           if(!this.msg.KJCostTypeId)this.msg.KJCostTypeId=0;
           if(!this.msg.IsSelectKJSetCostType)this.msg.IsSelectKJSetCostType=0;
           this.loading= true;
+          this.allotDataList=[];
+            if(this.msg.NewFinanceId&&this.msg.NewFinanceId>0){
+              this.apipost(
+                      "Financial_post_SelectAllotFinan",
+                      {FrID:this.msg.NewFinanceId},
+                      res => {
+                        if (res.data.resultCode == 1) {
+                          let data = res.data.data;
+                        
+                          let obj= {
+                            FrID:data.FrID,
+                            Money:data.Money,
+                            CurrencyName:data.CurrencyName,
+                            SurplusMoney:data.SurplusMoney,
+                            NowMoney:0
+                          }
+                          this.allotDataList.push(obj);
+                        }
+                      },
+                      err => {}
+                    );
+            }
           this.apipost('Financial_post_GetHelpBranchALLPageList',this.msg,res=>{
               if(res.data.resultCode == 1) {
                   let data = res.data.data.pageData;
@@ -1105,7 +1161,9 @@ export default {
             this.Error('请选择需要关联的数据');
             return;
         }
-        this.showBindDialog = true
+        setTimeout(() => {
+          this.showBindDialog = true
+        }, 200);
       },
       GenerateDocuments(){
         if(this.multipleSelection.length==0){