24-01-17 lhj

src/components/OP/Groupedit.vue

@@ -61,7 +61,7 @@
                     <span
                         style="margin-bottom: 22px;display: inline-block;color: #606266;font-size: 14px;">（预付款,请输入RMB）</span>
                 </div>
-                <div style="display: flex;">
+                <div style="display: flex;align-items: center;">
                     <el-form-item label-width="120px" label="OP提成等级" prop="opRoyaltyLv">
                         <el-select v-model="ruleForm.opRoyaltyLv" placeholder="OP提成等级" clearable filterable
                             style="width: 100%;">
@@ -70,8 +70,12 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label-width="98px" label="等级说明:" prop="opRoyaltyRemark">
-                        <el-input type="textarea" v-model="ruleForm.opRoyaltyRemark" style="width: 500px;"></el-input>
+                    <el-form-item style="width:50%" label-width="98px" label="等级说明:" prop="opRoyaltyRemark">
+                        <el-select style="width:100%" class="op-type" v-model="ruleForm.opRoyaltyRemark" placeholder="请选择团组类型">
+                            <el-option v-for="(item, index) in commissionleve" :key="index" :label="item.lable"
+                                :value="item.lable"></el-option>
+                        </el-select>
+                        <!-- <el-input type="textarea" v-model="ruleForm.opRoyaltyRemark" style="width: 500px;"></el-input> -->
                     </el-form-item>
                     <span style="margin-bottom: 22px;display: inline-block;color: #606266;font-size: 14px;"
                         @click="dialogVisible = true">（点击查看等级说明）</span>
@@ -185,6 +189,41 @@ export default {
                 opRoyaltyLv: '',
                 opRoyaltyRemark: ''
             },
+            commissionleve:[
+                {
+                    lable:'1)普通团组：￥300/团；'
+                },
+                {
+                    lable:'2)VIP团（地市州书记 市长 成都副市级别 副书记级别 成都正厅级干部）：￥500/团；'
+                },
+                {
+                    lable:'3)VVIP团（四川省副部级 副省级 省长 ）：￥1000/团；'
+                },
+                {
+                    lable:'4)非全程接待或非标准团组，接待5天内（含5天）的团组：￥100/团；'
+                },
+                {
+                    lable:'5)非全程接待或非标准团组，但负责全程机票，接待5天以上的团组：￥200/团；'
+                },
+                {
+                    lable:'6)非全程接待或非标准团组且不负责全程机票，接待5天以上的团组：￥100/团；'
+                },
+                {
+                    lable:'7)非全程接待或非标准团组且不负责全程机票，只负责地接的，人数为10人以上的的团组:300/团；'
+                },
+                {
+                    lable:'8)人数为5人以内（含5人）的标准团组：￥200/团；'
+                },
+                {
+                    lable:'9)人数为5人以内（含5人）并且非全程接待5天内（含5天）的团组：￥100/团；'
+                },
+                {
+                    lable:'10)人数为5人以内（含5人），非全程接待5天以上并且负责全程机票的团组：￥200/团；'
+                },
+                {
+                    lable:'11)人数为5人以内（含5人）并且非全程接待5天以上，但不负责全程机票的团组：￥100.00/团；'
+                },
+            ],
             personarr: [],
             gradearr: [],
             OPtype: [],
@@ -489,6 +528,7 @@ export default {
 
 .approval-box>div {
     width: 23%;
+    
 }
 
 .approval-box>div:nth-child(1) {

src/components/OP/GroupsTaskAssignment.vue

@@ -3,41 +3,78 @@
         <div class="communal-title">
             <div>团组任务分配</div>
         </div>
-        <div>
-            <div style="display: flex;">
-                <div style="width: 30%;">
-                    <el-select v-model="diId" filterable clearable placeholder="请选择" style="width:90%;"
+        <div class="konzh" style="display: flex;justify-content: space-between;">
+            <el-form style="display: flex;" label-width="70px" class="demo-form-inline">
+                <el-form-item style="width: 300px;margin-right: 20px;" label="团组名称">
+                    <el-select v-model="diId" filterable clearable placeholder="请选择" style="width:100%;"
+                        @change="diidChange()">
+                        <el-option v-for="item1 in delegationInfos" :key=item1.id :label=item1.name
+                            :value=item1.id></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item style="width: 300px;margin-right: 20px;" label="操作分类">
+                    <el-select v-model="ctId" filterable clearable placeholder="请选择" style="width:100%;"
+                    @change="sdIdChange()">
+                        <el-option v-for=" item1 in setData" :key=item1.id :label=item1.name :value=item1.id></el-option>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+                <!-- <div style="width: 240px;margin-right: 20px;">
+                    <el-select v-model="diId" filterable clearable placeholder="请选择" style="width:100%;"
                         @change="diidChange()">
                         <el-option v-for="item1 in delegationInfos" :key=item1.id :label=item1.name
                             :value=item1.id></el-option>
                     </el-select>
                 </div>
-                <div style="width: 30%;">
-                    <el-select v-model="ctId" filterable clearable placeholder="请选择" style="width: 90%;"
+                <div style="width: 200px;">
+                    <el-select v-model="ctId" filterable clearable placeholder="请选择" style="width:100%;"
                         @change="sdIdChange()">
                         <el-option v-for=" item1 in setData" :key=item1.id :label=item1.name :value=item1.id></el-option>
                     </el-select>
-                </div>
-                <div style="width: 30%;">
-                    <el-button type="primary" style="margin-left: 10px;" @click="btn">保存</el-button>
-                </div>
+                </div> -->
+  
+            <div style="width: 30%;text-align: right;">
+                <el-button type="primary" style="margin-left: 10px;" @click="btn">保存</el-button>
             </div>
         </div>
-        <div class="tzinif">
+        <div class="tzinif-info">
+            <div class="tzinif-info-li">
+                <label>团 号：</label>
+                <span>{{ DelegationInfo.tourCode  }}</span>
+            </div>
+            <div class="tzinif-info-li">
+                <label>客 户：</label>
+                <span>{{ DelegationInfo.clientName }}</span>
+            </div>
+            <div class="tzinif-info-li">
+                <label>出访国家：</label>
+                <span>{{ DelegationInfo.visitCountry |filter_city}}</span>
+            </div>
+            <div class="tzinif-info-li">
+                <label>起止日期：</label>
+                <span>{{ DelegationInfo.visitStartDate|filter_time }}~{{ DelegationInfo.visitEndDate|filter_time}}</span>
+            </div>
+            <div class="tzinif-info-li">
+                <label>天数/人数：</label>
+                <span>{{ DelegationInfo.visitDays }}/{{ DelegationInfo.visitPNumber }}</span>
+            </div>
+        </div>
+        <!-- <div class="tzinif">
             <span style="font-weight: bold;">团 号：</span>{{ DelegationInfo.tourCode }}
             <span style="font-weight: bold;">客 户：</span>{{ DelegationInfo.clientName }}
             <span style="font-weight: bold;">出访国家：</span>{{ DelegationInfo.visitCountry }}
             <span style="font-weight: bold;">起止日期：</span>{{ DelegationInfo.visitStartDate }} ～ {{
                 DelegationInfo.visitEndDate }}
             <span style="font-weight: bold;">天数/人数：</span>{{ DelegationInfo.visitDays }}天/{{ DelegationInfo.visitPNumber }}人
-        </div>
-        <div>
+        </div> -->
+        <!-- <div>
             <div>人员安排</div>
-        </div>
-        <div style="margin-top: 10px;">
+        </div> -->
+        <div style="margin-top: 10px;border-top: 1px solid #C0C4CC;">
             <div style="display: flex;flex-wrap: wrap;">
-                <div v-for="(  item, index  ) in   user  " :key="index"
-                    style="margin-left: 5px;width: 200px;margin-top: 10px;">
+                <div v-for="(  item, index  ) in   user  " 
+                :key="index" 
+                style="width: 12.5%;margin: 10px 0;text-align: center;">
                     <el-checkbox :label="item.id" :value="userStr.indexOf(item.id) != -1" border @change="check(item.id)"
                         style="width: 120px;">{{
                             item.name
@@ -76,31 +113,29 @@ export default {
                     Authorization: 'Bearer ' + this.token
                 },
             }).then(function (res) {
+                console.log(res)
                 if (res.data.code == 200) {
                     that.delegationInfos = res.data.data.delegationInfos;
+                    that.diId=res.data.data.delegationInfos[0].id;
                     that.setData = res.data.data.setData;
+                    that.ctId=res.data.data.setData[0].id;
                     that.user = res.data.data.user;
+                    setTimeout(() => {
+                        that.TaskAssignmenQuery();
+                    }, 500);
                     console.log(that.setData)
                 }
             })
         },
         TaskAssignmenQuery() {
             var that = this
-            var diidI = 0;
-            if (that.diId != '') {
-                diidI = that.diId
-            }
-            var ctIdI = 0;
-            if (that.ctId != '') {
-                ctIdI = that.ctId
-            }
             var url = "/api/Groups/TaskAssignmenQuery";
             this.$axios({
                 method: 'post',
                 url: url,
                 data: {
-                    diId: diidI,
-                    ctId: ctIdI,
+                    diId: that.diId,
+                    ctId: that.ctId,
                 },
                 headers: {
                     Authorization: 'Bearer ' + this.token
@@ -145,7 +180,7 @@ export default {
                         type: 'success'
                     });
                 } else {
-                    that.$message.error('保存失败！' + resp.data.msg);
+                    that.$message.error('保存失败！' + res.data.msg);
                 }
             })
         },
@@ -167,11 +202,22 @@ export default {
             }
         }
     },
+    filters:{
+        filter_city(value){
+            if(value){
+                return value.replaceAll('|','、')
+            }
+        },
+        filter_time(value){
+            if(value){
+                return value.split(" ")[0]
+            }
+        }
+    },
     mounted() {
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
         this.GetTaskAssignmen();
-        this.TaskAssignmenQuery();
     }
 }
 </script>
@@ -189,8 +235,7 @@ export default {
     font-size: 17px;
     font-weight: 600;
     color: #555;
-    margin-top: 8px;
-    margin-bottom: 10px;
+    margin-bottom: 15px;
     justify-content: space-between;
     align-items: center;
 }
@@ -203,7 +248,26 @@ export default {
     margin-left: 10px;
     padding: 8px 20px;
 }
-.tzinif{
-    margin: 10px 0;
+.tzinif-info {
+    display: flex;
+    margin-top: 10px;
+}
+
+.tzinif-info-li {
+    margin-right: 30px;
+}
+
+.tzinif-info-li label {
+    color: #606266;
+    font-size: 15px;
+    font-weight: 600;
+}
+
+.tzinif-info-li span {
+    color: #606266;
+    font-size: 14px;
+}
+.konzh .el-form-item{
+    margin-bottom: 0;
 }
 </style>

src/components/OP/HotelReservations.vue

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div v-loading="loading">
         <div class="hotelr-all">
             <div class="hotelr-head">
                 <div class="hotelr-head-li">
@@ -252,7 +252,7 @@
                             <el-form-item style="width:395px;" label="信用卡金额">
                                 <el-input-number class="fjprice" style="width:80px;" :precision="2" size="medium" :controls="false" v-model="TwoParameters.amount"></el-input-number>
                                 <!-- <el-input size="medium" type="text" v-model="TwoParameters.amount" style="width: 50%;" @change="bankCardPriceChange"></el-input> -->
-                                <el-input disabled size="medium" type="text" v-model="TwoParameters.credit" style="width: 43%;" @change="bankCardPriceChange"></el-input>
+                                <el-input disabled size="medium" type="text" v-model="TwoParameters.credit" style="width: 43%;"></el-input>
                             </el-form-item>
                             <el-form-item style="width:395px ;" label="地税">
                                 <el-input-number :controls="false" :precision="2" style="width:50% ;" size="medium"
@@ -299,7 +299,7 @@
                             <div style="width: 395px;">
                                 <el-form-item label="支付方式:" label-width="110px">
                                     <el-select v-model="Paymentinfor.paymentMethods" placeholder="支付方式"
-                                        style="width: 100%;" @change="payChange">
+                                        style="width: 100%;">
                                         <el-option v-for="item in payment" :key="item.id" :label="item.name"
                                             :value="item.id">
                                         </el-option>
@@ -338,7 +338,7 @@
                             <div style="display: flex;flex-wrap: wrap;">
                                 <div style="width: 395px;">
                                     <el-form-item label="卡类型:" label-width="110px">
-                                        <el-select v-model="Paymentinfor.cardtype" placeholder="卡类型"
+                                        <el-select :disabled="true" v-model="Paymentinfor.cardtype" placeholder="卡类型"
                                             style="width: 100%;" @change="changecardtype">
                                             <el-option v-for="item in bankCard" :key="item.id" :label="item.name"
                                                 :value="item.id">
@@ -449,6 +449,7 @@
 </template>
 <script>
 import { el } from '@fullcalendar/core/internal-common';
+import { set } from 'vue';
 export default {
     data() {
         return {
@@ -467,6 +468,8 @@ export default {
             headers: {
                 Authorization: JSON.parse(localStorage.getItem('userinif')).token,
             },
+            loading:false,
+            modifieds:0,//能否修改
             Rate: '1',
             loading: false,
             isAuditGM: 0,
@@ -762,6 +765,8 @@ export default {
                     that.bankCard=res.data.data.bankCard;
                     if(that.bankCard){
                         that.RequiredParameters.BankCards=that.bankCard[0].id;//银行卡
+                        that.Paymentinfor.cardtype=that.bankCard[0].id;
+                        that.changecardtype(that.RequiredParameters.BankCards)
                         that.TwoParameters.credit=that.bankCard[0].name+'('+that.bankCard[0].currency+')';//银行卡
                     }
                     that.bookingWebsite=res.data.data.bookingWebsite;
@@ -859,6 +864,7 @@ export default {
         //详情
         PostHotelReservationsDetails(index,row) {
             console.log(row)
+            this.modifieds=row.isAuditGM;
             this.inifid=row.id;
             var url = "/api/Groups/PostHotelReservationsDetails"
             var that = this
@@ -886,20 +892,21 @@ export default {
             }).then(function (res) {
                 console.log(res)
                 if (res.data.code == 200) {
-
                     //必填参数
                     that.RequiredParameters.TypeGuest=res.data.data.gtId;//客人类型
                     that.RequiredParameters.BankCards=res.data.data.ctdId;//银行卡
+                    console.log(that.bankCard)
                     for(let l=0;l<that.bankCard.length;l++){
                         if(that.bankCard[l].id==that.RequiredParameters.BankCards){
-                            that.TwoParameters.singleroomsCurrency=that.bankCard[l].currency
-                            that.TwoParameters.doubleroomCurrency=that.bankCard[l].currency
-                            that.TwoParameters.suiteCurrency=that.bankCard[l].currency
-                            that.TwoParameters.otherroomCurrency=that.bankCard[l].currency
+                            
                             that.TwoParameters.credit=that.bankCard[l].name+'('+that.bankCard[l].currency+')'
                             for(let f=0;f<that.currencyList.length;f++){
                                 if(that.bankCard[l].currency==that.currencyList[f].currencyCode){
                                     that.RequiredParameters.CurrentRate=that.currencyList[f].rate
+                                    that.TwoParameters.singleroomsCurrency=that.currencyList[f].currencyId
+                                    that.TwoParameters.doubleroomCurrency=that.currencyList[f].currencyId
+                                    that.TwoParameters.suiteCurrency=that.currencyList[f].currencyId
+                                    that.TwoParameters.otherroomCurrency=that.currencyList[f].currencyId
                                 }
                             }
                         }
@@ -939,7 +946,9 @@ export default {
                     //付款信息
                     that.Paymentinfor.paymentMethods=res.data.data.payDId//支付方式
                     that.Paymentinfor.consumptionPatterns=res.data.data.consumptionPatterns//消费方式
-                    that.Paymentinfor.purchaseDate=new Date(res.data.data.consumptionDate)//消费日期
+                    that.Paymentinfor.purchaseDate=res.data.data.consumptionDate//消费日期
+                    // that.$set(that.Paymentinfor,'purchaseDate',res.data.data.consumptionDate)//消费日期
+                    // console.log(that.Paymentinfor.purchaseDate)
                     that.Paymentinfor.paymentAmount=res.data.data.payMoney.toFixed(2)//付款金额
                     that.Paymentinfor.paymentCurrency=res.data.data.paymentCurrency//付款币种
                     //刷卡
@@ -980,6 +989,7 @@ export default {
         },
         //新增修改api
         PostHotelReservationsAddOrEdit() {
+            this.loading=true;
             var url = "/api/Groups/PostHotelReservationsAddOrEdit"
             var that = this
             var data= {
@@ -1022,7 +1032,7 @@ export default {
                     cityTaxCurrency:that.TwoParameters.CitytaxCurrency,//城市税币种
                     payDId:that.Paymentinfor.paymentMethods,//支付方式
                     consumptionPatterns:that.Paymentinfor.consumptionPatterns,//消费方式
-                    consumptionDate:that.transferdate(that.Paymentinfor.purchaseDate),//消费日期
+                    consumptionDate:that.Paymentinfor.purchaseDate!=''?that.transferdate(that.Paymentinfor.purchaseDate):'',//消费日期
                     payMoney:that.Paymentinfor.paymentAmount,//付款金额
                     paymentCurrency:that.Paymentinfor.paymentCurrency,//付款币种
                     bankNo:that.Paymentinfor.cardnumber,//银行卡号
@@ -1082,7 +1092,7 @@ export default {
                     cityTaxCurrency:that.TwoParameters.CitytaxCurrency,//城市税币种
                     payDId:that.Paymentinfor.paymentMethods,//支付方式
                     consumptionPatterns:that.Paymentinfor.consumptionPatterns,//消费方式
-                    consumptionDate:that.transferdate(that.Paymentinfor.purchaseDate),//消费日期
+                    consumptionDate:that.Paymentinfor.purchaseDate!=''?that.transferdate(that.Paymentinfor.purchaseDate):'',//消费日期
                     payMoney:that.Paymentinfor.paymentAmount,//付款金额
                     paymentCurrency:that.Paymentinfor.paymentCurrency,//付款币种
                     bankNo:that.Paymentinfor.cardnumber,//银行卡号
@@ -1098,28 +1108,43 @@ export default {
             }).then(function (res) {
                 console.log(res)
                 if (res.data.code == 200) {
-                   that.PostHotelReservationsItemsByDiId()
-                   that.$message({
+                    that.$message({
                         type: 'success',
                         message: res.data.msg,
                         duration:'3000'
                     });
-                   that.AddToggle()
+                    that.PostHotelReservationsItemsByDiId()
+                    setTimeout(() => {
+                        that.AddToggle()
+                        that.loading=false;
+                    }, 500);
+                }else{
+                    that.$message.error(res.data.msg);
+                    that.loading=false;
                 }
             }).catch(function (error) {
                 that.$message.error("新增或修改失败");
+                that.loading=false;
             });
         },
         //保存
         AddBtn(RequiredParameters) {
-            console.log(this.transferdate(this.Paymentinfor.purchaseDate))
+            // console.log(this.Paymentinfor.purchaseDate)
             this.CalculateAmount()
             this.$refs[RequiredParameters].validate((valid) => {
                 if (valid) {
                     if(this.inifid==0){
-                        this.PostHotelReservationsAddOrEdit();
+                        if(this.modifieds==0){
+                            this.PostHotelReservationsAddOrEdit();
+                        }else{
+                            this.$message.error("已被审核，无法修改此条数据");
+                        }
                     }else{
-                        this.PostHotelReservationsAddOrEdit();
+                        if(this.modifieds==0){
+                            this.PostHotelReservationsAddOrEdit();
+                        }else{
+                            this.$message.error("已被审核，无法修改此条数据");
+                        }
                     }
                 } else {
                     this.$message({
@@ -1135,46 +1160,50 @@ export default {
         },
         //删除
         delinif(index,row){
-            this.$confirm('此操作将删除此条数据，是否确认', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-            }).then(() => {
-                var url = "/api/Groups/PostHotelReservationsDel"
-                var that = this
-                this.$axios({
-                    method: 'post',
-                    url: url,
-                    headers: {
-                        Authorization: 'Bearer ' + this.token
-                    },
-                    data: {
-                        portType:1,
-                        userId:that.userId,
-                        pageId:that.pageId,
-                        id:row.id,
-                        diId:that.OpHotelReservationsData.diId
-                    }
-                }).then(function (res) {
-                    console.log(res)
-                    if (res.data.code == 200) {
-                        that.$message({
-                            type: 'success',
-                            message: '删除成功!'
-                        });
-                        that.PostHotelReservationsItemsByDiId()
-                    }
-                }).catch(function (error) {
-                    that.$message.error("删除失败");
-                });
-            }).catch(() => {
+            if(row.isAuditGM!=1){
+                this.$confirm('此操作将删除此条数据，是否确认', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    var url = "/api/Groups/PostHotelReservationsDel"
+                    var that = this
+                    this.$axios({
+                        method: 'post',
+                        url: url,
+                        headers: {
+                            Authorization: 'Bearer ' + this.token
+                        },
+                        data: {
+                            portType:1,
+                            userId:that.userId,
+                            pageId:that.pageId,
+                            id:row.id,
+                            diId:that.OpHotelReservationsData.diId
+                        }
+                    }).then(function (res) {
+                        console.log(res)
+                        if (res.data.code == 200) {
+                            that.$message({
+                                type: 'success',
+                                message: '删除成功!'
+                            });
+                            that.PostHotelReservationsItemsByDiId()
+                        }
+                    }).catch(function (error) {
+                        that.$message.error("删除失败");
+                    });
+                }).catch(() => {
 
-            });
+                });
+            }else{
+                this.$message.error("已被审核，无法删除此条数据");
+            }
             
         },
         //新增切换
         AddToggle(){
-            
+            this.modifieds=0;
             this.inifid=0;
             //必填参数
             this.RequiredParameters={
@@ -1228,7 +1257,7 @@ export default {
                 paymentAmount:0,//付款金额
                 paymentCurrency:0,//付款币种
                 beneficiary:'',//收款方
-                expenseid:'',//费用标识
+                expenseid:-1,//费用标识
                 remarks:'',//备 注
                 //刷卡
                 cardtype:'',//卡类型:
@@ -1285,6 +1314,10 @@ export default {
         },
         //付款金额
         AmountPayment(){
+            console.log(this.TwoParameters.suiteCurrency)
+            console.log(this.TwoParameters.RentCurrency)
+            console.log(this.TwoParameters.CitytaxCurrency)
+            console.log(this.TwoParameters.breakfastCurrency)
             if(this.TwoParameters.suiteCurrency!=this.TwoParameters.RentCurrency||this.TwoParameters.suiteCurrency!=this.TwoParameters.CitytaxCurrency||this.TwoParameters.suiteCurrency!=this.TwoParameters.breakfastCurrency){
                 this.Paymentinfor.paymentCurrency=836;
                 var dishui=0;
@@ -1319,613 +1352,21 @@ export default {
                 }else{
                     zaocan=this.TwoParameters.breakfastPrice*this.RequiredParameters.CurrentRate
                 }
-                console.log(dishui,chengshishui,zaocan)
+                // console.log(dishui,chengshishui,zaocan)
                 this.Paymentinfor.paymentAmount=(dishui+chengshishui+zaocan+(this.TwoParameters.amount*this.RequiredParameters.CurrentRate)).toFixed(2)
             }else{
                 this.Paymentinfor.paymentCurrency=this.TwoParameters.RentCurrency
                 this.Paymentinfor.paymentAmount=(this.TwoParameters.RentPrice+this.TwoParameters.CitytaxPrice+this.TwoParameters.breakfastPrice+this.TwoParameters.amount).toFixed(2)
             }
         },
-        //hongge
-        HotelReservationsInitialize() {
-            var url = "/api/Groups/HotelReservationsInitialize"
-            var that = this
-            this.$axios({
-                method: 'post',
-                url: url,
-                headers: {
-                    Authorization: 'Bearer ' + this.token
-                },
-                data: {
-                    UserId: that.userId,
-                    PortType: 1,
-                    diid: 0
-                }
-            }).then(function (res) {
-                if (res.data.code == 200) {
-
-                    that.guestType = res.data.data.guestType//客人类型
-                    that.currencyList = res.data.data.currencyList//币种下拉框
-                    that.bankCard = res.data.data.bankCard//卡类型下拉框
-                    that.payment = res.data.data.payment//支付方式下拉框
-                    that.bookingWebsite = res.data.data.bookingWebsite//预订网站
-
-                    that.delegationInfoList = res.data.data.delegations;
-                    that.OpHotelReservationsData.diId = that.$route.query.diId
-                    if (that.OpHotelReservationsData.diId == undefined) {
-                        that.delegationInfo = that.delegationInfoList[0]
-                        that.OpHotelReservationsData.diId = that.delegationInfoList[0].id;
-                        that.VisitDate = that.dateFormat(that.delegationInfo.visitStartDate) + '至' + that.dateFormat(that.delegationInfo.visitEndDate);
-                    } else {
-                        for (let index = 0; index < that.delegationInfoList.length; index++) {
-
-                            if (that.delegationInfoList[index].id == that.OpHotelReservationsData.diId) {
-                                that.delegationInfo = that.delegationInfoList[index];
-                                that.OpHotelReservationsData.diId = that.delegationInfoList[index].id;
-                                break;
-                            }
-                        }
-                    }
-                    that.HotelReservationsByDiId();
-                }
-            }).catch(function (error) {
-                that.$message({
-                    message:"网络错误",
-                    duration:3000,
-                    type:"error"
-                });
-            });
-        },
+        //切换团组
         delegationSelectChange() {
             this.delegationInfo=[];
             this.PostGroupListByCTableAndUserId();
-            // for (let index = 0; index < this.delegationInfoList.length; index++) {
-
-            //     if (this.delegationInfoList[index].id == this.OpHotelReservationsData.diId) {
-            //         this.delegationInfo = this.delegationInfoList[index];
-            //         this.OpHotelReservationsData.diId = this.delegationInfoList[index].id;
-            //         this.VisitDate = this.dateFormat(this.delegationInfo.visitStartDate) + '至' + this.dateFormat(this.delegationInfo.visitEndDate);
-            //         break;
-            //     }
-            // }
-
-            // this.HotelReservationsByDiId();
-
-            // this.OpHotelReservationsData.status = 1;
-            // this.OpHotelReservationsData.id = 0;
-            // this.OpHotelReservationsData.checkNumber = '';
-            // this.OpHotelReservationsData.reservationsWebsite = 103;
-            // this.OpHotelReservationsData.reservationsNo = '';
-            // this.OpHotelReservationsData.determineNo = '';
-            // this.OpHotelReservationsData.city = '';
-            // this.OpHotelReservationsData.hotelName = '';
-            // this.OpHotelReservationsData.hotelAddress = '';
-            // this.OpHotelReservationsData.hotelTel = '';
-            // this.OpHotelReservationsData.guestName = '';
-            // this.OpHotelReservationsData.checkInDate = '';
-            // this.OpHotelReservationsData.budgetCurrency = 836;
-            // this.OpHotelReservationsData.checkOutDate = '';
-            // this.OpHotelReservationsData.singleRoomCount = 0;
-            // this.OpHotelReservationsData.singleRoomPrice = 0.00;
-            // this.OpHotelReservationsData.doubleRoomCount = 0;
-            // this.OpHotelReservationsData.doubleRoomPrice = 0.00;
-            // this.OpHotelReservationsData.suiteRoomCount = 0;
-            // this.OpHotelReservationsData.suiteRoomPrice = 0.00;
-            // this.OpHotelReservationsData.otherRoomCount = 0;
-            // this.OpHotelReservationsData.otherRoomPrice = 0.00;
-            // this.OpHotelReservationsData.roomExplanation = '';
-            // this.OpHotelReservationsData.attachment = '';
-            // this.OpHotelReservationsData.cardPrice = 0.00;
-            // this.OpHotelReservationsData.isCardPrice = 0;
-            // this.OpHotelReservationsData.predictSingleRoom = 0;
-            // this.OpHotelReservationsData.predictDoubleRoom = 0;
-            // this.OpHotelReservationsData.predictSuiteRoom = 0;
-            // this.OpHotelReservationsData.predictOtherRoom = 0;
-            // this.OpHotelReservationsData.governmentRent = 0.00;
-            // this.OpHotelReservationsData.governmentRentCurrency = '';
-            // this.OpHotelReservationsData.cityTax = 0.00;
-            // this.OpHotelReservationsData.cityTaxCurrency = '';
-            // this.OpHotelReservationsData.checkType = '';
-            // this.OpHotelReservationsData.createUserId = 0;
-            // this.OpHotelReservationsData.remark = '';
-            // this.OpHotelReservationsData.payMoney = 0.00;
-            // this.OpHotelReservationsData.paymentCurrency = '';
-            // this.OpHotelReservationsData.payDId = '';
-            // this.OpHotelReservationsData.consumptionPatterns = '';
-            // this.OpHotelReservationsData.consumptionDate = '';
-            // this.OpHotelReservationsData.ctdId = '';
-            // this.OpHotelReservationsData.companyBankNo = '';
-            // this.OpHotelReservationsData.otherBankName = '';
-            // this.OpHotelReservationsData.otherSideNo = '';
-            // this.OpHotelReservationsData.otherSideName = '';
-            // this.OpHotelReservationsData.bankNo = '';
-            // this.OpHotelReservationsData.cardholderName = '';
-            // this.OpHotelReservationsData.payee = '';
-            // this.OpHotelReservationsData.orbitalPrivateTransfer = 0;
-            // this.OpHotelReservationsData.cRemark = ''
-            // this.$nextTick(() => {
-            //     this.$refs.OpHotelReservationsData.clearValidate();
-            // })
-        },
-        HotelReservationsByDiId() {
-
-            var url = "/api/Groups/HotelReservationsByDiId"
-            var that = this
-            this.$axios({
-                method: 'post',
-                url: url,
-                headers: {
-                    Authorization: 'Bearer ' + this.token
-                },
-                data: {
-                    pageIndex: 0,
-                    pageSize: 0,
-                    portType: 1,
-                    diId: that.OpHotelReservationsData.diId,
-                }
-            }).then(function (res) {
-                if (res.data.code == 200) {
-                    that.tableDatas = res.data.data;
-                    that.tableData = that.tableDatas
-                    if (that.tableDatas.length != 0) {
-                        if (that.tableDatas.slice((that.currentPage - 1) * that.pageSize, that.currentPage * that.pageSize).length == 0) {
-                            if (that.currentPage > 1) {
-                                that.currentPage = that.currentPage - 1;
-                            }
-                        }
-                    }
-                }
-            }).catch(function (error) {
-                that.$message.error("网络错误，请稍后重试");
-            });
-        },
-        upDate(index, row) {
-
-            var url = "/api/Groups/HotelReservationsById"
-            var that = this
-            this.$axios({
-                method: 'post',
-                url: url,
-                headers: {
-                    Authorization: 'Bearer ' + this.token
-                },
-                data: {
-                    id: row.id
-                }
-            }).then(function (res) {
-                if (res.data.code == 200) {
-                    var hotelReservations = res.data.data.hotelReservations;
-                    var creditCardPayment = res.data.data.creditCardPayment;
-
-                    that.OpHotelReservationsData.status = 2;
-                    that.OpHotelReservationsData.id = row.id;
-                    that.OpHotelReservationsData.gtId = hotelReservations.gtId;
-                    that.OpHotelReservationsData.checkNumber = hotelReservations.checkNumber;
-                    that.OpHotelReservationsData.reservationsWebsite = hotelReservations.reservationsWebsite;
-                    that.OpHotelReservationsData.reservationsNo = hotelReservations.reservationsNo;
-                    that.OpHotelReservationsData.determineNo = hotelReservations.determineNo;
-                    that.OpHotelReservationsData.city = hotelReservations.city;
-                    that.OpHotelReservationsData.hotelName = hotelReservations.hotelName;
-                    that.OpHotelReservationsData.hotelAddress = hotelReservations.hotelAddress;
-                    that.OpHotelReservationsData.hotelTel = hotelReservations.hotelTel;
-                    that.OpHotelReservationsData.guestName = hotelReservations.guestName;
-                    that.OpHotelReservationsData.checkInDate = hotelReservations.checkInDate;
-                    that.OpHotelReservationsData.budgetCurrency = hotelReservations.budgetCurrency;
-                    that.OpHotelReservationsData.checkOutDate = hotelReservations.checkOutDate;
-                    that.OpHotelReservationsData.singleRoomCount = hotelReservations.singleRoomCount;
-                    that.OpHotelReservationsData.singleRoomPrice = hotelReservations.singleRoomPrice;
-                    that.OpHotelReservationsData.doubleRoomCount = hotelReservations.doubleRoomCount;
-                    that.OpHotelReservationsData.doubleRoomPrice = hotelReservations.doubleRoomPrice;
-                    that.OpHotelReservationsData.suiteRoomCount = hotelReservations.suiteRoomCount;
-                    that.OpHotelReservationsData.suiteRoomPrice = hotelReservations.suiteRoomPrice;
-                    that.OpHotelReservationsData.otherRoomCount = hotelReservations.otherRoomCount;
-                    that.OpHotelReservationsData.otherRoomPrice = hotelReservations.otherRoomPrice;
-                    that.OpHotelReservationsData.roomExplanation = hotelReservations.roomExplanation;
-                    that.OpHotelReservationsData.attachment = hotelReservations.attachment;
-                    that.OpHotelReservationsData.cardPrice = hotelReservations.cardPrice;
-                    that.OpHotelReservationsData.isCardPrice = hotelReservations.isCardPrice;
-                    that.OpHotelReservationsData.predictSingleRoom = hotelReservations.predictSingleRoom;
-                    that.OpHotelReservationsData.predictDoubleRoom = hotelReservations.predictDoubleRoom;
-                    that.OpHotelReservationsData.predictSuiteRoom = hotelReservations.predictSuiteRoom;
-                    that.OpHotelReservationsData.predictOtherRoom = hotelReservations.predictOtherRoom;
-                    that.OpHotelReservationsData.governmentRent = hotelReservations.governmentRent;
-                    that.OpHotelReservationsData.governmentRentCurrency = hotelReservations.governmentRentCurrency;
-                    that.OpHotelReservationsData.cityTax = hotelReservations.cityTax;
-                    that.OpHotelReservationsData.cityTaxCurrency = hotelReservations.cityTaxCurrency;
-                    that.OpHotelReservationsData.checkType = hotelReservations.checkType;
-                    that.OpHotelReservationsData.createUserId = hotelReservations.createUserId;
-                    that.OpHotelReservationsData.remark = hotelReservations.remark;
-                    that.OpHotelReservationsData.payMoney = creditCardPayment.payMoney;
-                    if (creditCardPayment.paymentCurrency == 0) {
-                        that.OpHotelReservationsData.paymentCurrency = ''
-                    }
-
-                    if (that.OpHotelReservationsData.governmentRentCurrency == 0) {
-                        that.OpHotelReservationsData.governmentRentCurrency = '';
-                    }
-                    if (that.OpHotelReservationsData.cityTaxCurrency == 0) {
-                        that.OpHotelReservationsData.cityTaxCurrency = '';
-                    }
-                    that.OpHotelReservationsData.paymentCurrency = creditCardPayment.paymentCurrency;
-                    that.OpHotelReservationsData.payDId = creditCardPayment.payDId;
-                    if (that.OpHotelReservationsData.payDId == 0) {
-                        that.OpHotelReservationsData.payDId == ''
-                    }
-                    that.OpHotelReservationsData.consumptionPatterns = creditCardPayment.consumptionPatterns;
-                    that.OpHotelReservationsData.consumptionDate = creditCardPayment.consumptionDate;
-                    that.OpHotelReservationsData.ctdId = creditCardPayment.ctdId;
-                    if (that.OpHotelReservationsData.ctdId == 0) {
-                        that.OpHotelReservationsData.ctdId = '';
-                    }
-                    that.OpHotelReservationsData.companyBankNo = creditCardPayment.companyBankNo;
-                    that.OpHotelReservationsData.otherBankName = creditCardPayment.otherBankName;
-                    that.OpHotelReservationsData.otherSideNo = creditCardPayment.otherSideNo;
-                    that.OpHotelReservationsData.otherSideName = creditCardPayment.otherSideName;
-                    that.OpHotelReservationsData.bankNo = creditCardPayment.bankNo;
-                    that.OpHotelReservationsData.cardholderName = creditCardPayment.cardholderName;
-                    that.OpHotelReservationsData.payee = creditCardPayment.payee;
-                    that.OpHotelReservationsData.orbitalPrivateTransfer = creditCardPayment.orbitalPrivateTransfer;
-
-                    that.OpHotelReservationsData.cRemark = creditCardPayment.remark;
-                    that.uploadFiles = []
-                    if (that.OpHotelReservationsData.attachment != null && that.OpHotelReservationsData.attachment != undefined && that.OpHotelReservationsData.attachment != "") {
-                        that.uploadFiles.push({
-                            name: that.OpHotelReservationsData.attachment,
-                            url: 'http://132.232.92.186:24/Office/GrpFile/酒店费用录入相关文件/',
-                        })
-                    }
-                    that.PostCurrencyByDiid(that.OpHotelReservationsData.diId, 76, that.OpHotelReservationsData.budgetCurrency)
-                    // var s = that.currencyList.filter(x => x.id == that.OpHotelReservationsData.paymentCurrency);
-                    // if (s.length > 0) {
-                    //     that.currencySingle.id = s[0].id;
-                    //     that.currencySingle.name = s[0].name;OpHotelReservationsDataRules
-                    //     that.currencySingle.remark = s[0].remark;
-                    //     that.CardCurrency = that.currencySingle.name + '(' + that.currencySingle.remark + ')'
-                    // }
-                    that.isAuditGM = creditCardPayment.isAuditGM;
-                    that.OpHotelReservationsData.cardPriceCurrency = hotelReservations.cardPriceCurrency
-                    if (that.OpHotelReservationsData.cardPriceCurrency == '74') {
-                        that.CardCurrency = "USD(美元)"
-                    } else if (that.OpHotelReservationsData.cardPriceCurrency == '75') {
-                        that.CardCurrency = "EUR(欧元)"
-                    } else {
-                        that.CardCurrency = "CNY(人民币)"
-                    }
-
-                }
-            }).catch(function (error) {
-
-                that.$message.error("网络错误，请稍后重试");
-            });
-        },
-        payChange() {
-            this.OpHotelReservationsData.ctdId = '';
-            this.OpHotelReservationsData.bankNo = '';
-            this.OpHotelReservationsData.cardholderName = '';
-            this.OpHotelReservationsData.companyBankNo = '';
-            this.OpHotelReservationsData.otherBankName = '';
-            this.OpHotelReservationsData.otherSideNo = '';
-            this.OpHotelReservationsData.otherSideName = '';
-            this.OpHotelReservationsData.cRemark = '';
-            if (this.OpHotelReservationsData.payDId == 73) {
-                this.OpHotelReservationsDataRules.companyBankNo = [{ required: true, message: '公司银行账号', trigger: ['blur', 'change'] },]
-                this.OpHotelReservationsDataRules.otherBankName = [{ required: true, message: '对方开户行', trigger: ['blur', 'change'] },]
-                this.OpHotelReservationsDataRules.otherSideNo = [{ required: true, message: '对方银行卡号', trigger: ['blur', 'change'] },]
-                this.OpHotelReservationsDataRules.otherSideName = [{ required: true, message: '对方姓名', trigger: ['blur', 'change'] },]
-                this.OpHotelReservationsDataRules.ctdId = []
-            } else if (this.OpHotelReservationsData.payDId == 72) {
-                this.OpHotelReservationsDataRules.ctdId = [{ required: true, message: '请选择卡类型', trigger: ['blur', 'change'] },]
-                this.OpHotelReservationsDataRules.companyBankNo = []
-                this.OpHotelReservationsDataRules.otherBankName = []
-                this.OpHotelReservationsDataRules.otherSideNo = []
-                this.OpHotelReservationsDataRules.otherSideName = []
-            } else if (this.OpHotelReservationsData.payDId == 83) {
-                this.OpHotelReservationsDataRules.companyBankNo = []
-                this.OpHotelReservationsDataRules.otherBankName = [{ required: true, message: '对方开户行', trigger: ['blur', 'change'] },]
-                this.OpHotelReservationsDataRules.otherSideNo = [{ required: true, message: '对方银行卡号', trigger: ['blur', 'change'] },]
-                this.OpHotelReservationsDataRules.otherSideName = [{ required: true, message: '对方姓名', trigger: ['blur', 'change'] },]
-                this.OpHotelReservationsDataRules.ctdId = []
-            } else {
-                this.OpHotelReservationsDataRules.companyBankNo = []
-                this.OpHotelReservationsDataRules.otherBankName = []
-                this.OpHotelReservationsDataRules.otherSideNo = []
-                this.OpHotelReservationsDataRules.otherSideName = []
-                this.OpHotelReservationsDataRules.ctdId = []
-            }
-        },
-        ctdChange(id) {
-            this.OpHotelReservationsData.cardholderName = 'Zhang Hailin';
-            for (var i = 0; i < this.bankCard.length; i++) {
-                if (this.bankCard[i].id == parseInt(id)) {
-                    this.OpHotelReservationsData.bankNo = this.bankCard[i].remark
-                }
-            }
-            var that = this
-            var cardPriceCurrency = 0;
-            if (that.OpHotelReservationsData.ctdId == '74') {
-                cardPriceCurrency = 950
-            } else if (that.OpHotelReservationsData.ctdId == '75') {
-                cardPriceCurrency = 849
-            } else {
-                cardPriceCurrency = 836
-            }
-
-            var url = "/api/Groups/HotelConversionAmounts"
-            this.$axios({
-                method: 'post',
-                url: url,
-                headers: {
-                    Authorization: 'Bearer ' + this.token
-                },
-                data: {
-                    cTable: 76,
-                    diId: that.OpHotelReservationsData.diId,
-                    cardPrice: that.OpHotelReservationsData.cardPrice,
-                    cardPriceCurrency: cardPriceCurrency,
-                    governmentRent: that.OpHotelReservationsData.governmentRent,
-                    governmentRentCurrency: that.OpHotelReservationsData.governmentRentCurrency,
-                    cityTax: that.OpHotelReservationsData.cityTax,
-                    cityTaxCurrency: that.OpHotelReservationsData.cityTaxCurrency
-                }
-            }).then(function (res) {
-
-                if (res.data.code == 200) {
-                    var CurrencyBy = res.data.data;
-                    that.OpHotelReservationsData.payMoney = CurrencyBy.price;
-                    that.OpHotelReservationsData.paymentCurrency = CurrencyBy.currencyId
-                } else {
-                    that.$message.error('暂未查到该币种团组汇率，请手动填写付款金额');
-                }
-            }).catch(function (error) {
-                //that.$message.error("网络错误，请稍后重试");
-            });
-        },
-        //根据币种，团组Id查询汇率
-        PostCurrencyByDiid(diId, CId, CurrencyId) {
-            var that = this
-            var url = "/api/Business/PostCurrencyByDiid?DiId=" + diId + "&CId=" + CId + "&CurrencyId=" + CurrencyId
-            this.$axios({
-                method: 'post',
-                url: url,
-                headers: {
-                    Authorization: 'Bearer ' + this.token
-                },
-            }).then(function (res) {
-
-                if (res.data.code == 200) {
-
-                    var CurrencyBy = res.data.data;
-                    that.Rate = CurrencyBy.rate
-                } else {
-                    if (CurrencyId == 836) {
-                        that.Rate = 1
-                    } else {
-                        that.Rate = "暂未设置，请前往设置"
-                    }
-
-                }
-            })
-        },
-        bankCardChage(id) {
-            if (this.OpHotelReservationsData.governmentRent == 0) {
-                if (id == 74) {
-                    this.OpHotelReservationsData.governmentRentCurrency = 950
-                } else if (id == 75) {
-                    this.OpHotelReservationsData.governmentRentCurrency = 849
-                } else {
-                    this.OpHotelReservationsData.governmentRentCurrency = 836
-                }
-            }
-            if (this.OpHotelReservationsData.cityTax == 0) {
-                if (id == 74) {
-                    this.OpHotelReservationsData.cityTaxCurrency = 950
-                } else if (id == 75) {
-                    this.OpHotelReservationsData.cityTaxCurrency = 849
-                } else {
-                    this.OpHotelReservationsData.cityTaxCurrency = 836
-                }
-            }
-            if (this.OpHotelReservationsData.payMoney == 0) {
-                if (id == 74) {
-                    this.OpHotelReservationsData.paymentCurrency = 950
-                } else if (id == 75) {
-                    this.OpHotelReservationsData.paymentCurrency = 849
-                } else {
-                    this.OpHotelReservationsData.paymentCurrency = 836
-                }
-            }
-            this.OpHotelReservationsData.cardPriceCurrency = id
-
-            var cId = 0;
-            if (this.OpHotelReservationsData.cardPriceCurrency == '74') {
-                this.CardCurrency = "USD(美元)"
-                cId = 950
-            } else if (this.OpHotelReservationsData.cardPriceCurrency == '75') {
-                this.CardCurrency = "EUR(欧元)"
-                cId = 849
-            } else {
-                this.CardCurrency = "CNY(人民币)"
-                cId = 836
-            }
-            var s = this.currencyList.filter(x => x.id == cId);
-            if (s.length > 0) {
-                this.currencySingle.id = s[0].id;
-                this.currencySingle.name = s[0].name;
-                this.currencySingle.remark = s[0].remark;
-                this.CardCurrency = this.currencySingle.name + '(' + this.currencySingle.remark + ')'
-            }
-
-            this.HotelConversionAmounts();
-        },
-        bankCardPriceChange() {
-            if (this.OpHotelReservationsData.ctdId != 0 || this.OpHotelReservationsData.ctdId != '' || this.OpHotelReservationsData.ctdId != undefined || this.OpHotelReservationsData.governmentRent != 0 || this.OpHotelReservationsData.cityTax != 0) {
-                this.HotelConversionAmounts();
-            }
-        },
-        HotelConversionAmounts() {
-            var that = this
-            var cardPriceCurrency = 0;
-            if (that.OpHotelReservationsData.cardPriceCurrency == '74') {
-                cardPriceCurrency = 950
-            } else if (that.OpHotelReservationsData.cardPriceCurrency == '75') {
-                cardPriceCurrency = 849
-            } else {
-                cardPriceCurrency = 836
-            }
-
-            var url = "/api/Groups/HotelConversionAmounts"
-            this.$axios({
-                method: 'post',
-                url: url,
-                headers: {
-                    Authorization: 'Bearer ' + this.token
-                },
-                data: {
-                    cTable: 76,
-                    diId: that.OpHotelReservationsData.diId,
-                    cardPrice: that.OpHotelReservationsData.cardPrice,
-                    cardPriceCurrency: cardPriceCurrency,
-                    governmentRent: that.OpHotelReservationsData.governmentRent,
-                    governmentRentCurrency: that.OpHotelReservationsData.governmentRentCurrency,
-                    cityTax: that.OpHotelReservationsData.cityTax,
-                    cityTaxCurrency: that.OpHotelReservationsData.cityTaxCurrency
-                }
-            }).then(function (res) {
-
-                if (res.data.code == 200) {
-                    var CurrencyBy = res.data.data;
-                    that.OpHotelReservationsData.payMoney = CurrencyBy.price;
-                    that.OpHotelReservationsData.paymentCurrency = CurrencyBy.currencyId
-                } else {
-                    that.$message.error('暂未查到该币种团组汇率，请手动填写付款金额');
-                }
-            }).catch(function (error) {
-                //that.$message.error("网络错误，请稍后重试");
-            });
+            this.AddToggle()
         },
+        
        
-        //上传
-        // 文件超出限制
-        exceed(files, fileList) {
-            this.$message.warning(
-                `当前限制选择 1个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length
-                } 个文件,请取消要替换的文件`
-            );
-        },
-        //文件上传成功时的钩子
-        upLoadSuccess(response, file, fileList) {
-            var that = this;
-            if (response.code == 200) {
-                if (that.DelfileName != null && that.DelfileName != "" && that.DelfileName != undefined) {
-                    that.$axios({
-                        method: 'post',
-                        url: "/api/Groups/DelFileHotel",
-                        headers: {
-                            Authorization: 'Bearer ' + that.token
-                        },
-                        data: {
-                            fileName: that.DelfileName,
-                            id: that.id
-                        }
-                    }).then(function (res) {
-                        if (res.data.code == 200) {
-
-                        }
-                    })
-                }
-                //that.ctdId = that.ctdIdPay;
-                that.OpHotelReservationsData.createUserId = that.userId
-                that.OpHotelReservationsData.attachment = response.data
-                var url = "/api/Groups/OpHotelReservations"
-                this.$axios({
-                    method: 'post',
-                    url: url,
-                    headers: {
-                        Authorization: 'Bearer ' + this.token
-                    },
-                    data: that.OpHotelReservationsData
-                }).then(function (res) {
-
-                    if (res.data.code == 200) {
-                        that.$message({
-                            message: '保存成功',
-                            type: 'success'
-                        });
-                        that.HotelReservationsByDiId()
-                    } else {
-                    }
-                }).catch(function (error) {
-                    that.$message.error("网络错误，请稍后重试");
-                });
-
-            } else {
-                if (that.DelfileName != null && that.DelfileName != "" && that.DelfileName != undefined) {
-                    that.$axios({
-                        method: 'post',
-                        url: "/api/Groups/DelFile",
-                        headers: {
-                            Authorization: 'Bearer ' + that.token
-                        },
-                        data: {
-                            fileName: that.DelfileName,
-                            id: that.id
-                        }
-                    }).then(function (res) {
-                        if (res.data.code == 200) {
-
-                        }
-                    })
-                }
-                that.OpHotelReservationsData.createUserId = that.userId
-                that.OpHotelReservationsData.attachment = ''
-                var url = "/api/Groups/OpHotelReservations"
-                this.$axios({
-                    method: 'post',
-                    url: url,
-                    headers: {
-                        Authorization: 'Bearer ' + this.token
-                    },
-                    data: that.OpHotelReservationsData
-                }).then(function (res) {
-                    if (res.data.code == 200) {
-                        that.$message({
-                            message: '文件上传失败！,数据保存成功！',
-                            type: 'success'
-                        });
-                        that.HotelReservationsByDiId()
-                    } else {
-                    }
-                }).catch(function (error) {
-                    that.$message.error("网络错误，请稍后重试");
-                });
-            }
-
-        },
-
-        beforeRemove(file, fileList) {
-
-            console.log(file.name)
-            let id1 = this.uploadFiles.findIndex(item => {
-                if (item.name == file.name) {
-                    return true
-                }
-            })
-            this.uploadFiles.splice(id1, 1)
-            this.projectName = ""
-            this.DelfileName = file.name
-        },
-        onChange(file, fileList) {
-
-            this.projectName = file.name
-        },
-        download(index, row) {
-            if (row.attachment != "") {
-                window.location.href = "http://132.232.92.186:24/Office/GrpFile/酒店费用录入相关文件/" + row.attachment
-            } else {
-                this.$message.error("暂未上传附件");
-            }
-
-        },
         DownloadVOUCHER(index, row) {
             var url = "/api/Groups/PostHotelReservationsCreateVoucher"
             var that = this
@@ -1979,48 +1420,7 @@ export default {
                 that.$message.error("网络错误，请稍后重试");
             });
         },
-        del(index, row) {
-            this.$confirm('此操作将删除该数据, 是否继续?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-            }).then(() => {
-                var that = this
-                this.$axios({
-                    method: 'post',
-                    url: "/api/Groups/DelHotelPrice",
-                    headers: {
-                        Authorization: 'Bearer ' + this.token
-                    },
-                    data: {
-                        Id: row.id,
-                        DeleteUserId: this.userId
-                    }
-                }).then(function (res) {
-                    console.log(res)
-
-                    if (res.data.code == 200) {
-
-                        that.$message({
-                            message: '删除成功',
-                            type: 'success'
-                        });
-                        that.HotelReservationsByDiId()
-                    } else {
-                        that.$message.error('删除失败！');
-                    }
-                    that.loading = false
-                }).catch(function (error) {
-                    that.loading = false
-                    that.$message.error("网络错误，请稍后重试");
-                });
-            }).catch(() => {
-                this.$message({
-                    type: 'info',
-                    message: '操作已取消！'
-                });
-            });
-        },
+       
     },
     filters:{
         filter_city(value){
@@ -2077,6 +1477,7 @@ export default {
 .hotelr-info {
     display: flex;
     margin-top: 10px;
+    
 }
 
 .hotelr-info-li {

src/router/index.js

@@ -93,6 +93,7 @@ import Groupreports from '@/components/statistics/Groupreports';
 import Customers from '@/components/OP/Customers';
 import OpCustomers from '@/components/OP/OpCustomers';
 import Reportstbale from '@/components/statistics/Reportstbale';
+import PickupList from '@/components/OP/PickupList';
 
 
 
@@ -548,6 +549,11 @@ export default new Router({
           name: 'Reportstbale',
           component: Reportstbale
         },
+        {
+          path: '/home/PickupList',
+          name: 'PickupList',
+          component: PickupList
+        },
       ]
     },
     {