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

src/components/FinancialModule/RecPayQuery.vue

@@ -651,7 +651,23 @@
                           @click="EditInvoiceStatus(scope.row)">
                 </i>
               </el-tooltip>
-
+              <el-tooltip class="item"
+              v-if="(scope.row.Type==1||scope.row.Type==2)&& IsUpdatePayment"
+              :content="scope.row.Type==1?'修改帮代收公司':(scope.row.Type==2?'修改帮代付公司':'')"
+              placement="top">
+              <i style="width: 30px;
+                        height: 30px;
+                        display: inline-block;
+                        color: white !important;
+                        border-radius: 50%;
+                        text-align: center;
+                        line-height: 30px;
+                        margin-right: 10px;
+                        cursor: pointer;
+                        background-color: #47BF8C;
+                        outline: none;" class="iconfont icon-bianji" @click="showHelpBranch(scope.row)">
+              </i>
+              </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
@@ -778,6 +794,27 @@
           {{$t('pub.sureBtn')}}</el-button>
       </div>
     </el-dialog>
+
+      <!--修改代收/代付公司信息-->
+      <el-dialog :title='`${dialogTitle}`' width="300px" :visible.sync="IsHelpBranch" center >
+      <el-form class="cdForm" label-width="90px">
+        
+        <el-form-item :label="dialogTitle1" prop="HelpBranchId">
+          <template>
+            <el-select filterable v-model='HelpBranchMsg.HelpBranchId' placeholder="非代收代付"
+              class="w135 _border_b_1">
+              <el-option v-for='item in CompanyList' :label='item.BName' :value='item.Id' :key='item.Id'  :disabled="item.Id===HelpBranchMsg.RB_Branch_Id">
+                </el-option>
+            </el-select>
+          </template>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button class="hollowFixedBtn" @click="IsHelpBranch=false">{{$t('pub.cancelBtn')}}</el-button>
+        <el-button class="normalBtn" type="primary" @click="handlingSureHelpBranch" :loading="HelpBranchMsg.loading">
+          {{$t('pub.sureBtn')}}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -935,6 +972,16 @@
         isManageFinance: false,
         loadingTranMode: false,
         IsUpdatePayment: false,
+        IsHelpBranch:false,
+        HelpBranchMsg:{
+          FrId:0,
+          HelpBranchId:-1,
+          Type:0,
+          RB_Branch_Id:-1,
+          loading: false,
+        },
+        dialogTitle:"",
+        dialogTitle1:"",
       }
     },
     created() {
@@ -1125,6 +1172,24 @@
         this.PaymentSync =true;
       },
 
+
+      showHelpBranch(item) {
+        //弹出付款对象修改
+        this.HelpBranchMsg.FrId = item.FrID;
+        this.HelpBranchMsg.HelpBranchId = item.HelpBranchId;
+        this.HelpBranchMsg.Type=item.Type;
+        this.HelpBranchMsg.RB_Branch_Id=item.RB_Branch_Id;
+        console.log("item",item);
+        if(item.Type==1){
+          this.dialogTitle="修改代收公司";
+          this.dialogTitle1="代收公司";
+        }
+        else if(item.Type==2){
+          this.dialogTitle="修改代收公司";
+          this.dialogTitle1="代收公司";
+        }
+        this.IsHelpBranch =true;
+      },
       getExchange(rowData, index) {
         this.MsgBus.$emit('getRecQuery', rowData.FrID);
       },
@@ -1422,6 +1487,29 @@
           this.transTax.loading = false;
           this.Error("请选择垫付对象");
         }
+      },
+            // 确定垫付对象
+    handlingSureHelpBranch() {
+        if (this.HelpBranchMsg.loading) return;
+        this.HelpBranchMsg.loading = true;
+          this.apipost(
+            "Financial_post_UpdateHelpBranch", this.HelpBranchMsg,
+            res => {
+              if (res.data.resultCode == 1) {
+                this.Success("修改成功");
+                this.IsHelpBranch = false;
+                this.HelpBranchMsg.FrId = 0
+                this.HelpBranchMsg.HelpBranchId = -1
+                this.HelpBranchMsg.Type = 0
+                this.HelpBranchMsg.RB_Branch_Id = -1
+                this.getPageList();              }
+              this.HelpBranchMsg.loading = false;
+            },
+            err => {
+              this.HelpBranchMsg.loading = false;
+            }
+          );
+        
       },
       getAccountList(i, t) { //收款账户
         let accountList = [];