Merge remote-tracking branch 'origin/dev' into dev

2 years ago · 6210b057f0
parent 30889bf30e b20a6b5f7e
commit 6210b057f0
1 changed files with 5 additions and 1 deletions
--- a/src/views/inventory/supInoutSearchOrder.vue
+++ b/src/views/inventory/supInoutSearchOrder.vue
@ -376,7 +376,11 @@ export default {
            batchNo: this.filterQuery.batchNo,
            zczbhhzbapzbh: this.filterQuery.zczbhhzbapzbh,
            manufacturer: this.filterQuery.manufacturer,
-            actionType: this.filterQuery.actionType
+            actionType: this.filterQuery.actionType,
+            fromCorp: this.filterQuery.fromCorp,
+            mainAction: this.filterQuery.mainAction,
+            action:this.filterQuery.action
+
          };
          if (this.actDateRange !== null) {
            printParams.startAduditTime = this.actDateRange[0];