12271106

src/components/OP/EntryDetails.vue

@@ -166,6 +166,14 @@
                                 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">
@@ -623,6 +631,7 @@ export default {
                 EconomyClasstotal: 0,//经济舱合计
                 BusinessClasstotal: 0,//公务舱合计
                 Firstclasstotal: 0,//头等舱合计
+                twoItemRemark:''//备注
             },
 
             TotalAccommodationFee: 0,//住宿费合计
@@ -881,6 +890,7 @@ export default {
                 EconomyClasstotal: 0,//经济舱合计
                 BusinessClasstotal: 0,//公务舱合计
                 Firstclasstotal: 0,//TD舱合计
+                twoItemRemark:''//备注
             }
             this.choiceOne = false//境内费用(其他费用)选择框
             this.choiceTwo = false//国际旅费合计选择框
@@ -1378,6 +1388,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;
@@ -1934,6 +1945,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,
@@ -2098,6 +2110,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,

src/components/OP/Groupedit.vue

@@ -144,15 +144,15 @@
                     <el-form-item label-width="120px" label="出访目的:">
                         <el-input type="textarea" v-model="ruleForm.purposevisit"></el-input>
                     </el-form-item>
+                    <el-form-item class="items" label-width="120px" label="基础需求:">
+                        <el-input type="textarea" v-model="ruleForm.otherneeds"></el-input>
+                    </el-form-item>
                     <el-form-item label-width="120px" label="特殊需求:">
                         <el-input type="textarea" v-model="ruleForm.specialneeds"></el-input>
                     </el-form-item>
                     <el-form-item label-width="120px" label="公务需求:">
                         <el-input type="textarea" v-model="ruleForm.Officialneeds"></el-input>
                     </el-form-item>
-                    <el-form-item label-width="120px" label="其他需求:">
-                        <el-input type="textarea" v-model="ruleForm.otherneeds"></el-input>
-                    </el-form-item>
                 </el-form>
                 <el-form class="approval-box">
                     <el-form-item label-width="160px" label="出国任务审批部门名称:">
@@ -740,4 +740,7 @@ export default {
     display: flex;
     align-items: center;
 }
+.items .el-form-item__label{
+    color: red;
+}
 </style>>