0712xiugaits

src/components/OP/CarTouristGuideGrounContent.vue

@@ -6,52 +6,149 @@
             </div>
         </div>
         <el-popover class="oprompts" placement="right" trigger="hover">
-            <el-table height="600" :data="budgeting" border>
+            <el-table height="700" :data="budgeting" border>
                 <el-table-column width="100" property="date" label="日期"></el-table-column>
-                <el-table-column width="100" label="车费用">
+                <el-table-column width="70" label="车费用">
                     <template slot-scope="scope">
                         {{ townum(scope.row.carFee) + ' ' + bizhong }}
                     </template>
                 </el-table-column>
-                <el-table-column width="100" label="导游费用">
+                <el-table-column width="70" label="车型">
                     <template slot-scope="scope">
-                        {{ townum(scope.row.guideFee) + ' ' + bizhong }}
+                        {{scope.row.carType}}
                     </template>
                 </el-table-column>
-                <el-table-column width="100" label="餐食费">
+                <el-table-column width="70" label="司机工资">
                     <template slot-scope="scope">
-                        {{ townum(scope.row.mealFee) + ' ' + bizhong }}
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.driverFee) + '\n' + bizhong }}
+                        </span>
                     </template>
                 </el-table-column>
-                <el-table-column width="100" label="门票费">
+                <el-table-column width="70" label="司机小费">
                     <template slot-scope="scope">
-                        {{ townum(scope.row.ticketFee) + ' ' + bizhong }}
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.driverTipsFee) + '\n' + bizhong }}
+                        </span>
                     </template>
                 </el-table-column>
-                <el-table-column width="100" label="小费">
+                <el-table-column width="70" label="司机餐补">
                     <template slot-scope="scope">
-                        {{ townum(scope.row.tipFee) + ' ' + bizhong }}
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.driverMealSubsidy) + '\n' + bizhong }}
+                        </span>
                     </template>
                 </el-table-column>
-                <el-table-column width="110" label="饮料零食水果">
+                <el-table-column width="70" label="司机超时费用">
                     <template slot-scope="scope">
-                        {{ townum(scope.row.drinksSnacksFruitFee) + ' ' + bizhong }}
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.driverOvertimeFee) + '\n' + bizhong }}
+                        </span>
                     </template>
                 </el-table-column>
-                <el-table-column width="100" label="出行物资">
+                <el-table-column width="70" label="导游费用">
                     <template slot-scope="scope">
-                        {{ townum(scope.row.travelSupplies) + ' ' + bizhong }}
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.guideFee) + '\n' + bizhong }}
+                        </span>
                     </template>
                 </el-table-column>
-                <el-table-column property="carType" width="100" label="车型"></el-table-column>
-                <el-table-column width="100" label="领队费">
+                <el-table-column width="70" label="导游超时费用">
                     <template slot-scope="scope">
-                        {{ townum(scope.row.leadersFee) + ' ' + bizhong }}
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.guideOvertimeFee) + '\n' + bizhong }}
+                        </span>
                     </template>
                 </el-table-column>
-                <el-table-column width="100" label="零用金">
+                <el-table-column width="70" label="导游餐补">
                     <template slot-scope="scope">
-                        {{ townum(scope.row.spentCash) + ' ' + bizhong }}
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.guideMealSubsidy) + '\n' + bizhong }}
+                        </span>
+                    </template>
+                </el-table-column>
+                <el-table-column width="70" label="导游房补">
+                    <template slot-scope="scope">
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.guideRoomSubsidy) + '\n' + bizhong }}
+                        </span>
+                    </template>
+                </el-table-column>
+                <el-table-column property="carType" width="70" label="导游交通费">
+                    <template slot-scope="scope">
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.guideCarFare) + '\n' + bizhong }}
+                        </span>
+                    </template>
+                </el-table-column>
+                <el-table-column width="70" label="导游景点费">
+                    <template slot-scope="scope">
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.guideSpotFee) + '\n' + bizhong }}
+                        </span>
+                    </template>
+                </el-table-column>
+                <el-table-column width="70" label="导游小费">
+                    <template slot-scope="scope">
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.guideTipsFee) + '\n' + bizhong }}
+                        </span>
+                    </template>
+                </el-table-column>
+                <el-table-column width="70" label="早餐费">
+                    <template slot-scope="scope">
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.breakfast) + '\n' + bizhong }}
+                        </span>
+                    </template>
+                </el-table-column>
+                <el-table-column width="70" label="午餐费">
+                    <template slot-scope="scope">
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.lunch) + '\n' + bizhong }}
+                        </span>
+                    </template>
+                </el-table-column>
+                <el-table-column width="70" label="晚餐费">
+                    <template slot-scope="scope">
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.dinner) + '\n' + bizhong }}
+                        </span>
+                    </template>
+                </el-table-column>
+                <el-table-column width="70" label="门票费">
+                    <template slot-scope="scope">
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.ticketFee) + '\n' + bizhong }}
+                        </span>
+                    </template>
+                </el-table-column>
+                <el-table-column width="70" label="零用金">
+                    <template slot-scope="scope">
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.spentCash) + '\n' + bizhong }}
+                        </span>
+                    </template>
+                </el-table-column>
+                <el-table-column width="70" label="领队费">
+                    <template slot-scope="scope">
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.leadersFee) + '\n' + bizhong }}
+                        </span>
+                    </template>
+                </el-table-column>
+                <el-table-column width="70" label="饮料零食水果">
+                    <template slot-scope="scope">
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.drinksSnacksFruitFee) + '\n' + bizhong }}
+                        </span>
+                    </template>
+                </el-table-column>
+                <el-table-column width="70" label="出行物资">
+                    <template slot-scope="scope">
+                        <span style="white-space: pre-wrap;text-align: center;">
+                            {{ townum(scope.row.travelSupplies) + '\n' + bizhong }}
+                        </span>
                     </template>
                 </el-table-column>
             </el-table>
@@ -59,7 +156,7 @@
         </el-popover>
         <el-skeleton :rows="28" animated :loading="loading">
             <div style="display: flex;justify-content: space-between;">
-                <div style="width: 80%;display: flex;">
+                <div style="width: 70%;display: flex;">
                     <div style="width: 25%;margin-right: 10px;">
                         <el-select v-model="diId" placeholder="团组选择" clearable filterable style="width: 100%;"
                             :disabled="true">
@@ -69,7 +166,7 @@
                         </el-select>
                     </div>
                     <div style="width: 25%;">
-                        <el-select v-model="currency" placeholder="币种选择" clearable filterable style="width: 80%;">
+                        <el-select v-model="currency" placeholder="币种选择" clearable filterable style="width: 70%;">
                             <el-option v-for="item in currencyList" :key="item.currencyId"
                                 :label="item.currencyName + '(' + item.currencyCode + ')'" :value="item.currencyId">
                             </el-option>
@@ -82,17 +179,17 @@
                     <el-checkbox v-for="(item, index) in checkItems" :key="index" :label=item></el-checkbox>
                 </el-checkbox-group>
             </div>
-            <div style="margin:10px 0;color:#606266;font-size:15px;">
+            <div style="margin:10px 0;color:#706266;font-size:15px;">
                 <span style="font-weight: bold;">团队名称：</span>
-                <span style="color:#606266;">{{ delegationInfo.teamName }}&nbsp;&nbsp;&nbsp;</span>
+                <span style="color:#706266;">{{ delegationInfo.teamName }}&nbsp;&nbsp;&nbsp;</span>
                 <span style="font-weight: bold;">客户：</span>
-                <span style="color:#606266;">{{ delegationInfo.clientName }}&nbsp;&nbsp;&nbsp; </span>
+                <span style="color:#706266;">{{ delegationInfo.clientName }}&nbsp;&nbsp;&nbsp; </span>
                 <span style="font-weight: bold;">出访国家：</span>
-                <span style="color:#606266;">{{ delegationInfo.visitCountry }}&nbsp;&nbsp;&nbsp;</span>
+                <span style="color:#706266;">{{ delegationInfo.visitCountry }}&nbsp;&nbsp;&nbsp;</span>
                 <span style="font-weight: bold;">起止日期：</span>
-                <span style="color:#606266;">{{ delegationInfo.visitDate }}&nbsp;&nbsp;&nbsp;</span>
+                <span style="color:#706266;">{{ delegationInfo.visitDate }}&nbsp;&nbsp;&nbsp;</span>
                 <span style="font-weight: bold;">天数/人数：</span>
-                <span style="color:#606266;">{{ delegationInfo.visitDays }}天/{{
+                <span style="color:#706266;">{{ delegationInfo.visitDays }}天/{{
                     delegationInfo.visitPNumber }}人</span>
             </div>
             <hr style='background-color:#5555; height:1px; border:none;' />
@@ -124,7 +221,7 @@
                                     <el-input-number size="small" placeholder="请输入金额" v-model="scope.row.price"
                                         :controls="false" @change="PriceChange"></el-input-number>
 
-                                    <!-- <el-input placeholder="请输入金额" v-model="scope.row.price" clearable style="width:180px;"
+                                    <!-- <el-input placeholder="请输入金额" v-model="scope.row.price" clearable style="width:170px;"
                                     @change="PriceChange" /> -->
                                     <el-select size="small" v-model="currency" placeholder="币种选择" clearable filterable
                                         style="width:120px" :disabled="true">
@@ -174,20 +271,20 @@
                         <div style="display: flex;">
 
                             <div style="width: 25%;">
-                                <el-form-item label="此次付款百分比:" prop="payPercentage" label-width="160px">
+                                <el-form-item label="此次付款百分比:" prop="payPercentage" label-width="170px">
                                     <el-input placeholder="此次付款百分比" v-model="OPContenData.payPercentage">
                                         <template slot="append">%</template>
                                     </el-input>
                                 </el-form-item>
                             </div>
                             <div style="width: 25%;">
-                                <el-form-item label="收款方:" prop="payee" label-width="160px">
+                                <el-form-item label="收款方:" prop="payee" label-width="170px">
                                     <el-input placeholder="收款方" v-model="OPContenData.payee">
                                     </el-input>
                                 </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="170px">
                                     <el-select v-model="OPContenData.orbitalPrivateTransfer" clearable filterable
                                         placeholder="费用标识" style="width: 100%;">
                                         <el-option :key=0 :value="0" label="公转"></el-option>
@@ -196,7 +293,7 @@
                                 </el-form-item>
                             </div>
                             <div style="width: 25%;">
-                                <el-form-item label="支付方式:" prop="payDId" label-width="160px">
+                                <el-form-item label="支付方式:" prop="payDId" label-width="170px">
                                     <el-select v-model="OPContenData.payDId" placeholder="支付方式" clearable filterable
                                         style="width:100%">
                                         <el-option v-for="item in payment" :key="item.id" :label="item.name"
@@ -209,7 +306,7 @@
                         <div style="display: flex;">
 
                             <div style="width: 25%;">
-                                <el-form-item label="总金额:" label-width="160px">
+                                <el-form-item label="总金额:" label-width="170px">
                                     <el-input placeholder="金额" v-model="countCost" :disabled="true"
                                         style="width: 120px;"></el-input>
                                     <el-select v-model="currency" placeholder="币种选择" clearable filterable
@@ -263,7 +360,7 @@ export default {
                 diId: '',
                 cTGGRId: '',
                 orbitalPrivateTransfer: 0,
-                payPercentage: '80',
+                payPercentage: '70',
                 payee: '',
                 payDId: '',
                 currency: '',
@@ -615,13 +712,13 @@ export default {
     padding: 10px;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
-    min-height: 800px;
+    min-height: 700px;
 }
 
 .car_add .communal-title {
     display: flex;
     font-size: 17px;
-    font-weight: 600;
+    font-weight: 700;
     color: #555;
     margin-bottom: 20px;
     justify-content: space-between;
@@ -669,7 +766,7 @@ export default {
     }
 
     .appraise-box>div el-form-item__content {
-        width: 260px !important;
+        width: 270px !important;
     }
 }
 

src/components/Sankunginfo.vue

@@ -45,7 +45,7 @@ export default {
             window.open("http://132.232.92.186:24/Office/Word/EnterExitCost/File/"+this.fileName)
             // this.$router.push({path: "http://132.232.92.186:24/Office/Word/EnterExitCost/File/"+this.fileName});
         },
-        //获取基础数据
+        //确认
         PostEnterExitCostIsConfirm(){
             var url = "/api/Groups/PostEnterExitCostIsConfirm"
             var that = this
@@ -56,7 +56,7 @@ export default {
                     Authorization: 'Bearer ' + that.token
                 },
                 data:{
-                    type:2,
+                    type:1,
                     id:that.id
                 }
             }).then(function (res) {