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

src/components/FinancialModule/addFinancialDocuments.vue

@@ -890,9 +890,34 @@ export default {
             if(this.orderObj){
               this.msg.VisaIds = this.orderObj.VisaIds?this.orderObj.VisaIds:'';
             }
+            // 2019-12-3 18:29:31 新增费用类型判断
+            let riqi = false
             this.msg.detailList.forEach(x=>{
+                if (!riqi && (x.CostTypeName == '房费' || x.CostTypeName == '差旅费' || x.CostTypeName == '签证费' || x.CostTypeName.indexOf('机票') !== -1)){
+                    riqi = true
+                }
               delete x.rate;
             });
+            if (riqi) {
+                var today = new Date();
+                var year = today.getFullYear();
+                var month = today.getMonth();
+                var date = today.getDate();
+                var weeks = ["日","一","二","三","四","五","六"]
+                var temp = new Date(year,month,date+3)
+                var today =  Date.parse(new Date())
+                var PayDate = this.msg.PayDate
+                var startTime = Date.parse(temp);
+                var endTime = Date.parse(PayDate);
+                if (endTime > startTime) {
+                    this.$message.error('房费、差旅费、签证费、机票相关费用类型单据的预付款日期最多推后3天！');
+                    return
+                }
+                //  else if (endTime < today) {
+                //     this.$message.error('房费、差旅费、签证费、机票相关费用类型单据的预付款日期最多推后3天！');
+                //     return
+                // }
+            }
           //旅客名单数据组装
           if(!this.$route.query.edit){ 
                 this.msg.Type = this.$route.query.Type

src/components/dmc/manager/dmcTotalTable.vue

@@ -502,7 +502,7 @@
               <td colspan="23" style="text-align: left!important;padding:0 20px;">
                 <div class="link">
                   <p @click="getJourney(item)" style="padding-top:4px;">{{item.Title}}</p>
-                  <div v-if="outItem.PriceCommonList[index].DMCNum && outItem.PriceCommonList[index].DMCNum!=''"
+                  <div
                     class="colorE95252" style="padding-top:5px;padding-bottom:4px;font-size:13px;">{{$t('op.DJBZTH')}}：<span style="font-weight:bold">{{outItem.PriceCommonList[index].DMCNum}}</span>
                   </div>
                   <div v-show="outItem.PriceCommonList[index].OPInnerRemark!=''" class="colorE95252"