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

src/components/LeaderManagement/leaderReimbursement.vue

@@ -1763,7 +1763,8 @@
         }, res => {
           if (res.data.resultCode == 1) {
              if(res.data.data.State==1){
-              this.$confirm(res.data.data.Msg,  this.$t('tips.tips'), {
+              if(res.data.data.roomZeroNum>0){
+                this.$confirm('存在用款计划酒店数据未维护价格，请维护单价后再试',  this.$t('tips.tips'), {
                   confirmButtonText: this.$t('objFill.ckbjd'),
                   cancelButtonText: this.$t('pub.cancelBtn'),
                   type: 'warning'
@@ -1779,6 +1780,24 @@
                 }).catch(() => {
                   
                 });
+              }else{
+                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 = {
@@ -1887,7 +1906,8 @@
         }, res => {
           if (res.data.resultCode == 1) {
              if(res.data.data.State==1){
-              this.$confirm(res.data.data.Msg,  this.$t('tips.tips'), {
+              if(res.data.data.roomZeroNum>0){
+                this.$confirm('存在用款计划酒店数据未维护价格，请维护单价后再试',  this.$t('tips.tips'), {
                   confirmButtonText: this.$t('objFill.ckbjd'),
                   cancelButtonText: this.$t('pub.cancelBtn'),
                   type: 'warning'
@@ -1903,6 +1923,24 @@
                 }).catch(() => {
                   
                 });
+              }else{
+                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);
              }

src/components/dmc/manager/teamRevenueExpenditure.vue

@@ -394,7 +394,8 @@
         otherPay: 0,
         IsPrerealContrast: false,
         PrerealContrastMsg:'',
-        PrerealContrastOfferId:0
+        PrerealContrastOfferId:0,
+        roomZeroNum: 0
       }
     },
     methods: {
@@ -522,7 +523,8 @@
       },
       goUrl(_orderSource, _type,Offset) {
         if(this.IsPrerealContrast){
-          this.$confirm(this.PrerealContrastMsg,  this.$t('tips.tips'), {
+          if(_orderSource==1 && this.roomZeroNum>0){
+            this.$confirm('存在用款计划酒店数据未维护价格，请维护单价后再试',  this.$t('tips.tips'), {
               confirmButtonText: this.$t('objFill.ckbjd'),
               cancelButtonText: this.$t('pub.cancelBtn'),
               type: 'warning'
@@ -538,7 +540,26 @@
             }).catch(() => {
               
             });
-          return;
+            return;
+          }else if(this.PrerealContrastMsg!=''){
+            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 = []
@@ -665,6 +686,7 @@
               this.IsPrerealContrast=true;
               this.PrerealContrastMsg = res.data.data.Msg;
               this.PrerealContrastOfferId = res.data.data.OfferId;
+              this.roomZeroNum = res.data.data.roomZeroNum;
              }
           } else {}
         }, err => {})