Merge branch 'cloud' of http://115.238.142.158:20182/Ahrs/AHRS into cloud

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

@@ -511,7 +511,7 @@
 
                                     actions.push("</div><div></div><div class='need-del-last-border' style='margin-top: 5px'>")
                                     if (row.declarationStatus == 1) {
-                                        actions.push('<a class="btn btn-text-gray border-right-gray" ' + editFlag + ' href="javascript:void(0)"  onclick="showcqgwb(\'' + row.declarationId + '\')">岗位设置备案表</a> ');
+                                        actions.push('<a class="btn btn-text-gray border-right-gray" ' + editFlag + ' href="javascript:void(0)"  onclick="showcqgwb(\'' + row.declarationId + '\')">拟超缺岗位表</a> ');
                                     }
                                     if(row.declarationStatus===dec_status.YWC) {
                                         if (row.declarationType.indexOf(dec_type.GWBD_ZY) !== -1 || row.declarationType.indexOf(dec_type.GWBD_GWBD) !== -1) {
@@ -654,8 +654,8 @@
                                         }
                                     }
                                     if (row.declarationStatus == 1) {
-                                        actions.push('<a class="btn btn-text-gray border-right-gray" ' + editFlag + ' href="javascript:void(0)"  onclick="showcqgwb(\'' + row.declarationId + '\')">岗位设置备案表</a> ');
-                                        actions.push('<a class="btn btn-text-gray border-right-gray" ' + editFlag + ' href="javascript:void(0)"  onclick="approvalSingAll(\'' + row.declarationId + '\', \'' + row.sign + '\'),downloadCQGW(\'' + row.declarationId + '\')">岗位设置备案表下载</a> ');
+                                        actions.push('<a class="btn btn-text-gray border-right-gray" ' + editFlag + ' href="javascript:void(0)"  onclick="showcqgwb(\'' + row.declarationId + '\')">拟超缺岗位表</a> ');
+                                        // actions.push('<a class="btn btn-text-gray border-right-gray" ' + editFlag + ' href="javascript:void(0)"  onclick="approvalSingAll(\'' + row.declarationId + '\', \'' + row.sign + '\'),downloadCQGW(\'' + row.declarationId + '\')">拟超缺岗位表下载</a> ');
                                     }
                                     if(row.declarationStatus != 2 && row.declarationStatus != 5){
                                         actions.push('<a class="btn btn-text-gray border-right-gray" '+editFlag+' href="javascript:void(0)"  onclick="downloadFileTr(\'' + row.declarationId + '\', \'' + row.declarationType + '\' ,false)">一键生成</a> ');
@@ -1040,7 +1040,7 @@
             //maxmin: true,
             //关闭遮罩
             shade: 0,
-            title: "查看岗位设置备案表",
+            title: "查看拟超缺岗位表",
             content: prefix + "/showcqgwb/" + declarationId,
             /*btn: ['关闭'],*/
             // 弹层外区域关闭

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

@@ -338,8 +338,8 @@
                                             actions.push('<a class="btn btn-text-gray border-right-gray" ' + editFlag + ' href="javascript:void(0)"  onclick="downloadFile(\'' + qrh + '\')">确认函下载</a> ');
                                         }
                                     }
-                                    actions.push('<a class="btn btn-text-gray border-right-gray" ' + editFlag + ' href="javascript:void(0)"  onclick="showcqgwb(\'' + row.declarationId + '\')">岗位设置备案表</a> ');
-                                    actions.push('<a class="btn btn-text-gray border-right-gray" ' + editFlag + ' href="javascript:void(0)"  onclick="downloadCQGW(\'' + row.declarationId + '\')">岗位设置备案表下载</a> ');
+                                    actions.push('<a class="btn btn-text-gray border-right-gray" ' + editFlag + ' href="javascript:void(0)"  onclick="showcqgwb(\'' + row.declarationId + '\')">拟超缺岗位表</a> ');
+                                    // actions.push('<a class="btn btn-text-gray border-right-gray" ' + editFlag + ' href="javascript:void(0)"  onclick="downloadCQGW(\'' + row.declarationId + '\')">拟超缺岗位表下载</a> ');
                                 }
                                 //合并后的申报，子申报
                                 if(!$.common.isEmpty(row.createBy) && !$.common.isEmpty(row.parentId)){
@@ -539,13 +539,26 @@
             declarationId = declarationIds[0]
         }
 
-        $.modal.confirm("确认拆分?", function () {
+        let html = "<div class='flex flex-direction align-center'><svg xmlns='http://www.w3.org/2000/svg' width='52' height='52' fill='currentColor' class='bi bi-question-circle-fill' style='margin-bottom: 20px;color: #d3ddfb;' viewBox='0 0 16 16'><path d='M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.496 6.033h.825c.138 0 .248-.113.266-.25.09-.656.54-1.134 1.342-1.134.686 0 1.314.343 1.314 1.168 0 .635-.374.927-.965 1.371-.673.489-1.206 1.06-1.168 1.987l.003.217a.25.25 0 0 0 .25.246h.811a.25.25 0 0 0 .25-.25v-.105c0-.718.273-.927 1.01-1.486.609-.463 1.244-.977 1.244-2.056 0-1.511-1.276-2.241-2.673-2.241-1.267 0-2.655.59-2.75 2.286a.237.237 0 0 0 .241.247zm2.325 6.443c.61 0 1.029-.394 1.029-.927 0-.552-.42-.94-1.029-.94-.584 0-1.009.388-1.009.94 0 .533.425.927 1.01.927z'/></svg><span>确认拆分?</span></div>"
+        layer.confirm(html, {
+            title: "系统提示",
+            skin: 'add-mask-class-two-btn',
+            btn: ['确认', '取消']
+        }, function (index) {
             var url = prefix + "/breakUp"
             var data = {
                 'parentId': declarationId
             }
             $.operate.post(url, data);
         });
+
+        // $.modal.confirm("确认拆分?", function () {
+        //     var url = prefix + "/breakUp"
+        //     var data = {
+        //         'parentId': declarationId
+        //     }
+        //     $.operate.post(url, data);
+        // });
     }
 
     /** 签收任务 */
@@ -583,7 +596,7 @@
             //maxmin: true,
             //关闭遮罩
             shade: 0,
-            title: "查看岗位设置备案表",
+            title: "查看拟超缺岗位表",
             content: prefix + "/showcqgwb/" + declarationId,
             /*btn: ['关闭'],*/
             // 弹层外区域关闭