0703h5rifuquanbugong

src/components/Finance/FeesPage.vue

@@ -445,6 +445,9 @@ export default {
 .fesspage-box .el-table .cell{
     text-align: center;
 }
+.el-message-box{
+    width: 480px;
+}
 .message_box_alert .el-message-box__content{
     max-height: 300px;
     overflow-y: auto;

src/components/OP/OpLtinerary.vue

@@ -278,6 +278,7 @@ export default {
                     },
                     data: {
                         diid: that.value,
+                        isPDF:0
                     }
                 }).then(function (res) {
                     if (res.data.code == 200) {

src/components/OP/downloadpage.vue

@@ -14,7 +14,7 @@
                 <div class="downloadpage-table-tb tb-type">WORD</div> 
                 <div class="downloadpage-table-tb tb-Language">中文</div> 
                 <div class="downloadpage-table-tb tb-download">
-                    <el-button size="small" @click="dcwzxc" type="primary">下载</el-button>
+                    <el-button size="small" @click="dcwzxc(0)" type="primary">下载</el-button>
                 </div> 
             </div>
             <div class="downloadpage-table-tr">
@@ -22,7 +22,7 @@
                 <div class="downloadpage-table-tb tb-type">PDF</div> 
                 <div class="downloadpage-table-tb tb-Language">中文</div> 
                 <div class="downloadpage-table-tb tb-download">
-                    <el-button size="small" type="primary">下载</el-button>
+                    <el-button size="small" @click="dcwzxc(1)" type="primary">下载</el-button>
                 </div> 
             </div>
             <div class="downloadpage-table-tr">
@@ -196,7 +196,7 @@ export default {
             })
         },
         //导出完整行程
-        dcwzxc(){
+        dcwzxc(val){
             var url = "/api/Groups/ExportTravel"
             var that = this
             this.$axios({
@@ -207,6 +207,7 @@ export default {
                 },
                 data: {
                     diid: that.diIdselect,
+                    isPDF:val
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {

src/components/expenseMobile.vue

@@ -32,7 +32,7 @@
                 </el-input>
             </div>
         </div>
-        <div id="scroll-div" class="daily-box">
+        <div id="scroll-div" ref="element" class="daily-box">
             <div class="daily-card" v-for="(item,index) in tableData" :key="index">
                 <div class="card-description">费用描述：{{item.instructions}}</div>
                 <div class="card-date">申请时间：{{item.createTime}}</div>
@@ -42,10 +42,11 @@
                 </div>
                 <div class="card-btn">
                     <el-button @click="infobtn(item)" size="mini">详情</el-button>
-                    <el-button size="mini" type="primary">通过</el-button>
-                    <el-button size="mini" type="danger">拒绝</el-button>
+                    <el-button size="mini" @click="PostDelDailyPaymentAudit(item.id,1)" type="primary">通过</el-button>
+                    <el-button size="mini" @click="PostDelDailyPaymentAudit(item.id,2)" type="danger">拒绝</el-button>
                 </div>
             </div>
+            <div v-if="zwgd" class="expenseMobile-zwgd">暂无更多</div>
         </div>
         <div class="expenseMobile-tabtn">
             <div class="tabtn-box">
@@ -70,7 +71,8 @@ export default {
             expenseMobileVisible:false,
             dailydata:{},
             pageIndex:1,
-            loadflag:false
+            loadflag:false,
+            zwgd:false
         }
     },
     methods:{
@@ -113,6 +115,9 @@ export default {
             }).then(function (res) {
                 if (res.data.code == 200) {
                     var magarr=res.data.data.dataList;
+                    if(magarr.length<10){
+                        that.zwgd=true;
+                    }
                     for(let j=0;j<magarr.length;j++){
                         that.tableData.push(magarr[j])
                     }
@@ -121,6 +126,33 @@ export default {
                 }
             })
         },
+        //审核
+        PostDelDailyPaymentAudit(val1,val2){
+            var url = "/api/Financial/PostDelDailyPaymentAudit"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data: {
+                    id: val1,
+                    auditType:2,
+                    auditStatus:val2
+                }
+            }).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);
+                }
+            })
+        },
         //详情按钮
         infobtn(val){
             this.expenseMobileVisible=true;
@@ -149,17 +181,16 @@ export default {
         },
         //搜索
         searchbtn(){
+            this.zwgd=false;
+            this.pageIndex=1;
+            this.tableData=[];
             this.postPageDailyPaymentList()
         },
         scrollBottom(e) {
-            let Scroll = e.target
-            // 网页可见区域高：document.body.clientHeight
-            // 网页正文全文高：document.body.scrollHeight
-            let scrollHeight = Scroll.scrollHeight - Scroll.clientHeight
-            console.log(Scroll.scrollHeight);
-            this.scrollTop = Scroll.scrollTop
-            if (scrollHeight - Scroll.scrollTop < 100 && !this.loadflag) {
-                console.log('到底部了')
+            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 (scrollTop + clientHeight == scrollHeight) {
                 this.loadflag = true
                 this.PageTurning()
             }
@@ -285,4 +316,9 @@ export default {
     max-height: 160px;
     overflow: auto;
 }
+.expenseMobile-zwgd{
+    font-size: 14px;
+    font-weight: 600;
+    text-align: center;
+}
 </style>