12271117

src/components/OP/EntryDetails.vue

@@ -166,14 +166,6 @@
                                 v-if="TicketJudgment.jjcCurrentRate != TotalExpenses.EconomyClass || TicketJudgment.gwcCurrentRate != TotalExpenses.BusinessClass"
                                 type="primary" @click="Fillin" size="mini">填 入</el-button>
                         </div>
-                        
-                    </div>
-                    <div class="Entry-li-inif">
-                        <div class="Entry-inif-box">
-                            <label>备注:</label>
-                            <el-input style="width:1000px" size="mini"
-                                v-model="TotalExpenses.twoItemRemark"></el-input>
-                        </div>
                     </div>
                     <div class="Entry-li-inif">
                         <div class="Entry-inif-box">
@@ -182,6 +174,11 @@
                                 v-model="TotalExpenses.TravellingExpenses"></el-input-number>
                             <span>元/人;</span>
                         </div>
+                        <div class="Entry-inif-box">
+                            <label>备注:</label>
+                            <el-input style="width:1000px" size="mini"
+                                v-model="TotalExpenses.twoItemRemark"></el-input>
+                        </div>
                     </div>
                     <div class="Entry-li-inif">
                         <div v-for="(item, index) in currencys" :key="index" class="Entry-inif-box">

src/components/OP/EntryDetailsdraft.vue

@@ -191,6 +191,11 @@
                                 v-model="TotalExpenses.TravellingExpenses"></el-input-number>
                             <span>元/人;</span>
                         </div>
+                        <div class="Entry-inif-box">
+                            <label>备注:</label>
+                            <el-input style="width:1000px" size="mini"
+                                v-model="TotalExpenses.twoItemRemark"></el-input>
+                        </div>
                     </div>
                     <div class="Entrydraft-li-inif">
                         <div v-for="(item, index) in currencys" :key="index" class="Entrydraft-inif-box">
@@ -641,6 +646,7 @@ export default {
                 EconomyClasstotal: 0,//经济舱合计
                 BusinessClasstotal: 0,//公务舱合计
                 Firstclasstotal: 0,//头等舱合计
+                twoItemRemark:''//备注
             },
 
             TotalAccommodationFee: 0,//住宿费合计
@@ -975,6 +981,7 @@ export default {
                 EconomyClasstotal: 0,//经济舱合计
                 BusinessClasstotal: 0,//公务舱合计
                 Firstclasstotal: 0,//TD舱合计
+                twoItemRemark:''//备注
             }
             this.choiceOne = false//境内费用(其他费用)选择框
             this.choiceTwo = false//国际旅费合计选择框
@@ -1472,6 +1479,7 @@ export default {
                     that.TotalExpenses.BusinessClass = res.data.data.airGW;
                     that.TotalExpenses.Firstclass = res.data.data.airTD;
                     that.TotalExpenses.TravellingExpenses = res.data.data.cityTranffic;
+                    that.TotalExpenses.twoItemRemark = res.data.data.twoItemRemark;
 
                     //是否计算Checkbox
                     that.choiceOne = res.data.data.choiceOne == 1 ? true : false;
@@ -1558,6 +1566,7 @@ export default {
                 EconomyClasstotal: 0,//经济舱合计
                 BusinessClasstotal: 0,//公务舱合计
                 Firstclasstotal: 0,//TD舱合计
+                twoItemRemark:''//备注
             }
             this.choiceOne = false//境内费用(其他费用)选择框
             this.choiceTwo = false//国际旅费合计选择框
@@ -2487,6 +2496,7 @@ export default {
                     outsideJJPay: that.TotalExpenses.EconomyClasstotal,
                     outsideGWPay: that.TotalExpenses.BusinessClasstotal,
                     outsideTDPay: that.TotalExpenses.Firstclasstotal,
+                    twoItemRemark: that.TotalExpenses.twoItemRemark,
                     airJJ: that.TotalExpenses.EconomyClass,
                     airGW: that.TotalExpenses.BusinessClass,
                     airTD: that.TotalExpenses.Firstclass,
@@ -2668,6 +2678,7 @@ export default {
                         outsideJJPay: that.TotalExpenses.EconomyClasstotal,
                         outsideGWPay: that.TotalExpenses.BusinessClasstotal,
                         outsideTDPay: that.TotalExpenses.Firstclasstotal,
+                        twoItemRemark: that.TotalExpenses.twoItemRemark,
                         airJJ: that.TotalExpenses.EconomyClass,
                         airGW: that.TotalExpenses.BusinessClass,
                         airTD: that.TotalExpenses.Firstclass,