liuhj před 9 měsíci
rodič
revize
71aa442e8f

+ 0 - 9
src/components/Finance/FeesPage.vue

@@ -179,15 +179,6 @@ export default {
             console.log(this.activeName)
             console.log(this.activeName)
             var url = "/api/Groups/PostSearchGrpCreditCardPayment"
             var url = "/api/Groups/PostSearchGrpCreditCardPayment"
             var that = this
             var that = this
-            var data= {
-                    portType: 1,
-                    userId: that.userid,
-                    pageId: that.pageId,
-                    diId: that.diid,
-                    label: that.activeName,
-                    auditStatus: that.formInline.Status
-                }
-                console.log(JSON.stringify(data))
             this.$axios({
             this.$axios({
                 method: 'post',
                 method: 'post',
                 url: url,
                 url: url,

+ 7 - 7
src/components/Finance/PaymentFiled.vue

@@ -262,6 +262,8 @@ export default {
         everydayarr:[],//日付勾选中
         everydayarr:[],//日付勾选中
         fullscreenLoading:false,
         fullscreenLoading:false,
         hotelSubIdarr:[],
         hotelSubIdarr:[],
+        hotelSubIdarrs:[],
+        arrid:[]
     };
     };
     },
     },
     methods:{
     methods:{
@@ -452,23 +454,21 @@ export default {
         },
         },
         //保存勾选
         //保存勾选
         PostPayRequestCheckedChange(type){
         PostPayRequestCheckedChange(type){
-            var hotelSubIdarrs=[]
             for(let n=0;n<this.hotelSubIdarr.length;n++){
             for(let n=0;n<this.hotelSubIdarr.length;n++){
                 if(this.hotelSubIdarr[n]!=undefined&&this.hotelSubIdarr[n]!=-1){
                 if(this.hotelSubIdarr[n]!=undefined&&this.hotelSubIdarr[n]!=-1){
-                    hotelSubIdarrs.push(this.hotelSubIdarr[n]);
+                    this.hotelSubIdarrs.push(this.hotelSubIdarr[n]);
                 }
                 }
             }
             }
-            this.hotelSubIdarr=Array.from(new Set(hotelSubIdarrs))
-            var arrid=[]
+            this.hotelSubIdarr=Array.from(new Set(this.hotelSubIdarrs))
             for(let i=0;i<this.defaultarr.length;i++){
             for(let i=0;i<this.defaultarr.length;i++){
                 if(typeof this.defaultarr[i]!== 'number'){
                 if(typeof this.defaultarr[i]!== 'number'){
                     if(Number(this.defaultarr[i].split('p')[1])==Number(this.defaultarr[i].split('p')[1])){
                     if(Number(this.defaultarr[i].split('p')[1])==Number(this.defaultarr[i].split('p')[1])){
-                        arrid.push(Number(this.defaultarr[i].split('p')[1]));
+                        this.arrid.push(Number(this.defaultarr[i].split('p')[1]));
                     }
                     }
                 }
                 }
             }
             }
-            arrid=Array.from(new Set(arrid))
-            this.defaultarr=this.filt(arrid);
+            this.arrid=Array.from(new Set(this.arrid))
+            this.defaultarr=this.filt(this.arrid);
             var url = "/api/Financial/PostPayRequestCheckedChange"
             var url = "/api/Financial/PostPayRequestCheckedChange"
             var that = this
             var that = this
             this.$axios({
             this.$axios({

+ 19 - 23
src/components/expenseMobile.vue

@@ -70,7 +70,7 @@
                         <div>接团操作人:{{info.jietuanOperator}}</div>
                         <div>接团操作人:{{info.jietuanOperator}}</div>
                     </div>
                     </div>
                     <div class="examine-card-btn">
                     <div class="examine-card-btn">
-                        <el-button size="mini" type="primary">查看费用</el-button>
+                        <el-button @click="CheckCost(info)" size="mini" type="primary">查看费用</el-button>
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>
@@ -101,6 +101,7 @@ export default {
             dailydata:{},
             dailydata:{},
             pageIndex:1,
             pageIndex:1,
             pageIndexExamine:1,
             pageIndexExamine:1,
+            loadflagExamine:false,
             loadflag:false,
             loadflag:false,
             zwgd:false,
             zwgd:false,
             platejudgment:2,
             platejudgment:2,
@@ -160,6 +161,7 @@ export default {
                     for(let j=0;j<magarr.length;j++){
                     for(let j=0;j<magarr.length;j++){
                         that.tableData.push(magarr[j])
                         that.tableData.push(magarr[j])
                     }
                     }
+                    that.loadflag=true;
                     // that.tableData = res.data.data.dataList;
                     // that.tableData = res.data.data.dataList;
                 }
                 }
             })
             })
@@ -234,7 +236,7 @@ export default {
             let scrollTop=document.documentElement.scrollTop || document.body.scrollTop;
             let scrollTop=document.documentElement.scrollTop || document.body.scrollTop;
             let clientHeight=document.documentElement.clientHeight || document.body.clientHeight;
             let clientHeight=document.documentElement.clientHeight || document.body.clientHeight;
             let scrollHeight=document.documentElement.scrollHeight || document.body.scrollHeight;
             let scrollHeight=document.documentElement.scrollHeight || document.body.scrollHeight;
-            if (scrollTop + clientHeight == scrollHeight) {
+            if (scrollTop + clientHeight == scrollHeight&&this.loadflagExamine) {
                 this.PageTurningExamine()
                 this.PageTurningExamine()
             }
             }
         },
         },
@@ -242,28 +244,30 @@ export default {
             let scrollTop=document.documentElement.scrollTop || document.body.scrollTop;
             let scrollTop=document.documentElement.scrollTop || document.body.scrollTop;
             let clientHeight=document.documentElement.clientHeight || document.body.clientHeight;
             let clientHeight=document.documentElement.clientHeight || document.body.clientHeight;
             let scrollHeight=document.documentElement.scrollHeight || document.body.scrollHeight;
             let scrollHeight=document.documentElement.scrollHeight || document.body.scrollHeight;
-            if (scrollTop + clientHeight == scrollHeight) {
+            if (scrollTop + clientHeight == scrollHeight&&this.loadflag) {
                 this.PageTurning()
                 this.PageTurning()
             }
             }
         },
         },
         //日常切换
         //日常切换
         rcbtn(){
         rcbtn(){
+            this.loadflag=false;
             this.platejudgment=1;
             this.platejudgment=1;
             this.zwgd=false;
             this.zwgd=false;
-            this.pageIndex=0;
+            this.pageIndex=1;
             this.tableData=[];
             this.tableData=[];
             window.addEventListener('scroll', this.scrollBottom, true);
             window.addEventListener('scroll', this.scrollBottom, true);
             window.removeEventListener('scroll', this.scrollBottomExamine, true);
             window.removeEventListener('scroll', this.scrollBottomExamine, true);
-            // this.postPageDailyPaymentList();
+            this.postPageDailyPaymentList();
         },
         },
         //tuanzhuqiehuan
         //tuanzhuqiehuan
         tzbtn(){
         tzbtn(){
+            this.loadflagExamine=false;
             this.platejudgment=2;
             this.platejudgment=2;
-            this.pageIndexExamine=0;
+            this.pageIndexExamine=1;
             this.groupData=[];
             this.groupData=[];
             window.addEventListener('scroll', this.scrollBottomExamine, true);
             window.addEventListener('scroll', this.scrollBottomExamine, true);
             window.removeEventListener('scroll', this.scrollBottom, true);
             window.removeEventListener('scroll', this.scrollBottom, true);
-            // this.PostExpenseAuditGroupPageItems();
+            this.PostExpenseAuditGroupPageItems();
         },
         },
         //费用审核列表
         //费用审核列表
         PostExpenseAuditGroupPageItems(){
         PostExpenseAuditGroupPageItems(){
@@ -290,27 +294,17 @@ export default {
                     for(let j=0;j<groupDatas.length;j++){
                     for(let j=0;j<groupDatas.length;j++){
                         that.groupData.push(groupDatas[j])
                         that.groupData.push(groupDatas[j])
                     }
                     }
+                    that.loadflagExamine=true;
                 }
                 }
             })
             })
         },
         },
+        //查看费用
+        CheckCost(row){
+            this.$router.push({path: '/expenseMobileinfo?id=' + row.id +''});
+        }
     },
     },
     watch:{
     watch:{
-        // platejudgment(){
-        //     if(this.platejudgment==1){
-        //         this.zwgd=false;
-        //         this.pageIndex=1;
-        //         this.tableData=[];
-        //         window.addEventListener('scroll', this.scrollBottom, true);
-        //         window.removeEventListener('scroll', this.scrollBottomExamine, true);
-        //         this.postPageDailyPaymentList();
-        //     }else{
-        //         this.pageIndexExamine=1;
-        //         this.groupData=[];
-        //         window.addEventListener('scroll', this.scrollBottomExamine, true);
-        //         window.removeEventListener('scroll', this.scrollBottom, true);
-        //         this.PostExpenseAuditGroupPageItems();
-        //     }
-        // }
+   
     },
     },
     mounted(){
     mounted(){
         if(this.platejudgment==1){
         if(this.platejudgment==1){
@@ -393,6 +387,8 @@ export default {
 .expenseMobile-title{
 .expenseMobile-title{
     margin: 10px;
     margin: 10px;
     margin-bottom:0px;
     margin-bottom:0px;
+    font-size: 17px;
+    font-weight:600 ;
 }
 }
 .expenseMobile-search{
 .expenseMobile-search{
     padding: 8px;
     padding: 8px;

+ 231 - 0
src/components/expenseMobileinfo.vue

@@ -0,0 +1,231 @@
+<template>
+    <div class="expenseMobileinfo-all">
+        <div class="expenseMobileinfo-top">
+            <div class="back"><i style="font-weight:600 ;font-size: 16px;" class="el-icon-arrow-left"></i>返回</div>
+            <div class="expenseMobileinfo-title">费用清单</div>
+        </div>
+        <div class="expenseMobileinfo-box">
+            <div class="expenseMobileinfo-group">
+                <div class="expenseMobileinfo-group-name">团队名称:{{GroupInfo.teamName}}</div>
+                <div class="expenseMobileinfo-group-client">客户:{{GroupInfo.clientName}}</div>
+                <div class="expenseMobileinfo-group-nation">出访国家:{{GroupInfo.visitCountry}}</div>
+                <div class="expenseMobileinfo-group-date">起止日期:{{chuli(GroupInfo.visitStartDate)}}~{{chuli(GroupInfo.visitEndDate)}}</div>
+                <div class="expenseMobileinfo-group-day">天数/人数:{{GroupInfo.visitDays}}天 / {{GroupInfo.visitPNumber}}人</div>
+            </div>
+            <div class="expenseMobileinfo-content">
+                <div class="expenseMobileinfo-menu">
+                    <div @click="menuliclick(item.id,index)" class="expenseMobileinfo-menu-li" v-for="(item,index) in classify" :key="index">{{item.name}}</div>
+                </div>
+                <div class="expenseMobileinfo-list">
+                    <div v-for="(items,index) in tabledata" :key="index" class="expenseMobileinfo-list-card">
+                        <div class="ex-card-name">费用名称:{{items.priceNameContent}}</div>
+                        <div class="ex-card-module">费用模块:{{items.priceName}}</div>
+                        <div class="ex-card-copewith">应付款金额:{{items.waitPay}}</div>
+                        <div class="ex-card-payment">此次付款金额:{{items.currPay}}</div>
+                        <div class="ex-card-balance">剩余尾款:{{items.balance}}</div>
+                        <div class="ex-card-applicant">申请人:{{items.operatorName}}</div>
+                        <div class="ex-card-auditor">审核人:{{items.auditOperatorName}}</div>
+                        <div class="ex-card-budget">超预算比例:{{items.overBudget}}</div>
+                        <div class="ex-card-paymethod">支付方式:{{items.payType}}</div>
+                        <div class="ex-card-cardtype">卡类型:{{items.cardType}}</div>
+                        <div class="ex-card-btn">
+                            <el-button size="mini" type="primary">通过</el-button>
+                            <el-button size="mini" type="danger">驳回</el-button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data () {
+        return {
+            classify:[],
+            diid:'',
+            GroupInfo:{},
+            tabledata:[]
+        }
+    },
+    methods:{
+        //chili
+        chuli(val){
+            val=val+""
+            return val.split(' ')[0]
+        },
+        //获取分类
+        PostGroupDirectionalClassificationInit() {
+            var url = "/api/Business/PostGroupDirectionalClassificationInit"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+            }).then(function (res) {
+                console.log(res);
+                if (res.data.code == 200) {
+                    that.classify=res.data.data;
+                    that.menuliclick(that.classify[0].id,0)
+                }
+            })
+        },
+        //获取团组详情
+        PostShareGroupInfo(){
+            var url = "/api/Business/PostShareGroupInfo"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.userid
+                },
+                data:{
+                    portType:1,
+                    id: that.diid
+                }
+            }).then(function (res) {
+                if(res.data.code==200){
+                    that.GroupInfo=res.data.data;
+                }else{
+                    that.$message.error(res.data.msg);
+                }
+            })
+        },
+        //menu-li click
+        menuliclick(id,index){
+            this.tabledata=[];
+            var boxes = document.getElementsByClassName('expenseMobileinfo-menu-li');
+            for(let i=0;i<boxes.length;i++){
+                boxes[i].style.color="#555";
+                boxes[i].style.backgroundColor="#FFF";
+                boxes[index].style.backgroundColor="#ede8e8";
+                boxes[index].style.color="#000";
+            }
+            this.getPostSearchGrpCreditCardPayment(id);
+        },
+        //获取详情
+        getPostSearchGrpCreditCardPayment(val) {
+            var url = "/api/Groups/PostSearchGrpCreditCardPayment"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data: {
+                    portType: 1,
+                    userId: 21,
+                    pageId: 47,
+                    diId: that.diid,
+                    label: val,
+                    auditStatus: -1
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.tabledata=res.data.data.data.detailList;
+                }
+            })
+        },
+    },
+    mounted(){
+        this.diid = this.$route.query.id;
+        this.PostShareGroupInfo();
+        this.PostGroupDirectionalClassificationInit();
+        document.getElementsByClassName('expenseMobileinfo-menu')[0].style.height=(document.documentElement.clientHeight)-44+'px' || (document.body.clientHeight)-44+'px'
+        document.getElementsByClassName('expenseMobileinfo-list')[0].style.height=(document.documentElement.clientHeight)-44+'px' || (document.body.clientHeight)-44+'px'
+        
+        // var boxes = document.getElementsByClassName('expenseMobileinfo-menu-li');
+        // for (var i = 0; i < boxes.length; i++) {
+        //     boxes[i].addEventListener('click', function(event) {
+        //         this.style.backgroundColor = 'blue';
+        //     });
+
+        //     boxes[i].addEventListener('click', function(event) {
+        //         this.style.backgroundColor = 'white';
+        //     });
+        // }
+    }
+}
+</script>
+<style>
+*{
+    margin: 0;
+    padding: 0;
+}
+.expenseMobileinfo-all{
+    background-color: #fff;
+    font-size: 14px;
+    color: #555;
+}
+.expenseMobileinfo-top{
+    position: fixed;
+    top: 0;
+    background-color: #fff;
+    width: 100%;
+    text-align: center;
+    border-bottom: 1px solid #ede8e8;
+}
+.back{
+    position: absolute;
+    top: 10px;
+    left: 10px;
+    font-size: 16px;
+}
+.expenseMobileinfo-title{
+    margin: 10px 0;
+    font-size: 17px;
+    font-weight:600 ;
+}
+.expenseMobileinfo-box{
+    padding-top: 43px;
+}
+.expenseMobileinfo-menu{
+    width: 100px;
+    border-bottom: 1px solid #ede8e8;
+    border-right: 1px solid #ede8e8;
+    border-left: 1px solid #ede8e8;
+    overflow: auto;
+}
+.expenseMobileinfo-menu-li{
+    text-align: center;
+    padding: 5px 0;
+
+}
+.expenseMobileinfo-menu-li{
+    border-bottom: 1px solid #ede8e8;
+}
+.expenseMobileinfo-group{
+    padding: 5px;
+    border-bottom: 1px solid #ede8e8;
+}
+.expenseMobileinfo-group-client{
+    margin: 5px 0;
+}
+.expenseMobileinfo-group-date{
+    margin: 5px 0;
+}
+.expenseMobileinfo-content{
+    display: flex;
+}
+.expenseMobileinfo-list-card{
+    padding: 5px;
+    border-radius:5px ;
+    box-shadow: 0 0 10px #0005;
+    margin-bottom:5px ;
+}
+.expenseMobileinfo-list{
+    overflow: auto;
+    padding: 5px;
+    flex: 2;
+}
+.expenseMobileinfo-list-card div{
+    margin-bottom: 5px;
+}
+.ex-card-btn{
+    text-align: right;
+}
+</style>

+ 6 - 0
src/router/index.js

@@ -5,6 +5,7 @@ import Login from '@/components/Login'
 import home from '@/components/home'
 import home from '@/components/home'
 import Enroll from '@/components/Enroll'
 import Enroll from '@/components/Enroll'
 import expenseMobile from '@/components/expenseMobile'
 import expenseMobile from '@/components/expenseMobile'
+import expenseMobileinfo from '@/components/expenseMobileinfo'
 import index from '@/components/child/index'
 import index from '@/components/child/index'
 import Aideindex from '@/components/child/Aideindex'
 import Aideindex from '@/components/child/Aideindex'
 import Marketindex from '@/components/child/Marketindex'
 import Marketindex from '@/components/child/Marketindex'
@@ -705,6 +706,11 @@ export default new Router({
       path: '/expenseMobile',
       path: '/expenseMobile',
       name: 'expenseMobile',
       name: 'expenseMobile',
       component: expenseMobile
       component: expenseMobile
+    },
+    {
+      path: '/expenseMobileinfo',
+      name: 'expenseMobileinfo',
+      component: expenseMobileinfo
     }
     }
   ]
   ]
 })
 })