1

src/components/FinancialModule/FinancialSubmodule/czBillModule.vue

@@ -385,7 +385,7 @@ export default {
             this.IsAdvanceFinance=this.GetDetail.IsAdvanceFinance;
             this.ECommerceGoodsModel=this.GetDetail.ECommerceGoodsModel;
             this.details=this.GetDetail;
-            if(this.OtherType==7||this.details.MatchFrId>0){
+            if(this.OtherType==7||this.OtherType==65||this.details.MatchFrId>0){
                 this.getDetails()
                 if(this.OtherType==81){
                     this.getMatchTransferList()

src/components/FinancialModule/addFinancialDocuments.vue

@@ -530,7 +530,7 @@
         </div>
         <table class="Receipt_table" border="1" bordercolor="#106BAF" style="border-collapse:collapse;">
           <tr>
-            <th rowspan="2" width="150">{{$t('fnc.fyshuoming')}}111</th>
+            <th rowspan="2" width="150">{{$t('fnc.fyshuoming')}}</th>
             <th rowspan="2">{{$t('restaurant.res_Number')}}</th>
             <th rowspan="2">{{$t('fnc.danjia')}}</th>
             <th rowspan="2" width="100">{{$t('hotel.hotel_Currency')}}</th>
@@ -2074,7 +2074,26 @@
             });
           } else {
             this.resultCode = res.data.resultCode;
+            if(res.data.resultCode==11020){//超预算提醒
+              this.$confirm(res.data.message,  this.$t('tips.tips'), {
+                  confirmButtonText: this.$t('objFill.ckbjd'),
+                  cancelButtonText: this.$t('pub.cancelBtn'),
+                  type: 'warning'
+                }).then(() => {
+                  this.$router.push({
+                  name: 'OfferChange',
+                  query: {
+                    'offerid':res.data.data,
+                    'Qtype':3,
+                    'blank': 'y',
+                  }
+                });
+                }).catch(() => {
+                  
+                });
+            }else{
             this.$message.error(res.data.message);
+            }
           }
           this.loading = false;
         }, err => {})

src/components/LeaderManagement/leaderReimbursement.vue

@@ -52,7 +52,7 @@
     <p class="teamRevenueExpenditureTitle">
       {{$t('MarketingActi.car')}}
       <span class="fr" style="margin-top: -8px;">
-        <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(5,2)" />
+        <!-- <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(5,2)" /> -->
       </span>
     </p>
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
@@ -257,7 +257,7 @@
     <p class="teamRevenueExpenditureTitle">
       {{$t('hotel.hotel')}}
       <span class="fr" style="margin-top: -8px;">
-        <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(1,2)" />
+        <!-- <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(1,2)" /> -->
       </span>
     </p>
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
@@ -569,7 +569,7 @@
     <p class="teamRevenueExpenditureTitle">
       {{$t('ground.canshi')}}
       <span class="fr" style="margin-top: -8px;">
-        <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(2,2)" />
+        <!-- <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(2,2)" /> -->
       </span>
     </p>
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
@@ -721,7 +721,7 @@
     <p class="teamRevenueExpenditureTitle">
       {{$t('scen.sc_piao')}}
       <span class="fr" style="margin-top: -8px;">
-        <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(3,2)" />
+        <!-- <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(3,2)" /> -->
       </span>
     </p>
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
@@ -891,7 +891,7 @@
     <p class="teamRevenueExpenditureTitle">
       {{$t('objFill.qita')}}
       <span class="fr" style="margin-top: -8px;">
-        <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(8,2)" />
+        <!-- <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(8,2)" /> -->
       </span>
     </p>
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
@@ -1061,7 +1061,7 @@
               <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="$t('objFill.preparedocument')" class="normalBtn"
-                    @click="goDiJieZhiDan(item,0,leadr,cur)" />
+                    @click="goDiJieZhiDanValidate(item,0,leadr,cur)" />
                 </el-tooltip>
                 <template v-if="item.CompanyAlipay==0&&leadr.CurrencyId===1">
                   <el-tooltip class="item" effect="dark" placement="top" :content="currencyTypeObj[leadr.CurrencyId]">
@@ -1081,11 +1081,11 @@
             <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="$t('objFill.ridang')"
-                  class="normalBtn" @click="goDiJieZhiDan(item, 2)" />
+                  class="normalBtn" @click="goDiJieZhiDanValidate(item, 2)" />
                 <template v-if="item.hideZDBtn ">
                   <el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top">
                     <input type="button" :value="$t('objFill.preparedocument')" class="normalBtn"
-                      @click="goDiJieZhiDan(item,0,leadr,cur)" />
+                      @click="goDiJieZhiDanValidate(item,0,leadr,cur)" />
                   </el-tooltip>
                   <template v-if="item.CompanyAlipay==0&&leadr.CurrencyId===1">    <!-- -->
                   <el-tooltip class="item" effect="dark"  placement="top"  :content="currencyTypeObj[leadr.CurrencyId]"  >
@@ -1389,7 +1389,7 @@
           }],
         },
         allCurrencyList: [],
-        OtherLoading: false,
+        OtherLoading: false
       };
     },
     components: {
@@ -1757,26 +1757,52 @@
         );
       },
       ZhuiJiaTuanKuan(item) {
-        let TCIDARR = [item.TCIDS]; // [this.$route.query.id]
-        let orderObj = {
-          OrderID: 0,
-          OrderSource: 8,
-          Obj: {},
-          SourceID: 0,
-          TCIDList: TCIDARR,
-          TravelReplenish: this.$route.query.id,
-          OtherType: 1
-        };
-        this.$router.push({
-          name: "ChoiceAddFinancialDocuments",
-          query: {
-            Type: 2,
-            companyID: item.companyID,
-            path: "",
-            blank: "y",
-            orderObj: JSON.stringify(orderObj)
+
+        this.apipost('financestatistics_post_GetTravelPrerealContrast', {
+          TCID: item.TCIDS
+        }, res => {
+          if (res.data.resultCode == 1) {
+             if(res.data.data.State==1){
+              this.$confirm(res.data.data.Msg,  this.$t('tips.tips'), {
+                  confirmButtonText: this.$t('objFill.ckbjd'),
+                  cancelButtonText: this.$t('pub.cancelBtn'),
+                  type: 'warning'
+                }).then(() => {
+                  this.$router.push({
+                  name: 'OfferChange',
+                  query: {
+                    'offerid':res.data.data.OfferId,
+                    'Qtype':3,
+                    'blank': 'y',
+                  }
+                });
+                }).catch(() => {
+                  
+                });
+             }else {
+              let TCIDARR = [item.TCIDS]; // [this.$route.query.id]
+              let orderObj = {
+                OrderID: 0,
+                OrderSource: 8,
+                Obj: {},
+                SourceID: 0,
+                TCIDList: TCIDARR,
+                TravelReplenish: this.$route.query.id,
+                OtherType: 1
+              };
+              this.$router.push({
+                name: "ChoiceAddFinancialDocuments",
+                query: {
+                  Type: 2,
+                  companyID: item.companyID,
+                  path: "",
+                  blank: "y",
+                  orderObj: JSON.stringify(orderObj)
+                }
+              });
+            }
           }
-        });
+        }, err => {})
       },
       getzhuijiaList() {
         this.apipost(
@@ -1855,6 +1881,34 @@
           }
         });
       },
+      goDiJieZhiDanValidate: function(obj, num, leadr, cur){
+        this.apipost('financestatistics_post_GetTravelPrerealContrast', {
+          TCID: obj.TCIDS
+        }, res => {
+          if (res.data.resultCode == 1) {
+             if(res.data.data.State==1){
+              this.$confirm(res.data.data.Msg,  this.$t('tips.tips'), {
+                  confirmButtonText: this.$t('objFill.ckbjd'),
+                  cancelButtonText: this.$t('pub.cancelBtn'),
+                  type: 'warning'
+                }).then(() => {
+                  this.$router.push({
+                  name: 'OfferChange',
+                  query: {
+                    'offerid':res.data.data.OfferId,
+                    'Qtype':3,
+                    'blank': 'y',
+                  }
+                });
+                }).catch(() => {
+                  
+                });
+             }else{
+              this.goDiJieZhiDan(obj, num, leadr, cur);
+             }
+          }
+        }, err => {})
+      },
       goDiJieZhiDan: function (obj, num, leadr, cur) {
         let totailMoney = (Number(leadr.LeaderGetPriceT) + Number(cur.yiLing)).toFixed(2);
         let leadrPlanPrice = 0;
@@ -2011,7 +2065,6 @@
         var D = (nowStartDate.getDate() < 10 ? '0' + (nowStartDate.getDate()) : nowStartDate.getDate());
         this.TeamStartDateList.push(Y + M + D);
         this.UseTotalPrice = leadr.LeaderGetPriceT;
-        console.log("CompanyAlipayTCID222", this.CompanyAlipayTCID);
       },
       addOtherList(index, id) {
         this.list.OtherOrderReportList.OtherList.push({
@@ -2466,8 +2519,7 @@
               })
               arrList(data.OtherOrderReportList) //其它
               
-              this.list = data;
-              console.log("this.list",this.list);
+              this.list = data;              
               var lineArray = [168]; //新欧洲线只显示标准间
               var lineId = 0;
               //转成数字类型

src/components/dmc/manager/teamRevenueExpenditure.vue

@@ -392,6 +392,9 @@
         ticketPay: 0,
         busPay: 0,
         otherPay: 0,
+        IsPrerealContrast: false,
+        PrerealContrastMsg:'',
+        PrerealContrastOfferId:0
       }
     },
     methods: {
@@ -518,6 +521,26 @@
         this.picIsShow = true;
       },
       goUrl(_orderSource, _type,Offset) {
+        if(this.IsPrerealContrast){
+          this.$confirm(this.PrerealContrastMsg,  this.$t('tips.tips'), {
+              confirmButtonText: this.$t('objFill.ckbjd'),
+              cancelButtonText: this.$t('pub.cancelBtn'),
+              type: 'warning'
+            }).then(() => {
+              this.$router.push({
+              name: 'OfferChange',
+              query: {
+                'offerid':this.PrerealContrastOfferId,
+                'Qtype':3,
+                'blank': 'y',
+              }
+            });
+            }).catch(() => {
+              
+            });
+          return;
+        }
+
         let TCIDARR = []
         let id = [];
         if(this.msgList&&this.msgList.length>0&&this.msgList[0].LineId==this.LineId){
@@ -632,6 +655,19 @@
             this.Error(res.data.message)
           }
         }, err => {})
+      },
+      getTravelPrerealContrast(){
+        this.apipost('financestatistics_post_GetTravelPrerealContrast', {
+          TCID: this.$route.query.id
+        }, res => {
+          if (res.data.resultCode == 1) {
+             if(res.data.data.State==1){
+              this.IsPrerealContrast=true;
+              this.PrerealContrastMsg = res.data.data.Msg;
+              this.PrerealContrastOfferId = res.data.data.OfferId;
+             }
+          } else {}
+        }, err => {})
       }
     },
     mounted() {
@@ -642,6 +678,10 @@
       this.getList(5)
       this.getList(14)
       this.getTuanMsg()
+      let userInfo = this.getLocalStorage();
+      if(userInfo.RB_Group_id==2 && this.LineId==14){
+        this.getTravelPrerealContrast(); 
+      }
     }
   }