From 1dc5e2add1efa5d99b76843696aed21a5bebff6c Mon Sep 17 00:00:00 2001
From: xiong_cl <140612616@qq.com>
Date: Fri, 12 Apr 2024 16:05:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E6=97=B6=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/js/directory/directory.js          | 60 +++++++++++-------
 .../static/js/directory/reviewDirectory.js    | 61 ++++++++++++-------
 2 files changed, 79 insertions(+), 42 deletions(-)

diff --git a/shandan-control/src/main/resources/static/js/directory/directory.js b/shandan-control/src/main/resources/static/js/directory/directory.js
index 7509ee6..cf21f07 100644
--- a/shandan-control/src/main/resources/static/js/directory/directory.js
+++ b/shandan-control/src/main/resources/static/js/directory/directory.js
@@ -129,29 +129,47 @@ function startRender() {
                     showErrorMsg("请至少选择一条数据！");
                     return false;
                 }
-                layer.confirm('是否确定驳回该数据？', {}, function (index) {
-                    layer.close(index);
-                    reviewData();
-                })
-                function reviewData() {
-                    const ids = datas.map(data => data.directoryId);
-                    let param = {
-                        ids: ids.join(','),
-                        status: ReviewStatus.REJECTED,
-                        opinion: '',
-                        sendNotice: true,
-                    };
-                    $.post(`${ctx}/business/review/directory/file/change`, param, function (res) {
-                        if (res.flag) {
-                            showOkMsg('驳回成功');
-                            refreshPermis().then(() => {
-                                metaListTable.reloadTable();
-                            })
+                layer.open({
+                    type: 1,
+                    title: '驳回',
+                    area: ['auto'],
+                    btn: ['确定', '取消'],
+                    content: reviewLayerHtml,
+                    success: function (_layer, index) {
+                        reviewForm.render();
+                        reviewForm.on('submit(reviewForm)', function ({elem, field}) {
+                            const ids = datas.map(data => data.directoryId);
+                            console.log(field);
+                            let param = {
+                                ids: ids.join(','),
+                                status: ReviewStatus.REJECTED,
+                                opinion: field.opinion,
+                                sendNotice: true,
+                            };
+                            $.post(`${ctx}/business/review/directory/file/change`, param, function (res) {
+                                if (res.flag) {
+                                    showOkMsg('驳回成功');
+                                    layer.close(index);
+                                    refreshPermis().then(() => {
+                                        metaListTable.reloadTable();
+                                    })
+                                } else {
+                                    layer.msg('驳回失败' + res.msg);
+                                }
+                            });
+                            return false;
+                        });
+                    },
+                    yes: function () {
+                        let formData = reviewForm.val('reviewForm');
+                        if (formData.status) {
+                            $('#btn-submit').click();
                         } else {
-                            layer.msg('驳回失败' + res.msg);
+                            layer.msg('请选择审核操作选项！');
+                            return false;
                         }
-                    });
-                }
+                    }
+                });
             })
 
             reviewForm.on('radio(statusRadio)', function (data) {
diff --git a/shandan-control/src/main/resources/static/js/directory/reviewDirectory.js b/shandan-control/src/main/resources/static/js/directory/reviewDirectory.js
index 4879659..7e10930 100644
--- a/shandan-control/src/main/resources/static/js/directory/reviewDirectory.js
+++ b/shandan-control/src/main/resources/static/js/directory/reviewDirectory.js
@@ -105,29 +105,48 @@ function startRender() {
                     showErrorMsg("请至少选择一条数据！");
                     return false;
                 }
-                layer.confirm('是否确定驳回该数据？', {}, function (index) {
-                    layer.close(index);
-                    reviewData();
-                })
-                function reviewData() {
-                    const ids = datas.map(data => data.directoryId);
-                    let param = {
-                        ids: ids.join(','),
-                        status: ReviewStatus.REJECTED,
-                        opinion: '',
-                        sendNotice: true,
-                    };
-                    $.post(`${ctx}/business/review/directory/file/change`, param, function (res) {
-                        if (res.flag) {
-                            showOkMsg('驳回成功');
-                            refreshPermis().then(() => {
-                                metaListTable.reloadTable();
-                            })
+                layer.open({
+                    type: 1,
+                    title: '驳回',
+                    area: ['auto'],
+                    btn: ['确定', '取消'],
+                    content: reviewLayerHtml,
+                    success: function (_layer, index) {
+                        reviewForm.render();
+                        reviewForm.on('submit(reviewForm)', function ({elem, field}) {
+                            const ids = datas.map(data => data.directoryId);
+                            console.log(field);
+                            let param = {
+                                ids: ids.join(','),
+                                status: ReviewStatus.REJECTED,
+                                opinion: field.opinion,
+                                sendNotice: true,
+                            };
+                            $.post(`${ctx}/business/review/directory/file/change`, param, function (res) {
+                                if (res.flag) {
+                                    showOkMsg('驳回成功');
+                                    layer.close(index);
+                                    refreshPermis().then(() => {
+                                        metaListTable.reloadTable();
+                                    })
+                                } else {
+                                    layer.msg('驳回失败' + res.msg);
+                                }
+                            });
+                            return false;
+                        });
+                    },
+                    yes: function () {
+                        let formData = reviewForm.val('reviewForm');
+                        if (formData.status) {
+                            $('#btn-submit').click();
                         } else {
-                            layer.msg('驳回失败' + res.msg);
+                            layer.msg('请选择审核操作选项！');
+                            return false;
                         }
-                    });
-                }
+                    }
+                });
+
             })
 
             reviewForm.on('radio(statusRadio)', function (data) {