no message

src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue

@@ -42,6 +42,7 @@
       <li v-for="(item,index) in NewItems">
         <template v-if="(item.IsShow === 1 || item.showYes) && item.bigShow">
         <div class="_left">
+          {{item.Id}}
           <span class="_Icon">{{item.Name.substring(0,1)}}</span>
           <div>
             <p class="_t">{{item.Name}}</p>
@@ -313,6 +314,7 @@
         else if (t==4) {
           this.GetList = this.ZRList;
         }
+
         if(this.GetList.length<1){
           this.noData = true;
         }else{
@@ -337,6 +339,7 @@
         this.apipost('Financial_post_GetList',{},res=>{
           if(res.data.resultCode==1){
             let data = res.data.data;
+            let list = [94,95,96,97,51,52,54,55,49,50,57,58,88,89]
             if(data){
               data.forEach(x => {
                 // 5-8 OrderSource 为5 并且当前登录人为吴珊，只显示49和50
@@ -381,13 +384,21 @@
                 if(x.Type==1){
                     this.collectList.push(x);
                 }else if (x.Type==2){
+                  // noTypeCost 不是leaderReimbursement制单排除流程
+                  if(this.$route.query.noTypeCost){
+                    if(x.Id!=94&&x.Id!=95&&x.Id!=96&&x.Id!=97&&x.Id!=51&&x.Id!=52&&x.Id!=54&&
+                    x.Id!=55&&x.Id!=49&&x.Id!=50&&x.Id!=57&&x.Id!=88&&x.Id!=89){
+                      this.payList.push(x);
+                    }
+                  }
+                  if(!this.$route.query.noTypeCost){
                     this.payList.push(x);
+                  }
                 }else if (x.Type==7){
                   this.GZList.push(x);
                 }else if (x.Type==8){
                   this.ZRList.push(x);
                 }
-
               });
             }
             this.GetList = this.collectList;

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -846,11 +846,12 @@
                 @click="lookbreakage(GetDetail.ReFinanceId)"> 报损/报溢单:{{GetDetail.ReFinanceId}}</span>
               <span
                 v-if="(GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64"
-                @click="Gourl(GetDetail)"
+                @click="Gourl('OPsalesCommissiondetails',GetDetail)"
                 style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
                 <span
-                v-if="(GetDetail.TemplateId==29 || GetDetail.TemplateId==31) && OPState && GetDetail.OtherType!=63 && GetDetail.OtherType!=64"
-                @click="GoOPurl(GetDetail)"
+                v-if="(GetDetail.TemplateId==29 || GetDetail.TemplateId==31) && OPState
+                && GetDetail.OtherType!=63 && GetDetail.OtherType!=64"
+                @click="GoOPurl('OpComPersonDetails',GetDetail)"
                 style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
               <span v-if="CostTypeState" @click="GourlCostType('VisitRecord',1)"
                 style="margin:0 10px;cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">拜访记录</span>
@@ -1756,9 +1757,9 @@
 
 
       },
-      GoOPurl(GetDetail) {
+      GoOPurl(path,GetDetail) {
         this.$router.push({
-          name: 'OPsalesCommissiondetails',
+          name: path,
           query: {
             PeriodId: GetDetail.ReFinanceId,
             OutBranchId: String(GetDetail.RB_Branch_Id),

src/components/FinancialModule/OpCommission/OPcommissionPeriods.vue

@@ -245,14 +245,14 @@
                   Money=item.SumPrice
               }
                   let obj = {
-                      CostType: 16,
+                      CostType: 16,//112
                       Money: Money,
                       CurrencyId: 1,
                       XSTC: 1,
                       OtherType:73,
                       ReFinanceId: item.ID,
                       isRB_Branch_Id: true,
-                      RB_Branch_Id: this.msg.OutBranchId
+                      RB_Branch_Id: this.msg.OutBranchId,
                   }
                   let query = {
                       blank: "y",

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1425,6 +1425,7 @@
           this.msg.ReFinanceId = this.orderObj.ReFinanceId ? this.orderObj.ReFinanceId : 0;
           this.msg.ReFinanceId2 = this.orderObj.ReFinanceId2 ? this.orderObj.ReFinanceId2 : 0;
           this.msg.ECOrderList = this.orderObj.ECOrderList ? this.orderObj.ECOrderList : [];
+          this.msg.EduCommissionEmp = this.orderObj.EduCommissionEmp ? this.orderObj.EduCommissionEmp: null
         }
         // 台湾提成汇率
         if (this.orderObj && this.orderObj.Rate && this.orderObj.Money) {
@@ -1563,6 +1564,16 @@
                 }
               })
             }).catch(() => {
+              if(this.orderObj&&(this.orderObj.EduCommissionEmp||this.orderObj.queryObj)){
+                location.reload()
+                this.$router.push({
+                  name: 'leaderReimbursement',
+                  query: {
+                    ...this.orderObj.queryObj,
+                    'blank': 'y',
+                  }
+                });
+              }else{
                 this.$router.push({
                   name: 'FinancialDocuments',
                   query: {
@@ -1570,6 +1581,7 @@
                     'InPay': this.$route.query.InPay
                   }
                 });
+              }
             });
           } else {
             this.resultCode = res.data.resultCode;

src/components/SalesVisa/ModifyVisaProduct.vue

@@ -444,6 +444,7 @@
                             value-format="yyyy-MM-dd"
                             >
                             </el-date-picker>
+                        <span style="color: red;font-size: 12px;">*：结束日期请设置为月20日左右， 防止销售月底报名次月无法提成帐未平；</span>
                     </el-form-item>
                     <el-form-item label="热门签证" prop="HotVisa">
                         <el-select v-model="addMsg.HotVisa">
@@ -993,6 +994,13 @@ getCompanyList() {
       this.PriceDates=[]
     },
     SaveVisaProduct(formName) {
+      let SendVisaDate = moment(new Date()).format("YYYY-MM")+'-25'
+      this.addMsg.SendVisaDate  = moment(this.PriceDates[1]).format("YYYY-MM-DD")
+      console.log(this.addMsg.SendVisaDate,this.addMsg.SendVisaDate<SendVisaDate,'---')
+      if(this.addMsg.SendVisaDate<SendVisaDate){
+        this.getBeforeDate(0,new Date().Format("yyyy-MM-dd"))
+      }
+      return
       this.$refs[formName].validate(valid => {
         if (valid) {
 

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -2386,13 +2386,15 @@
           OrderID: 0,
           OrderSource: 8,
           Obj: {},
-          TCIDList: TCArr
+          TCIDList: TCArr,
+
         }
         this.$router.push({
           name: "ChoiceAddFinancialDocuments",
           query: {
             Type: 2,
             companyID: this.OutBranchId,
+            noTypeCost: true,
             'blank': 'y',
             'orderObj': JSON.stringify(orderObj)
           }