From ead28da64858a45b291bfe2ed4b1d527bbc25951 Mon Sep 17 00:00:00 2001 From: fengdong777 <1478994744@qq.com> Date: Fri, 4 Aug 2023 18:06:03 +0800 Subject: [PATCH] 8.4 --- .../instorehouse/add/purchaseAdd.vue | 87 ++++--- .../instorehouse/add/purchaseShow.vue | 45 ++-- .../add/outListAdd.vue | 43 ++-- .../add/outListShow.vue | 228 ++++++++++++++++++ .../outStorehouseManagement/outList.vue | 26 +- 5 files changed, 342 insertions(+), 87 deletions(-) create mode 100644 warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListShow.vue 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 66d60d94..4f3d0bb5 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 @@ -17,36 +17,39 @@
主体信息
- + + + 订单编号： + + + + + + + + 订单日期： - + - - - 订单编号： - - - - - - - - + + + + - 供货商名称： + 供货单位： - + - + - - - + 采购申请人： - + + - + + 客户名称： - + - + - + 仓库名称： - + - + - - - + - + + @@ -397,7 +398,15 @@ let arrList=this.purchaseForm.products for(let i=0;i主体信息 - + - 订单日期： + 订单编号： - + + + {{purchaseForm.purchaseNo}} + + + - {{purchaseForm.purchaseDate}} + 订单日期： - + - 订单编号： + {{purchaseForm.purchaseDate}} - - - {{purchaseForm.purchaseNo}} - - - + + + + 供货商名称： - + {{purchaseForm.supplierName}} - - - + 采购申请人： - + {{purchaseForm.purchasePerson}} + - + + 客户名称： - + {{purchaseForm.custName}} - + 仓库名称： - + {{purchaseForm.storehouseName}} 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 index bc1b29e8..cc2fc123 100644 --- 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 @@ -50,7 +50,7 @@ - + - + @@ -268,13 +268,10 @@ } }) this.custList.forEach((v, i) => { - // if(v.name == this.purchaseForm.custerSid){ - // this.purchaseForm.custerName = v.name - // this.purchaseForm.custerSid = v.id - // }else if(v.id == this.purchaseForm.custerSid){ - // this.purchaseForm.custerName = v.name - // } - if(v.sid == this.purchaseForm.custerSid){ + if(v.enterpriseName == this.purchaseForm.custerSid){ + this.purchaseForm.custerName = v.enterpriseName + this.purchaseForm.custerSid = v.sid + }else if(v.sid == this.purchaseForm.custerSid){ this.purchaseForm.custerName = v.enterpriseName } }) @@ -290,12 +287,12 @@ }, async showEdit(row) { this.viewTitle = "【修改】出库订单"; - const { data: res } = await this.$http.get(`/purchasenew/fetchDetailsBySid/${row.sid}`) + const { data: res } = await this.$http.get(`/output/getOutStorehouse/${row.sid}`) if (res.code==200) { this.purchaseForm=res.data - this.supplierList.forEach((v, i) => { - if(v.id == res.data.custerSid){ + this.custList.forEach((v, i) => { + if(v.enterpriseName == res.data.custerName){ this.purchaseForm.custerSid = res.data.custerName } }) @@ -362,7 +359,15 @@ let arrList=this.purchaseForm.list for(let i=0;i +
+
+
{{ viewTitle }}
+
+ 返回 +
+
+
+ +
+
主体信息
+
+ + + + 订单编号： + + + + + {{purchaseForm.no}} + + + + + 订单日期： + + + + + {{purchaseForm.applicationDate}} + + + + + + + + 供货商名称： + + + + + {{purchaseForm.custerName}} + + + + + 采购申请人： + + + + + {{purchaseForm.creatorName}} + + + + + + + + + 客户名称： + + + + + {{purchaseForm.custName}} + + + + + + 仓库名称： + + + + + {{purchaseForm.storehouseName}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + \ No newline at end of file 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 7aa74c1f..b66790ab 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 @@ -8,7 +8,7 @@
- +
@@ -23,31 +23,25 @@ border> - - @@ -98,7 +92,7 @@
- +
@@ -108,14 +102,14 @@ import ButtonBar from '@/components/ButtonBar' import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' import divadd from '@/views/component/outStorehouseManagement/add/outListAdd.vue' -import storeShow from '@/views/component/outStorehouseManagement/add/outListAdd.vue' +import outListShow from '@/views/component/outStorehouseManagement/add/outListShow.vue' export default { components: { ButtonBar, Pagination, pageye, divadd, - storeShow + outListShow }, data () { return { @@ -127,7 +121,7 @@ data () { current: 1, size: 10, params: { - purchaseNo:'' + no:'' } }, btnList: [ @@ -203,7 +197,7 @@ methods: { return pageindex }, async getPurchaseList () { - const { data: result } = await this.$http.post('/purchasenew/listPage', this.queryInfo) + const { data: result } = await this.$http.post('/output/listPage', this.queryInfo) if (result.code == 200){ this.queryInfo.total=result.data.total this.purchaseList = result.data.records