From b7821eb5ef53e75fb90e8d8b129a2bd7709f1353 Mon Sep 17 00:00:00 2001 From: xjh <2423579486@qq.com> Date: Thu, 3 Aug 2023 10:49:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=AE=8C=E5=96=84=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=9D=97=E3=80=81=E4=BB=A3=E7=A0=81=E5=9D=97=E7=B1=BB=E7=9B=AE?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/index/code/code_module/index.vue | 8 ++++++-- .../AddCodeModuleCategoryDialog.vue | 2 +- .../EditCodeModuleCategoryDialog.vue | 4 ++-- .../index/code/code_module_category/index.vue | 7 +++++-- .../index/customer/customer_message/index.vue | 19 +++++++++++++++++-- 5 files changed, 31 insertions(+), 9 deletions(-) diff --git a/src/pages/index/code/code_module/index.vue b/src/pages/index/code/code_module/index.vue index 32f0681..7581ede 100644 --- a/src/pages/index/code/code_module/index.vue +++ b/src/pages/index/code/code_module/index.vue @@ -284,21 +284,24 @@ function handleAudit(row) { const Ids = row.code_module_guid || selectionData.value.map(v => v.code_module_guid).join() console.log(Ids); - ElMessageBox.confirm("是否通过审核？", "系统提示", { + ElMessageBox.prompt("是否通过审核？
(可在下方输入框填写审核结果消息附言)", "系统提示", { distinguishCancelAndClose: true, + dangerouslyUseHTMLString: true, confirmButtonText: '通过', cancelButtonText: '驳回', type: "warning", }) - .then(async () => { + .then(async (info) => { AuditData.code_module_audit = 2 AuditData.code_module_guid = Ids + AuditData.ps = info.value Audit() }) .catch((action) => { if (action == 'cancel') { AuditData.code_module_audit = 3 AuditData.code_module_guid = Ids + AuditData.ps = info.value Audit() // console.log("拒绝"); } @@ -314,6 +317,7 @@ async function Audit() { if (res.code == 0) { AuditData.code_module_audit = null AuditData.code_module_guid = null + AuditData.ps = null // ElMessageBox.alert(res.msg, "受理信息", { // dangerouslyUseHTMLString: true, // confirmButtonText: "确定", diff --git a/src/pages/index/code/code_module_category/components/AddCodeModuleCategoryDialog.vue b/src/pages/index/code/code_module_category/components/AddCodeModuleCategoryDialog.vue index 1806a8a..2e31163 100644 --- a/src/pages/index/code/code_module_category/components/AddCodeModuleCategoryDialog.vue +++ b/src/pages/index/code/code_module_category/components/AddCodeModuleCategoryDialog.vue @@ -112,7 +112,7 @@ async function getCustomerOptions() { //获取代码块类目树形列表 const dataList = ref([]) async function getList() { - await getCodeModuleCategoryList({ all: true }).then((res) => { + await getCodeModuleCategoryList({ all: true ,code_module_category_audit : 2}).then((res) => { if (res.code == 0) { dataList.value = res.data } diff --git a/src/pages/index/code/code_module_category/components/EditCodeModuleCategoryDialog.vue b/src/pages/index/code/code_module_category/components/EditCodeModuleCategoryDialog.vue index 6c52e48..5116f39 100644 --- a/src/pages/index/code/code_module_category/components/EditCodeModuleCategoryDialog.vue +++ b/src/pages/index/code/code_module_category/components/EditCodeModuleCategoryDialog.vue @@ -107,10 +107,10 @@ async function getCustomerOptions() { customerOptionList.value = res.data }) } - +//获取代码块类目树形列表 const dataList = ref([]) async function getList() { - await getCodeModuleCategoryList({ all: true }).then((res) => { + await getCodeModuleCategoryList({ all: true ,code_module_category_audit : 2}).then((res) => { if (res.code == 0) { dataList.value = res.data } diff --git a/src/pages/index/code/code_module_category/index.vue b/src/pages/index/code/code_module_category/index.vue index 594f474..6248be7 100644 --- a/src/pages/index/code/code_module_category/index.vue +++ b/src/pages/index/code/code_module_category/index.vue @@ -239,16 +239,18 @@ const handleDelete = data => { //审核数据 const handleAudit = data => { let code_module_category_guid = data.map(v => v.code_module_category_guid).join() - ElMessageBox.confirm("是否通过审核？", "系统提示", { + ElMessageBox.prompt("是否通过审核？
(可在下方输入框填写审核结果消息附言)", "系统提示", { distinguishCancelAndClose: true, + dangerouslyUseHTMLString: true, confirmButtonText: '通过', cancelButtonText: '驳回', type: "warning", }) - .then(async () => { + .then(async (info) => { const res = await auditCodeModuleCategory({ code_module_category_guid: code_module_category_guid, code_module_category_audit: 2, + ps: info.value }); if (res) { getList() @@ -259,6 +261,7 @@ const handleAudit = data => { const res = await auditCodeModuleCategory({ code_module_category_guid: code_module_category_guid, code_module_category_audit: 3, + ps: info.value }); if (res) { getList() diff --git a/src/pages/index/customer/customer_message/index.vue b/src/pages/index/customer/customer_message/index.vue index a21fa89..9d1fe04 100644 --- a/src/pages/index/customer/customer_message/index.vue +++ b/src/pages/index/customer/customer_message/index.vue @@ -54,6 +54,21 @@ + + +