Переглянути джерело

Merge branch 'appeal0121' into test

1178232204@qq.com 3 роки тому
батько
коміт
673a835654

+ 6 - 6
src/css/qcScore.less

@@ -891,12 +891,12 @@
     box-sizing: border-box;
   }
 }
-.modal .modal-footer a.cancel {
-  display: none;
-  color: #ff4d4f;
-  border-color: #ff4d4f;
-  margin-right: 16px;
-}
+// .modal .modal-footer a.cancel {
+//   display: none;
+//   color: #ff4d4f;
+//   border-color: #ff4d4f;
+//   margin-right: 16px;
+// }
 .checkTipsBox {
   width: 184px;
   height: 112px;

+ 3 - 3
src/html/appealExamine.html

@@ -14,7 +14,7 @@
                 <input type="radio" name="status" value="1" class="radio" />修改
             </div>
             <p class="item"><span class="title">质控条目:</span><input class="inp" disabled value="${casesEntryName}" /></p>
-            <p class="item"><span class="title"><i class="required">*</i>提示信息:</span><input class="inp case endis msg" disabled value="${msg}" /></p>
+            <p class="item"><span class="title"><i class="required">*</i>提示信息:</span><input class="inp case endis msg" disabled maxlength="100" value="${msg}" /></p>
             <p class="item"><span class="title">分值:</span><input class="inp endis score" disabled value="${value}" maxlength="100" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,1})?).*$/g, '$1')"/></p>
             <p class="item"><span class="title">备注:</span><input class="inp endis explainInfo" disabled value="${explainInfo}" maxlength="255"/></p>
             <p class="warning"><span></span><span class="red">处理结果不能为空~</span></p>
@@ -25,7 +25,7 @@
         <div class="appeal-box appealAdd">
             <p class="item"><span class="title">处理方式:</span>新增</p>
             <p class="item"><span class="title">质控条目:</span><input class="inp" disabled value="${casesEntryName}" /></p>
-            <p class="item"><span class="title"><i class="required">*</i>提示信息:</span><input class="inp msg" value="${msg}" /></p>
+            <p class="item"><span class="title"><i class="required">*</i>提示信息:</span><input class="inp msg" value="${msg}" maxlength="100"/></p>
             <p class="item"><span class="title">分值:</span><input class="inp score"  value="${value}" maxlength="100" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,1})?).*$/g, '$1')"/></p>
             <p class="item"><span class="title">备注:</span><input class="inp explainInfo"  value="${explainInfo}" maxlength="255"/></p>
             <p class="warning"><span></span><span class="red">处理结果不能为空~</span></p>
@@ -36,7 +36,7 @@
         <div class="appeal-box">
             <p class="item"><span class="title">处理方式:</span>恢复</p>
             <p class="item"><span class="title">质控条目:</span><input class="inp" disabled value="${casesEntryName}" /></p>
-            <p class="item"><span class="title"><i class="required">*</i>提示信息:</span><input class="inp msg" disabled value="${msg}" /></p>
+            <p class="item"><span class="title"><i class="required">*</i>提示信息:</span><input class="inp msg" disabled value="${msg}" maxlength="100"/></p>
             <p class="item"><span class="title">分值:</span><input class="inp score" disabled value="${value}" /></p>
             <p class="item"><span class="title">备注:</span><input class="inp explainInfo" disabled value="${explainInfo}" maxlength="255" /></p>
         </div>

+ 1 - 1
src/html/appealInit.html

@@ -42,7 +42,7 @@
                     </span>
                     <span class="filter">查询</span>
                     <span class="filterclear abnormalClear filterclearT">重置</span>
-                    <span class="export">导出</span>
+                    <!-- <span class="export">导出</span> -->
                 </div>
                 <a href="javascript:void(0);" class="filter-toggler up" id="filterToggler">展开筛选</a>
                 <div class="toggle-item clearfix">

+ 1 - 1
src/html/appealUserPage.html

@@ -215,7 +215,7 @@
                 <input type="text" class="flaw-drop-input ellipsis"/>
                 <ul></ul>
             </div>
-            <p class="exist-item"><span style="margin-right: 16px;">提示信息:</span><input title="${msg}" class="ellipsis" id="addQcMsg" type="text" value="${msg}" /></p>
+            <p class="exist-item"><span style="margin-right: 16px;"><i class="required">*</i>提示信息:</span><input title="${msg}" class="ellipsis" disabled id="addQcMsg" type="text" value="${msg}" /></p>
             <p class="exist-item"><span><i class="required">*</i>分值:</span> <input id="addQcScore" type="text" value="${score}" disabled onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,1})?).*$/g, '$1')"/></p>
             <p class="exist-item"><span style="margin-right: 16px;">备注:</span><input title="${explainInfo}" class="ellipsis" id="addQcInfo" type="text" value="${explainInfo}" autocomplete="off"/></p>
             <p><span><i class="required">*</i>申诉说明: </span><textarea  id="addQcEx" class="textarea-text" cols="40" rows="6"></textarea></p>