1 金蝶调整

src/components/FinancialModule/FinancialSubmodule/BillModule.vue

@@ -137,8 +137,7 @@
                   <span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==7">收支相抵</span>
                   <span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==10">虚拟结算</span>
                   <span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==11">电商结算</span>
-
-
+                  <span class="_r_name _r_IsPublic" v-if="GetDetail.KingdeeClientName && !isPrintPage">（垫付：{{GetDetail.KingdeeClientName}}）</span>
                 </p>
                 <p style="font-weight: bold"><span class="">{{$t('hotel.hotel_SerialNumber')}}：</span>{{GetDetail.FrID}}</p>
             </div>

src/components/FinancialModule/Kingdee/RecPayQuery.vue

@@ -677,7 +677,7 @@
               </el-form>
             </div>
       <div>
-        <span style="font-size: 13px; color:coral">*注意: 1、团费对接系统抓取'所有订单相关'和'客户预存与抵用'单据 </span>
+        <span style="font-size: 13px; color:coral">*注意: 1、团费对接系统抓取'所有订单相关'和'客户预存与抵用'单据   &nbsp;&nbsp;&nbsp; 2、团成本对接系统抓取团队所有的成本单据,不包含‘月结单’与‘多账户合并付款’与‘多币种账户付款’单据 </span>
       </div>
       <div class="query-box" style="padding: 0;border: 0;">
         <ul class="clearfix">

src/components/FinancialModule/RecPayQuery.vue

@@ -534,6 +534,22 @@
                         outline: none;" class="iconfont icon-zhifupeizhiguanli" @click="showjiaoyi(scope.row.FrID)">
               </i>
             </el-tooltip>
+
+            <el-tooltip class="item" content="修改垫付对象" placement="top" v-if="IsUpdatePayment == true && scope.row.Type==2">
+              <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="showPayment(scope.row.FrID)">
+              </i>
+            </el-tooltip>
+
           </template>
         </el-table-column>
       </el-table>
@@ -633,6 +649,32 @@
     <template v-if="transactionTax">
       <shouxufei :transTax="transTax" @success="close(),resetPageIndex(),getPageList()" @close="close"></shouxufei>
     </template>
+    <!--修改付款对象-->>
+    <el-dialog title="修改垫付对象" width="300px" :visible.sync="PaymentSync" center >
+      <el-form class="cdForm" label-width="90px">
+        <el-form-item label="客户类型" prop="ClientType">
+          <el-select filterable v-model='transTax.ClientType' :placeholder="$t('fnc.khleixing')"
+            @change="GetClientAccountList(transTax.ClientType)" class="w135 _border_b_1">
+            <el-option v-for='item in ClientTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="客户名称" prop="ClientID">
+          <template>
+            <el-select filterable v-model='transTax.ClientID' :placeholder="$t('fnc.khmingcheng')"
+              class="w135 _border_b_1">
+              <el-option v-for='item in ClientAccountList' :label='item.Name' :value='item.ID' :key='item.ID'>
+              </el-option>
+            </el-select>
+          </template>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button class="hollowFixedBtn" @click="PaymentSync=false">{{$t('pub.cancelBtn')}}</el-button>
+        <el-button class="normalBtn" type="primary" @click="handlingSurePayment" :loading="transTax.loading">
+          {{$t('pub.sureBtn')}}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -656,6 +698,8 @@
           ClientID: ''
         },
         transactionTax: false,
+        PaymentSync: false,//修改垫付对象
+
         showID: false,
         active: 1,
         userId: 0,
@@ -774,7 +818,8 @@
         istransaction: false,
         isJapanCommission: false,
         isManageFinance: false,
-        loadingTranMode: false
+        loadingTranMode: false,
+        IsUpdatePayment: false,
       }
     },
     created() {
@@ -795,6 +840,9 @@
       if (ActionMenuCode.indexOf("isManageFinance") != -1) {
         this.isManageFinance = true
       }
+      if (ActionMenuCode.indexOf("F_AccountantFinanceMerge") != -1) {
+        this.IsUpdatePayment = true
+      }
       if (this.$route.query.returnCode) {
         this.active = this.$route.query.returnCode;
         this.msg.Conditon = this.$route.query.returnCode;
@@ -905,6 +953,13 @@
         );
       },
 
+      showPayment(FrId) {
+        //弹出付款对象修改
+        this.transTax.FrId = FrId;
+        this.financeinfo_post_GetClientTypeList();
+        this.PaymentSync =true;
+      },
+
       getExchange(rowData, index) {
         this.MsgBus.$emit('getRecQuery', rowData.FrID);
       },
@@ -1120,6 +1175,16 @@
           }
         }, err => {})
       },
+      GetClientAccountList(i) { //获取客户名称并且根据费用类型和付款对象获取客户账号
+        this.msg.AccountNumber = '';
+        this.transTax.ClientID = ''
+        this.ClientTypeList.forEach(x => {
+          if (x.ID == i) {
+            // this.msg.RemitterName = x.Name;
+            this.financeinfo_post_GetClientAccountList(this.transTax.ClientType);
+          }
+        })
+      },
       financeinfo_post_GetClientAccountList(t) { // 获取对象类型
         let msg = {
           Type: t,
@@ -1142,6 +1207,36 @@
           }
         }, err => {})
       },
+      // 确定垫付对象
+      handlingSurePayment() {
+        if (this.transTax.loading) return;
+        this.transTax.loading = true;
+        if (this.transTax.ClientType && this.transTax.ClientType != "" && this.transTax.ClientID && this.transTax
+          .ClientID != "") {
+          this.apipost(
+            "Financial_post_SetKingdeeClientID", {
+              FrId: this.transTax.FrId,
+              KingdeeClientID: this.transTax.ClientID
+            },
+            res => {
+              if (res.data.resultCode == 1) {
+                this.Success("修改成功");
+                this.PaymentSync = false;
+                this.transTax.FrId = ''
+                this.transTax.ClientType = ''
+                this.transTax.ClientID = ''
+              }
+              this.transTax.loading = false;
+            },
+            err => {
+              this.transTax.loading = false;
+            }
+          );
+        } else {
+          this.transTax.loading = false;
+          this.Error("请选择垫付对象");
+        }
+      },
       getAccountList(i, t) { //收款账户
         let accountList = [];
         if (t == 1) { // 银行