Merge branch 'test' into dev_zxc

src/css/login.less

@@ -54,6 +54,7 @@ body {
   background-color: #fff;
   .loginBg {
     float: left;
+    width: 400px;
   }
   .message {
     float: left;

src/css/qcScore.less

@@ -2,6 +2,11 @@
 .main-part{
   height: 100%;
 }
+.waring {
+  color: #FF4D4F;
+  margin-top: 18px;
+  height: 18px;
+}
 .patient-info{
   height: 50px;
   line-height: 50px;
@@ -98,7 +103,49 @@
     .cont{
       display: inline-block;
       min-width: 33%;
-      margin-bottom: 15px;
+      margin-bottom: 15px;/*
+      .table-tip{
+        line-height: 20px;
+        padding: 7px 8px;
+        border:1px @tableBorderColor solid;
+      }*/
+      table{
+        width: 100%;
+        border:1px @tableBorderColor solid;
+      }
+      .embed-table{
+        border:1px @tableBorderColor solid;
+        &>tbody>tr:first-child>td{
+          padding: 0;
+          border:none;
+          &>table td{
+            border:1px @tableBorderColor solid;
+            line-height: 20px;
+            padding: 7px 8px;
+          }
+        }
+        .table-tip{
+          text-align: left;
+        }
+      }
+      th{
+        table{
+          border:none;
+        }
+        border:1px @tableBorderColor solid;
+        background: @thBgColor;
+        line-height: 20px;
+        padding: 7px 8px;
+      }
+      td{
+        text-align: center;
+        border:1px @tableBorderColor solid;
+        padding:7px  8px;
+        height: 20px;
+        table,td{
+          border:none;
+        }
+      }
       span{
         line-height: 20px;
         vertical-align: middle;
@@ -149,6 +196,17 @@
       height: 100%;
       overflow-y: auto;
     }
+    .empty{
+      /*display: none;*/
+      margin-top: 120px;
+      text-align: center;
+      p{
+        margin-top: 15px;
+        font-size: 12px;
+        text-indent: 10px;
+        color: #aaa;
+      }
+    }
     .flaw-item{
       display: none;
       margin: 0 20px 10px 30px ;
@@ -166,6 +224,14 @@
 .edit-box{
   p{
     margin-bottom: 10px;
+    .red{
+      display: inline-block;
+      width: auto;
+      text-indent: 5px;
+    }
+  }
+  .warning{
+    display: none;
   }
   input{
     border:1px @borderColor solid;

src/css/reset.less

@@ -99,6 +99,9 @@ textarea {
 @borderColor:#E2E5EF; /**边框颜色**/
 @frameBdColor:#F0F0F0;/***框架边框颜色**/
 @warnColor:#FF4D4F;  /**重点红色**/
+@thBgColor:#EFF0F9; /**标题背景色**/
+@tableBorderColor:#E2E5EF;  /**表格边框**/
+
 
 /****弹窗样式*****/
 .modal{

src/html/qcScore.html

@@ -22,10 +22,10 @@
         <span>住院号：${fileCode}</span>
         <span>姓名：${name}</span>
         <span>性别：${sex}</span>
-        <span>出生日期：${birthday.substr(0,10)}</span>
+        <span>年龄：${age}</span>
         <span>科室：${behDeptName}</span>
-        <span>评级：${level}</span>
-        <span>评分：${scoreRes}</span>
+        <span>质控等级：${level}</span>
+        <span>质控得分：${scoreRes}</span>
     </script>
     <script type="text/html" id="contentTmpl">
         <div class="content-item" code="${title}">
@@ -35,7 +35,91 @@
                 {{each(k,text) val}}
                 <div class="cont">
                     <span class="label">${k}:</span>
+                    {{if text.substr(0,3)==='[{"'}}
+                        {{if k==="出院诊断"}}
+                        <table class="embed-table">
+                            <tr>
+                                <td>
+                                    <table>
+                                        <tr>
+                                            <th>出院诊断</th>
+                                            <th>疾病编码</th>
+                                            <th>入院病情</th>
+                                        </tr>
+                                        {{each(i,v) JSON.parse(text)}}
+                                        {{if i<(JSON.parse(text).length/2)}}
+                                        <tr>
+                                            <td>${诊断名称}</td>
+                                            <td>${诊断编码}</td>
+                                            <td>${入院情况}</td>
+                                        </tr>
+                                        {{/if}}
+                                        {{/each}}
+                                    </table>
+                                </td>
+                                <td>
+                                    <table>
+                                        <tr>
+                                            <th>出院诊断</th>
+                                            <th>疾病编码</th>
+                                            <th>入院病情</th>
+                                        </tr>
+                                        {{each(i,v) JSON.parse(text)}}
+                                        {{if i>=(JSON.parse(text).length/2)}}
+                                        <tr>
+                                            <td>${诊断名称}</td>
+                                            <td>${诊断编码}</td>
+                                            <td>${入院情况}</td>
+                                        </tr>
+                                        {{/if}}
+                                        {{/each}}
+                                        {{if (JSON.parse(text).length)%2===1}}
+                                        <tr>
+                                            <td></td>
+                                            <td></td>
+                                            <td></td>
+                                        </tr>
+                                        {{/if}}
+                                    </table>
+                                </td>
+                            </tr>
+                            <tr><td colspan="2" class="table-tip">入院病情：1.有，2.临床未确定，3.情况不明，4.无。</td></tr>
+                        </table>
+                    <!--<p class="table-tip"></p>-->
+                        {{else}}
+                            <table>
+                        <tr>
+                            <th rowspan="2">手术及操作编码</th>
+                            <th rowspan="2">手术及操作日期</th>
+                            <th rowspan="2">手术级别</th>
+                            <th rowspan="2">手术及操作名称</th>
+                            <th colspan="3">手术及操作医生</th>
+                            <th rowspan="2">切口等级</th>
+                            <th rowspan="2">愈合等级</th>
+                            <th rowspan="2">麻醉方式</th>
+                            <th rowspan="2">麻醉医师</th>
+                        </tr>
+                        <tr><th>术者</th><th>I助</th><th>II助</th></tr>
+                        {{each JSON.parse(text)}}
+                        <tr>
+                            <td>${手术编码}</td>
+                            <td>${手术日期}</td>
+                            <td>${手术级别}</td>
+                            <td>${手术名称}</td>
+                            <td>${手术医生ID}</td>
+                            <td>${一助医生ID}</td>
+                            <td>${二助医生ID}</td>
+                            <td>${切口等级}</td>
+                            <td>${愈合等级}</td>
+                            <td>${麻醉方式}</td>
+                            <td>${麻醉医师}</td>
+                        </tr>
+                        {{/each}}
+                        </table>
+                        {{/if}}
+                    {{else}}
                     <span>${text}</span>
+                    {{/if}}
                 </div>
                 {{/each}}
                 {{/each}}
@@ -58,12 +142,19 @@
             </div>
         </div>
     </script>
+    <script type="text/html" id="emptyTmpl">
+        <div class="empty">
+            <img src="../images/empty.png" alt="空"/>
+            <p>暂无详情～</p>
+        </div>
+    </script>
     <script type="text/html" id="editTmpl">
         <div class="edit-box">
             <p><span>质控条目: </span><input disabled type="text" value="${msg}" /></p>
             <!--<p><span>模块名称: </span><input type="text" value="${modelName}" /></p>-->
             <p><span>提示信息: </span><input id="qcMsg" type="text" value="${msg}" /></p>
             <p><span>质控分数: </span> <input id="qcScore" type="text" value="${score}" /></p>
+            <p class="warning"><span></span><span class="red">支持≥0的数字输入，最多保留小数点后1位~</span></p>
         </div>
     </script>
 </head>
@@ -81,7 +172,12 @@
                     <span>缺陷详情</span>
                     <!--<a href="javascript:void(0);">+ 新增</a>-->
                 </div>
-                <div class="flaw-box content-ht"></div>
+                <div class="flaw-box content-ht">
+                    <!--<div class="empty">
+                        <img src="../images/empty.png" alt="空"/>
+                        <p>暂无详情～</p>
+                    </div>-->
+                </div>
             </div>
         </div>
     </div>

src/js/qcScore.js

@@ -1,6 +1,7 @@
 require("../css/qcScore.less");
 const $ = require('jquery');
 require('jquery-templates');
+require('./modal.js');
 const {api,post,getUrlArgObject} = require('./utils.js');
 //本页全局变量
 let global_flawData = {};    //缺陷数据
@@ -11,7 +12,6 @@ $(function(){
   //getSubMenu();
   //initScoreItem();
   getRecordDetail();
-
 function initMenu(data){
   //菜单数据填充
   $("#subMenuTmpl").tmpl(data).appendTo("#subMenu");
@@ -33,7 +33,8 @@ function initMenu(data){
     const code=$(this).attr("code");
     global_activeTab=code;
     $(".content-item,.flaw-item").hide();
-    $(".content-item[code="+code+"],.flaw-item[code="+code+"]").show();
+    $(".content-item[code='"+code+"']").show();
+    showFlawList();
   });
 }
 
@@ -67,7 +68,10 @@ function getRecordDetail(){
 
 //填充患者信息
 function initPatientInfo(data){
-  $("#infoTmpl").tmpl(data).appendTo("#patientInfo");
+  const date = data.birthday.substr(0,10);
+  const age=new Date(date).getTime()/(365*24*60*60*1000);
+  const obj=Object.assign({},data,{age:Math.floor(-age)});
+  $("#infoTmpl").tmpl(obj).appendTo("#patientInfo");
 }
 //显示病例模块明细
 function initContent(data){
@@ -85,7 +89,8 @@ function initScoreItem(data){
   for(let k in data){
     $("#flawTmpl").tmpl(data[k]).appendTo("#flaws .flaw-box");
   }
-  $(".flaw-item[code="+global_activeTab+"]").show();
+  //$(".flaw-item[code="+global_activeTab+"]").show();
+  showFlawList();
   $(".flaw-item .oper a").click(function () {
     //const activeTab=$(".sub-menu .page.active").attr("code");
     const i = $(".flaw-item[code="+global_activeTab+"]").index($(this).parents(".flaw-item"));
@@ -94,6 +99,18 @@ function initScoreItem(data){
     showModal(isEdit?'0':'1',code,i);
   })
 }
+
+//显示缺陷列表
+function showFlawList(){
+  const hml = $(".flaw-item[code="+global_activeTab+"]");
+  if(hml.length){
+    hml.show();
+    $("#flaws .empty").hide();
+  }else{
+    $("#flaws .empty").length?$("#flaws .empty").show():$("#emptyTmpl").tmpl().appendTo("#flaws .flaw-box");
+  }
+}
+
 //删除评分项
 function delScore(id){
   const param={
@@ -106,7 +123,7 @@ function delScore(id){
     if(res.data.code==='0'){
       $("#delModal").hide();
       updateFlaws();
-      alert('删除成功');
+      $.alerModal({"message":"删除成功",type:"tip",time:'1000'});
     }
   });
 }
@@ -120,7 +137,7 @@ function editScore(info){
     if(res.data.code==='0'){
       $("#delModal").hide();
       updateFlaws();
-      alert("修改成功");
+      $.alerModal({"message":"修改成功",type:"tip",time:'1000'});
     }
   });
 }
@@ -129,11 +146,23 @@ function showModal(flag,code,i){
   $("#delModal .modal-body").html("");
   $("#delModal").show();
   $("#delModal .confirm").off("click");
+  $("#qcScore").off("input");
   const info = global_flawData[global_activeTab][i];
   if(flag==='0'){   //修改
     $("#delModal .title").text("修改评分");
     $("#editTmpl").tmpl(info).appendTo("#delModal .modal-body");
+    $("#qcScore").on("input",function(){
+      const val=$(this).val();
+      if(/^[0-9]\d*$|^[0-9]\d*(.\d)?$/.test(val)){
+        $(".edit-box .warning").hide();
+      }else{
+        $(".edit-box .warning").show();
+      }
+    });
     $("#delModal .confirm").click(function(){
+      if($(".edit-box .warning").is(":visible")){
+        return;
+      }
       const obj = Object.assign({},info,{msg:$("#delModal #qcMsg").val(),score:$("#delModal #qcScore").val()});
       editScore(obj);
     });