|
@@ -546,38 +546,38 @@ export default {
|
|
|
// }
|
|
|
// this.queryParams.orgStorageDate = [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59']
|
|
|
|
|
|
- nominateTreeselect().then((response) => {
|
|
|
- this.fWarehouseidOption = response.data;
|
|
|
- console.log("仓库")
|
|
|
- console.log(this.fWarehouseidOption)
|
|
|
- console.log(this.fWarehouseidOption[0].id);
|
|
|
- if (this.fWarehouseidOption.length > 0) {
|
|
|
- this.queryParams.fWarehouseLocationid = this.fWarehouseidOption[0].id;
|
|
|
- this.getList();
|
|
|
- } else {
|
|
|
- this.$alert('您没有所属仓库', '提示', {
|
|
|
- confirmButtonText: '确定',
|
|
|
- callback: action => {
|
|
|
- // const visitedViews = this.$store.state.tagsView.visitedViews
|
|
|
- // this.$store.state.tagsView.visitedViews = visitedViews.filter(v => {
|
|
|
- // return v.path !== this.$route.path
|
|
|
- // })
|
|
|
- // this.$router.go(-1)
|
|
|
- }
|
|
|
- });
|
|
|
-
|
|
|
- }
|
|
|
- });
|
|
|
+ // nominateTreeselect().then((response) => {
|
|
|
+ // this.fWarehouseidOption = response.data;
|
|
|
+ // console.log("仓库")
|
|
|
+ // console.log(this.fWarehouseidOption)
|
|
|
+ // console.log(this.fWarehouseidOption[0].id);
|
|
|
+ // if (this.fWarehouseidOption.length > 0) {
|
|
|
+ // this.queryParams.fWarehouseLocationid = this.fWarehouseidOption[0].id;
|
|
|
+ // this.getList();
|
|
|
+ // } else {
|
|
|
+ // this.$alert('您没有所属仓库', '提示', {
|
|
|
+ // confirmButtonText: '确定',
|
|
|
+ // callback: action => {
|
|
|
+ // // const visitedViews = this.$store.state.tagsView.visitedViews
|
|
|
+ // // this.$store.state.tagsView.visitedViews = visitedViews.filter(v => {
|
|
|
+ // // return v.path !== this.$route.path
|
|
|
+ // // })
|
|
|
+ // // this.$router.go(-1)
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ //
|
|
|
+ // }
|
|
|
+ // });
|
|
|
|
|
|
this.setRowList = this.tableDate;
|
|
|
this.getRowList = this.tableDate;
|
|
|
- // this.getList();
|
|
|
+ this.getList();
|
|
|
this.getDicts("data_trademodes").then((response) => {
|
|
|
this.fTrademodeidOptions = response.data;
|
|
|
});
|
|
|
- // treeselect().then((response) => {
|
|
|
- // this.fWarehouseidOption = response.data;
|
|
|
- // });
|
|
|
+ treeselect().then((response) => {
|
|
|
+ this.fWarehouseidOption = response.data;
|
|
|
+ });
|
|
|
this.getRow();
|
|
|
},
|
|
|
mounted() {
|
|
@@ -758,8 +758,8 @@ export default {
|
|
|
this.queryParams.fWarehouseLocationid = tree.id;
|
|
|
},
|
|
|
getTreeselect() {
|
|
|
- // treeselect().then((response) => {
|
|
|
- nominateTreeselect().then((response) => {
|
|
|
+ treeselect().then((response) => {
|
|
|
+ // nominateTreeselect().then((response) => {
|
|
|
this.warehousesOptions = response.data;
|
|
|
});
|
|
|
},
|