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

src/components/OP/Groupedit.vue

@@ -341,7 +341,7 @@ export default {
                     that.restaurantss=res.data.data.clientData;
                     that.restaurants= that.restaurantss.map((terminal) => {
                         return {
-                            value: terminal.contact +'  '+ terminal.client +'  '+terminal.telephone+'  '+terminal.wechat,
+                            value: terminal.contact +'   '+ terminal.client +'   '+terminal.telephone+'   '+terminal.wechat,
                         };
                     });
                     that.customerunitslist= that.restaurantss.map((terminal) => {
@@ -540,11 +540,11 @@ export default {
         },
         handleSelect(item) {
             // console.log(item.split(' '));
-            console.log(item.value.split('  '));
-            this.ruleForm.customername=item.value.split('  ')[0];
-            this.ruleForm.customerunits=item.value.split('  ')[1];
-            this.ruleForm.phonenumber=item.value.split('  ')[2];
-            this.ruleForm.Wechat=item.value.split('  ')[3];
+            console.log(item.value.split('   '));
+            this.ruleForm.customername=item.value.split('   ')[0];
+            this.ruleForm.customerunits=item.value.split('   ')[1];
+            this.ruleForm.phonenumber=item.value.split('   ')[2];
+            this.ruleForm.Wechat=item.value.split('   ')[3];
         }
     },
     beforeRouteEnter(to, from, next) {

src/components/OP/HotelReservations.vue

@@ -1338,7 +1338,6 @@ export default {
         },
         //计算信用卡金额
         CalculateAmount(){
-
             console.log(this.CalculateTade())
             var compute=0
             compute=((this.TwoParameters.singleroomsNum*this.TwoParameters.singleroomsPrice)+(this.TwoParameters.doubleroomNum*this.TwoParameters.doubleroomPrice)+(this.TwoParameters.suiteNum*this.TwoParameters.suitePrice)+(this.TwoParameters.otherroomNum*this.TwoParameters.otherroomPrice))*this.CalculateTade()

src/components/OP/InvitationOfficialActivities.vue

@@ -48,24 +48,44 @@
                             {{ (currentPage - 1) * pageSize + scope.$index + 1 }}
                         </template>
                     </el-table-column>
-                    <el-table-column prop="inviterArea" label="邀请方地区" width="200">
+                    <el-table-column prop="inviterArea" label="邀请方地区" width="120">
                     </el-table-column>
-                    <el-table-column prop="inviter" label="邀请方" width="335">
+                    <el-table-column prop="inviter" label="邀请方" width="200">
                     </el-table-column>
                     <el-table-column prop="inviteTime" label="邀请时间" width="160">
                     </el-table-column>
-                    <el-table-column prop="inviteCost,currency" label="邀请费用" width="150" sortable>
+                    <el-table-column prop="inviteCost,currency" label="邀请费用" width="120" sortable>
                         <template slot-scope="scope">
-                            {{ scope.row.inviteCost }}({{ scope.row.currency }})
+                            {{ scope.row.inviteCost|numFilter}} {{ scope.row.inviteCurrency }}
                         </template>
                     </el-table-column>
-                    <el-table-column prop="isGoOfficaiaBussiness" label="是否到场" width="150">
+                    <el-table-column prop="inviteCost,currency" label="快递费用" width="120" sortable>
+                        <template slot-scope="scope">
+                            {{ scope.row.sendCost|numFilter}} {{ scope.row.sendCurrency }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="inviteCost,currency" label="翻译费用" width="120" sortable>
+                        <template slot-scope="scope">
+                            {{ scope.row.translateCost|numFilter }} {{ scope.row.translateCurrency }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="inviteCost,currency" label="活动费" width="120" sortable>
+                        <template slot-scope="scope">
+                            {{ scope.row.eventsCost|numFilter }} {{ scope.row.eventsCurrency }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="inviteCost,currency" label="支付费用" width="120" sortable>
+                        <template slot-scope="scope">
+                            {{ scope.row.payMoney|numFilter }} {{ scope.row.paymentCurrency }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="isGoOfficaiaBussiness" label="是否到场" width="78">
                         <template slot-scope="isGoOfficaiaBussiness">
                             <span v-if="isGoOfficaiaBussiness.row.isGoOfficaiaBussiness == 1">是</span>
                             <span v-else>否</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="isAudit" label="是否审核" width="90">
+                    <el-table-column prop="isAudit" label="是否审核" width="78">
                         <template slot-scope="isAudit">
                             <span v-if="isAudit.row.isAudit == 1">已通过</span>
                             <span v-else-if="isAudit.row.isAudit == 0">未审核</span>
@@ -73,7 +93,7 @@
                             <span v-else>自动审核通过</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="attachment" label="附件" width="280">
+                    <el-table-column prop="attachment" label="附件" width="200">
                     </el-table-column>
                     <el-table-column label="操作">
                         <template slot-scope="scope">
@@ -96,14 +116,14 @@
 </template>
 <script>
 export default {
-    beforeRouteLeave(to, from, next) {
-        console.log(to)
-        console.log(from)
-        if(to.name!='OpInvitationOfficialActivities'){
-            from.meta.keepAlive = false;
-        }
-        next()
-    },
+    // beforeRouteLeave(to, from, next) {
+    //     console.log(to)
+    //     console.log(from)
+    //     if(to.name!='OpInvitationOfficialActivities'){
+    //         from.meta.keepAlive = false;
+    //     }
+    //     next()
+    // },
     data() {
         return {
             loading: false,
@@ -114,6 +134,7 @@ export default {
             input: '',
             token: '',
             userId: 0,
+            DiIdst:'',
             DiId: '',
             inviter: "",
             pickerOptions: {
@@ -177,9 +198,12 @@ export default {
             }).then(function (res) {
                 if (res.data.code == 200) {
                     that.AirTicketResSelectData = res.data.data.groupName;
-
-                    that.DiId = parseInt(that.AirTicketResSelectData[0].id);
-                    that.delegationInfo = that.AirTicketResSelectData[0];
+                    if(that.DiIdst==undefined||that.DiIdst!=that.DiIdst){
+                        that.DiId =that.AirTicketResSelectData[0].id;
+                    }else{
+                        that.DiId =that.DiIdst
+                    }
+                    that.AirTicketResSelectChange()
                     that.InvitationOfficialActivities()
                 }
             }).catch(function (error) {
@@ -197,18 +221,41 @@ export default {
             this.InvitationOfficialActivities();
         },
         AirTicketResSelectChange() {
-            if (this.DiId != 0 && this.DiId != null) {
-                this.InvitationOfficialActivities();
-                for (let index = 0; index < this.AirTicketResSelectData.length; index++) {
+            // this.$router.push({ query: {} });
+            var url = "/api/Business/PostShareGroupInfo"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    portType: 1,
+                    id: that.DiId,
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
 
-                    if (this.AirTicketResSelectData[index].id == parseInt(this.DiId)) {
-                        this.delegationInfo = this.AirTicketResSelectData[index];
-                        break;
-                    }
+                    that.delegationInfo=res.data.data;
+                    that.InvitationOfficialActivities();
                 }
-            }
+            }).catch(function (error) {
+                that.$message.error(error);
+            });
+            // if (this.DiId != 0 && this.DiId != null) {
+                
+            //     for (let index = 0; index < this.AirTicketResSelectData.length; index++) {
+
+            //         if (this.AirTicketResSelectData[index].id == parseInt(this.DiId)) {
+            //             this.delegationInfo = this.AirTicketResSelectData[index];
+            //             break;
+            //         }
+            //     }
+            // }
 
         },
+
         //商邀费用信息绑定
         InvitationOfficialActivities() {
             var url = "/api/Groups/InvitationOfficialActivitiesList"
@@ -285,7 +332,7 @@ export default {
                         DeleteUserId: this.userId
                     }
                 }).then(function (res) {
-                    console.log(res)
+
 
                     if (res.data.code == 200) {
 
@@ -318,7 +365,24 @@ export default {
 
         }
     },
+    filters: {
+        numFilter(value) {
+            let realVal = "";
+            if (!isNaN(value) && value !== "") {
+            // 截取当前数据到小数点后两位,改变toFixed的值即可截取你想要的数值
+            realVal = parseFloat(value).toFixed(2);
+            } else {
+            realVal = "--";
+            }
+            return realVal;
+        },
+        dataFilter(value){
+            return value.spilt(' ')[0]
+        }
+    },
+
     mounted() {
+        this.DiIdst = Number(this.$route.query.DiId);
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
         this.AirTicketResSelect();

src/components/OP/OpAirTicketRes.vue

@@ -455,7 +455,15 @@ export default {
             cardType: [],//卡类型下拉框
             airTicketAgents: [],//合作的代理资料
             airTicketAgentsId: '',
-            clientNameId: [],//客人姓名
+            clientNameId: [
+                {
+                    firstName: "程单",
+                    id: -1,
+                    lastName: "行",
+                    phone: "行程单",
+                    pinyin: "行程单"
+                }
+            ],//客人姓名
             clientNameList: [],
             airGroupCostParameter: {},//机票成本预算
             status: 0,
@@ -666,7 +674,6 @@ export default {
                                 message: res.data.msg,
                                 type: 'success'
                             });
-                            that.loading = true;
                             console.log('that.airTicketResOpData.clientName', that.airTicketResOpData.clientName)
                             setTimeout(() => {
                                 that.back();
@@ -992,7 +999,9 @@ export default {
                 if (res.data.code == 200) {
                     //客户名单
                     console.log(res.data.data);
-                    that.clientNameId = res.data.data;
+                    for(let j=0;j<res.data.data.length;j++){
+                        that.clientNameId.push(res.data.data[j])
+                    }
                 }
             })
         },

src/components/OP/OpCustomers.vue

@@ -8,8 +8,8 @@
         <hr style='background-color:#5555; height:1px; border:none;' />
         <div class="opcustomers-box">
             <el-form :model="delegationInfo" label-width="100px" class="demo-ruleForm">
-                <div style="display: flex;">
-                    <div style="width: 25%;">
+                <div style="display: flex;flex-wrap: wrap;">
+                    <div style="width: 390px;">
                         <el-form-item label="团组名称:" label-width="160px">
                             <el-select v-model="OpCustomersData.diId" clearable filterable placeholder="团组选择"
                                 :disabled="isShow" @change="DiIdSelectChange">
@@ -19,39 +19,39 @@
                             </el-select>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <el-form-item label="团 号:" prop="tourCode" label-width="160px">
                             <el-input placeholder="团号" v-model="delegationInfo.tourCode" :disabled="true">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <el-form-item label="客户:" prop="clientName" label-width="160px">
                             <el-input placeholder="客户" v-model="delegationInfo.clientName" :disabled="true">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <el-form-item label="出访国家:" prop="visitCountry" label-width="160px">
                             <el-input placeholder="出访国家" v-model="delegationInfo.visitCountry" :disabled="true">
                             </el-input>
                         </el-form-item>
                     </div>
                 </div>
-                <div style="display: flex;">
-                    <div style="width: 25%;">
+                <div style="display: flex;flex-wrap: wrap;">
+                    <div style="width: 390px;">
                         <el-form-item label="出访时间:" label-width="160px">
                             <el-input placeholder="出访时间" v-model="VisitDate" :disabled="true">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <el-form-item label="出访人数:" label-width="160px">
                             <el-input placeholder="出访人数" v-model="delegationInfo.visitPNumber" :disabled="true">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <el-form-item label="出访天数:" label-width="160px">
                             <el-input placeholder="出访天数" v-model="delegationInfo.visitDays" :disabled="true">
                             </el-input>
@@ -61,8 +61,8 @@
             </el-form>
             <el-form :model="OpCustomersData" ref="OpCustomersData" :rules="OpCustomersDataRules" label-width="100px"
                 class="demo-ruleForm">
-                <div style="display: flex;">
-                    <div style="width: 25%;">
+                <div style="display: flex;flex-wrap: wrap;">
+                    <div style="width: 390px;">
                         <el-form-item label="保险种类:" prop="iid" label-width="160px">
                             <el-select v-model="OpCustomersData.iid" filterable placeholder="保险种类" @change="iidChane">
                                 <el-option v-for="item in insuranceCostList" :key="item.id" :label="item.gName"
@@ -78,7 +78,7 @@
                         </el-form-item>
                     </div> -->
                     
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <el-form-item label="保险费用:" prop="insuranceCosts" label-width="160px">
                             <el-input placeholder="保险费用" v-model="OpCustomersData.insuranceCosts" style="width: 48%;">
                             </el-input>
@@ -123,8 +123,8 @@
                     </div>
                 </div>
                 <hr style='background-color:#5555; height:1px; border:none;margin-top: 10px;' />
-                <div style="display: flex;">
-                    <div style="width: 25%;">
+                <div style="display: flex;flex-wrap: wrap;">
+                    <div style="width: 390px;">
                         <el-form-item label="支付方式:" prop="payDId" label-width="160px">
                             <el-select v-model="OpCustomersData.payDId" placeholder="支付方式" style="width: 100%;"
                                 @change="payChange">
@@ -133,20 +133,20 @@
                             </el-select>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <el-form-item label="消费方式:" prop="consumptionPatterns" label-width="160px">
                             <el-input placeholder="消费方式" v-model="OpCustomersData.consumptionPatterns">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <el-form-item label="消费日期:" prop="consumptionDate" label-width="160px">
                             <el-date-picker v-model="OpCustomersData.consumptionDate" placeholder="消费日期" type="date">
                             </el-date-picker>
 
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <el-form-item label="付款金额:" prop="payMoney" label-width="160px">
                             <el-input placeholder="付款金额" v-model="OpCustomersData.insuranceCosts" style="width: 52%;"
                                 :disabled="true">
@@ -160,8 +160,8 @@
                     </div>
                 </div>
                 <div v-if="OpCustomersData.payDId == 72">
-                    <div style="display: flex;">
-                        <div style="width: 25%;">
+                    <div style="display: flex;flex-wrap: wrap;">
+                        <div style="width: 390px;">
                             <el-form-item label="卡类型:" prop="ctdId" label-width="160px">
                                 <el-select v-model="OpCustomersData.ctdId" placeholder="卡类型" style="width: 100%;"
                                     @change="ctdChange">
@@ -171,13 +171,13 @@
                                 </el-select>
                             </el-form-item>
                         </div>
-                        <div style="width: 25%;">
+                        <div style="width: 390px;">
                             <el-form-item label="银行卡号:" prop="bankNo" label-width="160px">
                                 <el-input placeholder="银行卡号" v-model="OpCustomersData.bankNo" :disabled="true">
                                 </el-input>
                             </el-form-item>
                         </div>
-                        <div style="width: 25%;">
+                        <div style="width: 390px;">
                             <el-form-item label="持卡人姓名:" prop="cardholderName" label-width="160px">
                                 <el-input placeholder="持卡人姓名" v-model="OpCustomersData.cardholderName" :disabled="true">
                                 </el-input>
@@ -186,27 +186,27 @@
                     </div>
                 </div>
                 <div v-else-if="OpCustomersData.payDId == 73">
-                    <div style="display: flex;">
-                        <div style="width: 25%;">
+                    <div style="display: flex;flex-wrap: wrap;">
+                        <div style="width: 390px;">
                             <el-form-item label="公司银行账号:" label-width="160px" prop="companyBankNo">
                                 <el-input placeholder="公司银行账号" v-model="OpCustomersData.companyBankNo">
                                 </el-input>
 
                             </el-form-item>
                         </div>
-                        <div style="width: 25%;">
+                        <div style="width: 390px;">
                             <el-form-item label="对方开户行:" prop="otherBankName" label-width="160px">
                                 <el-input placeholder="对方开户行:" v-model="OpCustomersData.otherBankName">
                                 </el-input>
                             </el-form-item>
                         </div>
-                        <div style="width: 25%;">
+                        <div style="width: 390px;">
                             <el-form-item label="对方银行卡号:" prop="otherSideNo" label-width="160px">
                                 <el-input placeholder="对方银行卡号" v-model="OpCustomersData.otherSideNo">
                                 </el-input>
                             </el-form-item>
                         </div>
-                        <div style="width: 25%;">
+                        <div style="width: 390px;">
                             <el-form-item label="对方姓名:" prop="otherSideName" label-width="160px">
                                 <el-input placeholder="对方姓名" v-model="OpCustomersData.otherSideName">
                                 </el-input>
@@ -215,20 +215,20 @@
                     </div>
                 </div>
                 <div v-else-if="OpCustomersData.payDId == 83">
-                    <div style="display: flex;">
-                        <div style="width: 25%;">
+                    <div style="display: flex;flex-wrap: wrap;">
+                        <div style="width: 390px;">
                             <el-form-item label="对方开户行:" prop="otherBankName" label-width="160px">
                                 <el-input placeholder="对方开户行" v-model="OpCustomersData.otherBankName">
                                 </el-input>
                             </el-form-item>
                         </div>
-                        <div style="width: 25%;">
+                        <div style="width: 390px;">
                             <el-form-item label="对方银行卡号:" prop="otherSideNo" label-width="160px">
                                 <el-input placeholder="对方银行卡号" v-model="OpCustomersData.otherSideNo">
                                 </el-input>
                             </el-form-item>
                         </div>
-                        <div style="width: 25%;">
+                        <div style="width: 390px;">
                             <el-form-item label="对方姓名:" prop="otherSideName" label-width="160px">
                                 <el-input placeholder="对方姓名" v-model="OpCustomersData.otherSideName">
                                 </el-input>
@@ -237,14 +237,14 @@
                     </div>
                 </div>
                 <div v-else></div>
-                <div style="display:flex;">
-                    <div style="width: 25%;">
+                <div style="display:flex;flex-wrap: wrap;">
+                    <div style="width: 390px;">
                         <el-form-item label="收款方:" prop="payee" label-width="160px">
                             <el-input placeholder="对方姓名:" v-model="OpCustomersData.payee">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <el-form-item label="费用标识:" prop="orbitalPrivateTransfer" label-width="160px">
                             <el-select v-model="OpCustomersData.orbitalPrivateTransfer" placeholder="费用标识"
                                 style="width: 100%;">

src/components/OP/OpInvitationOfficialActivities.vue

@@ -110,22 +110,90 @@
                         </el-form-item>
                     </div>
                 </div>
-                <div style="display:flex ;">
+                <div style="display:flex ;flex-wrap: wrap;">
+                    <div style="width: 25%;">
+                        <div style="display: flex;">
+                            <div style="width: 72%;">
+                                <el-form-item label="公务活动费:" prop="eventsCost" label-width="160px">
+                                    <el-input-number @change="computerenminbi" :precision="2" placeholder="公务活动费" v-model="InvitationOfficialActivities.eventsCost" :controls='false'>
+                                    </el-input-number>
+                                </el-form-item>
+                            </div>
+                            <div style="width: 28%;">
+                                <el-form-item prop="eventsCurrency" label-width="5px">
+                                    <el-select @change="computerenminbi" v-model="InvitationOfficialActivities.eventsCurrency" placeholder="币种">
+                                        <el-option v-for="item in rateList" :key="item.currencyId"
+                                            :label="item.currencyCode" :value="item.currencyId"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </div>
+                        </div>
+                    </div>
+                    <div style="width: 25%;">
+                        <div style="display: flex;">
+                            <div style="width: 72%;">
+                                <el-form-item label="公务翻译费:" prop="translateCost" label-width="160px">
+                                    <el-input-number @change="computerenminbi" :precision="2" placeholder="公务翻译费" v-model="InvitationOfficialActivities.translateCost" :controls='false'>
+                                    </el-input-number>
+                                </el-form-item>
+                            </div>
+                            <div style="width: 28%;">
+                                <el-form-item prop="translateCurrency" label-width="5px">
+                                    <el-select @change="computerenminbi" v-model="InvitationOfficialActivities.translateCurrency" placeholder="币种">
+                                        <el-option v-for="item in rateList" :key="item.currencyId"
+                                            :label="item.currencyCode" :value="item.currencyId"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </div>
+                        </div>
+                    </div>
+                    <div style="width: 25%;">
+                        <div style="display: flex;">
+                            <div style="width: 72%;">
+                                <el-form-item label="快递费:" prop="sendCost" label-width="160px">
+                                    <el-input-number @change="computerenminbi" :precision="2" v-model="InvitationOfficialActivities.sendCost" :controls='false'
+                                ></el-input-number>
+                                </el-form-item>
+                            </div>
+                            <div style="width: 28%;">
+                                <el-form-item prop="sendCurrency" label-width="5px">
+                                    <el-select @change="computerenminbi" v-model="InvitationOfficialActivities.sendCurrency" placeholder="币种">
+                                        <el-option v-for="item in rateList" :key="item.currencyId"
+                                            :label="item.currencyCode" :value="item.currencyId"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </div>
+                        </div>
+                    </div>
                     <div style="width: 25%;">
                         <div style="display: flex;">
                             <div style="width: 72%;">
                                 <el-form-item label="邀请费用:" prop="inviteCost" label-width="160px">
-                                    <el-input placeholder="邀请费用" v-model="InvitationOfficialActivities.inviteCost">
-                                    </el-input>
-                                    <!-- <el-select v-model="InvitationOfficialActivities.inviteCurrency" style="width: 40%;">
-                                    <el-option v-for="item in rateList" :key="item.currencyId" :label="item.currencyCode"
-                                        :value="item.currencyId"></el-option>
-                                </el-select> -->
+                                    <el-input-number @change="computerenminbi" :precision="2" placeholder="邀请费用" v-model="InvitationOfficialActivities.inviteCost" :controls='false'>
+                                    </el-input-number>
                                 </el-form-item>
                             </div>
                             <div style="width: 28%;">
                                 <el-form-item prop="inviteCurrency" label-width="5px">
-                                    <el-select v-model="InvitationOfficialActivities.inviteCurrency" placeholder="币种">
+                                    <el-select @change="computerenminbi" v-model="InvitationOfficialActivities.inviteCurrency" placeholder="币种">
+                                        <el-option v-for="item in rateList" :key="item.currencyId"
+                                            :label="item.currencyCode" :value="item.currencyId"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </div>
+                        </div>
+                    </div>
+                    <div style="width: 25%;">
+                        <div style="display: flex;">
+                            <div style="width: 72%;">
+                                <el-form-item label="支付总费用:" prop="payMoney" label-width="160px">
+                                    <el-input-number :disabled="true" :precision="2" v-model="InvitationOfficialActivities.payMoney" :controls='false'
+                                ></el-input-number>
+                                </el-form-item>
+                            </div>
+                            <div style="width: 28%;">
+                                <el-form-item prop="paymentCurrency" label-width="5px">
+                                    <el-select :disabled="true" v-model="InvitationOfficialActivities.paymentCurrency" placeholder="币种">
                                         <el-option v-for="item in rateList" :key="item.currencyId"
                                             :label="item.currencyCode" :value="item.currencyId"></el-option>
                                     </el-select>
@@ -143,13 +211,24 @@
                         <el-form-item label="费用标识:" prop="orbitalPrivateTransfer">
                             <el-select v-model="InvitationOfficialActivities.orbitalPrivateTransfer" placeholder="费用标识"
                                 style="width: 100%;">
-                                <el-option key="0" label="公转" :value=0>
-                                </el-option>
-                                <el-option key="1" label="私转" :value=1>
+                                <el-option v-for="item in costIdentificationData" :key="item.id" :label="item.name" :value="item.id">
                                 </el-option>
                             </el-select>
                         </el-form-item>
                     </div>
+                    <div style="width: 25%;">
+                        <el-form-item label="消费日期:" prop="consumptionDate">
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="InvitationOfficialActivities.consumptionDate"
+                                type="date" placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </div>
+                    <div style="width: 25%;">
+                        <el-form-item label="消费方式:" prop="consumptionPatterns">
+                            <el-input placeholder="消费方式" v-model="InvitationOfficialActivities.consumptionPatterns">
+                            </el-input>
+                        </el-form-item>
+                    </div>
                     <div style="width: 25%;">
                         <el-form-item label="支付方式:" prop="payDId">
                             <el-select v-model="InvitationOfficialActivities.payDId" placeholder="支付方式">
@@ -158,13 +237,48 @@
                             </el-select>
                         </el-form-item>
                     </div>
-                </div>
-
-                <div style="display: flex;">
-                    <div style="width: 25%;" class="ExpressPirce">
-                        <el-form-item label="快递费:" prop="sendCost" label-width="160px">
-                            <el-input-number v-model="InvitationOfficialActivities.sendCost" :controls='false'
-                                :min="0"></el-input-number>
+                    <div v-if="InvitationOfficialActivities.payDId==72" style="width: 25%;">
+                        <el-form-item label="卡类型:" prop="ctdId">
+                            <el-select @change="cardhandoff" v-model="InvitationOfficialActivities.ctdId" placeholder="卡类型">
+                                <el-option v-for="item in cardTypeData" :key="item.id" :label="item.name" :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </div>
+                    <div v-if="InvitationOfficialActivities.payDId==72" style="width: 25%;">
+                        <el-form-item label="银行卡号:" prop="bankNo">
+                            <el-input :disabled="true" placeholder="银行卡号" v-model="InvitationOfficialActivities.bankNo">
+                            </el-input>
+                        </el-form-item>
+                    </div>
+                    <div v-if="InvitationOfficialActivities.payDId==72" style="width: 25%;">
+                        <el-form-item label="持卡人姓名:" prop="cardholderName">
+                            <el-input :disabled="true" placeholder="持卡人姓名" v-model="InvitationOfficialActivities.cardholderName">
+                            </el-input>
+                        </el-form-item>
+                    </div>
+                    <div v-if="InvitationOfficialActivities.payDId==73||InvitationOfficialActivities.payDId==83" style="width: 25%;">
+                              <el-form-item label="公司银行卡号:" prop="companyBankNo">
+                            <el-input placeholder="公司银行卡号" v-model="InvitationOfficialActivities.companyBankNo">
+                            </el-input>
+                        </el-form-item>
+                    </div>
+                    <div v-if="InvitationOfficialActivities.payDId==73||InvitationOfficialActivities.payDId==83" style="width: 25%;">
+                        <el-form-item label="对方开户行:" prop="otherBankName">
+                            <el-input placeholder="对方开户行" v-model="InvitationOfficialActivities.otherBankName">
+                            </el-input>
+                        </el-form-item>
+                    </div>
+                    <div v-if="InvitationOfficialActivities.payDId==73||InvitationOfficialActivities.payDId==83" style="width: 25%;">
+                        <el-form-item label="对方银行账号:" prop="otherSideNo">
+                            <el-input placeholder="对方银行账号" v-model="InvitationOfficialActivities.otherSideNo">
+                            </el-input>
+                        </el-form-item>
+                    </div>
+                    <div v-if="InvitationOfficialActivities.payDId==73||InvitationOfficialActivities.payDId==83" style="width: 25%;">
+                        <el-form-item label="对方姓名:" prop="otherSideName">
+                            <el-input placeholder="对方姓名" v-model="InvitationOfficialActivities.otherSideName">
+                            </el-input>
                         </el-form-item>
                     </div>
                     <div style="width: 25%;">
@@ -176,11 +290,10 @@
                                 <!-- <el-button style="margin-left: 10px;" size="small" type="success"
                                     @click="submitUpload">上传到服务器</el-button> -->
                             </el-upload>
-
-
+    
+    
                         </el-form-item>
                     </div>
-
                 </div>
                 <div style="display: flex;">
                     <div style="width: 100%;">
@@ -193,9 +306,7 @@
                 <el-form-item>
                     <div style="text-align: right;">
                         <el-button type="primary" @click="addBtn">保存</el-button>
-                        <router-link to='/home/InvitationOfficialActivities'>
-                            <el-button>取消</el-button>
-                        </router-link>
+                        <el-button @click="cancelbtn">取消</el-button>
                     </div>
                 </el-form-item>
             </el-form>
@@ -222,9 +333,11 @@ export default {
             IsAuditGM: 0,
             delegationInfoList: [],//团组下拉框
             payment: [],//支付方式下拉框
+            cardTypeData:[],//卡类型下拉框
+            costIdentificationData:[],//费用标识下拉框
             InvitationOfficialActivities: {
                 status: 0,
-                payDId: 73,
+                payDId: 0,
                 orbitalPrivateTransfer: 0,
                 payee: '',
                 id: 0,
@@ -233,9 +346,16 @@ export default {
                 inviter: '',
                 inviteTime: this.transformDateFormat(new Date()),
                 attachment: '',
+                payMoney:0,
+                paymentCurrency:'',
+                eventsCost:0,
+                eventsCurrency:'',
                 inviteCost: 0,
                 inviteCurrency: '',
+                translateCost:0,
+                translateCurrency: '',
                 sendCost: 0,
+                sendCurrency:'',
                 isGoOfficaiaBussiness: 0,
                 createUserId: 0,
                 remark: '',
@@ -245,7 +365,16 @@ export default {
                 tel: '',
                 email: '',
                 fax: '',
-                otherInformation: ''
+                otherInformation: '',
+                consumptionDate: '',//消费日期
+                consumptionPatterns: '',//消费方式
+                ctdId: '',//卡类型
+                bankNo: '',//银行卡号
+                cardholderName: '',//持卡人姓名
+                companyBankNo: '',//公司银行卡号
+                otherBankName: '',//对方开户行
+                otherSideNo: '',//对方银行账号
+                otherSideName: '',//对方姓名
             },
             headers: {
                 Authorization: JSON.parse(localStorage.getItem('userinif')).token,
@@ -254,7 +383,30 @@ export default {
             InvitationOfficialActivitiesRules: {
                 inviteCost: [
                     { required: true, message: '请输入费用金额', trigger: 'blur' },
-                    { pattern: /^(([1-9]?\d{0,8}(\.\d{1,2})?)|999999999|999999999\.(0){1,2})$/, message: '请输入正确的金额' }
+                ],
+                eventsCost: [
+                    { required: true, message: '请输入费用金额', trigger: 'blur' },
+                ],
+                translateCost: [
+                    { required: true, message: '请输入费用金额', trigger: 'blur' },
+                ],
+                sendCost: [
+                    { required: true, message: '请输入费用金额', trigger: 'blur' },
+                ],
+                payMoney: [
+                    { required: true, message: '请输入费用金额', trigger: 'blur' },
+                ],
+                companyBankNo: [
+                    { required: true, message: '请输入', trigger: 'blur' },
+                ],
+                otherBankName: [
+                    { required: true, message: '请输入', trigger: 'blur' },
+                ],
+                otherSideNo: [
+                    { required: true, message: '请输入', trigger: 'blur' },
+                ],
+                otherSideName: [
+                    { required: true, message: '请输入', trigger: 'blur' },
                 ],
                 inviterArea: [
                     { required: true, message: '请输入邀请方地区', trigger: 'change' },
@@ -268,6 +420,14 @@ export default {
                     { required: true, message: '请选择邀请时间', trigger: 'change' },
                     { required: true, message: '请选择邀请时间', trigger: 'blur' },
                 ],
+                consumptionDate: [
+                    { required: true, message: '请选择邀请时间', trigger: 'change' },
+                    { required: true, message: '请选择邀请时间', trigger: 'blur' },
+                ],
+                consumptionPatterns: [
+                    { required: true, message: '请选择邀请时间', trigger: 'change' },
+                    { required: true, message: '请选择邀请时间', trigger: 'blur' },
+                ],
                 contact: [
                     { required: true, message: '请输入联系人', trigger: 'change' },
                     { required: true, message: '请输入联系人', trigger: 'blur' },
@@ -288,12 +448,76 @@ export default {
                     { required: true, message: '请选择币种', trigger: 'change' },
                     { required: true, message: '请选择币种', trigger: 'blur' },
                 ],
+                eventsCurrency: [
+                    { required: true, message: '请选择币种', trigger: 'change' },
+                    { required: true, message: '请选择币种', trigger: 'blur' },
+                ],
+                translateCurrency: [
+                    { required: true, message: '请选择币种', trigger: 'change' },
+                    { required: true, message: '请选择币种', trigger: 'blur' },
+                ],
+                sendCurrency: [
+                    { required: true, message: '请选择币种', trigger: 'change' },
+                    { required: true, message: '请选择币种', trigger: 'blur' },
+                ],
+                paymentCurrency: [
+                    { required: true, message: '请选择币种', trigger: 'change' },
+                    { required: true, message: '请选择币种', trigger: 'blur' },
+                ],
 
             },
             rateList: [],
         }
     },
     methods: {
+        //卡类型切换
+        cardhandoff(val){
+            console.log(val)
+            for(var i=0;i<this.cardTypeData.length;i++){
+                if(val==this.cardTypeData[i].id){
+                    this.InvitationOfficialActivities.bankNo=this.cardTypeData[i].remark;
+                    this.InvitationOfficialActivities.cardholderName=this.cardTypeData[i].cardholder;
+                }
+            }
+        },
+        //获取基础数据
+        InvitationOfficialActivityInitBasicData() {
+            var url = "/api/Groups/InvitationOfficialActivityInitBasicData"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                }
+            
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    console.log(res)
+                    that.payment = res.data.data.payTypeData;
+                    that.cardTypeData = res.data.data.cardTypeData;
+                    that.costIdentificationData = res.data.data.costIdentificationData;
+                    //下拉框初始值
+                    that.InvitationOfficialActivities.orbitalPrivateTransfer=that.costIdentificationData[0].id;
+                    that.InvitationOfficialActivities.payDId=that.payment[0].id;
+                    that.InvitationOfficialActivities.ctdId=that.cardTypeData[0].id;
+                    that.InvitationOfficialActivities.bankNo=that.cardTypeData[0].remark;
+                    that.InvitationOfficialActivities.cardholderName=that.cardTypeData[0].cardholder;
+                    if (that.id != null && that.id != undefined && that.id != 0) {
+                        that.InvitationOfficialActivitiesById();
+                        that.title = "修改商邀费用";
+                        that.InvitationOfficialActivities.status = 2
+                        that.isShow = true
+                    } else {
+                        that.InvitationOfficialActivities.status = 1
+                        that.title = "新增商邀费用"
+                        that.isShow = false
+                    }
+                }else{
+                    that.$message.error(res.data.msg);
+                }
+            })
+        },
         //团组下拉框
         AirTicketResSelect() {
             var url = "/api/Groups/DecreasePaymentsSelect"
@@ -310,6 +534,7 @@ export default {
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
+                    console.log(res)
                     that.delegationInfoList = res.data.data.groupName;
                     that.DiIdSelect = parseInt(that.DiId)
                     for (let index = 0; index < that.delegationInfoList.length; index++) {
@@ -318,12 +543,9 @@ export default {
                             break;
                         }
                     }
-                    that.payment = res.data.data.payment
+                    // that.payment = res.data.data.payment
                 }
-
             })
-
-
         },
         InvitationOfficialActivitiesById() {
             var url = "/api/Groups/InvitationOfficialActivitiesById"
@@ -341,29 +563,47 @@ export default {
             }).then(function (res) {
                 if (res.data.code == 200) {
                     console.log(res.data.data)
-                    that.InvitationOfficialActivities.payDId = res.data.data._CreditCard.payDId
-                    that.InvitationOfficialActivities.orbitalPrivateTransfer = res.data.data._CreditCard.orbitalPrivateTransfer
-                    that.InvitationOfficialActivities.payee = res.data.data._CreditCard.payee
-                    that.InvitationOfficialActivities.id = res.data.data._Invitation.id
-                    that.InvitationOfficialActivities.diId = res.data.data._Invitation.diId
-                    that.InvitationOfficialActivities.inviterArea = res.data.data._Invitation.inviterArea
-                    that.InvitationOfficialActivities.inviter = res.data.data._Invitation.inviter
-                    that.InvitationOfficialActivities.inviteTime = res.data.data._Invitation.inviteTime
-                    that.InvitationOfficialActivities.attachment = res.data.data._Invitation.attachment
-                    that.projectName = res.data.data._Invitation.attachment
-                    that.InvitationOfficialActivities.inviteCost = res.data.data._Invitation.inviteCost
-                    that.InvitationOfficialActivities.inviteCurrency = res.data.data._Invitation.inviteCurrency
-                    that.InvitationOfficialActivities.sendCost = res.data.data._Invitation.sendCost
-                    that.InvitationOfficialActivities.isGoOfficaiaBussiness = res.data.data._Invitation.isGoOfficaiaBussiness
-                    that.InvitationOfficialActivities.remark = res.data.data._Invitation.remark
-                    that.InvitationOfficialActivities.address = res.data.data._InvitationData.address
-                    that.InvitationOfficialActivities.contact = res.data.data._InvitationData.contact
-                    that.InvitationOfficialActivities.job = res.data.data._InvitationData.job
-                    that.InvitationOfficialActivities.tel = res.data.data._InvitationData.tel
+                    that.InvitationOfficialActivities.payDId = res.data.data._CreditCard.payDId;
+                    that.InvitationOfficialActivities.orbitalPrivateTransfer = res.data.data._CreditCard.orbitalPrivateTransfer;
+                    that.InvitationOfficialActivities.payee = res.data.data._CreditCard.payee;
+                    that.InvitationOfficialActivities.id = res.data.data._Invitation.id;
+                    that.InvitationOfficialActivities.diId = res.data.data._Invitation.diId;
+                    that.InvitationOfficialActivities.inviterArea = res.data.data._Invitation.inviterArea;
+                    that.InvitationOfficialActivities.inviter = res.data.data._Invitation.inviter;
+                    that.InvitationOfficialActivities.inviteTime = res.data.data._Invitation.inviteTime;
+                    that.InvitationOfficialActivities.attachment = res.data.data._Invitation.attachment;
+                    that.projectName = res.data.data._Invitation.attachment;
+                    that.InvitationOfficialActivities.inviteCost = res.data.data._Invitation.inviteCost;
+                    that.InvitationOfficialActivities.inviteCurrency = res.data.data._Invitation.inviteCurrency;
+                    that.InvitationOfficialActivities.sendCost = res.data.data._Invitation.sendCost;
+                    that.InvitationOfficialActivities.sendCurrency = res.data.data._Invitation.sendCurrency;
+                    that.InvitationOfficialActivities.eventsCost = res.data.data._Invitation.eventsCost;
+                    that.InvitationOfficialActivities.eventsCurrency = res.data.data._Invitation.eventsCurrency;
+                    that.InvitationOfficialActivities.translateCost = res.data.data._Invitation.translateCost;
+                    that.InvitationOfficialActivities.translateCurrency = res.data.data._Invitation.translateCurrency;
+                    that.InvitationOfficialActivities.isGoOfficaiaBussiness = res.data.data._Invitation.isGoOfficaiaBussiness;
+                    that.InvitationOfficialActivities.remark = res.data.data._Invitation.remark;
+                    that.InvitationOfficialActivities.address = res.data.data._InvitationData.address;
+                    that.InvitationOfficialActivities.contact = res.data.data._InvitationData.contact;
+                    that.InvitationOfficialActivities.job = res.data.data._InvitationData.job;
+                    that.InvitationOfficialActivities.tel = res.data.data._InvitationData.tel;
                     that.IsAuditGM = res.data.data._CreditCard.isAuditGM;
-                    that.InvitationOfficialActivities.email = res.data.data._InvitationData.email
-                    that.InvitationOfficialActivities.fax = res.data.data._InvitationData.fax
-                    that.InvitationOfficialActivities.otherInformation = res.data.data._InvitationData.remark
+                    //
+                    that.InvitationOfficialActivities.consumptionDate = res.data.data._CreditCard.consumptionDate;
+                    that.InvitationOfficialActivities.consumptionPatterns = res.data.data._CreditCard.consumptionPatterns;
+                    that.InvitationOfficialActivities.ctdId = res.data.data._CreditCard.ctdId;
+                    that.InvitationOfficialActivities.bankNo = res.data.data._CreditCard.bankNo;
+                    that.InvitationOfficialActivities.cardholderName = res.data.data._CreditCard.cardholderName;
+                    that.InvitationOfficialActivities.companyBankNo = res.data.data._CreditCard.companyBankNo;
+                    that.InvitationOfficialActivities.otherBankName = res.data.data._CreditCard.otherBankName;
+                    that.InvitationOfficialActivities.otherSideNo = res.data.data._CreditCard.otherSideNo;
+                    that.InvitationOfficialActivities.otherSideName = res.data.data._CreditCard.otherSideName;
+                    //
+                    that.InvitationOfficialActivities.payMoney=res.data.data._CreditCard.payMoney;
+                    that.InvitationOfficialActivities.paymentCurrency=res.data.data._CreditCard.paymentCurrency;
+                    that.InvitationOfficialActivities.email = res.data.data._InvitationData.email;
+                    that.InvitationOfficialActivities.fax = res.data.data._InvitationData.fax;
+                    that.InvitationOfficialActivities.otherInformation = res.data.data._InvitationData.remark;
                     if (that.InvitationOfficialActivities.attachment != null && that.InvitationOfficialActivities.attachment != undefined && that.InvitationOfficialActivities.attachment != "") {
                         that.uploadFiles.push({
                             name: that.InvitationOfficialActivities.attachment,
@@ -375,7 +615,57 @@ export default {
 
             })
         },
-
+        //币种不同计算为人民币
+        computerenminbi(){
+            var eventsRate=0;
+            var inviteRate=0;
+            var translateRate=0;
+            var sendRate=0;
+            for (let h = 0; h < this.rateList.length; h++) {
+                if(this.InvitationOfficialActivities.eventsCurrency==this.rateList[h].currencyId){
+                    eventsRate=this.rateList[h].rate;
+                }
+                if(this.InvitationOfficialActivities.inviteCurrency==this.rateList[h].currencyId){
+                    inviteRate=this.rateList[h].rate;
+                }
+                if(this.InvitationOfficialActivities.translateCurrency==this.rateList[h].currencyId){
+                    translateRate=this.rateList[h].rate;
+                }
+                if(this.InvitationOfficialActivities.sendCurrency==this.rateList[h].currencyId){
+                    sendRate=this.rateList[h].rate;
+                }
+            }
+            if(
+                this.InvitationOfficialActivities.eventsCurrency!=this.InvitationOfficialActivities.inviteCurrency
+                ||this.InvitationOfficialActivities.inviteCurrency!=this.InvitationOfficialActivities.translateCurrency
+                ||this.InvitationOfficialActivities.translateCurrency!=this.InvitationOfficialActivities.sendCurrency
+                ||this.InvitationOfficialActivities.sendCurrency!=this.InvitationOfficialActivities.eventsCurrency
+                ){
+                this.InvitationOfficialActivities.paymentCurrency=836
+                this.InvitationOfficialActivities.payMoney=(
+                    this.InvitationOfficialActivities.eventsCost*eventsRate+
+                    this.InvitationOfficialActivities.inviteCost*inviteRate+
+                    this.InvitationOfficialActivities.translateCost*translateRate+
+                    this.InvitationOfficialActivities.sendCost*sendRate
+                );
+            }else{
+                this.InvitationOfficialActivities.paymentCurrency=this.InvitationOfficialActivities.eventsCurrency
+                this.InvitationOfficialActivities.payMoney=(
+                    this.InvitationOfficialActivities.eventsCost+
+                    this.InvitationOfficialActivities.inviteCost+
+                    this.InvitationOfficialActivities.translateCost+
+                    this.InvitationOfficialActivities.sendCost
+                );
+            }
+        },
+        cancelbtn(){
+            this.$router.push({
+                path: "/home/InvitationOfficialActivities",
+                query: {
+                    DiId: this.DiId,
+                }
+            })
+        },
         //点击保存事件
         addBtn() {
             if (this.IsAuditGM == 1) {
@@ -423,9 +713,8 @@ export default {
                                         message: res.data.msg,
                                         type: 'success'
                                     });
-                                    that.loading = true;
                                     setTimeout(() => {
-                                        that.$router.push('/home/InvitationOfficialActivities')
+                                        that.cancelbtn()
                                     }, 500);
                                 } else {
                                     that.$message.error(res.data.msg);
@@ -469,9 +758,8 @@ export default {
                                             message: res.data.msg,
                                             type: 'success'
                                         });
-                                        that.loading = true;
                                         setTimeout(() => {
-                                            that.$router.push('/home/InvitationOfficialActivities')
+                                            that.cancelbtn();
                                         }, 500);
                                     } else {
                                         that.$message.error(res.data.msg);
@@ -593,6 +881,12 @@ export default {
                     //汇率
                     console.log("汇率--", res.data.data);
                     that.rateList = res.data.data.teamRates;
+                    console.log(that.rateList[0].currencyId)
+                    // that.InvitationOfficialActivities.inviteCurrency=that.rateList[0].currencyId;
+                    // that.InvitationOfficialActivities.eventsCurrency=that.rateList[0].currencyId;
+                    // that.InvitationOfficialActivities.translateCurrency=that.rateList[0].currencyId;
+                    // that.InvitationOfficialActivities.sendCurrency=that.rateList[0].currencyId;
+                    // that.InvitationOfficialActivities.paymentCurrency=that.rateList[0].currencyId;
                 }
             })
         },
@@ -608,21 +902,12 @@ export default {
     },
 
     mounted() {
-
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
+        this.InvitationOfficialActivityInitBasicData();
         this.AirTicketResSelect();
         this.id = this.$route.query.id
-        if (this.id != null && this.id != undefined && this.id != 0) {
-            this.InvitationOfficialActivitiesById();
-            this.title = "修改商邀费用";
-            this.InvitationOfficialActivities.status = 2
-            this.isShow = true
-        } else {
-            this.InvitationOfficialActivities.status = 1
-            this.title = "新增商邀费用"
-            this.isShow = false
-        }
+        
         this.DiId = this.$route.query.DiId
         this.QueryRate();
     }
@@ -665,6 +950,7 @@ export default {
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     min-height: 810px;
+    
 }
 
 .ExpressPirce .el-input input {

src/components/Resource/OpTicketBlackCode.vue

@@ -103,9 +103,7 @@
                     <div style="width: 40%;text-align:right;margin-top: 2%;">
                         <div>
                             <el-button type="primary" @click="addBtn">保存</el-button>
-                            <router-link :to="{ path: '/home/TicketBlackCode'}">
-                                <el-button>取消</el-button>
-                            </router-link>
+                            <el-button @click="back()">取消</el-button>
                         </div>
 
                     </div>
@@ -205,7 +203,6 @@ export default {
                     that.delegationInfo = res.data.data.delegationInfo
                     that.airGroupCostParameter = res.data.data.groupCostParameter
                     if (res.data.data.ticketBlackCode != null) {
-                        debugger
                         var TicketBlackCode = res.data.data.ticketBlackCode
                         that.OpTicketBlackCodeData.id = TicketBlackCode.id
                         that.OpTicketBlackCodeData.diId = TicketBlackCode.diId
@@ -220,6 +217,15 @@ export default {
 
             })
         },
+        //跳转
+        back() {
+            this.$router.push({
+                path: "/home/TicketBlackCode",
+                query: {
+                    DiId: this.DiId,
+                }
+            })
+        },
         //团组下拉框选择事件
         AirTicketResChange() {
             this.QueryTicketBlackCodeById()
@@ -251,9 +257,9 @@ export default {
                                 type: 'success'
                             });
                             setTimeout(() => {
-                                that.$router.push('/home/TicketBlackCode')
+                                that.back();
+                                // that.$router.push('/home/TicketBlackCode')
                             }, 3000);
-                            that.loading = true;
                         } else {
                             that.$message.error(res.data.msg);
                         }

src/components/Resource/TicketBlackCode.vue

@@ -68,12 +68,12 @@
 </template>
 <script>
 export default {
-    beforeRouteLeave(to, from, next) {
-        if(to.name!='OpTicketBlackCode'){
-            from.meta.keepAlive = false;
-        }
-        next()
-    },
+    // beforeRouteLeave(to, from, next) {
+    //     if(to.name!='OpTicketBlackCode'){
+    //         from.meta.keepAlive = false;
+    //     }
+    //     next()
+    // },
     data() {
         return {
             loading: false,
@@ -83,6 +83,7 @@ export default {
             pageSize: 12,// 每页的数据条数
             token: '',
             userId: 0,
+            DiIdSelect:'',
             DiId: '',
             DelegationSelect: [],
             DelegationInfo: {}
@@ -116,7 +117,10 @@ export default {
             }).then(function (res) {
                 if (res.data.code == 200) {
                     that.DelegationSelect = res.data.data;
-                    that.DiId = that.DelegationSelect[0].id
+                    if(that.DiId==''){
+                        that.DiId = that.DelegationSelect[0].id
+                    }
+                    // console.log(that.DiId)
                     that.QueryTicketBlackCodeByDiId();
                 }
 
@@ -126,6 +130,7 @@ export default {
         },
         //团组下拉框值改变事件
         AirTicketResSelectChange() {
+            this.DiIdSelect='';
             this.QueryTicketBlackCodeByDiId();
         },
         QueryTicketBlackCodeByDiId() {
@@ -138,7 +143,7 @@ export default {
                     Authorization: 'Bearer ' + this.token
                 },
                 data: {
-                    diId: that.DiId
+                    diId: that.DiIdSelect?that.DiIdSelect:that.DiId
                 }
             }).then(function (res) {
                 console.log(res)
@@ -165,18 +170,18 @@ export default {
             this.$router.push({
                 path: "/home/OpTicketBlackCode",
                 query: {
-                    DiId: this.DiId,
+                    DiId: this.DiIdSelect?this.DiIdSelect:this.DiId,
                     id: row.id
                 }
             })
         },
+       
         addIf() {
-            
             if (this.DiId != 0 && this.DiId != '' && this.DiId != undefined) {
                 this.$router.push({
                     path: "/home/OpTicketBlackCode",
                     query: {
-                        DiId: this.DiId,
+                        DiId: this.DiIdSelect?this.DiIdSelect:this.DiId,
                     }
                 })
 
@@ -229,6 +234,12 @@ export default {
 
     },
     mounted() {
+        this.DiIdSelect = parseInt(this.$route.query.DiId)
+        if(this.DiIdSelect){
+
+            this.DiId = parseInt(this.$route.query.DiId)
+        }
+        console.log(this.DiId,this.DiIdSelect)
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
         this.DelegationSelectFun()

src/components/home.vue

@@ -1263,5 +1263,11 @@ i.icon-tongzhi {
 .all-box .communal-box .el-autocomplete,.el-select{
   margin-right: 0;
 }
+.all-box .el-table th.el-table__cell>.cell{
+  text-align: center;
+}
+.all-box .el-table--enable-row-transition .el-table__body td.el-table__cell{
+  text-align: center;
+}
 </style>
 

src/router/index.js

@@ -408,10 +408,10 @@ export default new Router({
           path: '/home/InvitationOfficialActivities',
           name: 'InvitationOfficialActivities',
           component: InvitationOfficialActivities,
-          meta: {
-            keepAlive: true, //此组件需要被缓存
-            isBack:false, //用于判断上一个页面是哪个
-          }
+          // meta: {
+          //   keepAlive: true, //此组件需要被缓存
+          //   isBack:false, //用于判断上一个页面是哪个
+          // }
         },
         {
           path: '/home/OpInvitationOfficialActivities',
@@ -467,10 +467,10 @@ export default new Router({
           path: '/home/TicketBlackCode',
           name: 'TicketBlackCode',
           component: TicketBlackCode,
-          meta: {
-            keepAlive: true, //此组件需要被缓存
-            isBack:false, //用于判断上一个页面是哪个
-          }
+          // meta: {
+          //   keepAlive: true, //此组件需要被缓存
+          //   isBack:false, //用于判断上一个页面是哪个
+          // }
         },
         {
           path: '/home/OpTicketBlackCode',