From 53ea6fa83e646f13240331c43e68c6366516730b Mon Sep 17 00:00:00 2001 From: x_z Date: Tue, 21 Mar 2023 16:55:07 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E9=A2=84=E8=AD=A6=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=202.=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=B7=BB=E5=8A=A0=E6=96=B9=E5=BC=8F=E5=92=8C?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=88=86=E7=A6=BB=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=BC=B9=E7=AA=97=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=80=BC=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=203.=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=A1=AE=E8=AE=A4=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/invRemindSet.js | 20 +- src/views/inventory/InvProducts.vue | 53 ++- src/views/inventory/addInvRemindSetDialog.vue | 212 +++++++++++ src/views/remind/addInvRemindSetDialog.vue | 339 ++++++++++++++++++ src/views/remind/invRemindMsg.vue | 128 +++++-- src/views/remind/invRemindSet.vue | 173 +++++---- src/views/remind/invRemindSetModify.vue | 104 ++---- 7 files changed, 861 insertions(+), 168 deletions(-) create mode 100644 src/views/inventory/addInvRemindSetDialog.vue create mode 100644 src/views/remind/addInvRemindSetDialog.vue diff --git a/src/api/system/invRemindSet.js b/src/api/system/invRemindSet.js index 32c32d6..c907fa6 100644 --- a/src/api/system/invRemindSet.js +++ b/src/api/system/invRemindSet.js @@ -10,16 +10,32 @@ export function getInvRemindSetList(params) { export function saveInvRemindSet(data, formName) { return axios({ - url: formName === "add"? "/udiwms/inv/remind/set/add" : "/udiwms/inv/remind/set/update", + url: formName === "add" ? "/udiwms/inv/remind/set/add" : "/udiwms/inv/remind/set/update", method: "post", data: data }); } -export function deleteInvRemindSet(data){ +export function deleteInvRemindSet(data) { return axios({ url: "/udiwms/inv/remind/set/delete", method: "post", data: data }); } + +export function getInfoByInvId(params) { + return axios({ + url: "/udiwms/inv/remind/set/getInfoByInvId", + method: "get", + params: params + }); +} + +export function batchAddInvRemindSet(data) { + return axios({ + url: "/udiwms/inv/remind/set/batchAddInvRemindSet", + method: "post", + data: data + }); +} diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue index e970daf..d06bfe5 100644 --- a/src/views/inventory/InvProducts.vue +++ b/src/views/inventory/InvProducts.vue @@ -135,12 +135,12 @@ border> + show-overflow-tooltip width="200"> + show-overflow-tooltip width="200"> - - + + @@ -151,13 +151,20 @@ width="180"> + width="200"> + width="200"> - + @@ -207,6 +228,7 @@ import {getInvProduct, deleteInvProduct, getProduct} from "@/api/inventory/invPo import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"; import {isBlank} from "@/utils/strUtil"; import invProductsDetail from "@/views/inventory/InvProductsDetail.vue"; +import addInvRemindSetDialog from "@/views/inventory/addInvRemindSetDialog.vue"; export default { name: "InvProducts", @@ -249,7 +271,9 @@ export default { supId: null, deptCode: null, invCode: null - } + }, + addInvRemindSetDialogVisible: null, + invId: null }; }, methods: { @@ -379,10 +403,19 @@ export default { }).catch((error) => { this.$message.error(error.message); }); - } + }, + invRemindSet(row) { + this.invId = row.id; + this.addInvRemindSetDialogVisible = true; + }, + closeRemindSetDialog() { + this.invId = null; + this.addInvRemindSetDialogVisible = false; + }, }, components: { - invProductsDetail + invProductsDetail, + addInvRemindSetDialog }, mounted() { document.body.ondrop = function (event) { diff --git a/src/views/inventory/addInvRemindSetDialog.vue b/src/views/inventory/addInvRemindSetDialog.vue new file mode 100644 index 0000000..cd7da55 --- /dev/null +++ b/src/views/inventory/addInvRemindSetDialog.vue @@ -0,0 +1,212 @@ + + + + + + diff --git a/src/views/remind/addInvRemindSetDialog.vue b/src/views/remind/addInvRemindSetDialog.vue new file mode 100644 index 0000000..fc46f6e --- /dev/null +++ b/src/views/remind/addInvRemindSetDialog.vue @@ -0,0 +1,339 @@ + + + + diff --git a/src/views/remind/invRemindMsg.vue b/src/views/remind/invRemindMsg.vue index 519bfc6..befd6f2 100644 --- a/src/views/remind/invRemindMsg.vue +++ b/src/views/remind/invRemindMsg.vue @@ -153,7 +153,7 @@ - + @@ -196,6 +196,77 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 取消 + 提交 + +
+ + { - let params = { - id: row.id, - handleMsg: value - }; - confirmMsg(params).then((res) => { - if (res.code === 20000) { - this.$message.success("已确认"); - this.getList(); - } else { - this.$message.error(res.message); - } - }) - }).catch(() => { - }); + this.rowData = row; + let typeName = this.typeMap[row.type]; + this.rowData.typeName = typeName; + this.handleMsg = null; + this.confirmMsgVisible = true; }, ignoreMsg(row) { this.ignoreVisible = true; @@ -425,7 +487,31 @@ export default { this.currentId = null; }) }, - + closeConfirmDialog() { + this.confirmMsgVisible = false; + this.rowData = {} + }, + updateHandleMsg() { + let params = { + id: this.rowData.id, + handleMsg: this.handleMsg + }; + confirmMsg(params).then((res) => { + if (res.code === 20000) { + this.rowData = {}; + this.handleMsg = null; + this.confirmMsgVisible = false; + this.$message.success("已确认"); + } else { + this.$message.error(res.message); + } + }).catch((error) => { + this.rowData = {}; + this.handleMsg = null; + this.confirmMsgVisible = false; + this.$message.error(error.message); + }) + }, statusFilterType(status) { const statusMap = { diff --git a/src/views/remind/invRemindSet.vue b/src/views/remind/invRemindSet.vue index e445901..0600f9a 100644 --- a/src/views/remind/invRemindSet.vue +++ b/src/views/remind/invRemindSet.vue @@ -1,53 +1,81 @@ - +