From a1669a3e08f086e18af40641ecd698847e1550a9 Mon Sep 17 00:00:00 2001 From: mashuai Date: Mon, 1 Jul 2024 15:36:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E4=BA=8C=E7=BA=A7?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LargeScreenServiceImpl.java | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java index 450eea79..cec081ab 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java @@ -169,23 +169,28 @@ public class LargeScreenServiceImpl implements ILargeScreenService { @Override public PageResultVo getAcceptanceDetailStorage(ParamsDto dto) { extracted(dto); - // 分页 - PageHelper.startPage(dto.getPageNum() == 0 ? 1 : dto.getPageNum(), dto.getPageSize()); - PageResultVo pageResult = new PageResultVo(); - List result; - result = mapper.getAcceptanceDetailStorage(dto); - result = result.stream() + List result = mapper.getAcceptanceDetailStorage(dto); + List filteredResult = result.stream() .filter(storageDetail -> storageDetail.getPurchaseNum() != 0 || storageDetail.getCheckNum() != 0 || storageDetail.getInputNum() != 0) .collect(Collectors.toList()); - // 分页信息 - PageInfo pageInfo = new PageInfo<>(result); - pageResult.setTotal(pageInfo.getTotal()); - pageResult.setTotalPageCount(pageInfo.getPages()); - pageResult.setRows(result); - pageResult.setPageNum (dto.getPageNum()); - pageResult.setPageSize(dto.getPageSize()); + // 手动计算分页信息 + int pageNum = dto.getPageNum() == 0 ? 1 : dto.getPageNum(); + int pageSize = dto.getPageSize(); + int total = filteredResult.size(); + int totalPages = (int) Math.ceil((double) total / pageSize); + // 手动分页，获取当前页的数据 + int startIndex = (pageNum - 1) * pageSize; + int endIndex = Math.min(startIndex + pageSize, total); + List currentPageData = filteredResult.subList(startIndex, endIndex); + // 构建返回结果对象 + PageResultVo pageResult = new PageResultVo(); + pageResult.setTotal(total); + pageResult.setTotalPageCount(totalPages); + pageResult.setRows(currentPageData); + pageResult.setPageNum(pageNum); + pageResult.setPageSize(pageSize); return pageResult; } From 1a9cf0b6097d6dbf87e594efe35714f2c267497b Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Mon, 1 Jul 2024 17:12:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=EF=BC=8C=E6=A0=87?= =?UTF-8?q?=E6=AE=B5=E5=B7=A5=E7=A8=8B=E6=96=B0=E5=A2=9E=E5=BC=80=E5=B7=A5?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=EF=BC=8C=E7=AB=A3=E5=B7=A5=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/views/base/project/index.vue | 83 +++++++++++++++++-- sgzb-ui/src/views/base/section/index.vue | 82 ++++++++++++++++-- .../claimAndreturn/picking/outbound/index.vue | 57 ++++++++++--- sgzb-ui/vue.config.js | 4 +- 4 files changed, 196 insertions(+), 30 deletions(-) diff --git a/sgzb-ui/src/views/base/project/index.vue b/sgzb-ui/src/views/base/project/index.vue index 2b528dca..b05ca2ae 100644 --- a/sgzb-ui/src/views/base/project/index.vue +++ b/sgzb-ui/src/views/base/project/index.vue @@ -86,31 +86,43 @@ label="工程项目名称" align="center" prop="proName" - :show-overflow-tooltip="true" + show-overflow-tooltip /> + + @@ -221,6 +233,35 @@ onkeyup="this.value = this.value.replace(/[^\d]/g,'');" /> + + + + + +
= endDate) { + this.form.completionDate = '' + } + } + }, }, } diff --git a/sgzb-ui/src/views/base/section/index.vue b/sgzb-ui/src/views/base/section/index.vue index 5a4eb75c..c1f8e79d 100644 --- a/sgzb-ui/src/views/base/section/index.vue +++ b/sgzb-ui/src/views/base/section/index.vue @@ -84,37 +84,49 @@ label="标段工程名称" align="center" prop="lotName" - :show-overflow-tooltip="true" + show-overflow-tooltip /> + + + + + + + +
= endDate) { + this.form.completionDate = '' + } + } + }, }, } diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue index fbc5709c..8c395427 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue @@ -173,6 +173,7 @@ > 出库 + @@ -285,8 +286,11 @@ size="mini" @click="codeOut(scope.row)" v-if=" + scope.row.status != 2 && scope.row.manageType == 0 && - scope.row.status != 2 + (isOutboundFun(scope.row.userId) || + isMonitor || + userId == 1) " > 编码出库 @@ -295,9 +299,11 @@ size="mini" type="primary" v-if=" - (scope.row.manageType == 1 || - scope.row.manageType == 2) && - scope.row.status != 2 + scope.row.status != 2 && + scope.row.manageType == 1 && + (isOutboundFun(scope.row.userId) || + isMonitor || + userId == 1) " @click="numOut(scope.row)" > @@ -306,7 +312,12 @@ 完成出库 @@ -537,6 +548,7 @@ import { getTypeList } from '@/api/store/warehousing' import { equipmentTypeTree } from '@/api/store/tools' import Treeselect from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' +import store from '@/store' export default { name: 'receiveOut', components: { Treeselect }, @@ -613,8 +625,11 @@ export default { outTotal: 0, //编码弹窗分页-总数 outCodeList: [], //编码弹窗表格数据 outNumList: [], //数量弹窗表格数据 + userId: sessionStorage.getItem('userId'), // 当前登录用户的 userId + isMonitor: false, } }, + created() { this.getTypeList() this.getUnitList() @@ -622,6 +637,11 @@ export default { this.equipmentType() this.getList() + + const roles = store.getters && store.getters.roles + if (roles.includes('jjbz')) { + this.isMonitor = true + } }, methods: { //获取单位 @@ -767,17 +787,17 @@ export default { outboundCompleted({ id: this.dialogQuery.id, typeId: row.typeId, - }).then((response) => { - this.$modal.msgSuccess('完成出库成功') + }).then((res) => { + this.$modal.msgSuccess('已完成') this.handleDialogQuery() this.handleQuery() }) }) .catch(() => { - this.$message({ - type: 'info', - message: '已取消完成出库', - }) + // this.$message({ + // type: 'info', + // message: '已取消完成出库', + // }) }) }, handleOutQuery() { @@ -825,7 +845,7 @@ export default { return obj }) // console.log(params) - submitOut(params).then((response) => { + submitOut(params).then((res) => { this.$modal.msgSuccess('出库成功') this.openCode = false this.handleDialogQuery() @@ -869,6 +889,19 @@ export default { `领料出库_${new Date().getTime()}.xlsx`, ) }, + + // 当前用户是否可以出库 + isOutboundFun(ids) { + if (!ids) { + return false + } else { + if (ids.split(',').includes(this.userId)) { + return true + } else { + return false + } + } + }, }, } diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js index 4cf9b9e5..15559acd 100644 --- a/sgzb-ui/vue.config.js +++ b/sgzb-ui/vue.config.js @@ -43,11 +43,11 @@ module.exports = { // target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://z.csgmall.com.cn`, - // target: `http://192.168.2.122:28080`, //超 + target: `http://192.168.2.122:28080`, //超 // target: `http://10.40.92.81:28080`, //韩/ // target: `http://10.40.92.74:8080`,//旭/ // target: `http://10.40.92.140:28080`, //帅 - target: `http://192.168.2.209:28080`, //福 + // target: `http://192.168.2.209:28080`, //福 //******** 注意事项 ********* */ //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;