问题修改

src/html/appealExamine.html

@@ -14,9 +14,10 @@
                 <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">提示信息：</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 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>
         </div>
     </script>
 
@@ -24,9 +25,10 @@
         <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"><i class="required">*</i>提示信息：</span><input class="inp msg" value="${msg}" /></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>
         </div>
     </script>
 
@@ -34,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">提示信息：</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}" /></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>

src/html/appealUserPage.html

@@ -216,7 +216,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}" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,1})?).*$/g, '$1')"/></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>
             <p class="warning"><span></span><span class="red">支持≥0的数字输入，最多保留小数点后1位~</span></p>
@@ -228,6 +228,10 @@
             <p><span>申诉人: </span> ${claimantName}</p>
             <p><span>审核人: </span> ${checkName}</p>
             <p><span>操作类型: </span> ${appealOperationType == 0 ? '删改条目' : appealOperationType == 1 ? '新增已有条目' : appealOperationType == 2 ? '新增缺失条目' : '恢复条目'}</p>
+            <p><span>质控条目:</span>${casesEntryName}</p>
+            <p><span>提示信息:</span>${casesEntryMsg}</p>
+            <p><span>分值:</span>${value}</p>
+            <p><span>备注:</span>${appealRemark}</p>
             <p><span>申诉说明: </span> ${appealExplain}</p>
             {{if exampleStatus==='1'||exampleStatus==='2'}}
             <p class="check-item reject-item"><span>审核时间:</span>${appealExamineDate}</p>

src/html/qcScore.html

@@ -188,7 +188,7 @@
                 {{/if}}
                 {{if isDeleted==="N"}}
                 <div class="oper fr">
-                    {{if appealOperationType == "0"}}
+                    {{if exampleStatus == "0"}}
                     {{else}}
                     <a class="edit-flaw blue" code="${id}" href="javascript:void(0);" style="margin-right: 18px;">修改</a>
                     <a class="del-flaw red" code="${id}" href="javascript:void(0);">删除</a>

src/js/appealExamine.js

@@ -52,11 +52,12 @@ function getApprovedView() {
     return post(api.getApprovedView, param).then(res => {
         if (res.data.code == '0') {
             data = res.data.data
+            console.log();
             appealExamineRecordDTOList = {
-                casesEntryName: data.appealExamineRecordDTOList[0].casesEntryName,
-                value: data.appealExamineRecordDTOList[0].value,
-                msg: data.appealExamineRecordDTOList[0].casesEntryMsg,
-                explainInfo: data.appealExamineRecordDTOList[0].appealExplain,
+                casesEntryName: data.appealExamineRecordDTOList[data.appealExamineRecordDTOList.length-1].casesEntryName,
+                value: data.appealExamineRecordDTOList[data.appealExamineRecordDTOList.length-1].score,
+                msg: data.appealExamineRecordDTOList[data.appealExamineRecordDTOList.length-1].msg,
+                explainInfo: data.appealExamineRecordDTOList[data.appealExamineRecordDTOList.length-1].appealExplain,
             };
             appealInfo = {
                 exampleOperation: 2,
@@ -68,11 +69,11 @@ function getApprovedView() {
                 qcResultAlgVO: {
                     casesEntryId: casesEntryId,
                     id: data.qcresultDetailId,
-                    casesScore: data.appealExamineRecordDTOList[0].casesScore,
-                    msg: data.appealExamineRecordDTOList[0].msg,
+                    casesScore: data.appealExamineRecordDTOList[data.appealExamineRecordDTOList.length-1].casesScore,
+                    msg: data.appealExamineRecordDTOList[data.appealExamineRecordDTOList.length-1].msg,
                     score: data.qcresultDetaiValue,
-                    isReject: data.appealExamineRecordDTOList[0].isReject,
-                    explainInfo: data.appealExamineRecordDTOList[0].appealExplain,
+                    isReject: data.appealExamineRecordDTOList[data.appealExamineRecordDTOList.length-1].isReject,
+                    explainInfo: data.appealExamineRecordDTOList[data.appealExamineRecordDTOList.length-1].appealExplain,
                 }
             };
             $('.info').html('');
@@ -157,7 +158,7 @@ function getHistory(data) {
                 <p class="con-title">提示信息：${item.casesEntryMsg || '-'}</p>
                 <p class="con-title">分值：${item.value || '-'}</p>
                 <p class="con-title">备注：${item.appealRemark || '-'}</p>
-                `:""}
+                `: ""}
             <p class="con-title">申诉说明：${item.appealExplain || '-'}</p>
             ${item.exampleStatus == 2 ?
                 `<p class="con-title" ><span>审核时间：${item.appealExamineDate || '-'}</span><span>审核人：${item.checkName || '-'}</span></p>
@@ -221,10 +222,10 @@ $(document).on("click", ".btn-sure", (e) => {
 $(document).on("click", ".goback", (e) => {
     console.log(form);
     if (form == 1 || form == 2) {
-        $(parent.document).find("#contentIframe").attr("src", './appealCheck.html?page='+ page);
+        $(parent.document).find("#contentIframe").attr("src", './appealCheck.html?page=' + page);
     } else {
         console.log(123);
-        $(parent.document).find("#contentIframe").attr("src", './appealHistory.html?page='+ page);
+        $(parent.document).find("#contentIframe").attr("src", './appealHistory.html?page=' + page);
     }
 
 });
@@ -241,6 +242,7 @@ $(document).on("click", ".btn-cancel", (e) => {
 });
 //审核
 function approved(type) {
+    console.log(type);
     if (type == 1) {
         appealInfo.exampleOperation = $('input:radio:checked').val()
         if ($('input:radio:checked').val() == 2) {
@@ -250,12 +252,24 @@ function approved(type) {
             appealInfo.qcResultAlgVO.score = $('.score').val()
             appealInfo.qcResultAlgVO.explainInfo = $('.explainInfo').val()
             appealInfo.qcResultAlgVO.msg = $('.msg').val()
+            let val = $(".msg").val()
+            if (!val) {
+                $(".appealDel .warning .red").text("提示信息不能为空~");
+                $(".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()
+        let val = $(".msg").val()
+        if (!val) {
+            $(".appealAdd .warning .red").text("提示信息不能为空~");
+            $(".appealAdd .warning").show();
+            return
+        }
     } else if (type == 3) {
         appealInfo.exampleOperation = 4
         appealInfo.processResult = $(".textarea").val()
@@ -270,7 +284,6 @@ function approved(type) {
             $(".appealDef .warning").show();
             return
         }
-
     } else if (type == 4) {
         appealInfo.exampleOperation = 5
         appealInfo.qcResultAlgVO.score = $('.score').val()

src/js/appealUserPage.js

@@ -37,13 +37,10 @@ $(function () {
   let global_checkers = [];    //审核人列表
   getAllModules();
   getCheckUser(); //获取审核人列表
-  const form = getUrlArgObject("form");
-  const onAppeal = getCookie('checkAuth').indexOf('10')
+  const form = getUrlArgObject("form") || 0;
   window.document.title = "质控申诉-" + getUrlArgObject("name");
   //新增申诉点击事件
-  // if(onAppeal>0){
-  //   $(".add-flaw").hide()
-  // }
+
   $(".add-flaw").click(function () {
     showModal('2');
   });
@@ -368,12 +365,14 @@ $(function () {
 
   //评分项数据填充
   function initScoreItem(data) {
-
     $("#flaws .flaw-box").html("");
     for (let k in data) {
-      data[k][0].onAppeal = onAppeal
       $("#flawTmpl").tmpl(data[k]).appendTo("#flaws .flaw-box");
     }
+    if(form == 44){
+      $(".add-flaw").hide()
+      $(".edit-flaw").hide()
+    }
     showFlawList();
     $(".flaw-item .oper a").unbind("click").click(function () {
       console.log(123);

src/js/qcScore.js

@@ -443,12 +443,11 @@ function delScore(id,info,isRecover){
 }
 //修改评分项
 function editScore(info){
-  console.log(info);
   const param={
     "behospitalCode": global_id,
     "optResultAlgVO": {
-      "reviewer":exampleStatus?reviewer:linkman,
-      "exampleDate":exampleStatus?exampleDate:gmtModified,
+      "reviewer":info.exampleStatus?reviewer:linkman,
+      "exampleDate":info.exampleStatus?exampleDate:gmtModified,
       ...info
     }
 };