Merge remote-tracking branch 'origin/master'

src/views/modules/flowable/task/NoticePageList.vue

@@ -156,7 +156,7 @@
         // console.log('row', row)
         if (row.taskName === '库存提醒') {
           // console.log('测试进来了')
-          this.$refs.wareHouseHistoryPopup.init()
+          this.$refs.wareHouseHistoryPopup.init(row.defId)
           this.inputForm = {
             id: row.id
           }

src/views/modules/materialManagement/wareHouseSummary/WareHouseHistoryPopup.vue

@@ -112,6 +112,7 @@
           procurementType: '',
           createBy: ''
         },
+        basicId: '',
         dataList: [],
         tablePage: {
           total: 0,
@@ -140,12 +141,15 @@
       InputNumber
     },
     methods: {
-      init () {
+      init (basicId) {
+        console.log('basicId', basicId)
         this.visible = true
+        this.basicId = basicId
         this.refreshList()
       },
       // 获取数据列表
       refreshList () {
+        this.searchForm.basicId = this.basicId
         this.loading = true
         this.wareHouseService.wareHouseSummaryList2({
           'current': this.tablePage.currentPage,
@@ -163,11 +167,11 @@
       currentChangeHandle ({currentPage, pageSize}) {
         this.tablePage.currentPage = currentPage
         this.tablePage.pageSize = pageSize
-        this.list()
+        this.refreshList()
       },
       resetSearch () {
         this.$refs.searchForm.resetFields()
-        this.list()
+        this.refreshList()
       },
       close () {
         this.$refs.searchForm.resetFields()

src/views/modules/sys/dashboard/workBench/Pending.vue

@@ -544,7 +544,7 @@
         // console.log('row', row)
         if (row.taskName === '库存提醒') {
           // console.log('测试进来了')
-          this.$refs.wareHouseHistoryPopup.init()
+          this.$refs.wareHouseHistoryPopup.init(row.defId)
           this.inputForm = {
             id: row.id
           }