From 1045c50acd9758382aebbec0a522e7d842c73820 Mon Sep 17 00:00:00 2001 From: wangxy Date: Fri, 11 Jun 2021 10:50:26 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- version.txt | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/version.txt b/version.txt index fe1d922..dcf462e 100644 --- a/version.txt +++ b/version.txt @@ -1,12 +1,9 @@ -git:83a905d2d714da8d465dba4090b4379fb5be9cc4 -作者:liwei -日期:2021-6-11 10:39 -说明:Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei -******************************************************************************* -git:1a68481bc33098f2a7f571c0730cb462c6a02ca3 -作者:Liwei -日期:2021-6-7 9:53 -说明:Merge pull request '修改甘特图样式' (#68) from feature_supplier into develop +git:ddfeb2fbfe95eae0ed2e482fdf567e9bd4d4d683 +作者:wangxy +日期:2021-6-11 10:49 +说明:Merge pull request '添加版本日志' (#75) from liwei into develop ******************************************************************************* + + From 4b6b1b28edfd079b01733848bd38ce46aea2d124 Mon Sep 17 00:00:00 2001 From: wangxy Date: Fri, 11 Jun 2021 11:06:16 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- version.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/version.txt b/version.txt index dcf462e..1f60757 100644 --- a/version.txt +++ b/version.txt @@ -1,3 +1,8 @@ +git:1045c50acd9758382aebbec0a522e7d842c73820 +作者:wangxy +日期:2021-6-11 10:50 +说明:自动提交版本信息 +******************************************************************************* git:ddfeb2fbfe95eae0ed2e482fdf567e9bd4d4d683 作者:wangxy 日期:2021-6-11 10:49 @@ -7,3 +12,4 @@ git:ddfeb2fbfe95eae0ed2e482fdf567e9bd4d4d683 + From 7e9a45ac3dd3ff9a04beda18016843c9b2c83c3c Mon Sep 17 00:00:00 2001 From: wangxy Date: Fri, 11 Jun 2021 16:41:43 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- version.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/version.txt b/version.txt index 1f60757..d99a349 100644 --- a/version.txt +++ b/version.txt @@ -1,3 +1,8 @@ +git:4b6b1b28edfd079b01733848bd38ce46aea2d124 +作者:wangxy +日期:2021-6-11 11:6 +说明:自动提交版本信息 +******************************************************************************* git:1045c50acd9758382aebbec0a522e7d842c73820 作者:wangxy 日期:2021-6-11 10:50 @@ -13,3 +18,4 @@ git:ddfeb2fbfe95eae0ed2e482fdf567e9bd4d4d683 + From 14f05be23818f72bbdbbf4b88e427d4bb74f6c80 Mon Sep 17 00:00:00 2001 From: wangxy Date: Fri, 11 Jun 2021 16:46:32 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E9=97=A8?= =?UTF-8?q?=E6=88=B7=E9=9C=80=E6=B1=82=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/supplier/batch/realBatch.vue | 10 ++++++++++ src/views/supplier/detail/realDetail.vue | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/views/supplier/batch/realBatch.vue b/src/views/supplier/batch/realBatch.vue index 2411b11..c20afc3 100644 --- a/src/views/supplier/batch/realBatch.vue +++ b/src/views/supplier/batch/realBatch.vue @@ -8,6 +8,12 @@ clearable v-model="form.artid"> + + + + 搜索 @@ -82,6 +88,7 @@ export default { return { form: { artid: undefined, + planresourceid: undefined, pageNumber: 1, pageSize: 10, }, @@ -91,6 +98,7 @@ export default { 'LOG_ArtDemandHeadCache-ArtId', 'LOG_ArtDemandHeadCache-DemandCtrlPara3', 'LOG_ArtDemandHeadCache-DemandId', + 'LOG_ArtDemandHeadCache-PlanResourceId', 'LOG_ArtDemandHeadCache-DemandDate', 'LOG_ArtDemandHeadCache-DemandQty', 'LOG_ArtDemandHeadCache-OrderType', @@ -125,6 +133,7 @@ export default { //搜索 searchList() { if (this.form.artid === '') this.form.artid = undefined + if (this.form.planresourceid === '') this.form.planresourceid = undefined this.form.pageNumber = 1 this.getList() }, @@ -132,6 +141,7 @@ export default { resetQuery() { this.form = { artid: undefined, + planresourceid: undefined, pageNumber: 1, pageSize: 10, } diff --git a/src/views/supplier/detail/realDetail.vue b/src/views/supplier/detail/realDetail.vue index c2358e0..f069429 100644 --- a/src/views/supplier/detail/realDetail.vue +++ b/src/views/supplier/detail/realDetail.vue @@ -14,6 +14,12 @@ clearable v-model="form.artid"> + + + + 搜索 @@ -84,6 +90,7 @@ export default { form: { demandid: undefined, artid: undefined, + planresourceid: undefined, pageNumber: 1, pageSize: 10, }, @@ -93,6 +100,7 @@ export default { 'LOG_ArtDemandLstCache-DemandId', 'LOG_ArtDemandLstCache-ArtId', 'LOG_ArtDemandLstCache-DemandCtrlPara3', + 'LOG_ArtDemandLstCache-PlanResourceId', 'LOG_ArtDemandLstCache-DemandDate', 'LOG_ArtDemandLstCache-DemandQty', 'LOG_ArtDemandLstCache-OrderType', @@ -122,6 +130,7 @@ export default { searchList() { if (this.form.artid === '') this.form.artid = undefined if (this.form.demandid === '') this.form.demandid = undefined + if (this.form.planresourceid === '') this.form.planresourceid = undefined this.form.pageNumber = 1 this.getList() }, @@ -129,6 +138,7 @@ export default { resetQuery() { this.form = { artid: undefined, + planresourceid: undefined, pageNumber: 1, pageSize: 10, } From e445bb2867f030cb9217a7443ec5095adccefa3d Mon Sep 17 00:00:00 2001 From: wangxy Date: Fri, 11 Jun 2021 16:59:17 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- version.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/version.txt b/version.txt index d99a349..80c8c2c 100644 --- a/version.txt +++ b/version.txt @@ -1,3 +1,8 @@ +git:14f05be23818f72bbdbbf4b88e427d4bb74f6c80 +作者:wangxy +日期:2021-6-11 16:46 +说明:供应商门户需求完善 +******************************************************************************* git:4b6b1b28edfd079b01733848bd38ce46aea2d124 作者:wangxy 日期:2021-6-11 11:6 @@ -19,3 +24,4 @@ git:ddfeb2fbfe95eae0ed2e482fdf567e9bd4d4d683 +