From b5336d2b37289fbcdbc3bd332a628f763724dca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Mon, 24 Jul 2023 16:35:12 +0800 Subject: [PATCH 1/6] =?UTF-8?q?1=E3=80=81=E5=BA=93=E5=AD=98=E4=BD=99?= =?UTF-8?q?=E9=A2=9D=E6=89=B9=E9=87=8F=E5=90=AF=E7=94=A8=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=BC=80=E5=8F=91=EF=BC=8C=202=E3=80=81=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=9D=83=E9=99=90=EF=BC=8C=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=8E=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=AF=94=E5=AF=B9=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Count/CountNote-msQuery.vue | 1 + .../InventoryQuery/InventoryBalance.vue | 42 ++++++++++++++++++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue b/fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue index f4d4ef7ae..0e6a9ea39 100644 --- a/fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue +++ b/fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue @@ -77,6 +77,7 @@ export default { let data = true val.forEach(key => { if (this.propsData.adjusted == key) { + // if (this.propsData.adjusted == key && this.propsData.creatorId == this.$store.getters.name.id) { data = false } }) diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue index 496fc9df6..b13a85389 100644 --- a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue +++ b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue @@ -9,7 +9,7 @@ :totalCount="totalCount" :multipleSelection="multipleSelection" :MaxResultCount="PageListParams.MaxResultCount" - @topbutton="topbutton" + @topbutton="topbuttonHandle" @inlineDialog="inlineDialog" @sortChange="sortChange" @alertoldSkipCount="alertoldSkipCount" @@ -22,6 +22,7 @@ :primarySearchOption="primarySearchOption" @overallSearchFormClick="overallSearchFormClick" :httpOverallSearchData="httpOverallSearchData" + :tableSelection="true" > @@ -106,6 +107,14 @@ export default { currenButtonData: [ this.defaultImportBtn(),//导入 this.defaultExportBtn(),//导出 + { + type: "success", + icon: "el-icon-check", + label: "批量启用", + name: "batch-active", + size: "mini", + background:"#31bb99" + }, this.defaultFieldSettingBtn(),//字段设置 this.defaultFreshBtn(),//刷新 this.defaultFilterBtn(),//筛选 @@ -198,6 +207,37 @@ export default { }); } }, + topbuttonHandle(val,item){ + // 批量操作 + if(val == 'batch-active'){ + if(!this.multipleSelection || this.multipleSelection.length <= 0){ + this.$warningMsg('请选择数据') + return + } + this.$confirm('此操作将启用已选 ('+this.multipleSelection.length+'条) 数据, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.Loading.tableLoading = true + let _ajaxs = [] + this.multipleSelection.forEach(item=>{ + _ajaxs.push(inventoryBalanceActive({id: item.id})) + }) + Promise.all(_ajaxs).then((allData) => { + this.$successMsg('启用成功!') + this.Loading.tableLoading = false + this.paging() + }).catch((err)=>{ + this.Loading.tableLoading = false + }) + }).catch((err) => { + console.log(err) + }); + }else{ + this.topbutton(val,item) + } + }, //抽屉下拉按钮操作 库存余额删除 只能删除库存数量为0的记录 // drawerHandle(val) { // if (val == 'delete') { From f804f5b091d6507ddd08fa6bb361255844deb17f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Mon, 24 Jul 2023 16:56:52 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E4=B8=8E=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E7=94=A8=E6=88=B7=E4=B8=8D=E7=AC=A6=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E8=BF=9B=E8=A1=8C=E7=94=9F=E6=88=90=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue b/fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue index 0e6a9ea39..6f4b5c57b 100644 --- a/fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue +++ b/fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue @@ -77,7 +77,6 @@ export default { let data = true val.forEach(key => { if (this.propsData.adjusted == key) { - // if (this.propsData.adjusted == key && this.propsData.creatorId == this.$store.getters.name.id) { data = false } }) @@ -115,6 +114,10 @@ export default { //抽屉常用按钮 drawerbutton (val) { if(val == 'adjust'){ + if(this.propsData.creatorId != this.$store.getters.name.id){ + this.$errorMsg('当前用户与创建用户不符，不能进行生成盘点调整申请') + return + } const data = this.propsData.id this.Loading.appMainLoading = true StartAdjust(data).then(res=>{ From 4c9ab7c964b82ad2bd1170eb2d214ddcc16df426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Mon, 24 Jul 2023 16:57:58 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/public/version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fe/PC/public/version.json b/fe/PC/public/version.json index 60d4e6307..62e93c29d 100644 --- a/fe/PC/public/version.json +++ b/fe/PC/public/version.json @@ -1,3 +1,3 @@ { - "version": "1.0.62" + "version": "1.0.63" } \ No newline at end of file From 5c90110a41194cf7852705baf5fed701bb41ec95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Tue, 25 Jul 2023 10:57:33 +0800 Subject: [PATCH 4/6] css --- fe/PC/public/version.json | 2 +- fe/PC/src/components/searchOverall/style/index.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fe/PC/public/version.json b/fe/PC/public/version.json index 62e93c29d..c4b6ddc79 100644 --- a/fe/PC/public/version.json +++ b/fe/PC/public/version.json @@ -1,3 +1,3 @@ { - "version": "1.0.63" + "version": "1.0.64" } \ No newline at end of file diff --git a/fe/PC/src/components/searchOverall/style/index.scss b/fe/PC/src/components/searchOverall/style/index.scss index 963723f9f..164b929f2 100644 --- a/fe/PC/src/components/searchOverall/style/index.scss +++ b/fe/PC/src/components/searchOverall/style/index.scss @@ -1,7 +1,7 @@ .searchOverallComponent{ height: 0; transition:all 0.5s; - z-index: 1; + z-index: 2; overflow: hidden; .border-outer{ From 604e63ec67bb6679b50fbe263f928214683fc26b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Tue, 25 Jul 2023 11:20:38 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=8C=E7=9B=98=E7=82=B9=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?excel=E6=9A=82=E6=97=B6=E6=94=BE=E5=BC=80=E5=8E=9F=E6=9D=90?= =?UTF-8?q?=E6=96=99=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/components/StepsCountPlanForm/index.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fe/PC/src/components/StepsCountPlanForm/index.vue b/fe/PC/src/components/StepsCountPlanForm/index.vue index 26990ac01..583bb5e6f 100644 --- a/fe/PC/src/components/StepsCountPlanForm/index.vue +++ b/fe/PC/src/components/StepsCountPlanForm/index.vue @@ -407,7 +407,9 @@ export default { // 如果是pda类型盘点，库位类型 则使用 locationTypeForPADPlan 枚举（区别为线边库位为不可选） // 如果是Excel类型盘点，库位类型 则使用 locationTypeForExcelPlan 枚举（区别为原材料库位为不可选） if(item.prop == 'type'){ - item.filters = this.CreateFormData.requestType == 2 ? 'locationTypeForPADPlan' : 'locationTypeForExcelPlan' + // todo:暂时 + // item.filters = this.CreateFormData.requestType == 2 ? 'locationTypeForPADPlan' : 'locationTypeForExcelPlan' + item.filters = this.CreateFormData.requestType == 2 ? 'locationTypeForPADPlan' : 'locationType' } }); return _list @@ -451,7 +453,9 @@ export default { // 盘点库存 过滤线边仓数据 20230703更新 // 如果是Excel盘点类型(this.CreateFormData.requestType == 1)，过滤原材料2 // 如果不是Excel盘点类型(this.CreateFormData.requestType != 1)，过滤线边仓数据5 - let type_value = this.CreateFormData.requestType == 1 ? '2' : '5' + // todo://暂时 + // let type_value = this.CreateFormData.requestType == 1 ? '2' : '5' + let type_value = this.CreateFormData.requestType == 1 ? null : '5' let _filter = { action: "!=", column: "type", @@ -468,7 +472,7 @@ export default { hide: true } if(this.pageListLocation.condition.filters.length <= 0){ - this.pageListLocation.condition.filters.push(_filter) + if(type_value)this.pageListLocation.condition.filters.push(_filter) this.pageListLocation.condition.filters.push(_filter_code) } // code多选处理 20230705更新 From 8fa59f50548dd861bd945ec1d0680d0b6db67eaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Wed, 26 Jul 2023 08:50:31 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/public/version.json | 2 +- fe/PC/src/components/StepsCountPlanForm/index.vue | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fe/PC/public/version.json b/fe/PC/public/version.json index c4b6ddc79..e0861ead5 100644 --- a/fe/PC/public/version.json +++ b/fe/PC/public/version.json @@ -1,3 +1,3 @@ { - "version": "1.0.64" + "version": "1.0.65" } \ No newline at end of file diff --git a/fe/PC/src/components/StepsCountPlanForm/index.vue b/fe/PC/src/components/StepsCountPlanForm/index.vue index 583bb5e6f..b9fc53917 100644 --- a/fe/PC/src/components/StepsCountPlanForm/index.vue +++ b/fe/PC/src/components/StepsCountPlanForm/index.vue @@ -408,8 +408,8 @@ export default { // 如果是Excel类型盘点，库位类型 则使用 locationTypeForExcelPlan 枚举（区别为原材料库位为不可选） if(item.prop == 'type'){ // todo:暂时 - // item.filters = this.CreateFormData.requestType == 2 ? 'locationTypeForPADPlan' : 'locationTypeForExcelPlan' - item.filters = this.CreateFormData.requestType == 2 ? 'locationTypeForPADPlan' : 'locationType' + item.filters = this.CreateFormData.requestType == 2 ? 'locationTypeForPADPlan' : 'locationTypeForExcelPlan' + // item.filters = this.CreateFormData.requestType == 2 ? 'locationTypeForPADPlan' : 'locationType' } }); return _list @@ -454,8 +454,8 @@ export default { // 如果是Excel盘点类型(this.CreateFormData.requestType == 1)，过滤原材料2 // 如果不是Excel盘点类型(this.CreateFormData.requestType != 1)，过滤线边仓数据5 // todo://暂时 - // let type_value = this.CreateFormData.requestType == 1 ? '2' : '5' - let type_value = this.CreateFormData.requestType == 1 ? null : '5' + let type_value = this.CreateFormData.requestType == 1 ? '2' : '5' + // let type_value = this.CreateFormData.requestType == 1 ? null : '5' let _filter = { action: "!=", column: "type",