Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/financialManagement/collectionManagementList.vue

@@ -625,7 +625,8 @@ export default {
           
         })
 
-      this.staffQO.roleId = 'd6a5c8a52da544309259f91f75de1ec6'
+      // this.staffQO.roleId = 'd6a5c8a52da544309259f91f75de1ec6'
+      this.staffQO.roleId = '4be0c38df3e243a9b86446a3c524b91a'
       kuguan(this.staffQO)
         .toPromise()
         .then(response => {

src/views/newTask/listPage.vue

@@ -263,7 +263,7 @@ export default {
         amount: this.typeAllnum,
       })
       this.$nextTick(function () {
-        this.$refs.taskListBoxshow.style.height = `calc(100vh - ${this.$refs.taskTypeShow.offsetHeight}px)`
+        this.$refs.taskListBoxshow.style.height = `calc(100vh - 200px)`
       })
     },
     noticeListFun () {