소스 검색

三公拆分

liuhj 5 일 전
부모
커밋
4167e0f0b3
1개의 변경된 파일43개의 추가작업 그리고 13개의 파일을 삭제
  1. 43 13
      src/components/OP/EntryDetails.vue

+ 43 - 13
src/components/OP/EntryDetails.vue

@@ -131,7 +131,7 @@
                                 <label>(经济舱)</label>
                                 <div class="sub-boxs">
                                     {{ TotalExpenses.EconomyClasstotal=(TotalExpenses.EconomyClass +
-                                        TotalExpenses.TravellingExpenses) | numFilter }}
+                                        TotalExpenses.TravellingExpensesJJ) | numFilter }}
                                 </div>
                                 <span>元/人</span>
                             </div>
@@ -141,7 +141,7 @@
                                 <label>(公务舱)</label>
                                 <div class="sub-boxs">
                                     {{ TotalExpenses.BusinessClasstotal=(TotalExpenses.BusinessClass +
-                                        TotalExpenses.TravellingExpenses) | numFilter }}
+                                        TotalExpenses.TravellingExpensesGW) | numFilter }}
                                 </div>
                                 <span>元/人</span>
                             </div>
@@ -151,7 +151,7 @@
                                 <label>(头等舱)</label>
                                 <div class="sub-boxs">
                                     {{ TotalExpenses.Firstclasstotal=(TotalExpenses.Firstclass +
-                                        TotalExpenses.TravellingExpenses) | numFilter }}
+                                        TotalExpenses.TravellingExpensesTD) | numFilter }}
                                 </div>
                                 <span>元/人</span>
                             </div>
@@ -199,10 +199,23 @@
                         </div>
                     </div>
                     <div class="Entry-li-inif">
+                         <label>城市区间交通费:&nbsp; &nbsp; &nbsp; </label>
                         <div class="Entry-inif-box">
-                            <label>城市区间交通费:</label>
+                            <label>(经济舱):</label>
                             <el-input-number size="mini" :controls="false" :precision="2"
-                                v-model="TotalExpenses.TravellingExpenses"></el-input-number>
+                                v-model="TotalExpenses.TravellingExpensesJJ"></el-input-number>
+                            <span>元/人;</span>
+                        </div>
+                        <div class="Entry-inif-box">
+                            <label>(公务舱):</label>
+                            <el-input-number size="mini" :controls="false" :precision="2"
+                                v-model="TotalExpenses.TravellingExpensesGW"></el-input-number>
+                            <span>元/人;</span>
+                        </div>
+                        <div class="Entry-inif-box">
+                            <label>(头等舱):</label>
+                            <el-input-number size="mini" :controls="false" :precision="2"
+                                v-model="TotalExpenses.TravellingExpensesTD"></el-input-number>
                             <span>元/人;</span>
                         </div>
                     </div>
@@ -664,7 +677,9 @@ export default {
                 EconomyClass: 0,//经济舱
                 BusinessClass: 0,//公务舱
                 Firstclass: 0,//头等舱
-                TravellingExpenses: 0,//城市区间交通费
+                TravellingExpensesJJ: 0,//城市区间交通费JJ
+                TravellingExpensesGW: 0,//城市区间交通费GW
+                TravellingExpensesTD: 0,//城市区间交通费TD
                 EconomyClasstotal: 0,//经济舱合计
                 BusinessClasstotal: 0,//公务舱合计
                 Firstclasstotal: 0,//头等舱合计
@@ -908,7 +923,8 @@ export default {
             });
             this.TotalExpenses.EconomyClass = obj.jjcCurrentRate;
             this.TotalExpenses.BusinessClass = obj.gwcCurrentRate;
-            this.TotalExpenses.TravellingExpenses = obj.tdcCurrentRate;
+            this.TotalExpenses.Firstclass = obj.tdcCurrentRate;
+            //添加城市交通费
         },
         //获取文件
         EnterExitCostFileOwner() {
@@ -983,7 +999,9 @@ export default {
                 EconomyClass: 0,//经济舱
                 BusinessClass: 0,//公务舱
                 Firstclass: 0,//TD舱
-                TravellingExpenses: 0,//城市区间交通费
+                TravellingExpensesJJ: 0,//城市区间交通费JJ
+                TravellingExpensesGW: 0,//城市区间交通费GW
+                TravellingExpensesTD: 0,//城市区间交通费TD
                 EconomyClasstotal: 0,//经济舱合计
                 BusinessClasstotal: 0,//公务舱合计
                 Firstclasstotal: 0,//TD舱合计
@@ -1494,7 +1512,9 @@ export default {
                     that.TotalExpenses.EconomyClass = res.data.data.airJJ;
                     that.TotalExpenses.BusinessClass = res.data.data.airGW;
                     that.TotalExpenses.Firstclass = res.data.data.airTD;
-                    that.TotalExpenses.TravellingExpenses = res.data.data.cityTranffic;
+                    that.TotalExpenses.TravellingExpensesJJ = res.data.data.cityTranffic;
+                    that.TotalExpenses.TravellingExpensesGW = res.data.data.cityTranffic1;
+                    that.TotalExpenses.TravellingExpensesTD = res.data.data.cityTranffic2;
                     that.TotalExpenses.twoItemRemark = res.data.data.twoItemRemark;
 
                     //是否计算Checkbox
@@ -2128,7 +2148,9 @@ export default {
                     airJJ: that.TotalExpenses.EconomyClass,
                     airGW: that.TotalExpenses.BusinessClass,
                     airTD: that.TotalExpenses.Firstclass,
-                    cityTranffic: that.TotalExpenses.TravellingExpenses,
+                    cityTranffic: that.TotalExpenses.TravellingExpensesJJ,
+                    cityTranffic1: that.TotalExpenses.TravellingExpensesGW,
+                    cityTranffic2: that.TotalExpenses.TravellingExpensesTD,
                     dayOtherPriceData: arrSeven,
                     currencys: that.currencys,
                     choiceThree: that.choiceThree ? 1 : 0,
@@ -2298,7 +2320,9 @@ export default {
                         airJJ: that.TotalExpenses.EconomyClass,
                         airGW: that.TotalExpenses.BusinessClass,
                         airTD: that.TotalExpenses.Firstclass,
-                        cityTranffic: that.TotalExpenses.TravellingExpenses,
+                        cityTranffic: that.TotalExpenses.TravellingExpensesJJ,
+                        cityTranffic1: that.TotalExpenses.TravellingExpensesGW,
+                        cityTranffic2: that.TotalExpenses.TravellingExpensesTD,
                         dayOtherPriceData: otherDatas,
                         currencys: that.currencys,
                         choiceThree: that.choiceThree ? 1 : 0,
@@ -2804,8 +2828,14 @@ export default {
                 if (newVal.BusinessClass == undefined) {
                     newVal.BusinessClass = 0
                 }
-                if (newVal.TravellingExpenses == undefined) {
-                    newVal.TravellingExpenses = 0
+                if (newVal.TravellingExpensesJJ == undefined) {
+                    newVal.TravellingExpensesJJ = 0
+                }
+                if (newVal.TravellingExpensesGW == undefined) {
+                    newVal.TravellingExpensesGW = 0
+                }
+                if (newVal.TravellingExpensesTD == undefined) {
+                    newVal.TravellingExpensesTD = 0
                 }
             },
             immediate: true,