问题修改

src/css/appealExamine.less

@@ -152,10 +152,6 @@ h2 {
       text-align: right;
       display: inline-block;
     }
-    .text{
-      position: absolute;
-      top: 0;
-    }
     .inp {
       border: 1px solid #e2e5ef;
       height: 24px;
@@ -168,7 +164,7 @@ h2 {
       overflow-y: auto;
       border: 1px solid #e2e5ef;
       resize:none;
-      margin-left: 80px;
+      vertical-align: top;
     }
   }
 }

src/css/appealUserPage.less

@@ -1029,6 +1029,8 @@
   border:1px #E2E5EF solid;
   vertical-align: top;
   padding: 10px;
+  resize: none;
+  overflow-y: auto;
 }
 .modal .modal-body{
   padding:20px 22px 10px;

src/css/common.less

@@ -1,4 +1,7 @@
 @import "./reset.less";
+.container{
+  overflow-y: hidden;
+}
 .ellipsis {
   overflow: hidden;
   text-overflow: ellipsis;

src/html/appealExamine.html

@@ -7,7 +7,7 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>病历质控申诉发起</title>
     <script type="text/html" id="appealDel">
-        <div class="appeal-box">
+        <div class="appeal-box appealDel">
             <div class="item">
                 <span class="title">处理方式: </span>
                 <input type="radio" name="status" value="2" class="radio" checked/>删除 
@@ -16,17 +16,19 @@
             <p class="item"><span class="title">质控条目：</span><input class="inp" disabled value="${casesEntryName}" /></p>
             <p class="item"><span class="title">提示信息：</span><input class="inp case endis msg" disabled value="${msg}" /></p>
             <p class="item"><span class="title">分值：</span><input class="inp endis score" disabled value="${value}" /></p>
-            <p class="item"><span class="title">备注：</span><input class="inp endis explainInfo" disabled value="${explainInfo}"/></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">支持≥0且≤100的数字输入，最多保留小数点后1位~</span></p>
         </div>
     </script>
 
     <script type="text/html" id="appealAdd">
-        <div class="appeal-box">
+        <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">提示信息：</span><input class="inp msg" value="${msg}" /></p>
             <p class="item"><span class="title">分值：</span><input class="inp score"  value="${value}" /></p>
-            <p class="item"><span class="title">备注：</span><input class="inp explainInfo"  value="${explainInfo}"/></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">支持≥0且≤100的数字输入，最多保留小数点后1位~</span></p>
         </div>
     </script>
 
@@ -36,7 +38,7 @@
             <p class="item"><span class="title">质控条目：</span><input class="inp" disabled value="${casesEntryName}" /></p>
             <p class="item"><span class="title">提示信息：</span><input class="inp msg" disabled value="${msg}" /></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}"/></p>
+            <p class="item"><span class="title">备注：</span><input class="inp explainInfo" disabled value="${explainInfo}" maxlength="255" /></p>
         </div>
     </script>
 

src/html/appealUserPage.html

@@ -158,7 +158,7 @@
                 {{/if}}
                 {{if exampleStatus!=="0"}}
                 <div class="oper fr">
-                    <a class="edit-flaw blue" code="${id}" href="javascript:void(0);" style="margin-right: 18px;">申诉11</a>
+                    <a class="edit-flaw blue" code="${id}" href="javascript:void(0);" style="margin-right: 18px;">申诉</a>
                 </div>
                 {{/if}}
             </div>
@@ -190,7 +190,7 @@
                 <span type="text" class="checker-drop-input ellipsis"></span>
                 <ul></ul>
             </div>
-            <p><span><i class="required">*</i>申诉说明: </span><textarea  id="qcInfo" class="textarea-text" cols="40" rows="6"></textarea></p>
+            <p><span><i class="required">*</i>申诉说明: </span><textarea  id="qcInfo" class="textarea-text" cols="38" rows="6"></textarea></p>
             <p class="warning"><span></span><span class="red">申诉说明不能为空~</span></p>
         </div>
     </script>
@@ -215,7 +215,7 @@
                 <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><i class="required">*</i>分值:</span> <input id="addQcScore" type="text" value="${score}" /></p>
+            <p class="exist-item"><span><i class="required">*</i>分值:</span> <input id="addQcScore" type="text" value="${score}" 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>
             <p class="warning"><span></span><span class="red">支持≥0的数字输入，最多保留小数点后1位~</span></p>

src/js/appealCheck.js

@@ -54,7 +54,7 @@ function getTabData(activePage) {
         current: activePage,
         deptId: deptId.trim(),
         deptName: deptName == "全部" ? "" : deptName || '',
-        casesName: casesName == "全部" ? "" : casesName || '',
+        modeName: casesName == "全部" ? "" : casesName || '',
         operationType: operationType,
         state: state,
         size: 15,

src/js/appealExamine.js

@@ -52,7 +52,7 @@ function getApprovedView() {
         if (res.data.code == '0') {
             data = res.data.data.data
             appealExamineRecordDTOList = {
-                casesEntryName:data.qcresultDetailMsg,
+                casesEntryName: data.qcresultDetailMsg,
                 value: data.qcresultDetaiValue,
                 msg: data.appealExamineRecordDTOList[0].msg,
                 explainInfo: data.appealExamineRecordDTOList[0].appealExplain,
@@ -152,8 +152,8 @@ function getHistory(data) {
             <p class="con-title">操作类型：${item.appealOperationType == 0 ? '删改条目' : item.appealOperationType == 1 ? '新增已有条目' : item.appealOperationType == 2 ? '新增缺失条目' : '恢复条目'}</p>
             <p class="con-title">申诉说明：${item.appealExplain || '-'}</p>
             ${item.exampleStatus == 2 ?
-                `<p class="con-title" style="border-top: 1px solid #333;margin-top: 10px;padding-top: 10px;">审核时间：${item.appealExamineDate || '-'}</p>
-                <p class="con-title">申诉结果：审核通过</p>
+                `<p class="con-title" style="border-top: 1px solid #333;margin-top: 10px;padding-top: 10px;"><span>审核时间：${item.appealExamineDate || '-'}</span><span>审核人：${item.checkName || '-'}</span></p>
+                <p class="con-title">审核结果：审核通过</p>
                 <p class="con-title">处理方式：${item.exampleOperation == 1 ? '修改' : item.exampleOperation == 2 ? '删除' : item.exampleOperation == 3 ? '新增已有' : item.exampleOperation == 4 ? '新增缺失' : '恢复条目'}</p>
                 <p class="con-title">质控条目：${item.casesEntryName || '-'}</p>
                 <p class="con-title">提示信息：${item.msg || '-'}</p>
@@ -242,12 +242,26 @@ function approved(type) {
             appealInfo.qcResultAlgVO.score = $('.score').val()
             appealInfo.qcResultAlgVO.explainInfo = $('.explainInfo').val()
             appealInfo.qcResultAlgVO.msg = $('.msg').val()
+            if (/^[0-9]\d*$|^[0-9]\d*(.\d)?$/.test(appealInfo.qcResultAlgVO.score) && appealInfo.qcResultAlgVO.score <= 100) {
+                $(".appealDel .warning").hide();
+            } else {
+                $(".appealDel .warning .red").text("支持≥0且≤100的数字输入，最多保留小数点后1位~");
+                $(".appealDel .warning").show();
+                return;
+            }
         }
     } else if (type == 2) {
         appealInfo.exampleOperation = 3
         appealInfo.qcResultAlgVO.score = $('.score').val()
         appealInfo.qcResultAlgVO.explainInfo = $('.explainInfo').val()
         appealInfo.qcResultAlgVO.msg = $('.msg').val()
+        if (/^[0-9]\d*$|^[0-9]\d*(.\d)?$/.test(appealInfo.qcResultAlgVO.score) && appealInfo.qcResultAlgVO.score <= 100) {
+            $(".appealAdd .warning").hide();
+        } else {
+            $(".appealAdd .warning .red").text("支持≥0且≤100的数字输入，最多保留小数点后1位~");
+            $(".appealAdd .warning").show();
+            return;
+        }
     } else if (type == 3) {
         appealInfo.exampleOperation = 4
         appealInfo.processResult = $(".textarea").val()
@@ -262,8 +276,11 @@ function approved(type) {
             $(".appealDef .warning").show();
             return
         }
+
     } else if (type == 4) {
         appealInfo.exampleOperation = 5
+        appealInfo.qcResultAlgVO.score = $('.score').val()
+
     }
     const param = {
         'id': id,
@@ -324,10 +341,10 @@ function getAuditNumber() {
     return post(api.getAuditNumber, {}).then(res => {
         if (res.data.code == '0') {
             auditNumber = res.data.data.data > 99 ? '99+' : res.data.data.data
-            if(auditNumber == 0){
+            if (auditNumber == 0) {
                 $(".menu .page", parent.document).children('.reds').hide()
                 $(".menu .dian", parent.document).hide()
-            }else{
+            } else {
                 $(".menu .page", parent.document).children('.reds').html(auditNumber)
             }
         } else {

src/js/appealHistory.js

@@ -58,7 +58,7 @@ function getTabData(activePage) {
         current: activePage,
         deptId: deptId.trim(),
         deptName: deptName == "全部" ? "" : deptName || '',
-        casesName: moduleName == "全部" ? "" : moduleName || '',
+        modeName: moduleName == "全部" ? "" : moduleName || '',
         operationType: operationType,
         state: state,
         size: 15,
@@ -436,7 +436,8 @@ function addAppealInfo(data) {
         casesId:data.casesId,
         casesScore:data.casesScore,
         casesEntryId:data.casesEntryId,
-        qcresultDetaiValue:data.qcresultDetaiValue
+        qcresultDetaiValue:data.qcresultDetaiValue,
+        qcresultDetailMsg:data.qcresultDetailMsg
     }
     post(api.addAppealInfo, param).then(function (res) {
         if (res.data.code === '0') {
@@ -941,7 +942,7 @@ $((function ($) {
         const param = {
             deptId: deptId.trim(),
             deptName: deptName == "全部" ? "" : deptName || '',
-            casesName: moduleName == "全部" ? "" : moduleName || '',
+            modeName: moduleName == "全部" ? "" : moduleName || '',
             operationType: operationType,
             state: state,
             size: 15,

src/js/appealUserPage.js

@@ -197,7 +197,7 @@ $(function () {
         // global_activeTab=$(".sub-menu .page.active").attr("code");
         // initPatientInfo(info);
         // initContent(result.pageData);
-        initList(msg,null,1);
+        initList(msg, null, 1);
         initScoreItem(msg);
         global_flawData = msg;
         global_flawDataPay = drgs;
@@ -340,7 +340,7 @@ $(function () {
     }
   }
 
-  function initList(data, type,num) {
+  function initList(data, type, num) {
     //$("#flawTotalList").tmpl({title:"缺陷总览",data:data}).appendTo(".flaw-table");
     formatSpecPage(data, "缺陷总览", type);
     // $(".flaw-table").show();
@@ -352,7 +352,7 @@ $(function () {
       $(".flaw-table").show();
       $(".flaw-table .page-item[code=" + global_activeTab + "]").show();
     }
-    if(num){
+    if (num) {
       $(".flaw-table").show();
       $(".flaw-table .page-item[code=" + global_activeTab + "]").show();
     }
@@ -437,14 +437,14 @@ $(function () {
         "casesEntryMsg": info.msg,
         "casesEntryName": info.msg,
         "checkId": info.userId,
-        "casesId": info.casesId,
+        "modeId": info.modelId,
         "modeName": info.modelName,
         "remark": info.explainInfo,
         "value": info.score,
         "casesScore": info.caseScore,
         "msg": info.msg,
         "isReject": info.isReject,
-        "qcresultDetaiValue":info.score,
+        "qcresultDetaiValue": info.score,
       };
     } else {
       param = {
@@ -554,10 +554,9 @@ $(function () {
           workFlowNodeId: 1,
           casesScore: info.casesScore,
           casesEntryId: info.casesEntryId,
-          casesId: info.casesId,
           isReject: info.isReject,
           qcresultDetaiValue: info.score,
-          qcresultDetailMsg:info.standardMsg
+          qcresultDetailMsg: info.standardMsg
         };
         appealItem(obj);
       });
@@ -582,7 +581,6 @@ $(function () {
       flawDropEvent(".add-box .flaw-drop-input", getQcCasesEntry, selectFlaw);
       //分数输入验证
       $("#addQcScore").on("input", function () {
-        const val = $(this).val();
         if (/^[0-9]\d*$|^[0-9]\d*(.\d)?$/.test(val) && val <= 100) {
           $(".add-box .warning").hide();
         } else {