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

src/components/Finance/GroupStatus.vue

@@ -89,12 +89,12 @@
                     <el-table-column label="操作" width="110">
                         <template slot-scope="scope">
                           <el-button
-                            v-if="scope.row.isSure=0"
+                            v-if="scope.row.isSure==0"
                             type="primary"
                             size="mini"
                             @click="Complete(scope.$index, scope.row)">操作完成</el-button>
                             <el-button
-                            v-if="scope.row.isSure=1"
+                            v-if="scope.row.isSure==1"
                             type="primary"
                             size="mini"
                            >已完成</el-button>

src/components/OP/EntryDetails.vue

@@ -111,6 +111,13 @@
                                 <div class="sub-boxs">{{TotalExpenses.BusinessClasstotal=(TotalExpenses.BusinessClass+TotalExpenses.TravellingExpenses)|numFilter}}</div>
                                 <span>元/人</span>
                             </div>
+                            &nbsp;&nbsp;&nbsp;&nbsp;                          
+                            <div class="li-lable">
+                                <el-checkbox style="margin-right: -10px;" v-model="sumTDC"></el-checkbox>
+                                <label>(头等舱)</label>
+                                <div class="sub-boxs">{{TotalExpenses.Firstclasstotal=(TotalExpenses.Firstclass+TotalExpenses.TravellingExpenses)|numFilter}}</div>
+                                <span>元/人</span>
+                            </div>
                         </div>
                     </div>
                     <div class="Entry-li-inif">
@@ -125,6 +132,11 @@
                             <el-input-number size="mini"  :controls="false" :precision="2" v-model="TotalExpenses.BusinessClass"></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.Firstclass"></el-input-number>
+                            <span>元/人;</span>
+                        </div>
                         <span v-if="JSON.stringify(TicketJudgment) == '{}'" class="redzhu">(机票数据未录入)</span>
                         <div v-else>
                             <span v-if="TicketJudgment.jjcCurrentRate!=TotalExpenses.EconomyClass||TicketJudgment.gwcCurrentRate!=TotalExpenses.BusinessClass" class="redzhu">{{ TicketJudgment.remark }}</span>&nbsp;&nbsp;&nbsp;&nbsp;
@@ -533,6 +545,13 @@
                                 <div class="sub-boxs">{{gwctotal|numFilter}}</div>
                                 <span>元/人</span>
                             </div>
+                            &nbsp;&nbsp;&nbsp;&nbsp;                          
+                            <div class="li-lable">
+                                <!-- <el-checkbox style="margin-right: -10px;" v-model="airGWC_Checked"></el-checkbox> -->
+                                <label>(头等舱)</label>
+                                <div class="sub-boxs">{{tdctotal|numFilter}}</div>
+                                <span>元/人</span>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -565,6 +584,7 @@ export default {
             choiceSix:false,//培训费用选择框
             sumJJC:false,//经济舱小计选择框
             sumGWC:false,//公务舱小计选择框
+            sumTDC:false,//头等舱小计选择框
             airJJC_Checked:false,//经济舱选择框
             airGWC_Checked:false,//公务舱选择框
 
@@ -588,9 +608,11 @@ export default {
             TotalExpenses:{
                 EconomyClass:0,//经济舱
                 BusinessClass:0,//公务舱
+                Firstclass:0,//头等舱
                 TravellingExpenses:0,//城市区间交通费
                 EconomyClasstotal:0,//经济舱合计
                 BusinessClasstotal:0,//公务舱合计
+                Firstclasstotal:0,//头等舱合计
             },
 
             TotalAccommodationFee:0,//住宿费合计
@@ -615,6 +637,7 @@ export default {
 
             jjctotal:0,//经济舱合计
             gwctotal:0,//公务舱合计
+            tdctotal:0,//公务舱合计
 
             storageid:0,
             visabeizhu:"",
@@ -779,9 +802,11 @@ export default {
             this.TotalExpenses={
                 EconomyClass:0,//经济舱
                 BusinessClass:0,//公务舱
+                Firstclass:0,//TD舱
                 TravellingExpenses:0,//城市区间交通费
                 EconomyClasstotal:0,//经济舱合计
                 BusinessClasstotal:0,//公务舱合计
+                Firstclasstotal:0,//TD舱合计
             }
             this.choiceOne=false//境内费用(其他费用)选择框
             this.choiceTwo=false//国际旅费合计选择框
@@ -791,6 +816,7 @@ export default {
             this.choiceSix=false//培训费用选择框
             this.sumJJC=false//经济舱小计选择框
             this.sumGWC=false//公务舱小计选择框
+            this.sumTDC=false//公务舱小计选择框
             this.airJJC_Checked=false//经济舱选择框 
             this.airGWC_Checked=false//公务舱选择框
             this.storageid=0
@@ -1158,7 +1184,6 @@ export default {
 
             var url = "/api/Groups/GetEnterExitCostInfobyDiId"
             var that = this
-            console.log(that.value)
             this.$axios({
                 method: 'post',
                 url: url,
@@ -1186,19 +1211,21 @@ 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;
 
                     //是否计算Checkbox
-                    that.choiceOne=res.data.data.choiceOne==1?true:false
-                    that.choiceTwo=res.data.data.choiceTwo==1?true:false
-                    that.choiceThree=res.data.data.choiceThree==1?true:false
-                    that.choiceFour=res.data.data.choiceFour==1?true:false
-                    that.choiceFive=res.data.data.choiceFive==1?true:false
-                    that.choiceSix=res.data.data.choiceSix==1?true:false
-                    that.sumJJC=res.data.data.sumJJC==1?true:false
-                    that.sumGWC=res.data.data.sumGWC==1?true:false
-                    that.airJJC_Checked=res.data.data.airJJC_Checked==1?true:false
-                    that.airGWC_Checked=res.data.data.airGWC_Checked==1?true:false
+                    that.choiceOne=res.data.data.choiceOne==1?true:false;
+                    that.choiceTwo=res.data.data.choiceTwo==1?true:false;
+                    that.choiceThree=res.data.data.choiceThree==1?true:false;
+                    that.choiceFour=res.data.data.choiceFour==1?true:false;
+                    that.choiceFive=res.data.data.choiceFive==1?true:false;
+                    that.choiceSix=res.data.data.choiceSix==1?true:false;
+                    that.sumJJC=res.data.data.sumJJC==1?true:false;
+                    that.sumGWC=res.data.data.sumGWC==1?true:false;
+                    that.sumTDC=res.data.data.sumTDC==1?true:false;
+                    that.airJJC_Checked=res.data.data.airJJC_Checked==1?true:false;
+                    that.airGWC_Checked=res.data.data.airGWC_Checked==1?true:false;
                     //住宿费
                     that.quarterageData=res.data.data.quarterageData;
                     for(let a=0;a<res.data.data.quarterageData.length;a++){
@@ -1610,10 +1637,13 @@ export default {
                     choiceTwo: that.choiceTwo?1:0,
                     sumJJC:that.sumJJC?1:0,
                     sumGWC:that.sumGWC?1:0,
+                    sumTDC:that.sumTDC?1:0,
                     outsideJJPay:that.TotalExpenses.EconomyClasstotal,
-                    outsaideGWPay:that.TotalExpenses.BusinessClasstotal,
+                    outsideGWPay:that.TotalExpenses.BusinessClasstotal,
+                    outsideTDPay:that.TotalExpenses.Firstclasstotal,
                     airJJ:that.TotalExpenses.EconomyClass,
                     airGW:that.TotalExpenses.BusinessClass,
+                    airTD:that.TotalExpenses.Firstclass,
                     cityTranffic: that.TotalExpenses.TravellingExpenses,
                     currencys: that.currencys,
                     choiceThree:that.choiceThree?1:0,
@@ -1693,6 +1723,7 @@ export default {
             var jnfy
             var jjcxj
             var gwcxj
+            var tdcxj
             var zsf
             var hsf
             var gzf
@@ -1702,7 +1733,6 @@ export default {
             } else {
                 jnfy= 0;
             }
-            
             if (this.choiceThree == true) {
                 zsf=this.TotalAccommodationFee;
             } else {
@@ -1737,9 +1767,13 @@ export default {
                 gwcxj= 0;
                 this.gwctotal=0;
             }
-            
-            
-            
+            if (this.sumTDC == true) {
+                tdcxj=this.TotalExpenses.Firstclasstotal;
+                this.tdctotal=jnfy+tdcxj+zsf+hsf+gzf+pxf;
+            } else {
+                tdcxj= 0;
+                this.tdctotal=0;
+            }
         },
         //删除
         deleteRow(index,row,rows,val){
@@ -1882,6 +1916,9 @@ export default {
         sumGWC(val){//公务舱小计选择框
             this.calculation();
         },
+        sumTDC(val){//公务舱小计选择框
+            this.calculation();
+        },
         'DomesticFees.total':{
             handler(newVal,oldVal) {
                 this.calculation();
@@ -1933,6 +1970,14 @@ export default {
                 // console.log(this.DomesticFees.total+this.TotalAccommodationFee+this.TotalMeals+this.TotalMiscellaneous+this.trainingExpense+this.TotalExpenses.BusinessClasstotal)
             },
         },
+        'TotalExpenses.Firstclasstotal':{
+            handler(newVal,oldVal) {
+                this.calculation();
+                // this.jjctotal=this.DomesticFees.total+this.TotalAccommodationFee+this.TotalMeals+this.TotalMiscellaneous+this.trainingExpense+this.TotalExpenses.EconomyClasstotal;
+                // this.gwctotal=this.DomesticFees.total+this.TotalAccommodationFee+this.TotalMeals+this.TotalMiscellaneous+this.trainingExpense+this.TotalExpenses.BusinessClasstotal;
+                // console.log(this.DomesticFees.total+this.TotalAccommodationFee+this.TotalMeals+this.TotalMiscellaneous+this.trainingExpense+this.TotalExpenses.BusinessClasstotal)
+            },
+        },
         
         //境内费用非空处理
         DomesticFees: {

src/components/OP/Groupedit.vue

@@ -479,8 +479,8 @@ export default {
                         that.ruleForm.numdays = datagroup.visitDays + "";
                         that.ruleForm.numperson = datagroup.visitPNumber + "";
                         that.ruleForm.contracttime =datagroup.tontractTime==null?"":new Date(datagroup.tontractTime.split(' ')[0]);
-                        that.ruleForm.payments = datagroup.paymentMoney==''?'':datagroup.paymentMoney + '';
-                        that.ruleForm.occasion = datagroup.payDay==''?'':datagroup.payDay + '';
+                        that.ruleForm.payments = datagroup.paymentMoney + '';
+                        that.ruleForm.occasion =datagroup.payDay + '';
                         that.ruleForm.purposevisit = datagroup.visitPurpose;
                         that.ruleForm.specialneeds = datagroup.specialNeeds;
                         that.ruleForm.otherneeds = datagroup.otherNeeds;