Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/OP/CarTouristGuideGrounContent.vue

@@ -33,7 +33,7 @@
                 <span style="font-weight: bold;font-size:12px;">出访国家：</span>
                 <span style="color:#606266;font-size:12px;">{{ delegationInfo.visitCountry }}&nbsp;&nbsp;&nbsp;</span>
                 <span style="font-weight: bold;font-size:12px;">起止日期：</span>
-                <span style="color:#606266;font-size:12px;">{{ VisitDate }}&nbsp;&nbsp;&nbsp;</span>
+                <span style="color:#606266;font-size:12px;">{{ delegationInfo.visitDate }}&nbsp;&nbsp;&nbsp;</span>
                 <span style="font-weight: bold;font-size:12px;">天数/人数：</span>
                 <span style="color:#606266;font-size:12px;">{{ delegationInfo.visitDays }}天/{{
                     delegationInfo.visitPNumber }}人</span>
@@ -192,26 +192,6 @@ export default {
                     { required: true, message: '请选择付款方式', trigger: ['blur', 'change'] },
                 ]
             },
-            VisitDate: '',
-            dateFormat: function (value) {
-
-                // 将value转换为Date对象
-                var date = new Date(value);
-                // 获取年、月、日
-                var year = date.getFullYear();
-                var month = date.getMonth() + 1;
-                var day = date.getDate();
-                // 将月份和日期转换为两位数的格式
-
-                if (month < 10) {
-                    month = '0' + month;
-                }
-                if (day < 10) {
-                    day = '0' + day;
-                }
-                // 返回格式化后的日期字符串
-                return year + '-' + month + '-' + day;
-            },
         }
     },
     methods: {
@@ -237,7 +217,7 @@ export default {
                         debugger
                         if (that.delegationInfoList[index].id == that.diId) {
                             that.delegationInfo = that.delegationInfoList[index];
-                            that.VisitDate = that.dateFormat(that.delegationInfo.visitStartDate) + '至' + that.dateFormat(that.delegationInfo.visitEndDate);
+
                             break;
                         }
                     }
@@ -283,6 +263,7 @@ export default {
                         that.currency = CreditCardPayment.paymentCurrency
                         that.OPContenData.payPercentage = CreditCardPayment.payPercentage
                         that.countCost = CreditCardPayment.payMoney
+                        that.OPContenData.orbitalPrivateTransfer = CreditCardPayment.orbitalPrivateTransfer
                     }
                     var CarTouristsContent = res.data.data.carTouristsContent;
                     if (CarTouristsContent.length != 0) {
@@ -298,10 +279,7 @@ export default {
                             })
                         })
                     }
-                    var CarTourists = res.data.data.carTourists
-                    if (CarTourists != null) {
-                        that.OPContenData.orbitalPrivateTransfer = CarTourists.orbitalPrivateTransfer
-                    }
+
                     that.loading = false
                 }
             })

src/components/OP/OpCarTouristGuideGroundId.vue

@@ -243,7 +243,7 @@ export default {
                 busTel: { required: true, message: '请输入车公司联系电话', trigger: ['blur', 'change'] },
                 serviceStartTime: { required: true, message: '请输入服务时间起', trigger: ['blur', 'change'] },
                 serviceEndTime: { required: true, message: '请输入服务时间止', trigger: ['blur', 'change'] },
-                orbitalPrivateTransfer: { required: true, message: '请输选择费用表示', trigger: ['blur', 'change'] },
+                orbitalPrivateTransfer: { required: true, message: '请选择费用表示', trigger: ['blur', 'change'] },
             }
         }
     },