diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index 7f30c71..51e59fe 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -355,6 +355,53 @@ + + + + + + + 选入 + + + + + + + + + + + +
+ 取消 + +
+ + + { if (row.checkSelect==true) { that.$refs.typeList.toggleRowSelection(row, true); diff --git a/src/views/purchase/purApplyEditDiaolog.vue b/src/views/purchase/purApplyEditDiaolog.vue index a2b511b..77ab0ca 100644 --- a/src/views/purchase/purApplyEditDiaolog.vue +++ b/src/views/purchase/purApplyEditDiaolog.vue @@ -62,18 +62,7 @@ - - - {{ item.name }} - - - {{ item.name }} + {{ item.warehouseName }} - +
申购说明：
@@ -104,7 +94,7 @@ - + @@ -299,13 +289,11 @@ export default { return; } if (status === '2') { - if (this.formData.billDate == "" || this.formData.billDate == null) { + if(this.formData.billDate=="" || this.formData.billDate==null){ return this.$message.error("单据日期不能为空！"); } - if (this.formData.locStorageCode == "" || this.formData.locStorageCode == null) { - return this.$message.error("仓库不能为空！"); - } - if (this.formData.invWarehouseCode == "" || this.formData.invWarehouseCode == null) { + + if(this.formData.invWarehouseCode=="" || this.formData.invWarehouseCode==null){ return this.$message.error("分库不能为空！"); } @@ -396,6 +384,9 @@ export default { this.getList(); } }, + setWarehouseName(obj){ + this.formData.locStorageCode= this.subInvList.find(item => item.code == obj).parentId; + }, deleteCodeArray(index, row) { this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", { confirmButtonText: "确定", @@ -452,26 +443,10 @@ export default { this.total = 0; }); }, - - - getStorage() { - this.storageList = []; - filterAllByUser() - .then((response) => { - this.storageList = response.data || []; - if (this.storageList != null && this.storageList.length == 1) { - this.formData.locStorageCode = this.storageList[0].code; - } - this.findSubInvs(); - - }) - .catch(() => { - }); - }, findSubInvs() { this.subInvList = []; let query = { - pcode: this.formData.locStorageCode + filter:3 }; filterSubByInv(query) .then((response) => { @@ -483,13 +458,7 @@ export default { .catch(() => { }); }, - locInChange(item) { - if (this.formData.invWarehouseCode != null) { - this.formData.invWarehouseCode = ""; - } - this.formData.locStorageCode = item; - this.findSubInvs(); - }, + }, filters: {}, mounted() { @@ -519,7 +488,7 @@ export default { }; this.orderEditor = false; } - this.getStorage(); + this.findSubInvs(); this.codeArray = []; }, }; diff --git a/src/views/purchase/purPlanEditDialog.vue b/src/views/purchase/purPlanEditDialog.vue index eef45e8..627e6f6 100644 --- a/src/views/purchase/purPlanEditDialog.vue +++ b/src/views/purchase/purPlanEditDialog.vue @@ -83,18 +83,8 @@ - - - {{ item.name }} - - - {{ item.name }} + {{ item.warehouseName }} + + +
采购说明： @@ -364,13 +358,11 @@ export default { if (this.formData.billDate == "" || this.formData.billDate == null) { return this.$message.error("单据日期不能为空！"); } - // if (this.formData.billType == "" || this.formData.billType == null) { - // return this.$message.error("采购类型不能为空！"); - // } - if (this.formData.locStorageCode == "" || this.formData.locStorageCode == null) { - return this.$message.error("采购仓库不能为空！"); + if(this.formData.billType=="" || this.formData.billType==null){ + return this.$message.error("采购类型不能为空！"); } - if (this.formData.invWarehouseCode == "" || this.formData.invWarehouseCode == null) { + + if(this.formData.invWarehouseCode=="" || this.formData.invWarehouseCode==null){ return this.$message.error("采购分库不能为空！"); } for (let i = 0; i < this.codeArray.length; i++) { @@ -422,6 +414,9 @@ export default { this.thisData.stockOrderLists = this.codeArray; this.selectProductVisible = true; }, + setLocStorageCode(obj){ +  this.formData.locStorageCode= this.subInvList.find(item => item.code == obj).parentId; + }, selectApply() { this.selectApplyVisible = true; @@ -519,26 +514,10 @@ export default { this.total = 0; }); }, - - - getStorage() { - this.storageList = []; - filterAllByUser() - .then((response) => { - this.storageList = response.data || []; - if (this.storageList != null && this.storageList.length == 1) { - this.formData.locStorageCode = this.storageList[0].code; - } - this.findSubInvs(); - - }) - .catch(() => { - }); - }, findSubInvs() { this.subInvList = []; let query = { - pcode: this.formData.locStorageCode + filter:3 }; filterSubByInv(query) .then((response) => { @@ -550,13 +529,6 @@ export default { .catch(() => { }); }, - locInChange(item) { - if (this.formData.invWarehouseCode != null) { - this.formData.invWarehouseCode = ""; - } - this.formData.locStorageCode = item; - this.findSubInvs(); - }, getBusType() { let query = { enable: false, @@ -598,7 +570,7 @@ export default { }; this.orderEditor = false; } - this.getStorage(); + this.findSubInvs(); this.getBusType(); this.codeArray = []; }, diff --git a/src/views/purchase/pureApplyDetailDialog.vue b/src/views/purchase/pureApplyDetailDialog.vue index 5ff199f..f835a7e 100644 --- a/src/views/purchase/pureApplyDetailDialog.vue +++ b/src/views/purchase/pureApplyDetailDialog.vue @@ -61,20 +61,7 @@ - - - - {{ item.name }} - - - {{ item.name }} + {{ item.warehouseName }} - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
申购说明： @@ -130,6 +87,18 @@ + + + + {{ item.name }} + {{ item.warehouseName }} + + diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue index 39a8f51..880e0b2 100644 --- a/src/views/warehouse/stockHospOrderNew.vue +++ b/src/views/warehouse/stockHospOrderNew.vue @@ -61,7 +61,7 @@ - +//