Merge remote-tracking branch 'origin/master' into referMaster

src/css/appealUserPage.less

@@ -126,6 +126,15 @@
         background-color: @activeBg;
       }
     }
+    &.menu-55 {
+      background: url("../images/other.png") 20px 11px no-repeat;
+      &.active {
+        background: url("../images/other_a.png") 20px 11px no-repeat;
+      }
+      &.slide-up {
+        background-color: @activeBg;
+      }
+    }
   }
   .slide-up {
     background-color: @activeBg !important;
@@ -1021,7 +1030,7 @@
 #pacsIframeIn,
 #assistIframeIn,
 #pacsDetailIframeIn,
-#contentNursing {
+#contentNursing,#contentOther {
   //医嘱信息
   width: 100%;
   height: 100%;

src/css/mentCenter.less

@@ -0,0 +1,9 @@
+.mentCenter{
+    height: 100%;
+    padding: 24px;
+    background: #fff;
+    overflow-y: auto;
+}
+font>div:last-child{
+    padding-bottom: 30px;
+}

src/css/other.less

@@ -0,0 +1,374 @@
+@import './reset.less';
+
+.singleVeto{
+    width: 100%;
+    height: 100%;
+    overflow-y: auto;
+    background: @disColor;
+    .filterDropList{
+        position: absolute;
+        right: 0;
+        max-height: 200px;
+        overflow-y: auto;
+        background: #fff;
+        display: none;
+        border: 1px solid #e4e7ed;
+        box-shadow: 0 2px 12px 0 #e4e7ed;
+        z-index: 2;
+        li{
+            padding: 0 10px;
+        }
+    }
+    .deptList{
+        width: 160px;
+        max-height: 400px;
+    }    
+    .deptItem:hover{
+        background-color: #EEF4FF;
+        cursor: pointer;
+    }
+    .selectLevel,.selectDept{
+        display: inline-block;
+        position: relative;
+        width:160px;
+        padding: 0 10px;
+        height:40px;
+        border-radius:4px;
+        border: 1px solid #E2E5EF;
+        box-sizing: border-box;
+        cursor: pointer;
+    }
+    .filterItem.deptListWrap {
+        .selectDept,.deptList {
+            width: 180px;
+        }
+    }
+    .filterItem{
+        position: relative;
+        display: inline-block;
+        float: left;
+        height: 40px;
+        line-height: 40px;
+        margin: 0 20px 15px 0;
+        span{
+            display: inline-block;
+            line-height: 40px;
+            position: relative;
+        }
+        input{
+            width:120px;
+            height:34px;
+            border-radius:4px;
+            border: 1px solid #E2E5EF;
+            outline: none;
+            margin-right: 10px;
+            padding: 0 10px;
+            box-sizing: border-box;
+        }
+    }
+    .rejectList {
+        height: 80px !important;
+    }
+    .selectUsed,.selectReject {
+        float: right;
+    }
+    ul,li{
+        padding:0;
+        margin:0;
+        list-style:none;
+    }
+    h2{
+        width: 100%;
+        box-sizing: border-box;
+        background-color: #fff;
+        z-index: 20;
+        height: 44px;
+        line-height: 44px;
+        padding: 0 0 0 15px;
+        border-bottom: 1px solid #E2E5EF;
+        font-size: 16px;
+        font-weight: bold;
+        letter-spacing: 1px;
+    }
+    .main-body{
+        .main-body-com;
+        border: 0;
+        border-top: 1px solid #E2E5EF;
+    }
+    table{
+        .table;
+        .moduleNumber{
+            text-align: center;
+        }
+        
+    }
+    // .filterBox{
+    //     margin: 0 0 20px 0;
+    // }
+    .filterItem{
+        position: relative;
+        display: inline-block;
+        margin-right: 20px;
+        height: 40px;
+        line-height: 40px;
+        margin: 0 20px 20px 0;
+    }
+    .filterDropList{
+        position: absolute;
+        right: 0;
+        max-height: 200px;
+        overflow-y: auto;
+        background: #fff;
+        display: none;
+        border: 1px solid #e4e7ed;
+        box-shadow: 0 2px 12px 0 #e4e7ed;
+        z-index: 2;
+        li{
+            padding: 0 10px;
+        }
+    }
+    .rejectList, .usedList{
+        height: 120px;
+        li{
+            padding: 0 10px;
+        }
+        li:hover{
+            background-color: #EEF4FF;
+            cursor: pointer;
+        }
+    }
+    .switchImg{
+        width: 30px;
+    }
+    .roleSelect {
+        position: relative;
+        top: 3px;
+        cursor: pointer;
+    }
+    .selectModuleType,.moduleItemInp,.selectUsed, .selectReject{
+        display: inline-block;
+        position: relative;
+        width:140px;
+        padding: 0 10px;
+        height:34px;
+        border-radius:4px;
+        border: 1px solid #E2E5EF;
+        box-sizing: border-box;
+        cursor: pointer;
+        padding-right: 26px;
+    }
+    .arrow{
+        position: absolute;
+        width: 10px;
+        top: 16px;
+        right: 10px;
+    }
+    .moduleItemInp{
+        cursor: text;
+        outline: none;
+    }
+    .moduleItemInps{
+        width: 150px !important;
+    }
+    .moduleTypeList{
+         width: 160px;
+    }
+    .selectUsed, .selectReject{
+        width: 140px;
+    }
+    .modeTypeItem:hover{
+        background-color: #EEF4FF;
+        cursor: pointer;
+    }
+    .rejectList, .usedList {
+        width: 140px;
+    }
+    .filter{
+        display: inline-block;
+        width:60px;
+        height:36px;
+        background:@activeColor;
+        border-radius:4px;
+        color: #fff;
+        text-align: center;
+        line-height: 36px;
+        position: relative;
+        top: -1px;
+        cursor: pointer;
+    }
+    .export{
+        display: none;
+        width:60px;
+        height:34px;
+        line-height: 34px;
+        background: #fff;
+        border-radius: 4px;
+        color: #777;
+        text-align: center;
+        border: 1px solid #777;
+        box-sizing: border-box;
+        cursor: pointer;
+        margin-left: 10px;
+        margin-bottom: 10px;
+        float: left;
+        top: 0px;
+    }
+    .editItem{
+       color: @activeColor;
+       cursor: pointer;
+    }
+    .editItemDis{
+        color: #aaa;
+        cursor: not-allowed;
+    }
+    
+    .ellipsis{
+        overflow: hidden;
+        text-overflow:ellipsis;
+        white-space: nowrap;
+    }
+    .textCenter{
+        text-align: center;
+    }
+    
+    
+    .pagination{
+        margin: 35px 0 20px 0  ;
+        text-align: right;
+    }
+    .totalSum{
+        font-size:12px;
+        line-height:17px;
+        color: #777777;
+        margin-right: 20px;
+    }
+    .pageNum,.prePage,.nextPage, .more{
+        display: inline-block;
+        width: 20px;
+        cursor: pointer;
+        margin: 0 20px 0 0;
+        text-align: center;
+        color: #777;
+    }
+    .prePage,.nextPage{
+        img{
+            position: relative;
+            top: 0px   ;
+        }
+    }
+     .more{
+        cursor: not-allowed;
+    }
+    .arrowPage{
+        width: 6px;
+    }
+    .activePage{
+        color: @activeColor;
+    }
+    
+    input::-webkit-outer-spin-button,
+    input::-webkit-inner-spin-button {
+        -webkit-appearance: none;
+    }
+     
+    input[type="number"] {
+        -moz-appearance: textfield;
+    }
+}
+.singleVeto{
+    .rejectList{
+        height: 101px !important;
+    }
+    .partTitle {
+        text-align: center;
+        font-weight: bold;
+        font-size: 16px;
+    }
+}
+.goDetail{
+    cursor: pointer;
+    color: @activeColor;
+}
+
+.usrContain .selectReject,.usrContain .selectModuleType ,.managerContainer .selectModuleType  {
+    float: right;
+}
+.usrContain .rejectList,.usrContain .usedList{
+    height: 200px;
+}
+.usrContain .selectModuleType, .usrContain .moduleItemInp, .usrContain .selectUsed, .usrContain .selectReject {
+    width: 170px;
+}
+.managerContainer .moduleTypeList {
+    width: 140px;
+}
+.managerContainer.usrContain .moduleTypeList {
+    width: 170px;
+    height: 400px;
+}
+.managerContainer.usrContain .selectReject {
+    width: 140px;
+}
+.whichAdvice {
+    height: 30px;
+    width: 294px;
+    box-sizing: border-box;
+    overflow: hidden;
+    margin-bottom: 16px;
+    cursor: pointer;
+    span {
+        width: 33.33%;
+        font-size: 14px;
+        color: #777777;
+        float: left;
+        text-align: center;
+        height: 28px;
+        line-height: 27px;
+    }
+    .allAdvice {
+        border: 1px solid #777;
+        border-radius: 4px 0 0 4px;
+        border-right: 0;
+        box-sizing:border-box;
+    }
+    .errAdvice {
+        border: 1px solid #777;
+        box-sizing:border-box;
+    }
+    .noAdvice {
+        border: 1px solid #777;
+        box-sizing:border-box;
+        border-left: 0;
+        border-radius: 0 4px 4px 0;
+    }
+    .active {
+        background-color: #00A1FF;
+        color: #fff;
+        border-color: #00A1FF;
+    }
+}
+
+
+.selectLevel,.selectDept,.fpSelectCheck,.qcSelectCheck{
+    display: inline-block;
+    position: relative;
+    width:120px;
+    padding: 0 10px;
+    height:32px;
+    border-radius:4px;
+    border: 1px solid #E2E5EF;
+    box-sizing: border-box;
+    cursor: pointer;
+}
+.levelList,.checkList{
+    width: 120px;
+    // height: 200px;
+    li:hover{
+        background-color: #EEF4FF;
+        cursor: pointer;
+    }
+}
+.goDetailther:hover{
+    color: #00A1FF;
+    cursor: pointer;
+}

src/css/qcScore.less

@@ -126,6 +126,15 @@
         background-color: @activeBg;
       }
     }
+    &.menu-55 {
+      background: url("../images/other.png") 20px 11px no-repeat;
+      &.active {
+        background: url("../images/other_a.png") 20px 11px no-repeat;
+      }
+      &.slide-up {
+        background-color: @activeBg;
+      }
+    }
   }
   .slide-up {
     background-color: @activeBg !important;
@@ -969,7 +978,8 @@
 #pacsIframeIn,
 #assistIframeIn,
 #pacsDetailIframeIn,
-#contentNursing {
+#contentNursing,
+#contentOther {
   //医嘱信息
   width: 100%;
   height: 100%;

src/html/appealUserPage.html

@@ -364,6 +364,8 @@
                     style="display: none;"></iframe>
                 <iframe src="./pacsDetail.html" frameborder="0" id="pacsDetailIframeIn" name="pacsDetailIframeIn"
                     style="display: none;"></iframe>
+                <iframe src="./other.html" frameborder="0" id="contentOther" name="contentOther"
+                    style="display: none;"></iframe>
             </div>
             <div class="content-box fl" id="contentInfo"></div>
             <div class="operation fr" id="flaws">

src/html/mentCenter.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="ie=edge">
+  <!--<link rel="shortcut icon" href="../resource/favicon.ico" type="image/x-icon">-->
+  <title>文书详情</title>
+</head>
+<body>
+  <div class="mentCenter clearfix">
+      
+  </div>
+</body>
+</html>

src/html/other.html

@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title></title>
+
+</head>
+
+<body>
+    <div class="managerContainer singleVeto otherWrp">
+        <div class="partTitle">
+            其他信息
+        </div>
+        <div class="partTitleT"></div>
+        <div class="main-body">
+            <div class="filterBox">
+                <span class="filterItem">
+                    <span>文书名称：</span>
+                    <span class="">
+                        <input class="moduleItemInps" type="text" placeholder="请输入文书名称">
+                    </span>
+                </span>
+
+                <span class="filterItem typeFilter clearfix dataSelectLight">
+                    <span class="fl">创建时间：</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker"
+                            autocomplete="off" readonly /></span>
+                    <span class="divide fl">-</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"
+                            autocomplete="off" readonly /></span>
+                </span>
+                <span class="filter">查询</span>
+                <span class="filterclear abnormalClear">重置</span>
+                <span class="export">导出</span>
+            </div>
+            <table>
+                <thead>
+                    <th class="moduleName" style="width: 65px;">序号</th>
+                    <th class="moduleItemName">文书名称</th>
+                    <th class="moduleItemName desc" code="recDate">创建时间</th>
+                </thead>
+                <tbody class="tbody">
+
+                </tbody>
+            </table>
+            <div class="pagination"></div>
+        </div>
+    </div>
+</body>
+
+</html>

src/html/qcScore.html

@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -355,6 +356,7 @@
         </div>
     </script>
 </head>
+
 <body>
     <div class="main-part clearfix">
         <div class="sub-menu">
@@ -365,7 +367,9 @@
             <a href="javascript:void(0);" class="slide-show">
                 <img src="../images/down.png" alt="">
             </a>
-            <div class="copy-right"><p>©杭州朗通信息技术有限公司</p></div>
+            <div class="copy-right">
+                <p>©杭州朗通信息技术有限公司</p>
+            </div>
         </div>
         <div class="menu-mini fl">
             <div class="logo">
@@ -375,17 +379,24 @@
             <a href="javascript:void(0);" class="slide-hide">
                 <img src="../images/up.png" alt="">
             </a>
-           
+
         </div>
         <div class="tab-container clearfix">
             <div class="patient-info" id="patientInfo"></div>
             <p id="loading">加载中，请稍候 ...</p>
             <div class="flaw-table">
-                <iframe src="./nursing.html" frameborder="0" id="contentNursing" name="contentNursing" style="display: none;"></iframe>
-                <iframe src="./advice.html" frameborder="0" id="contentIframeIn" name="contentIframeIn" style="display: none;"></iframe>
-                <iframe src="./pacs.html" frameborder="0" id="pacsIframeIn" name="pacsIframeIn" style="display: none;"></iframe>
-                <iframe src="./assist.html" frameborder="0" id="assistIframeIn" name="assistIframeIn" style="display: none;"></iframe>
-                <iframe src="./pacsDetail.html" frameborder="0" id="pacsDetailIframeIn" name="pacsDetailIframeIn" style="display: none;"></iframe>
+                <iframe src="./nursing.html" frameborder="0" id="contentNursing" name="contentNursing"
+                    style="display: none;"></iframe>
+                <iframe src="./advice.html" frameborder="0" id="contentIframeIn" name="contentIframeIn"
+                    style="display: none;"></iframe>
+                <iframe src="./pacs.html" frameborder="0" id="pacsIframeIn" name="pacsIframeIn"
+                    style="display: none;"></iframe>
+                <iframe src="./assist.html" frameborder="0" id="assistIframeIn" name="assistIframeIn"
+                    style="display: none;"></iframe>
+                <iframe src="./pacsDetail.html" frameborder="0" id="pacsDetailIframeIn" name="pacsDetailIframeIn"
+                    style="display: none;"></iframe>
+                <iframe src="./other.html" frameborder="0" id="contentOther" name="contentOther"
+                    style="display: none;"></iframe>
             </div>
             <div class="content-box fl" id="contentInfo"></div>
             <div class="operation fr" id="flaws">
@@ -420,4 +431,5 @@
         </div>
     </div>
 </body>
-</html>
+
+</html>

src/js/api.js

@@ -226,6 +226,9 @@ const api = {
   getAppealDept:'/qc/appealInfo/getAppealDept', //申诉科室
   getAppealMode:'/qc/appealInfo/getAppealMode', //申诉模块
   getComplaintDetailMsg:'/qc/appealExamineInfo/getComplaintDetailMsg', //获取缺陷详情
+
+  getMedRecordOtherPage:'/qc/medRecordOther/getMedRecordOtherPage', //其他信息列表
+  getMedRecordContentOther:'/qc/medRecordOther/getMedRecordContentOther', //文书内容展示
 }
 const ywCheckApi = {
   addMedCheckInfo: '/qc/medCheckInfo/addMedCheckInfo',   //核查

src/js/appealCheck.js

@@ -37,7 +37,7 @@ let moduleName = getUrlArgObjectNew("moduleName", srcUrl) || ""
 let name = getUrlArgObjectNew("name", srcUrl) || ""
 let operationType = getUrlArgObjectNew("operationType", srcUrl) || ""
 let state = getUrlArgObjectNew("state", srcUrl) || ""
-let tabList = [], deptNameTemp = "",typeList,
+let tabList = [], deptNameTemp = "", typeList,
     deptIdTemp = "",
     fpCheckStatusTemp = "", fpCheckNameTemp = "", qcCheckNameTemp = "";
 let isPlacefile = getCookie('isPlacefile') || 1
@@ -56,19 +56,19 @@ $('.iconCalen').on("click", function (e) {
 $(".menu .page", parent.document).removeClass("active")
 $(parent.document).find(".menu .page[code=YH-SSXX-SSSH]").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) {
@@ -130,8 +130,11 @@ function getAuditNumber() {
             if (auditNumber == 0) {
                 $(".menu .page", parent.document).children('.reds').hide()
                 $(".menu .dian", parent.document).hide()
+                $(".menu-mini .page", parent.document).children('.reds').hide()
+                $(".menu-mini .dian", parent.document).hide()
             } else {
                 $(".menu .page", parent.document).children('.reds').html(auditNumber)
+                $(".menu-mini .page", parent.document).children('.reds').html(auditNumber)
             }
         } else {
             const token = localStorage.getItem('accessToken');
@@ -167,6 +170,7 @@ $(".filter").on("click", function (e) {
     qcCheckName = qcCheckNameTemp
     fpCheckStatus = fpCheckStatusTemp
     qcCheckStatus = state
+    page = 1
     getTabData(1)
 })
 
@@ -191,9 +195,9 @@ $(".abnormalClear").on("click", function (e) {
     state = ""
     moduleName = ""
     operationType = ""
-    name =""
+    name = ""
     $('.name').val(''),
-    data_desc = ["leave_hospital_date"]
+        data_desc = ["leave_hospital_date"]
     if (isPlacefile != 1) {
         data_desc = ["behospital_date"]
     }
@@ -279,7 +283,7 @@ function renderTab(data) {
                 <td >${item.behospitalCode}</td>
                 <td >${item.name || "-"}</td>
                 <td >${item.modeName || "-"}</td>
-                <td >${item.qcresultDetailMsg || "-"}</td>
+                ${item.qcresultDetailMsg && item.qcresultDetailMsg.length > 30 ? `<td title=${item.qcresultDetailMsg}>${item.qcresultDetailMsg.substring(0,30)+'...' || "-"}</td>` : `<td>${item.qcresultDetailMsg || "-"}</td>`}
                 <td >${item.checkName || "-"}</td>
                 <td >${item.checkGmtCreate || "-"}</td>
                 <td >${item.appealOperationType == 0 ? '删改条目' : item.appealOperationType == 1 ? '新增已有条目' : item.appealOperationType == 2 ? '新增缺失条目' : '恢复条目'}</td>
@@ -425,10 +429,10 @@ function renderTypeList(data) {
     }
     $('.typeList').html(str)
     if (operationType) {
-        $('.selectType').html(data[operationType]).attr("title",data[operationType])
+        $('.selectType').html(data[operationType]).attr("title", data[operationType])
         $(".selectType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     }
-   
+
     bindTypedSelect()
 }
 //操作类型选择
@@ -451,7 +455,7 @@ function renderStatusList(data) {
     $('.qcCheckList').html(str)
     bindCheckedSelectQc()
     if (state) {
-        $('.qcSelectCheck').html(data[state]).attr("title",data[state])
+        $('.qcSelectCheck').html(data[state]).attr("title", data[state])
         $(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     }
 }

src/js/appealExamine.js

@@ -170,7 +170,7 @@ function getHistory(data) {
                 <p class="con-title">备注：${item.exampleRemark || '-'}</p>`
                 : ""}
                 ${item.exampleStatus == 1 ?
-                `<p class="con-title" >审核时间：${item.appealExamineDate || '-'}<span>审核人：${item.checkName || '-'}</span></p>
+                `<p class="con-title" ><span>审核时间：${item.appealExamineDate || '-'}</span><span>审核人：${item.checkName || '-'}</span></p>
                 <p class="con-title">审核结果：驳回</p>
                 <p class="con-title">驳回理由：${item.rejectReason || '-'}</p>`
                 : ""}
@@ -365,8 +365,11 @@ function getAuditNumber() {
             if (auditNumber == 0) {
                 $(".menu .page", parent.document).children('.reds').hide()
                 $(".menu .dian", parent.document).hide()
+                $(".menu-mini .page", parent.document).children('.reds').hide()
+                $(".menu-mini .dian", parent.document).hide()
             } else {
                 $(".menu .page", parent.document).children('.reds').html(auditNumber)
+                $(".menu-mini .page", parent.document).children('.reds').html(auditNumber)
             }
         } else {
             const token = localStorage.getItem('accessToken');

src/js/appealHistory.js

@@ -157,6 +157,7 @@ $(".filter").on("click", function (e) {
     qcCheckName = qcCheckNameTemp
     fpCheckStatus = fpCheckStatusTemp
     qcCheckStatus = state
+    page = 1
     getTabData(1)
 })
 
@@ -412,7 +413,7 @@ function renderTab(data) {
                 <td >${item.behospitalCode}</td>
                 <td >${item.name || "-"}</td>
                 <td >${item.modeName || "-"}</td>
-                <td >${item.qcresultDetailMsg || "-"}</td>
+                ${item.qcresultDetailMsg && item.qcresultDetailMsg.length > 30 ? `<td title=${item.qcresultDetailMsg}>${item.qcresultDetailMsg.substring(0,30)+'...' || "-"}</td>` : `<td>${item.qcresultDetailMsg || "-"}</td>`}
                 <td >${item.checkName || "-"}</td>
                 <td >${item.checkGmtCreate || "-"}</td>
                 <td >${item.appealOperationType == 0 ? '删改条目' : item.appealOperationType == 1 ? '新增已有条目' : item.appealOperationType == 2 ? '新增缺失条目' : '恢复条目'}</td>
@@ -510,7 +511,7 @@ function cancelAppealInfo(id) {
             $("#delModal").hide();
             $.alerModal({ "message": "撤回成功", type: "tip", time: '1000', win: true });
         } else {
-            $.alerModal({ "message": res.data.msg || '失败,请重试~', type: "tip", time: '1000', win: 'default' });
+            $.alerModal({ "message": res.data.msg || '失败,请重试~', type: "tip", time: '1000', win: 'warn' });
 
         }
     }).catch(() => {
@@ -548,7 +549,7 @@ function addAppealInfo(data) {
         qcresultDetailMsg: data.qcresultDetailMsg,
         casesEntryMsg: data.qcresultDetailMsg,
         msg: data.msg,
-        value: data.value,
+        value: data.value || data.qcresultDetaiValue,
         remark: data.remark,
     }
     post(api.addAppealInfo, param).then(function (res) {
@@ -557,7 +558,7 @@ function addAppealInfo(data) {
             $("#delModal").hide();
             $.alerModal({ "message": "申诉成功", type: "tip", time: '1000', win: true });
         } else {
-            $.alerModal({ "message": res.data.msg || '失败,请重试~', type: "tip", time: '1000', win: 'default' });
+            $.alerModal({ "message": res.data.msg || '失败,请重试~', type: "tip", time: '1000', win: 'warn' });
 
         }
     }).catch(() => {

src/js/appealUserPage.js

@@ -86,7 +86,7 @@ $(function () {
     $(".page").on("click", function () {
       $(".info-item .cont,.flaw-item,td").removeClass("active");   //清空缺陷定位背景
       const title = $(this).attr("code");
-      if (title === "缺陷总览" || title === "谈话告知书" || title === "知情同意书" || title === '医嘱信息' || title === '检验信息' || title === '检查信息' || title === '护理信息') {
+      if (title === "缺陷总览" || title === "谈话告知书" || title === "知情同意书" || title === '医嘱信息' || title === '检验信息' || title === '检查信息' || title === '护理信息' || title === '其他信息') {
         if (title === "缺陷总览") {
           getRecordDetailUpdate()
         }
@@ -122,25 +122,31 @@ $(function () {
         $("#contentIframeIn").contents().find(".adviceWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
       });
     } else if (title === '检验信息') {
-      $("#contentIframeIn,#assistIframeIn,#pacsDetailIframeIn,#contentNursing").css("display", "none")
+      $("#contentIframeIn,#assistIframeIn,#pacsDetailIframeIn,#contentNursing,#contentOther").css("display", "none")
       $("#pacsIframeIn").css({ display: 'block' }).attr("src", 'pacs.html').contents().find(".pacsWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
       $(window).resize(function () {
         $("#pacsIframeIn").contents().find(".pacsWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
       });
     } else if (title === '检查信息') {
-      $("#contentIframeIn,#pacsIframeIn,#pacsDetailIframeIn,#contentNursing").css("display", "none")
+      $("#contentIframeIn,#pacsIframeIn,#pacsDetailIframeIn,#contentNursing,#contentOther").css("display", "none")
       $("#assistIframeIn").css({ display: 'block' }).attr("src", 'assist.html').contents().find(".assistWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
       $(window).resize(function () {
         $("#assistIframeIn").contents().find(".assistWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
       });
     } else if (title === '护理信息') {
-      $("#pacsIframeIn,#assistIframeIn,#pacsDetailIframeIn,#contentIframeIn").css("display", "none")
+      $("#pacsIframeIn,#assistIframeIn,#pacsDetailIframeIn,#contentIframeIn,#contentOther").css("display", "none")
       $("#contentNursing").css({ display: 'block' }).attr("src", 'nursing.html').contents().find(".nursingWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
       $(window).resize(function () {
         $("#contentNursing").contents().find(".nursingWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
       });
+    } else if (title === '其他信息') {
+      $("#pacsIframeIn,#assistIframeIn,#pacsDetailIframeIn,#contentIframeIn,#contentNursing").css("display", "none")
+      $("#contentOther").css({ display: 'block' }).attr("src", 'other.html').contents().find(".otherWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
+      $(window).resize(function () {
+        $("#contentOther").contents().find(".otherWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
+      });
     } else {
-      $("#contentIframeIn,#pacsIframeIn,#pacsDetailIframeIn,#assistIframeIn,#contentNursing").css({ display: 'none' })
+      $("#contentIframeIn,#pacsIframeIn,#pacsDetailIframeIn,#assistIframeIn,#contentNursing,#contentOther").css({ display: 'none' })
     }
   }
 
@@ -508,6 +514,7 @@ $(function () {
     $("#delModal .confirm").off("click");
     $("#addQcScore,#addQcMsg,#addQcInfo").off("input");
     $("#delModal .confirm").show();
+    $('.modal-body').scrollTop(100);
     if (flag === '0') {   //申诉
       getCheckUser(); //获取审核人列表
       getQcCasesEntry()
@@ -577,7 +584,7 @@ $(function () {
           appealExplain: $("#delModal #qcInfo").val(),
           appealOperationType: info.appealOperationType ? info.appealOperationType : 0,
           appealType: 1,
-          checkId: $(".checker-drop-input").attr("code") == "输血/血制品病程记录"?'输血血制品病程记录':$(".checker-drop-input").attr("code"),
+          checkId: $(".checker-drop-input").attr("code") == "输血/血制品病程记录" ? '输血血制品病程记录' : $(".checker-drop-input").attr("code"),
           modeId: info.modelId,
           modeName: info.modelName,
           qcresultDetailId: info.id,

src/js/index.js

@@ -106,12 +106,17 @@ $(function () {
   if (isPlacefile == 0) {
     $(this).find('.qiehuan i').html('切换病案质控')
     $('.subtitle').html('AI运行质控平台')
-    getAuditNumber()
+    if(onAppeal>0){
+      getAuditNumber()
+    }
+    
     getMenu()
   } else if (isPlacefile == 1) {
     $(this).find('.qiehuan i').html('切换运行质控')
     $('.subtitle').html('AI病案质控平台')
-    getAuditNumber()
+    if(onAppeal>0){
+      getAuditNumber()
+    }
     getMenu()
   }
   $(".header .title .qiehuan").click(function () {
@@ -126,7 +131,9 @@ $(function () {
       setCookie("isPlacefile", 1)
     }
     $('#contentIframe').attr('src', $('#contentIframe').attr('src'));
-    getAuditNumber()
+    if(onAppeal>0){
+      getAuditNumber()
+    }
     getMenu();
   })
   $(".header .title .qiehuan").mouseenter(function () {
@@ -340,6 +347,7 @@ function getAuditNumber() {
     analyzeType:isPlacefile
   }).then(res => {
     if (res.data.code == '0') {
+      $.alerModal({ "message": res.data.msg, type: "tip", time: '1000', isFather: true, fatherWrapper: $("#mainBox", parent.document) });
       auditNumber = res.data.data > 99 ? '99+' : res.data.data
     } else {
       const token = localStorage.getItem('accessToken');

src/js/mentCenter.js

@@ -0,0 +1,8 @@
+const $ = require('jquery');
+require("../css/mentCenter.less");
+$(function () {
+    let receive = window.opener["filter"];
+    //获取接收到的数据
+    $(".mentCenter").html(receive)
+    console.log(receive);
+});

src/js/modal.js

@@ -109,7 +109,7 @@ const jQuery = require('jquery');
         }
         if (ops.type == 'tip') {
             setTimeout(function () {
-                box.remove();
+                $(".divModal").remove();
             }, ops.time);
         }
         if (ops.callback && typeof ops.callback === 'function') {

src/js/qcScore.js

@@ -27,8 +27,8 @@ $(function () {
   const global_id = getUrlArgObject("id");
   const global_hid = getUrlArgObject("hid");
   let global_check;
-  let global_check_home, global_check_show,check_Operation_WithAppeal;
-  let global_entryName,global_casesEntryId
+  let global_check_home, global_check_show, check_Operation_WithAppeal;
+  let global_entryName, global_casesEntryId
   const global_code = getUrlArgObject("code");
   let global_activeTab = $(".sub-menu .page.active").attr("code");  //当前激活菜单项
   let global_modules = {};   //模板数据缓存
@@ -102,7 +102,7 @@ $(function () {
           $(".check").css('display', 'block').text(global_check == 1 ? '重新核查' : '病历核查')
         }
       }
-      if (title === "缺陷总览" || title === "谈话告知书" || title === "知情同意书" || title === '医嘱信息' || title === '检验信息' || title === '检查信息' || title === '护理信息') {
+      if (title === "缺陷总览" || title === "谈话告知书" || title === "知情同意书" || title === '医嘱信息' || title === '检验信息' || title === '检查信息' || title === '护理信息'  || title === '其他信息') {
         if (title === "缺陷总览") {
           getRecordDetailUpdate()
         }
@@ -130,31 +130,37 @@ $(function () {
   }
   function iframeShow(title) {
     if (title === '医嘱信息') {
-      $("#pacsIframeIn,#assistIframeIn,#pacsDetailIframeIn,#contentNursing").css("display", "none")
+      $("#pacsIframeIn,#assistIframeIn,#pacsDetailIframeIn,#contentNursing,#contentOther").css("display", "none")
       $("#contentIframeIn").css({ display: 'block' }).attr("src", 'advice.html').contents().find(".adviceWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
       $(window).resize(function () {
         $("#contentIframeIn").contents().find(".adviceWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
       });
     } else if (title === '检验信息') {
-      $("#contentIframeIn,#assistIframeIn,#pacsDetailIframeIn,#contentNursing").css("display", "none")
+      $("#contentIframeIn,#assistIframeIn,#pacsDetailIframeIn,#contentNursing,#contentOther").css("display", "none")
       $("#pacsIframeIn").css({ display: 'block' }).attr("src", 'pacs.html').contents().find(".pacsWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
       $(window).resize(function () {
         $("#pacsIframeIn").contents().find(".pacsWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
       });
     } else if (title === '检查信息') {
-      $("#contentIframeIn,#pacsIframeIn,#pacsDetailIframeIn,#contentNursing").css("display", "none")
+      $("#contentIframeIn,#pacsIframeIn,#pacsDetailIframeIn,#contentNursing,#contentOther").css("display", "none")
       $("#assistIframeIn").css({ display: 'block' }).attr("src", 'assist.html').contents().find(".assistWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
       $(window).resize(function () {
         $("#assistIframeIn").contents().find(".assistWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
       });
     } else if (title === '护理信息') {
-      $("#pacsIframeIn,#assistIframeIn,#pacsDetailIframeIn,#contentIframeIn").css("display", "none")
+      $("#pacsIframeIn,#assistIframeIn,#pacsDetailIframeIn,#contentIframeIn,#contentOther").css("display", "none")
       $("#contentNursing").css({ display: 'block' }).attr("src", 'nursing.html').contents().find(".nursingWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
       $(window).resize(function () {
         $("#contentNursing").contents().find(".nursingWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
       });
+    } else if (title === '其他信息') {
+      $("#pacsIframeIn,#assistIframeIn,#pacsDetailIframeIn,#contentIframeIn,#contentNursing").css("display", "none")
+      $("#contentOther").css({ display: 'block' }).attr("src", 'other.html').contents().find(".otherWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
+      $(window).resize(function () {
+        $("#contentOther").contents().find(".otherWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
+      });
     } else {
-      $("#contentIframeIn,#pacsIframeIn,#pacsDetailIframeIn,#assistIframeIn,#contentNursing").css({ display: 'none' })
+      $("#contentIframeIn,#pacsIframeIn,#pacsDetailIframeIn,#assistIframeIn,#contentNursing,#contentOther").css({ display: 'none' })
     }
   }
   //判断有无某一权限
@@ -175,11 +181,11 @@ $(function () {
     post(api.getRecordDetail, { 'behospitalCode': global_id }).then(function (res) {
       if (res.data.code === '0') {
         const data = res.data.data;
-        const { beHospital, result, msg, checkStatus, drgs, mrStatus, checkShow,checkOperationWithAppeal } = data;
+        const { beHospital, result, msg, checkStatus, drgs, mrStatus, checkShow, checkOperationWithAppeal } = data;
         global_check = checkStatus
         global_check_home = mrStatus
         global_check_show = checkShow;//0隐藏操作按钮1显示
-        check_Operation_WithAppeal =JSON.parse(checkOperationWithAppeal) 
+        check_Operation_WithAppeal = JSON.parse(checkOperationWithAppeal)
         const info = Object.assign(beHospital, result);
         initMenu(JSON.parse(result.menuData));
         // $(".sub-menu>ul>li:first-child.page,.menu-mini>ul>li:first-child.page").addClass("active");
@@ -367,7 +373,7 @@ $(function () {
   //评分项数据填充
   function initScoreItem(data) {
     $("#flaws .flaw-box").html("");
-    let hasAu = showCheckBtns && global_check_show &&  hasData('FUNC000013');    //修改缺陷权限
+    let hasAu = showCheckBtns && global_check_show && hasData('FUNC000013');    //修改缺陷权限
     let hasAu2 = showCheckBtns && global_check_show && hasData('FUNC000012');   //删除缺陷权限
     let hasAu3 = check_Operation_WithAppeal
     console.log(hasAu3);
@@ -395,7 +401,7 @@ $(function () {
       }
     })
     $(".edit-flaw").css({ "display": hasAu ? "inline" : "none" });
-    $(".del-flaw").css({ "display": hasAu2  ? "inline" : "none" });
+    $(".del-flaw").css({ "display": hasAu2 ? "inline" : "none" });
     $(".add-flaw").css({ "display": hasAu3 && global_check_show ? "inline" : "none" });
     $(".recover-flaw").css({ "display": hasAu2 ? "inline" : "none" });
     $(".flaw-item .title a[href]").unbind("click").click(function () {
@@ -451,22 +457,22 @@ $(function () {
   function editScore(info) {
     info.reviewer = info.exampleDate > info.gmtModified ? info.reviewer : info.linkman
     info.exampleDate = info.exampleDate > info.gmtModified ? info.exampleDate : info.gmtModified
-    
+
     const param = {
       "behospitalCode": global_id,
       "optResultAlgVO": info
     };
-    post(api.editScore,param).then(function(res){
-      if(res.data.code==='0'){
+    post(api.editScore, param).then(function (res) {
+      if (res.data.code === '0') {
         $("#delModal").hide();
         updateFlaws(res.data.data);
-        $.alerModal({"message":"修改成功",type:"tip",time:'1000',win:true});
-      }else{
-        $.alerModal({"message":'修改失败,请重试~',type:"tip",time:'1000',isFather: true,win: 'default', fatherWrapper: $("#mainBox", parent.document)});
+        $.alerModal({ "message": "修改成功", type: "tip", time: '1000', win: true });
+      } else {
+        $.alerModal({ "message": '修改失败,请重试~', type: "tip", time: '1000', isFather: true, win: 'default', fatherWrapper: $("#mainBox", parent.document) });
 
       }
-    }).catch(()=>{
-      $.alerModal({"message":'修改失败,请重试~',type:"tip",time:'1000',isFather: true,win: 'default', fatherWrapper: $("#mainBox", parent.document)});
+    }).catch(() => {
+      $.alerModal({ "message": '修改失败,请重试~', type: "tip", time: '1000', isFather: true, win: 'default', fatherWrapper: $("#mainBox", parent.document) });
 
     });
   }
@@ -755,7 +761,7 @@ $(function () {
     console.log(123);
   });
   $(document).on("blur", ".flaw-drop-input", (e) => {
-    $('.flaw-drop-input').val(global_entryName).attr({ "code": global_casesEntryId,"title": global_entryName });
+    $('.flaw-drop-input').val(global_entryName).attr({ "code": global_casesEntryId, "title": global_entryName });
   });
   //更新缺陷列表
   function updateFlaws(info) {
@@ -807,7 +813,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,7 +382,6 @@ 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');

webpack.config.js

@@ -7,7 +7,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 const webpack = require('webpack');
 const glob = require('glob');
-const proxyHost = "http://192.168.2.241:5858";
+const proxyHost = "http://192.168.2.236:5858";
 // const proxyHost = "http://192.168.2.241:5858";
 // const proxyHost = "http://192.168.4.222:5858";
 // const proxyHost = "http://192.168.3.117:5858";//铁钢

webpack.configCopy.jsx

@@ -64,6 +64,8 @@ module.exports = {
     assist:path.resolve(__dirname, 'src/js', 'assist.js'),
     error:path.resolve(__dirname, 'src/js', 'error.js'),
     nursing:path.resolve(__dirname, 'src/js', 'nursing.js'),
+    other:path.resolve(__dirname, 'src/js', 'other.js'),
+    mentCenter:path.resolve(__dirname, 'src/js', 'mentCenter.js'),
     test:path.resolve(__dirname, 'src/js/dept', 'test.js'),
     partDetailControlDept:path.resolve(__dirname, 'src/js/dept', 'partDetailControlDept.js'),
     vendor: 'lodash',  //多个页面所需的公共库文件，防止重复打包带入
@@ -130,6 +132,32 @@ module.exports = {
         collapseWhitespace: true //删除空白符与换行符
       }
     }),
+    new HtmlWebpackPlugin({
+      title: 'other',
+      template: path.resolve(__dirname, 'src/html', 'other.html'),
+      filename: 'other.html',
+      chunks: ['other', 'vendor', 'common','scrollBar'],
+      hash: true, //防止缓存
+      inject: true,
+      minify: {
+        removeAttributeQuotes: true, //压缩 去掉引号
+        removeComments: true, //移除HTML中的注释
+        collapseWhitespace: true //删除空白符与换行符
+      }
+    }),
+    new HtmlWebpackPlugin({
+      title: 'mentCenter',
+      template: path.resolve(__dirname, 'src/html', 'mentCenter.html'),
+      filename: 'mentCenter.html',
+      chunks: ['mentCenter', 'vendor', 'common','scrollBar'],
+      hash: true, //防止缓存
+      inject: true,
+      minify: {
+        removeAttributeQuotes: true, //压缩 去掉引号
+        removeComments: true, //移除HTML中的注释
+        collapseWhitespace: true //删除空白符与换行符
+      }
+    }),
     new HtmlWebpackPlugin({
       title: 'error',
       template: path.resolve(__dirname, 'src/html', 'error.html'),