09271527

src/components/expenseMobile.vue

@@ -26,7 +26,7 @@
         </el-dialog>
         <div v-if="platejudgment==1">
             <div class="expenseMobile-top">
-                <div class="expenseMobile-title">{{a}}日常付款申请{{b}}</div>
+                <div class="expenseMobile-title">{{this.portType!=2?'日常付款申请':''}}</div>
                 <div class="expenseMobile-search">
                     <el-input clearable placeholder="请输入费用描述" v-model="input" class="input-with-select">
                         <el-button @click="searchbtn" slot="append" icon="el-icon-search"></el-button>
@@ -49,13 +49,13 @@
                 </div>
             </div>
             <div id="tshezi" style="padding-bottom: 65px;">
-                <div v-if="zwgd" class="expenseMobile-zwgd">暂无更多</div>
-                <div v-if="!zwgd" class="expenseMobile-zwgd">加载中！</div>
+                <div v-if="!zwgd" class="expenseMobile-zwgd">暂无更多</div>
+                <div v-if="zwgd" class="expenseMobile-zwgd">加载中！</div>
             </div>
         </div>
         <div v-else>
             <div class="expenseMobile-top">
-                <div class="expenseMobile-title">费用审核</div>
+                <div class="expenseMobile-title">{{this.portType!=2?'费用审核':''}}</div>
                 <div class="expenseMobile-search">
                     <el-input clearable placeholder="请输入团组名称" v-model="value" class="input-with-select">
                         <el-button @click="searchexamine" slot="append" icon="el-icon-search"></el-button>
@@ -97,6 +97,8 @@
 export default {
     data () {
         return {
+            uid:'',
+            portType:0,
             tableData:[],
             input:'',
             expenseMobileVisible:false,
@@ -105,12 +107,10 @@ export default {
             pageIndexExamine:1,
             loadflagExamine:false,
             loadflag:false,
-            zwgd:false,
+            zwgd:true,
             platejudgment:2,
             value:'',
             groupData:[],
-            a:0,
-            b:0,
         }
     },
     methods:{
@@ -149,7 +149,7 @@ export default {
                     pageSize: 10,
                     companyId: -1,
                     financialAuditStatus: -1,//财务审核
-                    managerAuditStatus: -1,  //总经理审核
+                    managerAuditStatus: that.uid==21?0:-1,  //总经理审核
                     feeTypeId: -1,           //费用类型
                     feeSubTypeId: -1,       //费用子类型
                     feeDesc: that.input,    //描述
@@ -160,7 +160,7 @@ export default {
                 if (res.data.code == 200) {
                     var magarr=res.data.data.dataList;
                     if(magarr.length<10){
-                        that.zwgd=true;
+                        that.zwgd=false;
                     }
                     for(let j=0;j<magarr.length;j++){
                         that.tableData.push(magarr[j])
@@ -182,7 +182,7 @@ export default {
                 },
                 data: {
                     id: val1,
-                    auditType:2,
+                    auditType:that.uid==21?2:1,
                     auditStatus:val2
                 }
             }).then(function (res) {
@@ -192,6 +192,10 @@ export default {
                         type: 'success',
                         offset:50
                     });
+                    that.zwgd=true;
+                    that.tableData=[];
+                    that.pageIndex=1;
+                    that.postPageDailyPaymentList()
                 }else{
                     that.$message.error(res.data.msg);
                 }
@@ -225,7 +229,7 @@ export default {
         },
         //搜索
         searchbtn(){
-            this.zwgd=false;
+            this.zwgd=true;
             this.pageIndex=1;
             this.tableData=[];
             this.postPageDailyPaymentList();
@@ -250,7 +254,7 @@ export default {
             let scrollTop=document.documentElement.scrollTop || document.body.scrollTop;
             let clientHeight=document.documentElement.clientHeight || document.body.clientHeight;
             let scrollHeight=document.documentElement.scrollHeight || document.body.scrollHeight;
-            if(Math.abs(scrollHeight-clientHeight-scrollTop) < 1&&this.loadflag){
+            if(Math.abs(scrollHeight-clientHeight-scrollTop) < 1&&this.loadflag&&this.zwgd){
                 this.PageTurning()
             }
             // if (Math.floor(scrollTop + clientHeight) == scrollHeight&&this.loadflag) {
@@ -261,7 +265,7 @@ export default {
         rcbtn(){
             this.loadflag=false;
             this.platejudgment=1;
-            this.zwgd=false;
+            this.zwgd=true;
             this.pageIndex=1;
             this.tableData=[];
             window.addEventListener('scroll', this.scrollBottom, true);
@@ -316,6 +320,10 @@ export default {
    
     },
     mounted(){
+        this.uid = this.$route.query.uid;
+        this.portType = this.$route.query.portType?this.$route.query.portType:0;
+        console.log(this.portType);
+        
         // if(localStorage.getItem('Examinevalue')!=""){
         //     this.value=localStorage.getItem('Examinevalue');
         // }

src/components/expenseMobileinfo.vue

@@ -6,7 +6,7 @@
             
         </el-dialog>
         <div class="expenseMobileinfo-top">
-            <div @click="back" class="back"><i style="font-weight:600 ;font-size: 16px;" class="el-icon-arrow-left"></i>返回</div>
+            <div @click="back" 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">
@@ -168,7 +168,8 @@ export default {
             })
         },
         back(){
-            this.$router.push({path: '/expenseMobile'});
+            this.$router.back();
+            // this.$router.push({path: '/expenseMobile'});
         },
         passbtn(val,type){
             this.noPostAuditGrpCreditCardPayment(val,type)