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

src/components/Finance/DailyFeeedit.vue

@@ -3,6 +3,12 @@
         <div class="dailyedit-title">
             新增日常费用付款申请款项
         </div>
+        <div style="text-align: right;margin-bottom: 20px;">
+            <el-button v-if="editid&&userid==21||userid==22" size="small" type="primary" @click="PostDelDailyPaymentAudit(1)">审核通过</el-button>
+            <el-button v-if="editid&&userid==21||userid==22" size="small" type="primary" @click="PostDelDailyPaymentAudit(2)">审核不通过</el-button>
+            <el-button size="small" type="primary" @click="submitForm('ruleForm')">保 存</el-button>
+            <el-button size="small" @click="resetForm('ruleForm')">返 回</el-button>
+        </div>
         <el-form :model="ruleForm" :rules="rules" ref="ruleForm"  class="demo-ruleForm">
             <div class="dailyedit-set">
                 <el-form-item label="类型标识:" label-width="85px" prop="transferation">
@@ -70,10 +76,7 @@
                     </el-form>
                 </div>
             </div>
-            <el-form-item style="text-align: right;">
-                <el-button type="primary" @click="submitForm('ruleForm')">保 存</el-button>
-                <el-button @click="resetForm('ruleForm')">返 回</el-button>
-            </el-form-item>
+            
         </el-form>
     </div>
 </template>
@@ -340,6 +343,40 @@ export default {
                 }
             })
         },
+        //审核
+        PostDelDailyPaymentAudit(val){
+            var url = "/api/Financial/PostDelDailyPaymentAudit"
+            var that = this
+            var auditType=0
+            if(that.userid==21){
+                auditType=2
+            }
+            if(that.userid==22){
+                auditType=1
+            }
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data: {
+                    id: that.editid,
+                    auditType:auditType,
+                    auditStatus:val
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.$message({
+                        message: res.data.msg,
+                        type: 'success',
+                        offset:50
+                    });
+                }else{
+                    that.$message.error(res.data.msg);
+                }
+            })
+        },
         getPostSearchDailyPaymentInfo(){
             if(this.editid!=undefined){
                 console.log("jing")

src/components/OP/EntryDetails.vue

@@ -137,6 +137,7 @@
                             <label>{{item.currencyName}}汇率:</label>
                             <el-input-number size="mini"  :controls="false" :precision="4" v-model="item.rate"></el-input-number>
                         </div>
+                        <span class="redzhu">(注：请先修改汇率在添加数据，否则请删除在添加！)</span>
                     </div>
                 </div>
                 <div class="Entry-form-li">
@@ -740,13 +741,370 @@ export default {
             this.choiceSix=false//培训费用选择框
             this.sumJJC=false//经济舱小计选择框
             this.sumGWC=false//公务舱小计选择框
-            this.airJJC_Checked=false//经济舱选择框
+            this.airJJC_Checked=false//经济舱选择框 
             this.airGWC_Checked=false//公务舱选择框
+            this.storageid=0
 
-            this.quarterageData= []
-            this.boardWagesData=[]
-            this.miscellaneousFeeData=[]
-            this.trainingExpenseData=[]
+            this.quarterageData= [
+                {
+                    id:0,
+                    diId:this.value,
+                    type:1,
+                    days:1,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:1,
+                    days:2,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:1,
+                    days:3,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:1,
+                    days:4,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:1,
+                    days:5,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:1,
+                    days:6,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:1,
+                    days:7,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:1,
+                    days:8,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+            ]
+            this.boardWagesData=[
+                {
+                    id:0,
+                    diId:this.value,
+                    type:2,
+                    days:1,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:2,
+                    days:2,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:2,
+                    days:3,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:2,
+                    days:4,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:2,
+                    days:5,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:2,
+                    days:6,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:2,
+                    days:7,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:2,
+                    days:8,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+            ]
+            this.miscellaneousFeeData=[
+                {
+                    id:0,
+                    diId:this.value,
+                    type:3,
+                    days:1,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:3,
+                    days:2,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:3,
+                    days:3,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:3,
+                    days:4,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:3,
+                    days:5,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:3,
+                    days:6,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:3,
+                    days:7,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:3,
+                    days:8,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+            ]
+            this.trainingExpenseData=[
+                {
+                    id:0,
+                    diId:this.value,
+                    type:4,
+                    days:1,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:4,
+                    days:2,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:4,
+                    days:3,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:4,
+                    days:4,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:4,
+                    days:5,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:4,
+                    days:6,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:4,
+                    days:7,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+                {
+                    id:0,
+                    diId:this.value,
+                    type:4,
+                    days:8,
+                    nationalTravelFeeId:'',
+                    cost:0,
+                    currency:0,
+                    subTotal:0,
+                    remark:'',
+                },
+            ]
 
             var url = "/api/Groups/GetEnterExitCostInfobyDiId"
             var that = this
@@ -811,7 +1169,7 @@ export default {
                         that.trainingExpense+=res.data.data.trainingExpenseData[d].subTotal
                     }
                     that.storageid=res.data.data.id;
-                    that.GetNationalTravelFeeData();
+                    // that.GetNationalTravelFeeData();
                     that.fullscreenLoading=false;
                 }else{
                     that.fullscreenLoading=false;
@@ -865,6 +1223,8 @@ export default {
             });
             //在change中获取到整条对象数据
             console.log(obj);
+            console.log(this.currencys);
+            console.log(this.boardWagesData);
             // if(index!=undefined){
             //     val[index].currencyName=obj.currencyName;
             //     val[index].currency=obj.currency;
@@ -906,6 +1266,7 @@ export default {
             });
             //在change中获取到整条对象数据
             console.log(obj);
+            console.log(this.currencys);
             console.log(val);
             if(index!=undefined){
                 val[index].currencyName=obj.currencyName;
@@ -1057,62 +1418,70 @@ export default {
             //住宿费
             var quarterageDatas=[];
             for(let m=0;m<this.quarterageData.length;m++){
-                quarterageDatas.push({
-                    id:this.quarterageData[m].id,
-                    diId:this.quarterageData[m].diId,
-                    type:this.quarterageData[m].type,
-                    days:this.quarterageData[m].days,
-                    nationalTravelFeeId:this.quarterageData[m].nationalTravelFeeId,
-                    cost:this.quarterageData[m].cost,
-                    currency:this.quarterageData[m].currency,
-                    subTotal:this.quarterageData[m].subTotal,
-                    remark:this.quarterageData[m].remark,
-                })
+                if(this.quarterageData[m].nationalTravelFeeId!=''){
+                    quarterageDatas.push({
+                        id:this.quarterageData[m].id,
+                        diId:this.quarterageData[m].diId,
+                        type:this.quarterageData[m].type,
+                        days:this.quarterageData[m].days,
+                        nationalTravelFeeId:this.quarterageData[m].nationalTravelFeeId,
+                        cost:this.quarterageData[m].cost,
+                        currency:this.quarterageData[m].currency,
+                        subTotal:this.quarterageData[m].subTotal,
+                        remark:this.quarterageData[m].remark,
+                    })
+                }
             }
             //伙食费
             var boardWagesDatas=[];
             for(let n=0;n<this.boardWagesData.length;n++){
-                boardWagesDatas.push({
-                    id:this.boardWagesData[n].id,
-                    diId:this.boardWagesData[n].diId,
-                    type:this.boardWagesData[n].type,
-                    days:this.boardWagesData[n].days,
-                    nationalTravelFeeId:this.boardWagesData[n].nationalTravelFeeId,
-                    cost:this.boardWagesData[n].cost,
-                    currency:this.boardWagesData[n].currency,
-                    subTotal:this.boardWagesData[n].subTotal,
-                    remark:this.boardWagesData[n].remark,
-                })
+                if(this.boardWagesData[n].nationalTravelFeeId!=''){
+                    boardWagesDatas.push({
+                        id:this.boardWagesData[n].id,
+                        diId:this.boardWagesData[n].diId,
+                        type:this.boardWagesData[n].type,
+                        days:this.boardWagesData[n].days,
+                        nationalTravelFeeId:this.boardWagesData[n].nationalTravelFeeId,
+                        cost:this.boardWagesData[n].cost,
+                        currency:this.boardWagesData[n].currency,
+                        subTotal:this.boardWagesData[n].subTotal,
+                        remark:this.boardWagesData[n].remark,
+                    })
+                }
             }
             //公杂费miscellaneousFeeData
             var miscellaneousFeeDatas=[];
             for(let b=0;b<this.miscellaneousFeeData.length;b++){
-                miscellaneousFeeDatas.push({
-                    id:this.miscellaneousFeeData[b].id,
-                    diId:this.miscellaneousFeeData[b].diId,
-                    type:this.miscellaneousFeeData[b].type,
-                    days:this.miscellaneousFeeData[b].days,
-                    nationalTravelFeeId:this.miscellaneousFeeData[b].nationalTravelFeeId,
-                    cost:this.miscellaneousFeeData[b].cost,
-                    currency:this.miscellaneousFeeData[b].currency,
-                    subTotal:this.miscellaneousFeeData[b].subTotal,
-                    remark:this.miscellaneousFeeData[b].remark,
-                })
+                if(this.miscellaneousFeeData[b].nationalTravelFeeId!=''){
+                    miscellaneousFeeDatas.push({
+                        id:this.miscellaneousFeeData[b].id,
+                        diId:this.miscellaneousFeeData[b].diId,
+                        type:this.miscellaneousFeeData[b].type,
+                        days:this.miscellaneousFeeData[b].days,
+                        nationalTravelFeeId:this.miscellaneousFeeData[b].nationalTravelFeeId,
+                        cost:this.miscellaneousFeeData[b].cost,
+                        currency:this.miscellaneousFeeData[b].currency,
+                        subTotal:this.miscellaneousFeeData[b].subTotal,
+                        remark:this.miscellaneousFeeData[b].remark,
+                    })
+                }
             }
             //培训费
             var trainingExpenseDatas=[];
             for(let p=0;p<this.trainingExpenseData.length;p++){
-                trainingExpenseDatas.push({
-                    id:this.trainingExpenseData[p].id,
-                    diId:this.trainingExpenseData[p].diId,
-                    type:this.trainingExpenseData[p].type,
-                    days:this.trainingExpenseData[p].days,
-                    nationalTravelFeeId:this.trainingExpenseData[p].nationalTravelFeeId,
-                    cost:this.trainingExpenseData[p].cost,
-                    currency:this.trainingExpenseData[p].currency,
-                    subTotal:this.trainingExpenseData[p].subTotal,
-                    remark:this.trainingExpenseData[p].remark,
-                })
+                if(this.trainingExpenseData[p].nationalTravelFeeId!=''){
+                    trainingExpenseDatas.push({
+                        id:this.trainingExpenseData[p].id,
+                        diId:this.trainingExpenseData[p].diId,
+                        type:this.trainingExpenseData[p].type,
+                        days:this.trainingExpenseData[p].days,
+                        nationalTravelFeeId:this.trainingExpenseData[p].nationalTravelFeeId,
+                        cost:this.trainingExpenseData[p].cost,
+                        currency:this.trainingExpenseData[p].currency,
+                        subTotal:this.trainingExpenseData[p].subTotal,
+                        remark:this.trainingExpenseData[p].remark,
+                    })
+                }
             }
             this.storageAPI(quarterageDatas,boardWagesDatas,miscellaneousFeeDatas,trainingExpenseDatas)
         },

src/components/OP/OpCarTouristGuideGroundId.vue

@@ -151,7 +151,7 @@
                 </div>
                 <div style="display: flex;">
                     <div style="width: 25%;">
-                        <el-form-item label="费用表示:" prop="orbitalPrivateTransfer" label-width="160px">
+                        <el-form-item label="费用标识:" prop="orbitalPrivateTransfer" label-width="160px">
                             <el-select v-model="OpCarTouristGuideGroundData.orbitalPrivateTransfer" clearable filterable
                                 placeholder="费用标识" >
                                 <el-option :key=0 :value="0" label="公转"></el-option>

src/components/OP/OpVisaPriec.vue

@@ -581,7 +581,7 @@ export default {
         verifytoll() {
             if (Number(this.OpVisaPriceData.visaNumber) + Number(this.OpVisaPriceData.visaFreeNumber) > this.OpVisaPriceData.visaClient.length) {
                 this.$message.error("请检查人数");
-                return
+                return false
             }
         },
         addBtn() {
@@ -599,7 +599,10 @@ export default {
                             if (that.OpVisaPriceData.ctdId == '') {
                                 that.OpVisaPriceData.ctdId = 0
                             }
-                            that.verifytoll()
+                            if (Number(that.OpVisaPriceData.visaNumber) + Number(that.OpVisaPriceData.visaFreeNumber) > that.OpVisaPriceData.visaClient.length) {
+                                that.$message.error("请检查人数");
+                                return false
+                            }
                             var url = "/api/Groups/OpVisaPrice"
                             that.$axios({
                                 method: 'post',

src/components/OP/PickupList.vue

@@ -116,7 +116,8 @@
                     详 情
                 </div>
                 <div>
-                    <el-button slot="trigger" @click="Exportlist" type="primary">导出团组名单</el-button>
+                    <el-button slot="trigger" @click="Exportlist(1)" type="primary">导出团组名单(英文)</el-button>
+                    <el-button slot="trigger" @click="Exportlist(0)" type="primary">导出团组名单</el-button>
                     <el-button type="primary" @click="dialogTableVisible = true">添加多个资料</el-button>
                     <el-button type="primary" @click="addhandoff">新增切换</el-button>
                     <el-button type="primary" @click="preservation('pickupinif')">保存设置</el-button>
@@ -1183,7 +1184,7 @@ export default {
             });
         },
         //导出团组名单
-        Exportlist(){
+        Exportlist(val){
             var url = "/api/Groups/PostTourClientListDownloadFile"
             var that = this
             this.$axios({
@@ -1197,6 +1198,7 @@ export default {
                     userId:that.userId,
                     pageId:that.pageId,
                     diId:that.diId,
+                    language:val
                 }
             }).then(function (res) {
                 console.log(res)

src/components/OP/ThreeStandards.vue

@@ -45,7 +45,7 @@
                     </el-table-column>
                     <el-table-column
                     prop="continent"
-                    label="州"
+                    label="洲"
                     width="80">
                     </el-table-column>
                     <el-table-column
@@ -126,7 +126,7 @@
             <el-dialog :close-on-click-modal="false" width="720px" title="新增三公费用标准" :visible.sync="AdditionalFees">
                 <el-form :model="addfees" ref="addfees" :rules="addfeesrules">
                     <div class="standards-inif">
-                        <el-form-item label="州" prop="continent" :label-width="formLabelWidth">
+                        <el-form-item label="洲" prop="continent" :label-width="formLabelWidth">
                             <el-input size="medium" :controls="false" v-model="addfees.continent"></el-input>
                         </el-form-item>
                         <el-form-item label="国家" prop="country" :label-width="formLabelWidth">
@@ -187,7 +187,7 @@ export default {
             //新增
             addfees:{
                 id:0,
-                continent:'',//州
+                continent:'',//洲
                 country:'', //国家
                 city:'',//城市
                 currency:807,//币种
@@ -200,7 +200,7 @@ export default {
             formLabelWidth:'100px',
             addfeesrules:{
                 continent: [
-                    { required: true, trigger: 'change',message:'请填写州' }
+                    { required: true, trigger: 'change',message:'请填写洲' }
                 ],
                 country: [
                     {required: true, trigger: 'change',message:'请填写国家' }
@@ -288,7 +288,7 @@ export default {
             }
             this.addfees={
                 id:0,
-                continent:'',//州
+                continent:'',//洲
                 country:'', //国家
                 city:'',//城市
                 currency:807,//币种

src/components/OP/VisaPriec.vue

@@ -10,7 +10,7 @@
 
                     <div style="width: 80%;display: flex;">
                         <div style="width: 25%;">
-                            <el-select v-model="DiId" placeholder="团组选择" clearable filterable @change="VisaSelectChange"
+                            <el-select v-model="DiId" placeholder="团组选择" clearable filterable @change="visaSelect"
                                 style="width: 100%;">
                                 <el-option v-for="item in delegationInfoList" :key="item.id" :label="item.teamName"
                                     :value="item.id">
@@ -136,7 +136,7 @@ export default {
             }).then(function (res) {
                 if (res.data.code == 200) {
                     that.delegationInfoList = res.data.data.groupName;
-                    that.DiId = that.$route.query.diId
+                    
                     if (that.DiId == undefined) {
                         that.delegationInfo = that.delegationInfoList[0]
                         that.DiId = that.delegationInfoList[0].id;
@@ -145,7 +145,7 @@ export default {
                             if (that.delegationInfoList[index].id == that.DiId) {
                                 that.delegationInfo = that.delegationInfoList[index];
                                 that.DiId = that.delegationInfoList[index].id;
-                                break;
+                                
                             }
                         }
                     }
@@ -270,10 +270,14 @@ export default {
             });
         },
     },
-    mounted() {
+    created(){
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
-        this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
+        this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
+        this.DiId = this.$route.query.diId
         this.visaSelect();
+    },
+    mounted() {
+        
         //this.AirTicketResList()
     }
 }

src/router/index.js

@@ -335,10 +335,10 @@ export default new Router({
           path: '/home/DailyFeePayment',
           name: 'DailyFeePayment',
           component: DailyFeePayment,
-          meta: {
-            keepAlive: true, //此组件需要被缓存
-            isBack:false, //用于判断上一个页面是哪个
-          }
+          // meta: {
+          //   keepAlive: true, //此组件需要被缓存
+          //   isBack:false, //用于判断上一个页面是哪个
+          // }
         },
         {
           path: '/home/DailyFeeedit',