Browse Source

Merge branch 'develop_12' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh13

# Conflicts:
#	public/version.json
lilei 2 years ago
parent
commit
83fa1f6e6b
2 changed files with 5 additions and 1 deletions
  1. 1 1
      public/version.json
  2. 4 0
      src/views/inventoryManagement/inventoryQuery/list.vue

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1675757932506
+  "version": 1675764889686
 }

+ 4 - 0
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -400,6 +400,10 @@ export default {
       params.zeroQtyFlag = params.zeroQtyFlag ? '0' : ''
       params.enableFlag = params.enableFlag ? '' : '1'
       params.showCost = this.$hasPermissions('M_ShowAllCost') ? 1 : 0
+      // 仓库仓位
+      params.warehouseSn = params.warehouse[0]
+      params.warehouseLocationSn = params.warehouse[1]
+      
       this.exportLoading = true
       _this.spinning = true
       stockExport(params).then(res => {