diff --git a/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue b/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue index 9ebffc22..7a7d97a7 100644 --- a/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue +++ b/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue @@ -142,17 +142,17 @@ - + - + - + @@ -162,27 +162,27 @@ - + - + - + + - + @@ -297,7 +297,10 @@ } }) this.supplierList.forEach((v, i) => { - if(v.id == this.purchaseForm.supplierId){ + if(v.name == this.purchaseForm.supplierId){ + this.purchaseForm.supplierName = v.name + this.purchaseForm.supplierId = v.id + }else if(v.id == this.purchaseForm.supplierId){ this.purchaseForm.supplierName = v.name } }) @@ -313,11 +316,16 @@ }, async showEdit(row) { this.viewTitle = "【修改】采购订单"; - const _this = this - const { data: result } = await this.$http.get(`/purchasenew/fetchDetailsBySid/${row.sid}`) - if (result.code==200) { - _this.purchaseForm=result.data - } + const { data: res } = await this.$http.get(`/purchasenew/fetchDetailsBySid/${row.sid}`) + if (res.code==200) { + this.purchaseForm=res.data + + this.supplierList.forEach((v, i) => { + if(v.id == res.data.supplierId){ + this.purchaseForm.supplierId = res.data.supplierName + } + }) + } }, addStorehouse(){ this.$refs.dataForm.validate(async validate => { diff --git a/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseShow.vue b/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseShow.vue index a0b868a9..47da8d1e 100644 --- a/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseShow.vue +++ b/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseShow.vue @@ -96,21 +96,21 @@ - + - + - + - + - + diff --git a/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue new file mode 100644 index 00000000..dd055efa --- /dev/null +++ b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue @@ -0,0 +1,448 @@ + + + + + + diff --git a/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/outList.vue b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/outList.vue index 4cc6c659..7aa74c1f 100644 --- a/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/outList.vue +++ b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/outList.vue @@ -1,553 +1,282 @@ -