Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/paymentManagement.vue

@@ -5,9 +5,10 @@
       <template slot="left">
         <ws-button type="primary" @click="screen(2)">待结算</ws-button>
         <ws-button type="primary" @click="screen()">待审核</ws-button>
-        <ws-button type="primary" @click="screen()">全部</ws-button>
-        <ws-button type="primary" @click="reject">驳回</ws-button>
-        <ws-button type="primary" @click="adopt">通过</ws-button>
+        <ws-button type="primary"  @click="screen()">全部</ws-button>
+        <ws-button type="primary" @click="reject" v-if="isShowAdopt">驳回</ws-button>
+        <ws-button type="primary" @click="adopt" v-if="isShowAdopt">通过</ws-button>
+        <ws-button type="primary" @click="adopt" v-if="isShowAdopt">审核</ws-button>
         <ws-button type="primary" @click="payment">付款</ws-button>
       </template>
       <template slot="right">
@@ -216,6 +217,7 @@ export default {
         amountNotPayable: 0,
         paymentDate: ''
       },
+      isShowAdopt:false,
       //上传截图路径
       imageUrl: ''
     }
@@ -287,6 +289,23 @@ export default {
           this.paymentList = response
           this.deptBudgetTotal = response.total
         })
+     getpayment({
+        currentPage: 1,
+        pageSize: 99999,
+        warehouseName: this.warehouseName,
+        managementType : 1 
+      })
+        .toPromise()
+        .then((response) => {
+          for(let i = 0 ; i < response.length ; i++){
+            if(response[i].taskId){
+              this.isShowAdopt = true
+              return
+            }
+       
+          }
+       
+        })
     },
     del(row) {
       this.$confirm(