0306lhj

src/components/OP/CarTouristGuideGrounContent.vue

@@ -8,7 +8,7 @@
         <el-skeleton :rows="28" animated :loading="loading">
             <div style="display: flex;justify-content: space-between;">
                 <div style="width: 80%;display: flex;">
-                    <div style="width: 25%;">
+                    <div style="width: 25%;margin-right: 10px;">
                         <el-select v-model="diId" placeholder="团组选择" clearable filterable style="width: 100%;"
                             :disabled="true">
                             <el-option v-for="item in delegationInfoList" :key="item.id" :label="item.teamName"
@@ -18,24 +18,24 @@
                     </div>
                     <div style="width: 25%;">
                         <el-select v-model="currency" placeholder="币种选择" clearable filterable style="width: 80%;">
-                            <el-option v-for="item in currencyList" :key="item.id"
-                                :label="item.name + '(' + item.remark + ')'" :value="item.id">
+                            <el-option v-for="item in currencyList" :key="item.currencyId"
+                                :label="item.currencyName + '(' + item.currencyCode + ')'" :value="item.currencyId">
                             </el-option>
                         </el-select>
                     </div>
                 </div>
             </div>
-            <div style="margin:10px 0;color:#606266;font-size:12px;">
-                <span style="font-weight: bold;font-size:12px;">团队名称：</span>
+            <div style="margin:10px 0;color:#606266;font-size:16px;">
+                <span style="font-weight: bold;">团队名称：</span>
                 <span style="color:#606266;">{{ delegationInfo.teamName }}&nbsp;&nbsp;&nbsp;</span>
-                <span style="font-weight: bold;font-size:12px;">客户：</span>
-                <span style="color:#606266;font-size:12px;">{{ delegationInfo.clientName }}&nbsp;&nbsp;&nbsp; </span>
-                <span style="font-weight: bold;font-size:12px;">出访国家：</span>
-                <span style="color:#606266;font-size:12px;">{{ delegationInfo.visitCountry }}&nbsp;&nbsp;&nbsp;</span>
-                <span style="font-weight: bold;font-size:12px;">起止日期：</span>
-                <span style="color:#606266;font-size:12px;">{{ delegationInfo.visitDate }}&nbsp;&nbsp;&nbsp;</span>
-                <span style="font-weight: bold;font-size:12px;">天数/人数：</span>
-                <span style="color:#606266;font-size:12px;">{{ delegationInfo.visitDays }}天/{{
+                <span style="font-weight: bold;">客户：</span>
+                <span style="color:#606266;">{{ delegationInfo.clientName }}&nbsp;&nbsp;&nbsp; </span>
+                <span style="font-weight: bold;">出访国家：</span>
+                <span style="color:#606266;">{{ delegationInfo.visitCountry }}&nbsp;&nbsp;&nbsp;</span>
+                <span style="font-weight: bold;">起止日期：</span>
+                <span style="color:#606266;">{{ delegationInfo.visitDate }}&nbsp;&nbsp;&nbsp;</span>
+                <span style="font-weight: bold;">天数/人数：</span>
+                <span style="color:#606266;">{{ delegationInfo.visitDays }}天/{{
                     delegationInfo.visitPNumber }}人</span>
             </div>
             <hr style='background-color:#5555; height:1px; border:none;' />
@@ -48,7 +48,7 @@
 
                             </template>
                         </el-table-column>
-                        <el-table-column prop="SIdName" label="费用项目" width="100">
+                        <el-table-column prop="SIdName" label="费用项目" width="120">
                             <template slot-scope="scope">
                                 <span style="display: none;">{{ scope.row.sId }}</span>{{ scope.row.sIdName }}
                             </template>
@@ -63,8 +63,8 @@
                                     @change="PriceChange" /> -->
                                     <el-select v-model="currency" placeholder="币种选择" clearable filterable
                                         style="width:120px" :disabled="true">
-                                        <el-option v-for="item in currencyList" :key="item.id" :label="item.name"
-                                            :value="item.id">
+                                        <el-option v-for="item in currencyList" :key="item.currencyId" :label="item.currencyCode"
+                                            :value="item.currencyId">
                                         </el-option>
                                     </el-select>
                                 </div>
@@ -101,9 +101,9 @@
                                 </el-form-item>
                             </div>
                             <div style="width: 25%;">
-                                <el-form-item label="费用表示:" prop="orbitalPrivateTransfer" label-width="160px">
+                                <el-form-item label="费用标识:" prop="orbitalPrivateTransfer" label-width="160px">
                                     <el-select v-model="OPContenData.orbitalPrivateTransfer" clearable filterable
-                                        placeholder="费用标识" style="width: 220px;">
+                                        placeholder="费用标识" style="width: 100%;">
                                         <el-option :key=0 :value="0" label="公转"></el-option>
                                         <el-option :key=1 :value="1" label="私转"></el-option>
                                     </el-select>
@@ -112,7 +112,7 @@
                             <div style="width: 25%;">
                                 <el-form-item label="支付方式:" prop="payDId" label-width="160px">
                                     <el-select v-model="OPContenData.payDId" placeholder="支付方式" clearable filterable
-                                        style="width:120px">
+                                        style="width:100%">
                                         <el-option v-for="item in payment" :key="item.id" :label="item.name"
                                             :value="item.id">
                                         </el-option>
@@ -122,24 +122,22 @@
                         </div>
                         <div style="display: flex;">
 
-                            <div style="width: 50%;">
+                            <div style="width: 25%;">
                                 <el-form-item label="总金额:" label-width="160px">
                                     <el-input placeholder="金额" v-model="countCost" :disabled="true"
                                         style="width: 120px;"></el-input>
                                     <el-select v-model="currency" placeholder="币种选择" clearable filterable
-                                        style="width:120px" :disabled="true">
-                                        <el-option v-for="item in currencyList" :key="item.id" :label="item.name"
-                                            :value="item.id">
+                                        style="width:106px" :disabled="true">
+                                        <el-option v-for="item in currencyList" :key="item.currencyId" :label="item.currencyCode"
+                                            :value="item.currencyId">
                                         </el-option>
                                     </el-select>
                                 </el-form-item>
                             </div>
-                            <div style="width: 50%;text-align: right;">
+                            <div style="width: 75%;text-align: right;">
                                 <el-form-item>
-                                    <div style="margin-right: 25%;">
-                                        <el-button type="primary" @click="addBtn">保存</el-button>
-                                        <el-button @click="EscAdd">取消</el-button>
-                                    </div>
+                                    <el-button type="primary" @click="addBtn">保存</el-button>
+                                    <el-button @click="EscAdd">取消</el-button>
                                 </el-form-item>
                             </div>
 
@@ -158,7 +156,9 @@ import { dE } from '@fullcalendar/core/internal-common'
 export default {
     data() {
         return {
+            pageId:'',
             token: '',
+            cTable:'',
             userId: 0,
             id: '',
             diId: '',
@@ -216,18 +216,14 @@ export default {
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
-                    debugger
                     that.delegationInfoList = res.data.data.delegations;
                     for (let index = 0; index < that.delegationInfoList.length; index++) {
-                        debugger
                         if (that.delegationInfoList[index].id == that.diId) {
                             that.delegationInfo = that.delegationInfoList[index];
 
                             break;
                         }
                     }
-                    that.currencyList = res.data.data.currencyList;
-                    debugger
                     that.tableInitialization = res.data.data.tableInitialization;
                     that.tableInitialization.forEach(function (item) {
                         that.ContentList.push({
@@ -246,6 +242,49 @@ export default {
             })
 
         },
+        //获取ctable
+        PostPageLinkCTable() {
+            var url = "/api/Business/PostPageLinkCTable"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    pageId: that.pageId,
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.cTable=res.data.data.cTable
+                    that.PostGroupTeamRateByDiIdAndCTableId();
+                }
+            })
+        },
+        //获取团组币种
+        PostGroupTeamRateByDiIdAndCTableId() {
+            var url = "/api/Business/PostGroupTeamRateByDiIdAndCTableId"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    portType: 1,
+                    diId: that.diId,
+                    cTable: that.cTable,
+                }
+            }).then(function (res) {
+                console.log(res)
+                if (res.data.code == 200) {
+                    that.currencyList=res.data.data.teamRates;
+                    that.currency=that.currencyList[0].currencyId;
+                }
+            })
+        },
         OpCarTouristGuideGroundContenById() {
             var url = "/api/Groups/OpCarTouristGuideGroundContentById"
             var that = this
@@ -260,7 +299,6 @@ export default {
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
-                    debugger
                     var CreditCardPayment = res.data.data.creditCardPayment;
                     if (CreditCardPayment != null) {
                         that.OPContenData.payDId = CreditCardPayment.payDId
@@ -292,8 +330,7 @@ export default {
         addBtn() {
             if (this.IsAuditGM == 1) {
                 this.$message.error('已通过审核，不可修改！');
-            } else {
-                debugger
+            } else {                
                 if (this.diId == null && this.diId == undefined && this.diId == "") {
                     this.$message.error("请选择团组名称");
                     return;
@@ -363,10 +400,13 @@ export default {
     },
 
     mounted() {
+        this.pageId=localStorage.getItem('indexs').split('-')[1];
+        console.log(this.pageId)
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
         this.id = this.$route.query.id
         this.diId = parseInt(this.$route.query.diId)
+        this.PostPageLinkCTable();
         this.initializeSelect();
         //this.OpCarTouristGuideGroundContenById();
 

src/components/OP/CarTouristGuideGroundId.vue

@@ -18,23 +18,23 @@
                             </el-select>
                         </div>
                     </div>
-                    <div style="width: 20%">
+                    <div style="width: 20%;text-align: right;">
                         <el-button type="primary" style="" @click="addIf">新增</el-button>
                     </div>
                 </div>
             </div>
             <div style="margin:10px 0;color:#606266;">
-                <span style="font-weight: bold;font-size:17px;">团队名称：</span>
+                <span style="font-weight: bold;font-size:16px;">团队名称：</span>
                 <span style="color:#606266;">{{ delegationInfo.teamName }}&nbsp;&nbsp;&nbsp;</span>
-                <span style="font-weight: bold;font-size:17px;">客户：</span>
+                <span style="font-weight: bold;font-size:16px;">客户：</span>
                 <span style="color:#606266;">{{ delegationInfo.clientName }}&nbsp;&nbsp;&nbsp; {{
 }}&nbsp;&nbsp;&nbsp;</span>
-                <span style="font-weight: bold;font-size:17px;">出访国家：</span>
+                <span style="font-weight: bold;font-size:16px;">出访国家：</span>
                 <span style="color:#606266;">{{ delegationInfo.visitCountry }}&nbsp;&nbsp;&nbsp;</span>
-                <span style="font-weight: bold;font-size:17px;">起止日期：</span>
+                <span style="font-weight: bold;font-size:16px;">起止日期：</span>
                 <span style="color:#606266;">{{ delegationInfo.visitStartDate }}—{{ delegationInfo.visitEndDate
                 }}&nbsp;&nbsp;&nbsp;</span>
-                <span style="font-weight: bold;font-size:17px;">天数/人数：</span>
+                <span style="font-weight: bold;font-size:16px;">天数/人数：</span>
                 <span style="color:#606266;">{{ delegationInfo.visitDays }}天/{{ delegationInfo.visitPNumber }}人</span>
             </div>
 
@@ -161,8 +161,6 @@ export default {
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
-                    debugger
-                    debugger
                     that.delegationInfoList = res.data.data.groupName;
                     that.DiId = that.$route.query.diId
                     if (that.DiId == undefined) {
@@ -170,7 +168,6 @@ export default {
                         that.DiId = that.delegationInfoList[0].id;
                     } else {
                         for (let index = 0; index < that.delegationInfoList.length; index++) {
-                            debugger
                             if (that.delegationInfoList[index].id == that.DiId) {
                                 that.delegationInfo = that.delegationInfoList[index];
                                 that.DiId = that.delegationInfoList[index].id;
@@ -211,7 +208,6 @@ export default {
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
-                    debugger
                     that.tableDatas = res.data.data;
                     that.tableData = that.tableDatas
                     if (that.tableDatas.length != 0) {
@@ -251,7 +247,6 @@ export default {
 
         },
         addIf() {
-            debugger
             if (this.DiId != 0 && this.DiId != '' && this.DiId != undefined) {
                 this.$router.push({
                     path: "/home/OpCarTouristGuideGroundId",
@@ -323,6 +318,7 @@ export default {
     padding: 10px;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
+    min-height: 830px;
 }
 
 .communal-title {

src/components/Resource/InvitationOfficialActivityData.vue

@@ -49,7 +49,7 @@
                             {{ (currentPage - 1) * pageSize + scope.$index + 1 }}
                         </template>
                     </el-table-column>
-                    <el-table-column prop="country" label="国家">
+                    <el-table-column prop="country" width="100" label="国家">
                     </el-table-column>
                     <el-table-column prop="city" label="城市">
                     </el-table-column>
@@ -57,18 +57,18 @@
                     </el-table-column>
                     <el-table-column prop="field" label="涉及领域">
                     </el-table-column>
-                    <el-table-column prop="contact" label="联系人">
+                    <el-table-column prop="contact" width="100" label="联系人">
                     </el-table-column>
                     <el-table-column prop="job" label="职务">
                     </el-table-column>
-                    <el-table-column prop="tel" label="手机">
+                    <el-table-column prop="tel" width="120px" label="手机">
                     </el-table-column>
                     <el-table-column prop="delegationStr" label="关联团组">
                         <template slot-scope="Str">
                             <div :title="Str.row.delegationStr" class="title">{{ Str.row.delegationStr }}</div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="createUserName" label="录入者">
+                    <el-table-column width="80" prop="createUserName" label="录入者">
                     </el-table-column>
                     <el-table-column prop="createTime" label="录入时间">
                     </el-table-column>
@@ -91,13 +91,19 @@
 </template>
 <script>
 export default {
+    beforeRouteLeave(to, from, next) {
+        if(to.name!='OpInvitationOfficialActivityData'){
+            from.meta.keepAlive = false;
+        }
+        next()
+    },
     data() {
         return {
             loading: false,
             tableData: [],
             tableDatas: [],
             currentPage: 1, // 当前页码
-            pageSize: 8,// 每页的数据条数
+            pageSize: 10,// 每页的数据条数
             dataCount: 0,//总条数
             Country: "",
             restaurantsCountry: [],
@@ -235,7 +241,6 @@ export default {
             this.QueryInvitationOfficialActivityData()
         },
         QueryInvitationOfficialActivityData() {
-            debugger
             console.log(this.Delegation)
             var CreateUser = 0;
             if (this.CreateUserId == "" || this.CreateUserId == undefined || this.CreateUserId == null) {
@@ -419,7 +424,6 @@ export default {
             }).then(function (res) {
                 console.log(res)
                 if (res.data.code == 200) {
-                    debugger
                     that.restaurantDelegation = res.data.data;
 
                 }
@@ -494,8 +498,12 @@ export default {
     padding: 10px;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
+    min-height: 830px;
+}
+.communal-list .block{
+    margin-top: 15px;
+    
 }
-
 .communal-title {
     display: flex;
     font-size: 17px;
@@ -505,6 +513,7 @@ export default {
     margin-bottom: 10px;
     justify-content: space-between;
     align-items: center;
+    
 }
 
 .communal-box {
@@ -523,4 +532,7 @@ export default {
     white-space: nowrap;
     cursor: pointer;
 }
+.communal-box .el-autocomplete,.el-select{
+    margin-right: 15px;
+}
 </style>