@@ -317,12 +317,11 @@ export default {
rmNumber: { required: true, message: '移位数量必填', trigger: 'blur' },
},
ywTF: false,
- inventoryButton: {
- inventoryYW: {
+ ywFrom: {
inventory: { itemKey: { item: {} }, point: {} },
dstPoint: {},
+ id: null,
rmNumber: 0
- }
},
pointOptions: [],
xdMoveFromFlag: false,
@@ -371,7 +370,8 @@ export default {
this.crud.toQuery()
},
ywFTM(data){
- this.inventoryButton.inventoryYW.inventory = data;
+ this.ywFrom.inventory = data;
+ this.ywFrom.id=data.id;
this.ywTF=true;
},
planPickSaveM(data){
@@ -380,8 +380,8 @@ export default {
knywInventory(data).then(res=>{
this.ywTF = false;
this.$message.success(res)
- this.inventoryButton.inventoryYW.rmNumber=0;
- this.inventoryButton.inventoryYW.dstPoint= { };
+ this.ywFrom.rmNumber=0;
+ this.ywFrom.dstPoint= { };
this.crud.toQuery()
})
} else {
diff --git a/src/views/business-inv/inventory/invZz.vue b/src/views/business-inv/inventory/invZz.vue
index 251ea3d..dab7855 100644
--- a/src/views/business-inv/inventory/invZz.vue
+++ b/src/views/business-inv/inventory/invZz.vue
@@ -2,26 +2,15 @@
-
-
-
-
-
-
@@ -49,18 +38,10 @@
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期"
>
-
-
-
- {{ item.code }}
- {{ item.name }}
-
-
+
+
@@ -85,53 +66,43 @@
width="30%"
:close-on-click-modal="false"
>
-
-
-
-
-
-
-
-
-
-
+
+
-
@@ -140,10 +111,10 @@
>
-
+
-
+
@@ -174,9 +145,6 @@
-
@@ -203,21 +171,21 @@
>
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
- {{ scope.row.point.invMin }}
- {{ scope.row.point.invMin }}
+ {{ scope.row.kcyj_qty }}
+ {{ scope.row.kcyj_qty }}
+
+
@@ -264,6 +232,8 @@ import {download} from "@/api/data";
import {downloadFile} from "@/utils";
import BomAccountPointSelect from "@/views/generic-component/BomAccountPointSelect.vue";
import {zzjl} from "@/api/pickDetail";
+import AreaSelect from "@/views/generic-component/AreaSelect.vue";
+import PointSelect from "@/views/generic-component/PointSelect.vue";
const defaultForm = {
id: null,
billCode: null,
@@ -291,7 +261,7 @@ const defaultForm = {
}
export default {
name: 'InvZz',
- components: {BomAccountPointSelect, pagination, crudOperation, rrOperation, udOperation },
+ components: {PointSelect, AreaSelect, BomAccountPointSelect, pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -300,9 +270,9 @@ export default {
bexb:true,
pointType:'ZZKW'
},
- areaOptions: [],
title: '库存信息',
- url: 'api/inventory',
+ url: 'api/inventory/queryInventoryZz',
+ downurl: 'api/inventory',
idField: 'id',
sort: 'id,desc',
crudMethod: { ...crudInventory },
@@ -335,43 +305,25 @@ export default {
rmNumber: { required: true, message: '移位数量必填', trigger: 'blur' },
},
ywTF: false,
- inventoryButton: {
- inventoryYW: {
- inventory: { itemKey: { item: {} }, point: {} },
+ ywFrom: {
+ //inventory: {id},
dstPoint: {},
- rmNumber: 0
- }
+ rmNumber: 0,
+ id:null,item_code:null,item_name:null,point_code:null,quantity:null
+
},
- pointOptions: [],
cxjlFromFlag: false,
cxjlFrom: { bom_account_id: null,order_qty:0, item_code:null, item_name:null, zzkw_id:null, zzkw_code:null, gw_code:null, gw_name:null, status:null, remark:null,srs:0 }
}
},
mounted() {
- this.getAreaOptionsAll()
- this.infoData()
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
- infoData(){
- queryPointList({}).then(res=>{
- this.pointOptions = res;
- })
- },
- getItem() {
- getItems({}).then(res => {
- this.items = res.content.map(function(obj) {
- if (obj.hasChildren) {
- obj.children = null
- }
- return obj
- })
- })
- },
deleteDataM(id) {//删除数据的方法
let ids = []
ids.push(id)
@@ -390,7 +342,7 @@ export default {
this.crud.toQuery()
},
ywFTM(data){
- this.inventoryButton.inventoryYW.inventory = data;
+ this.ywFrom = data;
this.ywTF=true;
},
planPickSaveM(data){
@@ -399,8 +351,8 @@ export default {
knywInventory(data).then(res=>{
this.ywTF = false;
this.$message.success(res)
- this.inventoryButton.inventoryYW.rmNumber=0;
- this.inventoryButton.inventoryYW.dstPoint= { };
+ this.ywFrom.rmNumber=0;
+ this.ywFrom.dstPoint= { };
this.crud.toQuery()
})
} else {
@@ -410,21 +362,15 @@ export default {
})
},
downXbBtn(){
- console.log(123)
+ console.log(this.crud.downurl)
this.crud.downloadLoading = true
- download(this.crud.url + '/downloadXb', this.crud.getQueryParams()).then(result => {
+ download('api/inventory/downloadZz', this.crud.getQueryParams()).then(result => {
downloadFile(result, this.crud.title + '数据', 'xlsx')
this.crud.downloadLoading = false
}).catch(() => {
this.crud.downloadLoading = false
})
},
- //获取库区数据
- getAreaOptionsAll() {
- queryAreaList({bexb:true,enabled:true}).then(res => {
- this.areaOptions = res
- })
- },
getChangeVule(dben) {
this.cxjlFrom.order_qty=dben.srs;
this.cxjlFrom.item_code=dben.item_code;