主管部门已办合并办理界面取回弹窗修改

操作员待办合并办理界面提交弹窗修改

ruoyi-system/src/main/resources/templates/process/declaration/audit/czy/czyApprovalMergeS.html

@@ -907,9 +907,9 @@
                                     "declarationType":""
                                 },success: function (r) {
                                     if(r.code == 0){
-                                        layer.confirm("申请将提交至: <span style='color: red'>"+r.msg+"</span>", {
-                                                icon: 3,
-                                                area:[ (6+r.msg.length)*20 +'px','180px'],
+                                        let html = `<div class='flex flex-direction align-center'><h3>申请将提交至:</h3><img style="width: 48px;height: 110px;margin: 15px 0;object-fit: cover;" src="../../../../../imgs/img_mask_arrow.png"><span>${r.msg}</span></div>`;
+                                        layer.confirm(html, {
+                                                skin: 'add-mask-class',
                                                 title: "系统提示",
                                                 btn: ['确认并发送短信', '确认', '取消'],
                                                 btn3: function (index, layero) {

ruoyi-system/src/main/resources/templates/process/declaration/audit/zgbm/zgbmApprovalMergeDone.html

@@ -606,7 +606,7 @@
                             </tr>
                             <tr>
                                 <td colspan="2">审核意见:</td>
-                                <td colspan="12" style="text-align: left">[[${zgComment}]]<span style="">[[${zgbmczySubmitTime}]]</span></td>
+                                <td colspan="12" style="margin-left: 20px;text-align: left">[[${zgComment}]]<br><span style="">     [[${zgbmczySubmitTime}]]</span></td>
                             </tr>
 
 
@@ -1006,9 +1006,9 @@
                 "declarationType": ""
             }, success: function (r) {
                 if (r.code == 0) {
-                    layer.confirm("申请将从:<span style='color: red'> " + r.msg + "</span> 取回", {
-                        icon: 3,
-                        area: [(6 + r.msg.length) * 18 + 'px', '180px'],
+                    let html = `<div class='flex flex-direction align-center'><h3>申请将从:</h3><img style="width: 48px;height: 110px;margin: 15px 0;object-fit: cover;" src="../../../../../imgs/img_mask_arrow.png"><span>人事综合管理部门</span>取回</div>`;
+                    layer.confirm(html, {
+                        skin: 'add-mask-class2',
                         title: "系统提示",
                         btn: ['确认', '取消']
                     }, function (index) {