From fa4e3b36215f9685a099b240f5d0599b35406cd5 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Fri, 16 Aug 2024 16:50:47 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/cost/csotSettlement/costApplyList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/cost/csotSettlement/costApplyList.vue b/src/views/cost/csotSettlement/costApplyList.vue index a6e1bc8..1cf0910 100644 --- a/src/views/cost/csotSettlement/costApplyList.vue +++ b/src/views/cost/csotSettlement/costApplyList.vue @@ -333,7 +333,7 @@ export default { /** 批量导出月结明细表 */ handleBatchExport() { console.log('批量导出月结明细表') - + this.exportParams = [] if (this.ids.length < 1) { this.$message.error('请勾选需要导出的数据！') return @@ -348,7 +348,6 @@ export default { }) this.exportDialogVisible = true - this.$refs.tableRef.clearSelection() }, /** 关闭弹框 */ handleCloseDialog() { @@ -369,6 +368,7 @@ export default { ) this.exportDialogVisible = false + this.$refs.tableRef.clearSelection() }, /** 月结记录 */ handleMonthRecord(row) { From d92527b614ee94522ac95aa023f5a11d2ce727d0 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Mon, 19 Aug 2024 15:21:11 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehousing/newTools/index.vue | 75 ++++++++++--------- vue.config.js | 4 +- 2 files changed, 42 insertions(+), 37 deletions(-) diff --git a/src/views/warehouseManage/warehousing/newTools/index.vue b/src/views/warehouseManage/warehousing/newTools/index.vue index a26b5de..c984c4a 100644 --- a/src/views/warehouseManage/warehousing/newTools/index.vue +++ b/src/views/warehouseManage/warehousing/newTools/index.vue @@ -277,12 +277,12 @@ - + /> { - let deviceList = res.rows - deviceList.forEach((item) => { - item.taskId = this.query.taskId - item.typeId = item.typeId - item.maId = item.maId - item.inputNum = item.checkNum - item.maCode = item.maCode - }) - let param = { - taskId: this.query.taskId, - checkResult: '1', - inputRecordList: deviceList, - } - changePutinStatus(param) - .then((response) => { - if (response.code == 200) { - this.$modal.msgSuccess('审批成功') - this.getDialogTable() - this.getList() - } else { - this.$modal.msgSuccess('审批失败') - } - }) - .finally(() => { - this.passLoading = false - }) + this.ids.forEach((item) => { + item.taskId = this.query.taskId + item.typeId = item.typeId + item.maId = item.maId + item.inputNum = item.checkNum + item.maCode = item.maCode }) + let param = { + taskId: this.query.taskId, + checkResult: '1', + inputRecordList: deviceList, + } + changePutinStatus(param) + .then((response) => { + if (response.code == 200) { + this.$modal.msgSuccess('审批成功') + this.getDialogTable() + this.getList() + } else { + this.$modal.msgSuccess('审批失败') + } + }) + .finally(() => { + this.passLoading = false + }) + // getPutinDetailsList(params).then((res) => { + // let deviceList = res.rows + + // }) }, //拒绝 refused(row) { diff --git a/vue.config.js b/vue.config.js index 0673162..6ee22a5 100644 --- a/vue.config.js +++ b/vue.config.js @@ -42,9 +42,9 @@ module.exports = { // target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://z.csgmall.com.cn`, - target: `http://192.168.2.141:39080`, //超 + // target: `http://192.168.2.141:39080`, //超 // target: `http://10.40.92.81:8080`, //韩/ - // target: `http://10.40.92.74:8080`,//旭/ + target: `http://192.168.2.77:39080`,//旭/ // target: `http://10.40.92.138:28080`, //帅 // target: `http://192.168.2.218:39080`, //福 // target: `http://192.168.2.120:39080`, //跃 From cb14533f95dbce2d4069e0c22945181d41bfb3ad Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Mon, 19 Aug 2024 16:08:11 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../return/receive/component/handlePage.vue | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/views/claimAndreturn/return/receive/component/handlePage.vue b/src/views/claimAndreturn/return/receive/component/handlePage.vue index 594a480..8f4523c 100644 --- a/src/views/claimAndreturn/return/receive/component/handlePage.vue +++ b/src/views/claimAndreturn/return/receive/component/handlePage.vue @@ -88,7 +88,9 @@ align="center" width="80" type="index" - :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)" + :index=" + indexContinuation(queryParams.pageNum, queryParams.pageSize) + " > - + Date: Mon, 19 Aug 2024 16:34:03 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/warehouseManage/warehousing/newTools/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/warehouseManage/warehousing/newTools/index.vue b/src/views/warehouseManage/warehousing/newTools/index.vue index b8dc221..81dee83 100644 --- a/src/views/warehouseManage/warehousing/newTools/index.vue +++ b/src/views/warehouseManage/warehousing/newTools/index.vue @@ -745,7 +745,7 @@ export default { this.$message.error('请勾选需要入库的数据！') return } - this.passLoading = true + this.ids.forEach((item) => { item.taskId = this.query.taskId item.typeId = item.typeId @@ -756,8 +756,9 @@ export default { let param = { taskId: this.query.taskId, checkResult: '1', - inputRecordList: deviceList, + inputRecordList: this.ids, } + this.passLoading = true changePutinStatus(param) .then((response) => { if (response.code == 200) { From 9bfcacb4df6a71da37769727ed7d1e9418e6efa9 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Mon, 19 Aug 2024 17:08:14 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../secondStore/secondStore.vue | 194 ++++++++---------- 1 file changed, 89 insertions(+), 105 deletions(-) diff --git a/src/views/claimAndRefund/secondStore/secondStore.vue b/src/views/claimAndRefund/secondStore/secondStore.vue index 4890ef0..bb33e29 100644 --- a/src/views/claimAndRefund/secondStore/secondStore.vue +++ b/src/views/claimAndRefund/secondStore/secondStore.vue @@ -1,21 +1,12 @@