Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html

@@ -1547,32 +1547,6 @@
         return year + '-' + month + '-' + day
     }
     document.querySelector('#entryDate').innerHTML ='检查日期：' + conversionDate(new Date(document.querySelector('#entryDate').innerHTML))
-    // //领导意见
-    // var examinestateDatas = [[${@dict.getType('sys_examine_state')}]];
-    // var examinestateToFind = document.querySelector('#examinestate').innerHTML;
-    // const foundObject = examinestateDatas.find(obj => obj.dictValue === examinestateToFind);
-    // const result = foundObject ? foundObject.dictLabel : "";
-    // document.querySelector('#examinestate').innerHTML = result
-    // //工作交接
-    // var workstateData = [[${@dict.getType('sys_user_work')}]];
-    // var workstateToFind = document.querySelector('#workstate').innerHTML;
-    // var workstateObject = workstateData.find(obj => obj.dictValue === workstateToFind);
-    // var workstateresult = workstateObject ? workstateObject.dictLabel : "";
-    // document.querySelector('#workstate').innerHTML = workstateresult
-    // function ChangeRowspanHiddenData()
-    // {
-    //     var node;
-    //     var params=["r2","r7","r9","r13"];
-    //     for (var i = 0;i < params.length; i++)
-    //     {
-    //         node = document.getElementById(params[i]);
-    //         if (node != null)
-    //         {
-    //             node.style.display = "";
-    //         }
-    //     }
-    // }
-    // ChangeRowspanHiddenData();
 </script>
 </body>