lhj 0606

src/components/Finance/FeesPage.vue

@@ -59,10 +59,11 @@
                 </el-table-column>
                 <el-table-column prop="priceNameContent" label="费用所属" width="200">
                     <template slot-scope="scope">
-                        <el-popover style="white-space: pre-wrap;" placement="top-start" width="100" trigger="click"
-                            :content="scope.row.priceMsgContent">
-                            <span slot="reference">{{ scope.row.priceNameContent }}</span>
-                        </el-popover>
+                        <span @click="open(scope.row.priceMsgContent)" slot="reference">{{ scope.row.priceNameContent }}</span>
+                        <!-- <el-popover style="white-space: pre-wrap;" placement="top-start" width="200" trigger="click">
+                            <p>{{scope.row.priceMsgContent.replace(/<br\s*\/?>/,"</p><p>")}}</p>
+                            <span @click="open(scope.row.priceMsgContent)" slot="reference">{{ scope.row.priceNameContent }}</span>
+                        </el-popover> -->
                     </template>
                 </el-table-column>
                 <el-table-column prop="priceName" label="费用模块" width="120">
@@ -275,6 +276,11 @@ export default {
         },
         ceshi() {
             console.log("tg")
+        },
+        open(val) {
+            this.$alert(val, '费用所属', {
+            dangerouslyUseHTMLString: true
+            });
         }
     },
     mounted() {

src/components/OP/AirTicketRes.vue

@@ -6,7 +6,7 @@
                 <div class="communal-title">
                     <div>机票费用录入</div>
                 </div>
-                <div style="display: flex;">
+                <div style="display: flex;justify-content: space-between;">
                     <div style="width: 60%;">
                         <el-select v-model="DiId" placeholder="团组选择" @change="AirTicketResSelectChange">
                             <el-option v-for="item in AirTicketResSelectData" :key="item.id" :label="item.groupName"
@@ -23,18 +23,19 @@
                         </router-link>
                     </div>
                 </div>
-                <span style="font-weight: bold;">团队名称：</span>
-                {{ delegationInfo.teamName }}&nbsp;&nbsp;&nbsp;
-                <span style="font-weight: bold;">客户：</span>
-                {{ delegationInfo.clientName }}&nbsp;&nbsp;&nbsp;
-                <span style="font-weight: bold;">出访国家：</span>
-                {{ delegationInfo.visitCountry }}&nbsp;&nbsp;&nbsp;
-                <span style="font-weight: bold;">起止日期：</span>
-                {{ delegationInfo.visitStartDate }}—{{ delegationInfo.visitEndDate }}&nbsp;&nbsp;&nbsp;
-                <span style="font-weight: bold;">天数/人数：</span>
-                {{ delegationInfo.visitDays }}天/{{ delegationInfo.visitPNumber }}人
+                <div style="margin:10px 0;color:#606266;">
+                    <span style="font-weight: bold;font-size:17px;">团队名称：</span>
+                    <span style="color:#606266;">{{ delegationInfo.teamName }}&nbsp;&nbsp;&nbsp;</span>
+                    <span style="font-weight: bold;font-size:17px;">客户：</span>
+                    <span style="color:#606266;">{{ delegationInfo.clientName }}&nbsp;&nbsp;&nbsp;</span>
+                    <span style="font-weight: bold;font-size:17px;">出访国家：</span>
+                    <span style="color:#606266;">{{ delegationInfo.visitCountry }}&nbsp;&nbsp;&nbsp;</span>
+                    <span style="font-weight: bold;font-size:17px;">起止日期：</span>
+                    <span style="color:#606266;">{{ delegationInfo.visitStartDate }}—{{ delegationInfo.visitEndDate }}&nbsp;&nbsp;&nbsp;</span>
+                    <span style="font-weight: bold;font-size:17px;">天数/人数：</span>
+                    <span style="color:#606266;">{{ delegationInfo.visitDays }}天/{{ delegationInfo.visitPNumber }}人</span>
+                </div>
             </div>
-            <hr style='background-color:#5555; height:1px; border:none;' />
             <template>
                 <el-table :data="tableDatas.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border
                     style="width: 100%" v-loading="loading" element-loading-text="拼命加载中...">
@@ -49,7 +50,7 @@
                     </el-table-column>
                     <el-table-column prop="clientName" label="客人名单" width="280">
                     </el-table-column>
-                    <el-table-column prop="clientNum" label="客人人数" width="50">
+                    <el-table-column prop="clientNum" label="客人人数" width="100">
                     </el-table-column>
                     <el-table-column prop="prePrice,preCurrencyStr" label="机票单价" width="120" sortable>
                         <template slot-scope="scope">

src/components/OP/OpAirTicketRes.vue

@@ -4,14 +4,12 @@
             <div class="communal-title">
                 <div>{{ title }}</div>
             </div>
-
         </div>
-        <hr style='background-color:#5555; height:1px; border:none;' />
-        <div style="color:red;display: flex;">
-            <div style="text-align:left;width:20%;">
-                *团组成本预算 - 机票的预算:
+        <div style="display: flex;">
+            <div style="text-align:left;font-size: 17px;font-weight: 600;color: #555;">
+                团组成本预算 - 机票的预算:
             </div>
-            <div style="margin-left:20px;color:red;" v-if="airGroupCostParameter != null">
+            <div style="margin-left:20px;color: #555;" v-if="airGroupCostParameter != null">
                 经济舱： {{ airGroupCostParameter.jjccb }}元/人 {{ airGroupCostParameter.jjcrs }}人
                 共:{{ airGroupCostParameter.jjccb * airGroupCostParameter.jjcrs
                 }}元&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -19,10 +17,11 @@
                 共:{{ airGroupCostParameter.gwccb * airGroupCostParameter.gwcrs
                 }}元&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             </div>
-            <div style="margin-left:20px;color:red;" v-else>
+            <div style="margin-left:20px;" v-else>
                 团组成本暂未开放此团数据！
             </div>
         </div>
+        <hr style='background-color:#5555; height:1px; border:none;' />
         <div>
             <el-form :model="delegationInfo" label-width="100px" class="demo-ruleForm">
                 <div style="display: flex;">
@@ -88,7 +87,7 @@
                             <el-input placeholder="机票总价" v-model="airTicketResOpData.price" style="width: 58%;"
                                 :disabled="true">
                             </el-input>
-                            <el-select v-model="airTicketResOpData.currency" style="width: 35%;" :disabled="true">
+                            <el-select v-model="airTicketResOpData.currency" style="width: 40%;" :disabled="true">
                                 <el-option key="48" label="CNY" :value="48"></el-option>
                                 <el-option key="49" label="USD" :value="49"></el-option>
                                 <el-option key="51" label="EUR" :value="51"></el-option>
@@ -164,28 +163,28 @@
                     </div>
                 </div>
                 <div style="display: flex;">
-                    <div style="width: 90%;">
+                    <div style="width: 100%;">
                         <el-form-item label="此舱位客人名称:" prop="clientName" label-width="160px">
                             <el-input placeholder="此舱位客人名称" v-model="airTicketResOpData.clientName">
                             </el-input>
                         </el-form-item>
                     </div>
                 </div>
-                <div>
+                <!-- <div>
                     <span style="color: red; padding-left: 100px;">
                         请严格遵守此格式!!! 1. EK363 R1 WE08MAR CANDXB HK7 0015 0515 SEAME 2 3 (注意空格以及多条数据换行)
                     </span>
-                </div>
+                </div> -->
                 <div style="display: flex;">
-                    <div style="width: 60%;">
+                    <div style="width: 100%;">
                         <el-form-item label="航班描述:" prop="flightsDescription" label-width="160px">
-                            <el-input type="textarea" :rows="5" placeholder="航班描述"
+                            <el-input type="textarea" :rows="5" placeholder="请严格遵守此格式!!! 1. EK363 R1 WE08MAR CANDXB HK7 0015 0515 SEAME 2 3 (注意空格以及多条数据换行)"
                                 v-model="airTicketResOpData.flightsDescription"></el-input>
                         </el-form-item>
                     </div>
                 </div>
                 <div style="display: flex;">
-                    <div style="width: 90%;">
+                    <div style="width: 100%;">
                         <el-form-item label="费用描述:" prop="priceDescription" label-width="160px">
                             <el-input type="textarea" :rows="3" placeholder="费用描述"
                                 v-model="airTicketResOpData.priceDescription"></el-input>
@@ -193,7 +192,7 @@
                     </div>
                 </div>
                 <div style="display: flex;">
-                    <div style="width: 90%;">
+                    <div style="width: 100%;">
                         <el-form-item label="备 注:" prop="Remark" label-width="160px">
                             <el-input type="textarea" :rows="3" placeholder="备注"
                                 v-model="airTicketResOpData.remark"></el-input>
@@ -202,7 +201,7 @@
                 </div>
             </el-form>
             <div style="margin-top: 20px;">
-                <span style="color: red;">付款申请</span>
+                <div class="communal-title">付款申请</div>
                 <hr style='background-color:#5555; height:1px; border:none;margin-top: 10px;' />
             </div>
             <el-form :model="cardPaymentOpData" ref="cardPaymentOpData" :rules="cardPaymentRules" label-width="130px"
@@ -350,7 +349,7 @@
                     </div>
                 </div>
                 <div style="display: flex;">
-                    <div style="width: 90%;">
+                    <div style="width: 100%;">
                         <el-form-item label="备 注:" prop="Remark">
                             <el-input type="textarea" :rows="5" placeholder="备注"
                                 v-model="cardPaymentOpData.remark"></el-input>