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

src/components/OP/EntryDetails.vue

@@ -167,10 +167,18 @@
                                 v-model="TotalExpenses.Firstclass"></el-input-number>
                             <span>元/人;</span>
                         </div>
-                        <span v-if="JSON.stringify(TicketJudgment) == '{}'" class="redzhu">(机票数据未录入)</span>
+                        <span v-if="airDataArr.length<=0" class="redzhu">(机票数据未录入)</span>
                         <div v-else>
-                            <span class="redzhu">{{ TicketJudgment.remark }}</span>&nbsp;&nbsp;&nbsp;&nbsp;
-                            <el-button type="primary" @click="Fillin" size="mini">填 入</el-button>
+                            <span class="redzhu">有多条机票费用数据请自行选择！！</span>&nbsp;&nbsp;
+                            <el-select style="width:400px" @change="Fillin" size="mini" v-model="airDataArrvalue" placeholder="请选择">
+                                <el-option
+                                  v-for="item in airDataArr"
+                                  :key="item.remark"
+                                  :label="item.remark"
+                                  :value="item.remark">
+                                </el-option>
+                            </el-select>
+                            <!-- <el-button type="primary" @click="Fillin" size="mini">填 入</el-button> -->
                         </div>
                     </div>
                     <div class="Entry-li-inif">
@@ -689,7 +697,11 @@ export default {
             isView:false,
             viewUsers:[],
             viewUsersby:[],
-            viewUsersarr:[]
+            viewUsersarr:[],
+
+            //又憋两坨
+            airDataArr:[],
+            airDataArrvalue:''
         }
     },
     methods: {
@@ -801,8 +813,8 @@ export default {
                     }
                 }).then(function (res) {
                     if (res.data.code == 200) {
-                        that.TotalExpenses.EconomyClass = res.data.data.airData.jjcCurrentRate;
-                        that.TotalExpenses.BusinessClass = res.data.data.airData.gwcCurrentRate;
+                        that.TotalExpenses.EconomyClass = res.data.data.airData[0].jjcCurrentRate;
+                        that.TotalExpenses.BusinessClass = res.data.data.airData[0].gwcCurrentRate;
                         that.DomesticFees.visafees = res.data.data.visaData.feeTotal;
                         that.DomesticFees.visafeesDescription = res.data.data.visaData.remark;
                     } else {
@@ -825,11 +837,12 @@ export default {
                 }).then(function (res) {
                     if (res.data.code == 200) {
                         that.TicketJudgment = res.data.data.airData;
+                        that.airDataArr=res.data.data.airData;
                         if (that.TotalExpenses.EconomyClass==0) {
-                            that.TotalExpenses.EconomyClass = that.TicketJudgment.jjcCurrentRate;
+                            that.TotalExpenses.EconomyClass = that.airDataArr[0].jjcCurrentRate;
                         }
                         if (that.TotalExpenses.BusinessClass==0) {
-                            that.TotalExpenses.BusinessClass = that.TicketJudgment.gwcCurrentRate;
+                            that.TotalExpenses.BusinessClass = that.airDataArr[0].gwcCurrentRate;
                         }
                         that.visainfo = res.data.data.visaData;
                         that.currencyss = res.data.data.reteInfos;
@@ -852,9 +865,13 @@ export default {
             }
         },
         //机票费用填入
-        Fillin() {
-            this.TotalExpenses.EconomyClass = this.TicketJudgment.jjcCurrentRate;
-            this.TotalExpenses.BusinessClass = this.TicketJudgment.gwcCurrentRate;
+        Fillin(val) {
+            var obj = {}
+            obj = this.airDataArr.find(function (i,indexs) {
+                return i.remark === val
+            });
+            this.TotalExpenses.EconomyClass = obj.jjcCurrentRate;
+            this.TotalExpenses.BusinessClass = obj.gwcCurrentRate;
         },
         //获取文件
         EnterExitCostFileOwner() {
@@ -2078,7 +2095,7 @@ export default {
                     this.provinceId=this.options[i].provinceId
                 }
             }
-            
+            this.airDataArrvalue='';
             this.fullscreenLoading = true;
             // this.EnterExitCostFileOwner();
             // this.GetNationalTravelFeeData();