Merge branch 'appeal0121' into test

src/html/appealCheck.html

@@ -44,7 +44,7 @@
                     </span>
                     <span class="filterItem typeFilter">
                         <span>申诉人：</span>
-                        <input class="patientNameInp" type="text" placeholder="请输入申诉人" maxlength="10">
+                        <input class="name" type="text" placeholder="请输入申诉人" maxlength="10">
                     </span>
                     <span class="filterItem">
                         <span>操作类型：</span>

src/html/appealUserPage.html

@@ -247,7 +247,7 @@
             <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>
+            <p class="check-item"><span>处理方式:</span>${exampleOperation == 1 ? '修改' : exampleOperation == 2 ? '删除' : exampleOperation == 3 ? '新增已有' : exampleOperation == 4 ? '新增缺失' : '恢复'}</p>
             <p class="check-item"><span>质控条目:</span>${casesEntryName}</p>
             <p class="check-item"><span>提示信息:</span>${msg}</p>
             <p class="check-item"><span>分值:</span>${score}</p>

src/html/qcScore.html

@@ -163,7 +163,7 @@
             <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>
+            <p class="check-item"><span>处理方式:</span>${exampleOperation == 1 ? '修改' : exampleOperation == 2 ? '删除' : exampleOperation == 3 ? '新增已有' : exampleOperation == 4 ? '新增缺失' : '恢复'}</p>
             <p class="check-item"><span>质控条目:</span>${casesEntryName}</p>
             <p class="check-item"><span>提示信息:</span>${msg}</p>
             <p class="check-item"><span>分值:</span>${score}</p>

src/js/appealCheck.js

@@ -168,6 +168,7 @@ $(".abnormalClear").on("click", function (e) {
     state = ""
     moduleName = ""
     operationType = ""
+    name =""
     $('.name').val(''),
     data_desc = ["leave_hospital_date"]
     if (isPlacefile != 1) {
@@ -687,10 +688,6 @@ function bindColOrder() {
     })
 }
 
-$(".patientNameInp").on("input", function (e) {
-    const val = $(this).val().trim()
-    nameTemp = val
-})
 $(function () {
     $.datepicker.regional['zh-CN'] = {
         clearText: '清除',

src/js/appealExamine.js

@@ -160,17 +160,20 @@ function getHistory(data) {
             ${item.exampleStatus == 2 ?
                 `<p class="con-title" ><span>审核时间：${item.appealExamineDate || '-'}</span><span>审核人：${item.checkName || '-'}</span></p>
                 <p class="con-title">审核结果：审核通过</p>
-                <p class="con-title">${item.appealOperationType == 2 ? '处理结果：' : '处理方式：'}${item.appealOperationType == 2 ? item.processResult : item.exampleOperation == 1 ? '修改' : item.exampleOperation == 2 ? '删除' : item.exampleOperation == 3 ? '新增已有' : item.exampleOperation == 4 ? '新增缺失' : '恢复条目'}</p>`
-                : item.exampleStatus == 2 && item.appealOperationType != 2 ?
-                    `<p class="con-title">质控条目：${item.casesEntryName || '-'}</p>
+                <p class="con-title">${item.appealOperationType == 2 ? '处理结果：' : '处理方式：'}${item.appealOperationType == 2 ? item.processResult : item.exampleOperation == 1 ? '修改' : item.exampleOperation == 2 ? '删除' : item.exampleOperation == 3 ? '新增已有' : item.exampleOperation == 4 ? '新增缺失' : '恢复'}</p>`
+                : ""}
+                
+                ${item.exampleStatus == 2 && item.appealOperationType != 2 ?
+                `<p class="con-title">质控条目：${item.casesEntryName || '-'}</p>
                 <p class="con-title">提示信息：${item.msg || '-'}</p>
                 <p class="con-title">分值：${item.score == 0 ? '0' : item.score ? item.score : '-'}</p>
                 <p class="con-title">备注：${item.exampleRemark || '-'}</p>`
-                    : item.exampleStatus == 1 ?
-                        `<p class="con-title" >审核时间：${item.appealExamineDate || '-'}<span>审核人：${item.checkName || '-'}</span></p>
+                : ""}
+                ${item.exampleStatus == 1 ?
+                `<p class="con-title" >审核时间：${item.appealExamineDate || '-'}<span>审核人：${item.checkName || '-'}</span></p>
                 <p class="con-title">审核结果：驳回</p>
                 <p class="con-title">驳回理由：${item.rejectReason || '-'}</p>`
-                        : ""}
+                : ""}
         </div>`;
     }
     $('.history').append(str);

src/js/appealHistory.js

@@ -4,7 +4,7 @@ require("../css/appealHistory.less");
 require('./modal.js');
 require('jquery-templates');
 const { api } = require('./api.js')
-const { post, getCookie, getLocal, getUrlArgObjectNew, setDatePicker,emptyBox, downloadExportedData, expJson, getLogoParam, listenScroll, getPickerDate, exportTimeLimit } = require('./utils.js')
+const { post, getCookie, getLocal, getUrlArgObjectNew, setDatePicker, emptyBox, downloadExportedData, expJson, getLogoParam, listenScroll, getPickerDate, exportTimeLimit } = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck = require("./../images/icon_check.png")
@@ -61,19 +61,19 @@ $(parent.document).find(".menu .page[code=YH-SSXX-SSJL]").addClass("active")
 
 
 if (deptName) {
-    $('.selectDept').html(deptName).attr("title",deptName)
+    $('.selectDept').html(deptName).attr("title", deptName)
     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 }
 if (moduleName) {
-    $('.selectModular').html(moduleName).attr("title",moduleName)
+    $('.selectModular').html(moduleName).attr("title", moduleName)
     $(".selectModular").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 }
 if (operationType) {
-    $('.selectType').html(operationType).attr("title",operationType)
+    $('.selectType').html(operationType).attr("title", operationType)
     $(".selectType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 }
 if (state) {
-    $('.qcSelectCheck').html(state).attr("title",state)
+    $('.qcSelectCheck').html(state).attr("title", state)
     $(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 }
 if (name) {
@@ -179,9 +179,9 @@ $(".abnormalClear").on("click", function (e) {
     state = ""
     operationType = ""
     moduleName = "",
-    name = ""
-    patientName=""
-        data_desc = ["leave_hospital_date"]
+        name = ""
+    patientName = ""
+    data_desc = ["leave_hospital_date"]
     if (isPlacefile != 1) {
         data_desc = ["behospital_date"]
     }
@@ -452,11 +452,11 @@ function renderTab(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.msg
-            data.qcresultDetaiValue = res.data.data.score
-            data.value = res.data.data.score,
-                data.remark = res.data.data.explainInfo,
-                $("#delModal").show();
+            data.qcresultDetailMsg = res.data.data.msg;
+            data.qcresultDetaiValue = res.data.data.score;
+            data.value = res.data.data.score;
+            data.remark = res.data.data.explainInfo;
+            $("#delModal").show();
             getCheckUser()
             $("#delModal .modal-body").html("");
             $("#appealDef").tmpl(data).appendTo("#delModal .modal-body");
@@ -930,7 +930,7 @@ $(function () {
     }).datepicker("setDate", endDate);
     getTabData(page)
 
-    
+
 });
 
 //分页渲染

src/js/appealInit.js

@@ -335,7 +335,7 @@ function bindOrder(){
           $("th[code]").removeClass("asc desc");
           $(this).addClass("asc");
         }
-        getTabData(1);
+        getTabData(1,qcCheckMain);
     });
 }
 function renderTab(data){

src/js/appealUserPage.js

@@ -899,7 +899,7 @@ $(function () {
     const key = global_modules[mid].modeName.replace(/[^\u4e00-\u9fa5|a-zA-Z0-9]+/g, '');
     let hml = '<div class="content-item" code="' + key + '">' +
       '<h2 class="title">' + global_modules[mid].modeName + '(' + mid + ')</h2>' +
-      (n > 1 ? '<div class="container">' : '<div class="container content-ht">');
+      (n > 1 ? '<div class="container">' : '<div class="container content-hts">');
 
 
     for (let i in module) {

src/js/utils.js

@@ -382,6 +382,7 @@ function setBoxHeight() {
     $('.content-box').height(ht - 60 + 'px');
   }
   //$('.content-box').height(ht - 60 + 'px');
+  console.log(ht);
   $('.flaw-table').height(ht - 70 + 'px');
   $('.content-ht').height(ht - 120 + 'px');
   $('.scroll-table tbody').css('max-height', ht - 210 + 'px');