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

src/views/houseSelfCollect/inspectionManagement.vue

@@ -282,6 +282,7 @@ export default {
         })
     },
     print(row) {
+      
       getinspectLook({
         id: row.id,
       })

src/views/houseSelfCollect/paymentManagement.vue

@@ -291,21 +291,19 @@ export default {
           this.deptBudgetTotal = response.total
         })
         this.isShowAdopt = true
-     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
-            }
-          }
-        })
+    //  getpayment({
+    //     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(