lilei vor 3 Jahren
Ursprung
Commit
0d9afdb5cd

+ 2 - 0
src/views/inventoryManagement/inventoryChecking/selfDisk.vue

@@ -294,6 +294,7 @@ export default {
       ]
       if (this.basicInfoData && this.basicInfoData.warehouseFlag == '1') {
         arr.splice(4, 0, { title: '仓库', dataIndex: 'warehouseName', width: 140, align: 'center', customRender: function (text) { return text || '--' } })
+        arr.splice(5, 0, { title: '仓位', dataIndex: 'warehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' } })
       }
       return arr
     },
@@ -310,6 +311,7 @@ export default {
       ]
       if (this.basicInfoData && this.basicInfoData.warehouseFlag == '1') {
         arr.splice(4, 0, { title: '仓库', dataIndex: 'warehouseName', width: 140, align: 'center', customRender: function (text) { return text || '--' } })
+        arr.splice(5, 0, { title: '仓位', dataIndex: 'warehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' } })
       }
       return arr
     }

+ 6 - 1
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -252,7 +252,12 @@ export default {
     //  导出
     handleExport () {
       const _this = this
-      const params = this.queryParam
+      const params = JSON.parse(JSON.stringify(this.queryParam))
+      if (params.zeroQtyFlag) {
+        params.zeroQtyFlag = '0'
+      } else {
+        params.zeroQtyFlag = ''
+      }
       this.exportLoading = true
       _this.spinning = true
       stockExport(params).then(res => {