修改op费用界面

src/components/OP/CarTouristGuideGrounContent.vue

@@ -41,7 +41,7 @@
             <hr style='background-color:#5555; height:1px; border:none;' />
             <div>
                 <template>
-                    <el-table :data="ContenList" border style="width: 100%">
+                    <el-table :data="ContentList" border style="width: 100%">
                         <el-table-column prop="num" label="序 号" width="55">
                             <template slot-scope="scope">
                                 {{ scope.$index + 1 }}
@@ -91,7 +91,7 @@
                             </div>
                             <div style="width: 25%;">
                                 <el-form-item label="收款方:" prop="payee" label-width="160px">
-                                    <el-input placeholder="联系电话" v-model="OPContenData.payee">
+                                    <el-input placeholder="收款方" v-model="OPContenData.payee">
                                     </el-input>
                                 </el-form-item>
                             </div>
@@ -166,7 +166,7 @@ export default {
             tableInitialization: [],
             payment: [],
             IsAuditGM: 0,
-            ContenList: [],
+            ContentList: [],
             OPContenData: {
                 diId: '',
                 cTGGRId: '',
@@ -175,7 +175,7 @@ export default {
                 payee: '',
                 payDId: '',
                 currency: '',
-                OPContenList: [],
+                OPContentList: [],
                 CreateUserId: 0
             },
             OPContenDataRules: {
@@ -218,7 +218,7 @@ export default {
         //初始化下拉框
         initializeSelect() {
             //团组下拉框绑定
-            var url = "/api/Groups/CarTouristGuideGroundContenInitialize"
+            var url = "/api/Groups/CarTouristGuideGroundContentInitialize"
             var that = this
             this.$axios({
                 method: 'post',
@@ -245,7 +245,7 @@ export default {
                     debugger
                     that.tableInitialization = res.data.data.tableInitialization;
                     that.tableInitialization.forEach(function (item) {
-                        that.ContenList.push({
+                        that.ContentList.push({
                             id: 0,
                             sId: item.id,
                             sIdName: item.name,
@@ -262,7 +262,7 @@ export default {
 
         },
         OpCarTouristGuideGroundContenById() {
-            var url = "/api/Groups/OpCarTouristGuideGroundContenById"
+            var url = "/api/Groups/OpCarTouristGuideGroundContentById"
             var that = this
             this.$axios({
                 method: 'post',
@@ -284,10 +284,10 @@ export default {
                         that.OPContenData.payPercentage = CreditCardPayment.payPercentage
                         that.countCost = CreditCardPayment.payMoney
                     }
-                    var CarTouristsConten = res.data.data.carTouristsConten;
-                    if (CarTouristsConten.length != 0) {
-                        CarTouristsConten.forEach(function (item) {
-                            that.ContenList.forEach(function (item1) {
+                    var CarTouristsContent = res.data.data.carTouristsContent;
+                    if (CarTouristsContent.length != 0) {
+                        CarTouristsContent.forEach(function (item) {
+                            that.ContentList.forEach(function (item1) {
                                 if (item.sId == item1.sId) {
                                     item1.id = item.id
                                     item1.price = item.price
@@ -322,8 +322,8 @@ export default {
                             that.OPContenData.cTGGRId = that.id
                             that.OPContenData.currency = that.currency
                             that.OPContenData.CreateUserId = that.userId
-                            that.ContenList.forEach(function (item) {
-                                that.OPContenData.OPContenList.push({
+                            that.ContentList.forEach(function (item) {
+                                that.OPContenData.OPContentList.push({
                                     id: item.id,
                                     sId: item.sId,
                                     price: item.price,
@@ -332,7 +332,7 @@ export default {
                                 })
                             })
 
-                            var url = "/api/Groups/OpCarTouristGuideGroundConten"
+                            var url = "/api/Groups/OpCarTouristGuideGroundContent"
                             that.$axios({
                                 method: 'post',
                                 url: url,
@@ -368,7 +368,7 @@ export default {
         },
         PriceChange() {
             var countCost = 0;
-            this.ContenList.forEach(function (item) {
+            this.ContentList.forEach(function (item) {
                 if (item.price != '') {
                     countCost += parseFloat(item.price)
                 }

src/components/OP/HotelReservations.vue

@@ -26,7 +26,7 @@
                     </div>
                     <div class="hotelr-info-li">
                         <label>起止日期：</label>
-                        <span>{{ VisitDate }}</span>
+                        <span>{{ delegationInfo.visitDate }}</span>
                     </div>
                     <div class="hotelr-info-li">
                         <label>天数/人数：</label>
@@ -61,13 +61,7 @@
                             <i>下载附件</i>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="isAuditGM" label="是否审核" width="100">
-                        <template slot-scope="isAuditGM">
-                            <span v-if="isAuditGM.row.isAuditGM == 1">已通过</span>
-                            <span v-else-if="isAuditGM.row.isAuditGM == 0">未审核</span>
-                            <span v-else-if="isAuditGM.row.isAuditGM == 2">未通过</span>
-                            <span v-else>自动审核通过</span>
-                        </template>
+                    <el-table-column prop="isAuditGMStr" label="是否审核" width="100">
                     </el-table-column>
                     <el-table-column prop="name" label="操 作" width="140">
                         <template slot-scope="scope">
@@ -396,6 +390,7 @@ export default {
             currentPage: 1, // 当前页码
             pageSize: 5,// 每页的数据条数
             gridData: [],
+            loading: false,
             delegationInfoList: [],
             delegationInfo: {},
             guestType: [],//客人类型
@@ -482,26 +477,6 @@ export default {
                     { type: 'date', required: true, message: '请选择日期', trigger: '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: {
@@ -547,7 +522,6 @@ export default {
                             if (that.delegationInfoList[index].id == that.OpHotelReservationsData.diid) {
                                 that.delegationInfo = that.delegationInfoList[index];
                                 that.OpHotelReservationsData.diid = that.delegationInfoList[index].id;
-                                that.VisitDate = that.dateFormat(that.delegationInfo.visitStartDate) + '至' + that.dateFormat(that.delegationInfo.visitEndDate);
                                 break;
                             }
                         }