1178232204@qq.com il y a 3 ans
Parent
commit
105a05bd80

+ 9 - 1
src/css/appealHistory.less

@@ -528,7 +528,7 @@ input[type="number"] {
 ul {
   display: none;
   position: absolute;
-  right: 37px;
+  right: 44px;
   width: 70%;
   background: #fff;
   border: 1px @tableBorderColor solid;
@@ -571,3 +571,11 @@ p {
 .warning {
   display: none;
 }
+.show{
+  ul{
+    display: block;
+  }
+  &:after{
+    background-image: url("../images/arrow_up.png");
+  }
+}

+ 1 - 1
src/html/appealHistory.html

@@ -25,7 +25,7 @@
     </script>
     <script type="text/html" id="flawDropTmpl">
         {{each(i,it) info}}
-        <li class="infoItem" idx="${i}" name="${it.entryName||it.userName}" code="${it.id}" title="${it.entryName||it.userName}">${it.entryName||it.userName}</li>
+        <li class="infoItem" idx="${i}" name="${it.userName}" code="${it.id}" title="${it.userName}">${it.userName}</li>
         {{/each}}
     </script>
 </head>

+ 2 - 2
src/html/appealUserPage.html

@@ -228,13 +228,13 @@
             <p><span>申诉人: </span> ${claimantName}</p>
             <p><span>审核人: </span> ${checkName}</p>
             <p><span>操作类型: </span> ${appealOperationType == 0 ? '删改条目' : appealOperationType == 1 ? '新增已有条目' : appealOperationType == 2 ? '新增缺失条目' : '恢复条目'}</p>
-            <p><span>申诉说明: </span> ${appealExplain}</p>
             {{if appealOperationType==='1'}}
             <p><span>质控条目:</span>${casesEntryName}</p>
             <p><span>提示信息:</span>${casesEntryMsg}</p>
             <p><span>分值:</span>${value}</p>
             <p><span>备注:</span>${appealRemark}</p>
 		  	{{/if}}
+            <p><span>申诉说明: </span> ${appealExplain}</p>
             {{if exampleStatus==='1'||exampleStatus==='2'}}
             <p class="check-item reject-item"><span>审核时间:</span>${appealExamineDate}</p>
             <p class="check-item reject-item"><span>审核人: </span> ${checkName}</p>
@@ -243,7 +243,7 @@
                 <span class="check-status">${exampleStatus==='1'?'驳回':'审核通过'}</span>
             </p>
 		  	{{/if}}
-		  {{if exampleStatus==='1'}}
+		    {{if exampleStatus==='1'}}
             <p class="reject-item"><span>驳回理由:</span>${rejectReason}</p>
             {{/if}}
             {{if exampleStatus==='2'}}

+ 4 - 2
src/html/qcScore.html

@@ -144,13 +144,13 @@
             <p><span>申诉人: </span> ${claimantName}</p>
             <p><span>审核人: </span> ${checkName}</p>
             <p><span>操作类型: </span> ${appealOperationType == 0 ? '删改条目' : appealOperationType == 1 ? '新增已有条目' : appealOperationType == 2 ? '新增缺失条目' : '恢复条目'}</p>
-            <p><span>申诉说明: </span> ${appealExplain}</p>
             {{if appealOperationType==='1'}}
             <p><span>质控条目:</span>${casesEntryName}</p>
             <p><span>提示信息:</span>${casesEntryMsg}</p>
             <p><span>分值:</span>${value}</p>
             <p><span>备注:</span>${appealRemark}</p>
 		  	{{/if}}
+            <p><span>申诉说明: </span> ${appealExplain}</p>
             {{if exampleStatus==='1'||exampleStatus==='2'}}
             <p class="line"></p>
             <p class="check-item reject-item"><span>审核时间:</span>${appealExamineDate}</p>
@@ -159,7 +159,9 @@
                 <span>审核结果:</span>
                 <span class="check-status">${exampleStatus==='1'?'驳回':'审核通过'}</span>
             </p>
-            <p class="check-item reject-item"><span>驳回理由:</span>${rejectReason}</p>
+            {{/if}}
+            {{if exampleStatus==='1'}}
+            <p class="reject-item"><span>驳回理由:</span>${rejectReason}</p>
             {{/if}}
             {{if exampleStatus==='2'}}
             <p class="check-item"><span>处理方式:</span>${exampleOperation == 1 ? '修改' : exampleOperation == 2 ? '删除' : exampleOperation == 3 ? '新增已有' : exampleOperation == 4 ? '新增缺失' : '恢复条目'}</p>

+ 1 - 0
src/js/appealCheck.js

@@ -826,6 +826,7 @@ $((function ($) {
             modeName: casesName == "全部" ? "" : casesName || '',
             operationType: operationType,
             state: state,
+            isPlacefile: isPlacefile,
             size: 15,
             name: nameTemp,
             complaintDateEnd: behosDateEnd.replaceAll("/", "-"),

+ 4 - 4
src/js/appealExamine.js

@@ -55,8 +55,8 @@ function getApprovedView() {
             console.log();
             appealExamineRecordDTOList = {
                 casesEntryName: data.appealExamineRecordDTOList[data.appealExamineRecordDTOList.length-1].casesEntryName,
-                value: data.appealExamineRecordDTOList[data.appealExamineRecordDTOList.length-1].score,
-                msg: data.appealExamineRecordDTOList[data.appealExamineRecordDTOList.length-1].msg,
+                value: data.appealExamineRecordDTOList[data.appealExamineRecordDTOList.length-1].value,
+                msg: data.appealExamineRecordDTOList[data.appealExamineRecordDTOList.length-1].casesEntryMsg,
                 explainInfo: data.appealExamineRecordDTOList[data.appealExamineRecordDTOList.length-1].appealRemark,
             };
             appealInfo = {
@@ -137,7 +137,7 @@ function getCon(data) {
     str += `<p class="con-title">申诉模块:${data.modeName || '-'}</p>
         <p class="con-title">病历内容:${data.defectContent || '-'}</p>
         <p class="con-title">缺陷详情:${data.qcresultDetailMsg || '-'}</p>
-        <p class="con-title">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 评分:-${data.qcresultDetaiValue || '-'}</p>
+        <p class="con-title">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 评分:${data.qcresultDetaiValue == 0?'0':-data.qcresultDetaiValue}</p>
         <p class="con-title">病案详情:<span class="goDetail">查看</span></p>`;
     $('.content').append(str);
     $('.goDetail').on('click', function (e) {
@@ -166,7 +166,7 @@ function getHistory(data) {
                 <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>
-                <p class="con-title">分值:${item.score || '-'}</p>
+                <p class="con-title">分值:${item.score}</p>
                 <p class="con-title">备注:${item.exampleRemark || '-'}</p>`
                 : item.exampleStatus == 1 ?
                     `<p class="con-title" >审核时间:${item.appealExamineDate || '-'}</p>

+ 9 - 15
src/js/appealHistory.js

@@ -65,7 +65,7 @@ function getTabData(activePage) {
         patientName: $('.patientNameInp').val(),
         complaintDateEnd: behosDateEnd.replace(/\//g, '-'),
         complaintDateStart: behosDateStart.replace(/\//g, '-'),
-        "desc": ['claimant_gmt_create']
+        "desc": ['claimant_gmt_create'],
     }
     $('.pagination').html("")
     $('.tbody').html(emptyBox('努力加载中...', '',))
@@ -312,7 +312,8 @@ function getCheckUser() {
     });
 }
 function userDropEvent(domSelector, selectEvent) {
-    $("body").on("click", domSelector, function () {
+    $("body").on("click", domSelector, function (e) {
+        e.stopPropagation()
         $(domSelector).parents(".drop-box").toggleClass("show");
     });
     $("body").on("click", ".checker-drop-box li", function () {
@@ -369,7 +370,7 @@ function renderTab(data) {
     })
     $(".appealAgain").click(function () {
         let i = $(this).parent().attr("data-index")
-        getCheckUser()
+
         getAppealOperationType(data[i])
     })
     $(".goHomeDetail1").click(function () {
@@ -382,12 +383,13 @@ function renderTab(data) {
         $(parent.document).find("#contentIframe").attr("src", "appealExamine.html?id=" + id + "&hospitalId=" + hospitalId + "&behospitalCode=" + behospitalCode + "&casesEntryId=" + casesEntryId + "&qcresultDetailId=" + qcresultDetailId + "&appealOperationType=" + appealOperationType + "&page=" + page + "&form=" + 3)
     })
 }
-function getComplaintDetailMsg(data){
+function getComplaintDetailMsg(data) {
     post(api.getComplaintDetailMsg, { behospitalCode: data.behospitalCode, casesEntryId: data.casesEntryId, id: data.qcresultDetailId }).then(function (res) {
         if (res.data.code === '0') {
             data.qcresultDetailMsg = res.data.data
-            $("#delModal .modal-body").html("");
             $("#delModal").show();
+            getCheckUser()
+            $("#delModal .modal-body").html("");
             $("#appealDef").tmpl(data).appendTo("#delModal .modal-body");
             $("#delModal .confirm").text("确定").unbind("click").click(function () {
                 addAppealInfo(data)
@@ -479,15 +481,6 @@ function addAppealInfo(data) {
 
     });
 }
-$(document).on("click", ".checker-drop-input", (e) => {
-    e.stopPropagation()
-    $("#delModal ul").css("display", "block")
-});
-$(document).on("click", ".infoItem", (e) => {
-    e.stopPropagation()
-    const name = $(this).attr("data-name")
-    $("#delModal ul").css("display", "none")
-});
 //选择申诉模块
 $('.selectModular').on("click", function (e) {
     e.stopPropagation()
@@ -954,7 +947,7 @@ $(document).on("click", function () {
     $(".selectModular .arrow").attr("src", iconDown)
     $(".qcSelectCheck .arrow").attr("src", iconDown)
     $(".selectType .arrow").attr("src", iconDown)
-    $("#delModal ul").css("display", "none")
+    $(".checker-drop-box").removeClass("show");
 })
 
 
@@ -973,6 +966,7 @@ $((function ($) {
             deptName: deptName == "全部" ? "" : deptName || '',
             modeName: moduleName == "全部" ? "" : moduleName || '',
             operationType: operationType,
+            isPlacefile: isPlacefile,
             state: state,
             size: 15,
             name: $('.name').val(),

+ 5 - 5
src/js/appealUserPage.js

@@ -531,8 +531,6 @@ $(function () {
       $("#editTmpl").tmpl(info).appendTo("#delModal .modal-body");
       $("#flawDropTmpl").tmpl({ info: global_checkers }).appendTo("#delModal .modal-body ul");
       $("#qcInfo").off("input");
-
-
       //申诉说明输入验证
       const num = 500;
       $("#qcInfo").on("input", function () {
@@ -551,11 +549,13 @@ $(function () {
       });
 
       $("#delModal .confirm").unbind("click").click(function () {
-        if ($(".edit-box .warning").is(":visible")) {
-          return;
-        }
+        // if ($(".edit-box .warning").is(":visible")) {
+        //   return;
+        // }
+        console.log(123);
         const userId = $(".checker-drop-input").attr("code");
         const appealExec = $("#delModal #qcInfo").val();   //申诉说明
+        console.log(userId);
         if (!userId) {
           $(".edit-box .warning .red").text("请选择审核人~");
           $(".edit-box .warning").show();