用款计划合团领款验证调整

src/components/FinancialModule/FinancialDocuments.vue

@@ -1924,7 +1924,6 @@
             Type: fileTypeNumber,
             Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
           })
-          console.log("this.importData[this.importDataIndex]",this.importData[this.importDataIndex]);
           this.$message.success(this.$t('tips.scchenggong'))
         }, 1);
       },

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -2706,7 +2706,6 @@
             if(data.Type==2&&data.HelpBranchId>-1){
               this.ClientBankAccountTop=1;
             }
-            console.log("this.ClientBankAccountTop",this.ClientBankAccountTop);
             this.clientBankAccountData={
               AccountHolder:data.AccountHolder,
               AccountNumber:data.AccountNumber,

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

@@ -242,7 +242,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){

src/components/FinancialModule/RecPayQuery.vue

@@ -1209,7 +1209,6 @@
         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="代收公司";

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1872,7 +1872,6 @@
         let feeObj = this.msg.detailList.find(x=>{
           return x.CostTypeId==114 && x.CurrencyId==3 && (x.UnitPrice==550 || x.UnitPrice==275 ||x.UnitPrice==183 ||x.UnitPrice==184 ||x.UnitPrice==137.5)
         })
-        console.log(this.msg.detailList);
         if(feeObj){
           confirmMsg.push("从2024.1.1起制单，对于转账手续费将从原单剥离，系统自动生成独立手续费关联单据！");
         }

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -1649,8 +1649,6 @@
 
       },
       Financial_post_Set(){
-        console.log(this.msg,'=====------msg')
-        // return
         this.loading = true;
         this.apipost('Financial_post_Set', this.msg, res => {
           if (res.data.resultCode == 1) {

src/components/LeaderManagement/leaderReimbursement.vue

 <template>
   <div class="mb30" v-loading='loading'>
-    <input type="button" @click="downloadMoneyPlan()" class="normalBtn" value="下载"  />
+    <input type="button" @click="downloadMoneyPlan()" class="normalBtn" value="下载" />
     <div style="display: flex;justify-content: end;margin-top: 10px;margin-bottom: 10px;">
       <p><span class="groupTourOrderByTuan_ico"><i
             style="background-color:#3FC4FF"></i><span>{{$t('fnc.yidadan')}}</span></span>
@@ -701,6 +701,7 @@
         <th width="100">备注</th>
         <th width="110">成本单据</th>
       </tr>
+
       <template v-for='(item,index) in list.ScenicList'>
         <template v-for="(subItem,subIndex) in item.ScenicStatisticsList">
           <tr v-for="(childItem,childIndex) in subItem.TicketPriceList">
@@ -892,7 +893,7 @@
         <th>操作</th>
       </tr>
       <tr v-for='(item, index) in nav'>
-        <td>{{item.TCNUMS}}</td>
+        <td>{{item.TCNUMS}} </td>
         <td :rowspan="nav.length * CurrencyListMoney.length" width="180" v-if="index===0">总金额：
           <span v-for="(cur,index) in CurrencyListMoney" :key="index+5000">{{moneyFormat(cur.money)}}
             <span v-if="cur.CurrencyId>0"> (
@@ -903,7 +904,12 @@
                 {{currencyTypeObj[cur.CurrencyId]}}
               </template>
               ) </span>
-            <br /></span>
+            <br />
+            <template
+              v-if="cur.LeaderGetPriceArr&&cur.LeaderGetPriceArr.length>0 && cur.LeaderGetPriceArr[0].ShowTotalPrice">
+              <span> 合计领款不能超过 <font style="color:red;font-weight:bold">【 {{cur.LeaderGetPriceArr[0].ShowTotalPrice}}】</font></span>
+            </template>
+          </span>
         </td>
         <td style="padding: 5px 20px;">
           <div style="margin:10px 0" v-for="cur in CurrencyListMoney">
@@ -922,13 +928,10 @@
                     ) </span>
                 </span>
               </p>
-              <!-- <el-input class="w300" v-if="leadr.LeaderGetPrice < leadr.PlanPrice" type="number"
-                v-model="leadr.LeaderGetPriceT" @input="changePrice"></el-input> -->
-
               <el-input class="w300" type="number" v-model="leadr.LeaderGetPriceT" @input="changePrice"></el-input>
             </template>
           </div>
-          <span style="color:red;font-weight:bold;">
+          <span>
             注意：<span>1、合团的请分别领款!</span> <span style="margin-left: 20px;">2、如需日本PIC付款，请选择PIC相关付款流程，请注意日本转账手续费</span>
           </span>
         </td>
@@ -949,7 +952,7 @@
             <div style="margin:10px 0" v-for="(cur,index2) in CurrencyListMoney">
               <template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
                 <el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top">
-                  <input type="button" value="制单" class="normalBtn" @click="goZhiDan(item,0,leadr,cur)" />
+                  <input type="button" value="制单" class="normalBtn" @click="goDiJieZhiDan(item,0,leadr,cur)" />
                 </el-tooltip>
               </template>
             </div>
@@ -958,10 +961,10 @@
             <div style="margin:10px 0" v-for="(cur,index2) in CurrencyListMoney">
               <template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
                 <input type="button" v-if="item.TeamType == 1 && index2==0" value="日当费" class="normalBtn"
-                  @click="goZhiDan(item, 2)" />
+                  @click="goDiJieZhiDan(item, 2)" />
                 <template v-if="item.hideZDBtn && ContractUrlCount == 0">
                   <el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top">
-                    <input type="button" value="制单" class="normalBtn" @click="goZhiDan(item,0,leadr,cur)" />
+                    <input type="button" value="制单" class="normalBtn" @click="goDiJieZhiDan(item,0,leadr,cur)" />
                   </el-tooltip>
                 </template>
                 <template v-else-if="ContractUrlCount !== 0 && index2==0">
@@ -1141,7 +1144,11 @@
         fileName += ".xls"
         this.loading = true;
         let userInfo = this.getLocalStorage();
-        this.GetLocalFile("dmcstatistics_post_NewDownLoadGroupLeaderUserMoneyPlan",{TCIDs: this.$route.query.id,uid:userInfo.EmployeeId,NewCombinationNum:this.NewCombinationNum}, fileName, res => {
+        this.GetLocalFile("dmcstatistics_post_NewDownLoadGroupLeaderUserMoneyPlan", {
+          TCIDs: this.$route.query.id,
+          uid: userInfo.EmployeeId,
+          NewCombinationNum: this.NewCombinationNum
+        }, fileName, res => {
           this.loading = false;
         });
       },
@@ -1490,11 +1497,6 @@
           id = [98, 99];
         } else {
           id = [43, 48, 56, 53, 245, 246];
-          // if (obj.OutBranchId === 0) {
-          //   id = [43, 48, 245, 246];
-          // } else {
-          //   id = [56, 53, 245, 246];
-          // }
         }
         this.$router.push({
           name: "ChoiceAddFinancialDocuments",
@@ -1508,17 +1510,34 @@
           }
         });
       },
-      goZhiDan: function (obj, num, leadr, cur) {
+      goDiJieZhiDan: function (obj, num, leadr, cur) {
         let totailMoney = (Number(leadr.LeaderGetPriceT) + Number(cur.yiLing)).toFixed(2);
         let leadrPlanPrice = 0;
         if (leadr && leadr.PlanPrice) {
           leadrPlanPrice = leadr.PlanPrice.toFixed(2);
         }
         if (!num) {
-          if (totailMoney > leadrPlanPrice)
-            // return this.$message.error("最大领款为预付合计金额的95%！");
-            if (!leadr.LeaderGetPriceT || leadr.LeaderGetPriceT <= 0)
+          if (totailMoney > leadrPlanPrice) {
+            if (!leadr.LeaderGetPriceT || leadr.LeaderGetPriceT <= 0) {
               return this.$message.error("请输入金额！");
+            }
+          }
+        }
+        if (this.CurrencyListMoney && this.CurrencyListMoney.length > 0) {
+          var totalUseMoney = 0; //总领款金额
+          var totalUsePercentMoney = 0; //总计划领款金额
+          this.CurrencyListMoney.forEach(rootItem => {
+            if (rootItem.LeaderGetPriceArr && rootItem.LeaderGetPriceArr.length > 0) {
+              rootItem.LeaderGetPriceArr.forEach(sitem => {
+                totalUsePercentMoney = sitem.ShowTotalPrice;
+                totalUseMoney += Number(sitem.LeaderGetPriceT);
+              });
+            }
+          });
+          if (totalUseMoney > 0 && totalUsePercentMoney > 0 && totalUseMoney > totalUsePercentMoney) {
+            this.$message.error("总领款金额不能超过【" + totalUsePercentMoney + "】");
+            return;
+          }
         }
         if (this.list.hotelNoSureInfo !== "") {
           this.$confirm(
@@ -1769,6 +1788,7 @@
                     CurrencyId: cur.CurrencyId,
                     LeaderGetPrice: 0,
                     LeaderGetPriceT: 0,
+                    ShowTotalPrice: 0,
                     TCNUMS: x.TCNUMS,
                     TCIDS: x.TCIDS
                   };
@@ -1799,6 +1819,7 @@
                       lead.LeaderGetPriceT = Math.round(tempMoney * 100) / 100;
                     }
                   }
+                  lead.ShowTotalPrice = lead.LeaderGetPriceT;
                   lead.PlanPrice = cur.money * this.comRate;
                 });
               });