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

ruoyi-admin/src/main/resources/static/css/style.css

@@ -7154,6 +7154,16 @@ body.rtls .top-navigation .footer.fixed, body.rtls.top-navigation .footer.fixed
   padding: 0 12px;
 }
 
+.select-bg-blue{
+  font-size: 10px;
+  height: 24px;
+  padding: 0 8px;
+  background: rgba(67, 119, 254, 0.1);
+  border-radius: 24px;
+  color: #4377FE;
+  border: none;
+}
+
 .border-right-blue{
   border-right: 1px solid #4377FE;
 }

ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js

@@ -629,7 +629,7 @@
             		return [];
                 } else {
             		if(parent.document.getElementById("postIframe")){
-						parent.document.getElementById("postIframe").style.height = ((80 * (data.length + 1)) + 100) + 'px';
+						parent.document.getElementById("postIframe").style.height = ((80 * (data.length + 1)) + 200) + 'px';
 					}
                     return data;
                 }

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

@@ -454,7 +454,7 @@
             <div class="flex flex-direction align-center justify-between pd-28-24 bg-9ac" style="width: 470px;height: 568px;">
                 <h3 style="font-weight: bold">变动人员名单</h3>
                 <div class="bg-white width-100 position-relative flex justify-around flex-direction" style="padding: 30px 0;height: 386px;width: 276px">
-                    <img style="width: 100%;height: 324px;object-fit: cover;" src="../../../../../imgs/img_3.png">
+                  <img style="width: 100%;height: 324px;object-fit: cover;" src="../../../../../imgs/img_3.png">
                   <a href="javascript:void(0)" onclick="checkSave(2)" class="btn btn-bg-gray border-radius-50 position-absolute color-white flex align-center" style="right: 20px; bottom: 20px">
                     <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="currentColor" class="bi bi-search margin-r-8" viewBox="0 0 16 16">
                       <path d="M11.742 10.344a6.5 6.5 0 1 0-1.397 1.398h-.001c.03.04.062.078.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1.007 1.007 0 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0z"/>

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

@@ -493,7 +493,7 @@
                     </div>
                     <div class="flex flex-direction align-center justify-between pd-28-24 bg-9ac" style="width: 470px;height: 568px;">
                         <h3 style="font-weight: bold">变动人员名单</h3>
-                        <div class="bg-white width-100 position-relative flex justify-around flex-direction" style="padding: 30px 0;height: 386px;width: 276px">
+                        <div class="bg-white width-100 position-relative flex justify-around flex-direction" style="padding: 30px 0;height: 386px;width: 393px">
                             <img style="width: 100%;height: 324px;object-fit: cover;" src="../../../../../imgs/img_3.png">
                             <a href="javascript:void(0)" onclick="showbdrymd()" class="btn btn-bg-gray border-radius-50 position-absolute color-white flex align-center" style="right: 20px; bottom: 20px">
                                 <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="currentColor" class="bi bi-search margin-r-8" viewBox="0 0 16 16">
@@ -502,7 +502,6 @@
                                 查看大图
                             </a>
                         </div>
-
                         <div class="flex align-center">
                             <button type="button" class="btn btn-bg-blue padding-lr-36 margin-lr-10 flex align-center" onclick="showbdrymd(true)">
                                 <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="currentColor" class="bi bi-printer margin-r-8" viewBox="0 0 16 16">
@@ -533,9 +532,9 @@
                     <div>
                         <table border="0" align="center" cellspacing="0" class="myTable">
                             <tr th:if="${attritionFlag} == false">
-                                <td colspan="2"><span style="color: red; ">*</span>去文文号：</td>
+                                <td colspan="2"><span style="color: red;margin-right: 5px;">*</span>去文文号：</td>
                                 <td colspan="5"><input id="qwwh" name="qwwh" th:value="${declaration.qwwh}" placeholder="请填写去文文号"></td>
-                                <td colspan="2"><span style="color: red; ">*</span>去文标题：</td>
+                                <td colspan="2"><span style="color: red;margin-right: 5px;">*</span>去文标题：</td>
                                 <td colspan="5"><input id="qwbt" name="qwbt" th:value="${declaration.qwbt}" placeholder="请填写去文标题"></td>
                             </tr>
                             <tr>

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

@@ -556,7 +556,7 @@
                                         </div>
                                         <div class="flex flex-direction align-center justify-between pd-28-24 bg-9ac" style="width: 470px;height: 568px;">
                                             <h3 style="font-weight: bold">变动人员名单</h3>
-                                            <div class="bg-white width-100 position-relative flex justify-around flex-direction" style="padding: 30px 0;height: 386px;width: 276px">
+                                            <div class="bg-white width-100 position-relative flex justify-around flex-direction" style="padding: 30px 0;height: 386px;width: 393px">
                                                 <img style="width: 100%;height: 324px;object-fit: cover;" src="../../../../../imgs/img_3.png">
                                                 <a href="javascript:void(0)" onclick="showbdrymd()" class="btn btn-bg-gray border-radius-50 position-absolute color-white flex align-center" style="right: 20px; bottom: 20px">
                                                     <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="currentColor" class="bi bi-search margin-r-8" viewBox="0 0 16 16">

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

@@ -103,18 +103,18 @@
                         value = disposeUrl(value, "SYDW"), "utf-8";
                         var file;
                         if (userRoleId===103 && type!=1){
-                             file = "<button type='button' id='uploadBtn'  onclick='uploadFileCheckTable(this)'>选择</button><input id='attachment' declarationid='"+row.declarationId+"' multiple accept='.pdf,.png,.jpg' type='file' style='display: none;' onchange='uploadFile(this,2)'>&nbsp;" +
-                                "<a id='fileName' href='###'>未上传文件</a>&nbsp;&nbsp;<a id='remove_a' style='display: none' onclick='removeFileUrl(this)'><i style='color: #CD4528 ;' class='fa fa-remove'></i></a>"
+                             file = "<button type='button' id='uploadBtn' class='select-bg-blue' onclick='uploadFileCheckTable(this)'>选择</button><input id='attachment' declarationid='"+row.declarationId+"' multiple accept='.pdf,.png,.jpg' type='file' style='display: none;' onchange='uploadFile(this,2)'>" +
+                                "<a id='fileName' class='color-999' style='display: block;margin-top: 4px' href='###'>未上传文件</a><a id='remove_a' style='display: none' onclick='removeFileUrl(this)'><i style='color: #CD4528 ;' class='fa fa-remove'></i></a>"
                             if($.common.isNotEmpty(value)){
-                                file = "<button type='button' id='uploadBtn'  onclick='uploadFileCheckTable(this)'>选择</button><input multiple accept='.pdf,.png,.jpg' id='attachment' declarationid='"+row.declarationId+"' type='file' style='display: none;' onchange='uploadFile(this,2)' fileUrl='" +value + "'>&nbsp;" +
-                                    "<a id='fileName' href='###' onclick='openPDF(\"" + encodeURI(value, "utf-8") + "\")' >" + getFileName(value) +"</>"
+                                file = "<button type='button' id='uploadBtn' class='select-bg-blue' onclick='uploadFileCheckTable(this)'>选择</button><input multiple accept='.pdf,.png,.jpg' id='attachment' declarationid='"+row.declarationId+"' type='file' style='display: none;' onchange='uploadFile(this,2)' fileUrl='" +value + "'>" +
+                                    "<a id='fileName' href='###' style='display: block;margin-top: 4px' onclick='openPDF(\"" + encodeURI(value, "utf-8") + "\")' >" + getFileName(value) +"</>"
                             }
                         }else {
-                            file = "<input id='attachment' declarationid='"+row.declarationId+"' multiple accept='.pdf,.png,.jpg' type='file' style='display: none;' onchange='uploadFile(this,2)'>&nbsp;" +
-                                "<a id='fileName' href='###'>未上传文件</a>&nbsp;&nbsp;<a id='remove_a' style='display: none' onclick='removeFileUrl(this)'><i style='color: #CD4528 ;' class='fa fa-remove'></i></a>"
+                            file = "<input id='attachment' declarationid='"+row.declarationId+"' class='select-bg-blue' multiple accept='.pdf,.png,.jpg' type='file' style='display: none;' onchange='uploadFile(this,2)'>" +
+                                "<a id='fileName' class='color-999' style='display: block;margin-top: 4px' href='###'>未上传文件</a><a id='remove_a' style='display: none' onclick='removeFileUrl(this)'><i style='color: #CD4528 ;' class='fa fa-remove'></i></a>"
                             if($.common.isNotEmpty(value)){
-                                file = "<input multiple accept='.pdf,.png,.jpg' id='attachment' declarationid='"+row.declarationId+"' type='file' style='display: none;' onchange='uploadFile(this,2)' fileUrl='" +value + "'>&nbsp;" +
-                                    "<a id='fileName' href='###' onclick='openPDF(\"" + encodeURI(value, "utf-8") + "\")' >" + getFileName(value) +"</>"
+                                file = "<input multiple accept='.pdf,.png,.jpg' id='attachment' declarationid='"+row.declarationId+"' type='file' style='display: none;' onchange='uploadFile(this,2)' fileUrl='" +value + "'>" +
+                                    "<a id='fileName' href='###' style='display: block;margin-top: 4px' onclick='openPDF(\"" + encodeURI(value, "utf-8") + "\")' >" + getFileName(value) +"</>"
                             }
                         }
                         return file;