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

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

@@ -745,16 +745,13 @@
                                 <td colspan="2" class="bg-fa">事业单位行文</td>
                                 <td colspan="5">
                                     <div class="flex justify-between" style="vertical-align:middle;width: 98%;border: black 1px;" align="right">
+                                        <a id="addtachment" style="margin-left:15px; width: 75%;overflow: hidden;text-overflow:ellipsis;white-space: nowrap;text-align: left;line-height: 34px;"></a>
                                         <div class="flex align-center">
-<!--                                            <input type="text" style="font-size: 0" οnkeydοwn="return false;"-->
-<!--                                                   οnpaste="return false;" class="form-control">-->
                                             <label class="input-group-btn" style="display: none">
                                                 <button type="button" class="btn btn-default">
                                                     <span class="glyphicon glyphicon glyphicon-trash"></span>
                                                 </button>
                                             </label>
-                                            <a id="addtachment" style="left:15px; width: 95%;overflow: hidden;line-height: 34px;margin-left: 15px;
-                                          text-overflow:ellipsis;white-space: nowrap;text-align: left;"></a>
                                         </div>
                                     </div>
                                 </td>

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

@@ -645,6 +645,7 @@
                                 <td colspan="2" class="bg-fa">事业单位附件</td>
                                 <td colspan="5">
                                     <div class="flex justify-between" style="vertical-align:middle;width: 98%;border: black 1px;" align="right">
+                                        <a id="addtachment" style="margin-left:15px; width: 75%;overflow: hidden;text-overflow:ellipsis;white-space: nowrap;text-align: left;line-height: 34px;"></a>
                                         <div class="flex align-center">
                                             <input type="text" class="form-control" οnkeydοwn="return false;" οnpaste="return false;"   style="font-size: 0">
                                             <label class="input-group-btn" style="display: none" >
@@ -654,13 +655,11 @@
                                             </label>
                                             <label class="input-group-btn">
                                             </label>
-                                            <a id="addtachment" style="left:15px; width: 95%;overflow: hidden;line-height: 34px;margin-left: 15px;
-                                          text-overflow:ellipsis;white-space: nowrap;text-align: left;"></a>
                                         </div>
                                     </div>
                                 </td>
                                 <td colspan="2" class="bg-fa">事业单位备注</td>
-                                <td colspan="5"><input id="remark" th:field="*{remark}" readonly name="note" class="form-control" type="text"></td>
+                                <td colspan="5"><input style="background-color: white;" id="remark" th:field="*{remark}" readonly name="note" class="form-control" type="text"></td>
                             </tr>
                             <!--                            <tr th:if="${deptCategory} eq '4'">-->
                             <tr th:if="${deptCategory} eq '4'">