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

src/components/Finance/Cost.vue

@@ -243,7 +243,8 @@
                 <el-checkbox v-for="(  item, index  ) in    checkOptions  " :key="index" :title="item.tips"
                     :label="item.label" @change="(val) => { topcheckboxChange(val, item.label) }"></el-checkbox>
             </el-checkbox-group>
-            <el-table class="tables" style="font-size:10px" :summary-method="getSummaries" show-summary show-overflow-tooltip :data="tableData" :border="true" size="small" row-class-name="row"
+            <el-table class="tables" style="font-size:10px" :summary-method="getSummaries" show-summary
+                show-overflow-tooltip :data="tableData" :border="true" size="small" row-class-name="row"
                 cell-class-name="column" :highlight-current-row="true" :fit="true">
 
                 <!-- :height="centerheight" -->
@@ -490,8 +491,7 @@
                                     v-if="CheckBoxListSelect.filter(item => item.cbType == 'Left')[0].cbValues.includes(sheetitem.label)">
                                     <el-table :data="[{ a: 1 }]" border style="width: 100%"
                                         :class="{ 'hiddenElement': (sheetitem.EnLabel == 'visa' || sheetitem.EnLabel == 'bx') ? true : false }">
-                                        <el-table-column
-                                            v-for="(itemsheetone, index) in sheetitem.childList"
+                                        <el-table-column v-for="(itemsheetone, index) in sheetitem.childList"
                                             :key="index" :prop="itemsheetone.prop" :label="itemsheetone.childLabel">
                                             <!-- eslint-disable-next-line -->
                                             <template slot-scope="scope">
@@ -561,9 +561,29 @@
                                                 </div>
                                                 <span
                                                     v-else-if="itemcabinone.prop === 'costPerson' || itemcabinone.prop === 'singleQuote'"
-                                                    :title="scope.row[itemcabinone.prop]">{{
-        scope.row[itemcabinone.prop]
-    }}</span>
+                                                    :title="scope.row[itemcabinone.prop]">
+                                                    <span v-if="itemcabinone.prop === 'singleQuote'">
+                                                        <span v-if="itemcabinone.tips">
+                                                            <el-popover placement="top-start"
+                                                                :title="itemcabinone.title" width="200" trigger="hover">
+                                                                <span style="color:green">{{ itemcabinone.tips
+                                                                    }}</span>
+                                                                元/人
+                                                                <span slot="reference">{{ scope.row[itemcabinone.prop]
+                                                                    }}</span>
+                                                            </el-popover>
+                                                        </span>
+                                                        <span v-else>
+                                                            <el-popover placement="top-start"
+                                                                :title="itemcabinone.title" width="200" trigger="hover">
+                                                                <span style="color: red">暂无!</span>
+                                                                <span slot="reference">{{ scope.row[itemcabinone.prop]
+                                                                    }}</span>
+                                                            </el-popover>
+                                                        </span>
+                                                    </span>
+                                                    <span v-else>{{ scope.row[itemcabinone.prop] }}</span>
+                                                </span>
                                                 <span v-else-if="itemcabinone.prop === 'totalCost'"
                                                     :title="scope.row[itemcabinone.prop]">{{
         (scope.row['toll'] * scope.row['costPerson']).toFixed(2)
@@ -1399,7 +1419,9 @@ export default {
                         },
                         {
                             childLabel: '单人报价(CNY)',
-                            prop: 'singleQuote'
+                            prop: 'singleQuote',
+                            title: '报批(单人经济舱总报价):',
+                            tips: '这是一个tips',
                         },
                         {
                             childLabel: '总报价(CNY)',
@@ -1443,7 +1465,9 @@ export default {
                         },
                         {
                             childLabel: '单人报价(CNY)',
-                            prop: 'singleQuote'
+                            prop: 'singleQuote',
+                            title: '报批(单人经济舱总报价):',
+                            tips: '这是一个tips',
                         },
                         {
                             childLabel: '总报价(CNY)',
@@ -1487,7 +1511,9 @@ export default {
                         },
                         {
                             childLabel: '单人报价(CNY)',
-                            prop: 'singleQuote'
+                            prop: 'singleQuote',
+                            title: '报批(单人公务舱总报价):',
+                            tips: '这是一个tips',
                         },
                         {
                             childLabel: '总报价(CNY)',
@@ -1531,7 +1557,9 @@ export default {
                         },
                         {
                             childLabel: '单人报价(CNY)',
-                            prop: 'singleQuote'
+                            prop: 'singleQuote',
+                            title: '报批(单人公务舱总报价):',
+                            tips: '这是一个tips',
                         },
                         {
                             childLabel: '总报价(CNY)',
@@ -1575,7 +1603,9 @@ export default {
                         },
                         {
                             childLabel: '单人报价(CNY)',
-                            prop: 'singleQuote'
+                            prop: 'singleQuote',
+                            title: '报批(单人公务舱总报价):',
+                            tips: '这是一个tips',
                         },
                         {
                             childLabel: '总报价(CNY)',
@@ -1620,7 +1650,9 @@ export default {
                         },
                         {
                             childLabel: '单人报价(CNY)',
-                            prop: 'singleQuote'
+                            prop: 'singleQuote',
+                            title: '报批(单人经济舱总报价):',
+                            tips: '这是一个tips',
                         },
                         {
                             childLabel: '总报价(CNY)',
@@ -1690,7 +1722,9 @@ export default {
                         },
                         {
                             childLabel: '单人报价(CNY)',
-                            prop: 'singleQuote'
+                            prop: 'singleQuote',
+                            title: '报批(单人经济舱总报价):',
+                            tips: '这是一个tips',
                         },
                         {
                             childLabel: '总报价(CNY)',
@@ -1734,7 +1768,9 @@ export default {
                         },
                         {
                             childLabel: '单人报价(CNY)',
-                            prop: 'singleQuote'
+                            prop: 'singleQuote',
+                            title: '报批(单人经济舱总报价):',
+                            tips: '这是一个tips',
                         },
                         {
                             childLabel: '总报价(CNY)',
@@ -1778,7 +1814,9 @@ export default {
                         },
                         {
                             childLabel: '单人报价(CNY)',
-                            prop: 'singleQuote'
+                            prop: 'singleQuote',
+                            title: '报批(单人公务舱总报价):',
+                            tips: '这是一个tips',
                         },
                         {
                             childLabel: '总报价(CNY)',
@@ -1822,7 +1860,9 @@ export default {
                         },
                         {
                             childLabel: '单人报价(CNY)',
-                            prop: 'singleQuote'
+                            prop: 'singleQuote',
+                            title: '报批(单人公务舱总报价):',
+                            tips: '这是一个tips',
                         },
                         {
                             childLabel: '总报价(CNY)',
@@ -1866,7 +1906,9 @@ export default {
                         },
                         {
                             childLabel: '单人报价(CNY)',
-                            prop: 'singleQuote'
+                            prop: 'singleQuote',
+                            title: '报批(单人公务舱总报价):',
+                            tips: '这是一个tips',
                         },
                         {
                             childLabel: '总报价(CNY)',
@@ -1911,7 +1953,9 @@ export default {
                         },
                         {
                             childLabel: '单人报价(CNY)',
-                            prop: 'singleQuote'
+                            prop: 'singleQuote',
+                            title: '报批(单人经济舱总报价):',
+                            tips: '这是一个tips',
                         },
                         {
                             childLabel: '总报价(CNY)',
@@ -2969,6 +3013,31 @@ export default {
                             return x.type == "GongZa"
                         })
 
+                        var SumAirJJC = baoPi.filter(x => {
+                            return x.type == "SumAirJJC"
+                        })
+
+                        var SumAirGWC = baoPi.filter(x => {
+                            return x.type == "SumAirGWC"
+                        })
+
+
+                        if (SumAirJJC.length > 0) {
+                            for (var i = 0; i < that.cabinDatal.length; i++) {
+                                if (that.cabinDatal[i].label.indexOf('经济舱') != -1) {
+                                    that.cabinDatal[i].childList[3].tips = SumAirJJC[0].price
+                                }
+                            }
+                        }
+
+                        if (SumAirGWC.length > 0) {
+                            for (var i = 0; i < that.cabinDatal.length; i++) {
+                                if (that.cabinDatal[i].label.indexOf('公务舱') != -1) {
+                                    that.cabinDatal[i].childList[3].tips = SumAirGWC[0].price
+                                }
+                            }
+                        }
+
                         if (Meals.length > 0) {
                             that.ShowBaoPi.push(Meals[0]);
                         }
@@ -2979,6 +3048,7 @@ export default {
                             that.ShowBaoPi.push(GongZa[0]);
                         }
 
+
                     } else {
                         for (var m = 0; m < that.sheetDatal.length; m++) {
                             if (that.sheetDatal[m].childList[0].tips) {
@@ -4834,7 +4904,8 @@ export default {
 .czbtn {
     width: 70px;
 }
-.tables .el-textarea{
+
+.tables .el-textarea {
     font-size: 12px;
 }
 
@@ -4855,10 +4926,11 @@ export default {
     display: none;
 }
 
-.form-ss .el-checkbox__label{
+.form-ss .el-checkbox__label {
     font-size: 12px;
 }
-.tables .el-input--mini{
+
+.tables .el-input--mini {
     font-size: 12px;
 }
 </style>

src/components/OP/OpCarTouristGuideGroundId.vue

@@ -11,8 +11,8 @@
                 <div style="display: flex;">
                     <div style="width: 25%;">
                         <el-form-item label="团组名称:" label-width="160px">
-                            <el-select v-model="OpCarTouristGuideGroundData.diId" clearable filterable placeholder="团组选择"
-                                :disabled="isShow"  @change="DiIdSelectChange">
+                            <el-select v-model="OpCarTouristGuideGroundData.diId" clearable filterable
+                                placeholder="团组选择" :disabled="isShow" @change="DiIdSelectChange">
                                 <el-option v-for="item in delegationInfoList" :key="item.id" :label="item.teamName"
                                     :value="item.id">
                                 </el-option>
@@ -81,9 +81,10 @@
             <el-form :model="OpCarTouristGuideGroundData" ref="OpCarTouristGuideGroundData"
                 :rules="OpCarTouristGuideGroundDataRules" label-width="100px" class="demo-ruleForm">
                 <div style="display: flex;">
-                    <div style="width: 25%;">
-                        <el-form-item label="地区:" prop="area" label-width="160px">
-                            <!-- <el-autocomplete
+                    <div style="width: 25%;display: flex;">
+                        <div style="width: 70%;">
+                            <el-form-item label="地区:" prop="area" label-width="160px">
+                                <!-- <el-autocomplete
                             popper-class="el-autocomplete-suggestion"
                             :popper-append-to-body="false"
                             class="inline-input"
@@ -92,13 +93,22 @@
                             :fetch-suggestions="querySearch"
                             @select="selectarea"
                             ></el-autocomplete> -->
-                            <el-select v-model="OpCarTouristGuideGroundData.area" clearable filterable
-                                placeholder="地区" >
-                                <el-option v-for="(item,index) in restaurants" :key=index :value="item.id" :label="item.value"></el-option>
-                            </el-select>
-                            <!-- <el-input placeholder="地区" v-model="OpCarTouristGuideGroundData.area">
+                                <el-select v-model="OpCarTouristGuideGroundData.area" clearable filterable
+                                    placeholder="地区">
+                                    <el-option v-for="(item, index) in restaurants" :key=index :value="item.id"
+                                        :label="item.value"></el-option>
+                                </el-select>
+                                <!-- <el-input placeholder="地区" v-model="OpCarTouristGuideGroundData.area">
                             </el-input> -->
-                        </el-form-item>
+                            </el-form-item>
+                        </div>
+                        <div style="width: 27%;margin-left: 3%;">
+                            <el-select v-model="value" placeholder="费用标识">
+                                <el-option v-for="item in options" :key="item.value" :label="item.label"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </div>
                     </div>
                     <div style="width: 25%;">
                         <el-form-item label="服务时间起:" prop="serviceStartTime" label-width="160px">
@@ -153,7 +163,7 @@
                     <div style="width: 25%;">
                         <el-form-item label="费用标识:" prop="orbitalPrivateTransfer" label-width="160px">
                             <el-select v-model="OpCarTouristGuideGroundData.orbitalPrivateTransfer" clearable filterable
-                                placeholder="费用标识" >
+                                placeholder="费用标识">
                                 <el-option :key=0 :value="0" label="公转"></el-option>
                                 <el-option :key=1 :value="1" label="私转"></el-option>
                             </el-select>
@@ -258,7 +268,14 @@ export default {
                 serviceEndTime: { required: true, message: '请输入服务时间止', trigger: ['blur', 'change'] },
                 orbitalPrivateTransfer: { required: true, message: '请选择费用表示', trigger: ['blur', 'change'] },
             },
-            restaurants:[]
+            restaurants: [],
+            options: [{
+                value: '首付款',
+                label: '首付款'
+            }, {
+                value: '尾款',
+                label: '尾款'
+            }],
         }
     },
     methods: {
@@ -284,20 +301,20 @@ export default {
             }).then(function (res) {
                 console.log(res)
                 if (res.data.code == 200) {
-                    that.restaurants=res.data.data;
-                    that.restaurants= that.restaurants.map((terminal) => {
+                    that.restaurants = res.data.data;
+                    that.restaurants = that.restaurants.map((terminal) => {
                         return {
-                            id:terminal.id,
-                            value:terminal.country +'  '+ terminal.city,
+                            id: terminal.id,
+                            value: terminal.country + '  ' + terminal.city,
                         };
                     });
-                }else{
+                } else {
                     that.$message.error(res.data.msg);
                 }
             })
         },
         ///
-        selectarea(val){
+        selectarea(val) {
             console.log(this.OpCarTouristGuideGroundData.area);
             console.log(val);
         },
@@ -378,8 +395,8 @@ export default {
                     if (CreditCardPayment != null) {
                         that.IsAuditGM = CreditCardPayment.isAuditGM;
                     }
-                    
-                    that.OpCarTouristGuideGroundData.area = parseInt(carTouristGuideGround.area)?Number(carTouristGuideGround.area):"";
+
+                    that.OpCarTouristGuideGroundData.area = parseInt(carTouristGuideGround.area) ? Number(carTouristGuideGround.area) : "";
                     that.OpCarTouristGuideGroundData.serviceCompany = carTouristGuideGround.serviceCompany
                     that.OpCarTouristGuideGroundData.serviceGuide = carTouristGuideGround.serviceGuide
                     that.OpCarTouristGuideGroundData.serviceTel = carTouristGuideGround.serviceTel
@@ -438,7 +455,7 @@ export default {
                                         type: 'success'
                                     });
                                     setTimeout(() => {
-                                        that.$router.push('/home/CarTouristGuideGroundId?diId='+that.OpCarTouristGuideGroundData.diId+'')
+                                        that.$router.push('/home/CarTouristGuideGroundId?diId=' + that.OpCarTouristGuideGroundData.diId + '')
                                     }, 3000);
                                 } else {
                                     that.$message.error(res.data.msg);
@@ -461,7 +478,7 @@ export default {
             })
         }
     },
-    created(){
+    created() {
         this.OpCarCityResult()
     },
     mounted() {
@@ -471,7 +488,7 @@ export default {
         this.OpCarTouristGuideGroundData.diId = parseInt(this.$route.query.DiId)
         this.OpCarTouristGuideGroundData.id = this.$route.query.id
         this.OpCarTouristGuideGroundData.createUserId = this.userId
-        
+
         if (this.OpCarTouristGuideGroundData.id != null && this.OpCarTouristGuideGroundData.id != undefined && this.OpCarTouristGuideGroundData.id != 0) {
             this.QueryCarTouristGuideGroundById();
             this.title = "修改Op费用";
@@ -492,7 +509,7 @@ export default {
     padding: 10px;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
-    
+
 }
 
 .car_add .communal-title {
@@ -531,12 +548,15 @@ export default {
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
 }
-.car_add .el-date-editor.el-input{
+
+.car_add .el-date-editor.el-input {
     width: 100%;
 }
-.car_add .el-select{
+
+.car_add .el-select {
     width: 100%;
 }
+
 @media screen and (max-width: 1700px) {
     .appraise-box>div {
         width: 48%;