Merge branch 'newVersion6.0' of http://192.168.2.236:10080/zhouna/newICSS into newVersion6.0

src/common/components/SearchOption/index.jsx

@@ -50,6 +50,7 @@ class SearchOption extends React.Component {
         })
     }
     handleClearVal(){
+        console.log(12312313);
         const { handleChangeValue } = this.props;
         this.textInput.current.value = '';
         this.textInput.current.focus();
@@ -98,6 +99,7 @@ class SearchOption extends React.Component {
         });
     }
     handleFocus(){
+        console.log(1223);
       this.setState({showInsp:false})
       if(this.state.val.trim() != ''){
         return;

src/components/DiagResultSearch/index.jsx

@@ -42,6 +42,8 @@ class DiagResultSearch extends Component {
   }
 
   getSearchList(searchResult, isShowNoDataInfo) {
+    // console.log(searchResult,'searchResult');
+    // console.log(isShowNoDataInfo,'isShowNoDataInfo');
     if (isShowNoDataInfo === true && searchResult.length === 0 ){
       return <div className={style['search-result-noItem']}>暂无筛选项</div>
     }

src/components/Diagnosis/index.jsx

@@ -57,7 +57,12 @@ class Diagnosis extends Component {
         <div style={{ marginLeft: '10px', position: 'relative',color:'#000' }}>
           <Add showText="添加诊断结果" handleClick={this.handleshowSearch} id="addDiag" height="50px" />
           <DiagResultSearch
-            refreshScroller={this.refreshScroller} setHighter={this.props.setHighter} windowHeight={this.props.windowHeight} pageTop={this.state.pageTop} height={150}></DiagResultSearch>
+            refreshScroller={this.refreshScroller} 
+            setHighter={this.props.setHighter} 
+            windowHeight={this.props.windowHeight}
+            pageTop={this.state.pageTop} 
+            height={150}>
+          </DiagResultSearch>
         </div>
 
 

src/components/HistoryCaseContainer/HistoryList/index.jsx

@@ -348,7 +348,7 @@ class HistoryCaseContainer extends React.Component {
                         <span className={styles.sort} onClick={this.handleSortClick}>排序 <img src={sort} alt="排序"/></span>
                     </div>
                     <div className={styles.lists}>
-                        <ul id="hislistLeft" style={{ maxHeight: '722px',overflow:'auto' }} >
+                        <ul id="hislistLeft" style={{ overflow:'auto' }} >
                             {(items && items.length > 0) ? items.map((val,idx)=>{                                    
                               return <li key={val.id} onClick={() => { this.handleCaseClick(idx, val) }} onMouseEnter={() => this.handleMouseEnterLi(idx)} onMouseLeave={() => this.handleMouseLeaveLi(idx)}>
                                          <div className={styles.itemLeft}>

src/components/HistoryCaseContainer/HistoryList/index.less

@@ -11,7 +11,6 @@
     height: 86%;
     background-color: #fff;
     overflow: hidden;
-    // padding-bottom:20px;
     .close {
         position: absolute;
         top: 0;
@@ -50,9 +49,10 @@
         }
         .lists {
             box-sizing: border-box;
-            // overflow-y: auto;
             height: 100%;
-           
+            ul{
+                height : 100%;
+            }
             li {
                 height: 54px;
                 line-height: 54px;
@@ -68,14 +68,12 @@
                 .itemLeft{
                     flex: 1;
                     display: flex;
-                    // align-items: center;
                     justify-content: start;
                     flex-direction: column;
                     .historyTop{
                         display: flex;
                         height:34px;
                         .itemName {
-                            // display: inline-block;
                             max-width: 120px;
                             overflow: hidden;
                             text-overflow: ellipsis;
@@ -85,7 +83,6 @@
                             color: #1E1E1E;                      
                         }  
                         .itemNameActive {
-                            // display: inline-block;
                             max-width: 120px;
                             overflow: hidden;
                             text-overflow: ellipsis;
@@ -95,10 +92,8 @@
                             color: #3B9ED0;                      
                         }                   
                         .edit{
-
                             width: 30px;
                             height: 30px;
-                            // background-color: pink;
                             img{
                                 width: 14px;
                                 height: 14px;
@@ -128,8 +123,6 @@
                     display: flex;
                     align-items: center;
                     .del {
-                        // background-color: red;
-                        // margin-left: 8px;
                         width: 30px;
                         height:30px;
                         img{
@@ -137,19 +130,15 @@
                             height: 20px;
                             position: relative;
                             top: -7px;
-                            left: 3px;
+                            left: 13px;
                         }            
                     }
-                }
-                
-               
+                }              
             }
             li:hover {
                 border: 1px solid #66afe9;
                 border: 1px solid #66afe9\0;
-            }
- 
-           
+            }           
             .bgc {
                 background-color: #fff;
             }
@@ -162,11 +151,8 @@
                 color: #fff;
                 background-color: @template-color;
                 float: right;
-                // margin-top: 16px;
                 font-size: 12px;
-                // display: none;
                 outline: none;
-                // margin-left: 10px;
             }
             .quoteShow {
                 display: block;
@@ -179,12 +165,11 @@
     .mainHistoryRight {
         // margin-left: 300px;
         // position: absolute;
+        // top: 42px;
         overflow: auto;
         height: 100%;
         padding-top: 40px;
         padding-bottom:20px;
-        // top: 42px;
-
         float: left;
     }
     .closeHis {

src/components/PushData/index.jsx

@@ -37,9 +37,9 @@ class PushData extends Component{
 
     render(){
         const {hashNum } = this.state
-        const {mrId,planCode,showPushData,togglePushData ,windowWidth,windowHeight} = this.props
-        // console.log(windowWidth,windowHeight)
-        const url =`${pushPage2}?mrId=${mrId}&planCode=${planCode}&data=${hashNum}`;
+        const {mrId,planCode,showPushData,togglePushData ,windowWidth,windowHeight,hospitalId} = this.props
+        console.log(windowWidth,windowHeight)
+        const url =`${pushPage2}?mrId=${mrId}&planCode=${planCode}&hospitalId=${hospitalId}`;
         return <div >
             {!showPushData&&<div className={style['slideButton']} style={{right:(windowWidth-1200)/2+'px'}} onClick={this.showPushData}> 
                 朗通智能提醒 
@@ -48,11 +48,11 @@ class PushData extends Component{
             {showPushData&&<div id="dragModalWrap" className={style['pushWrapper']} style={{right:(windowWidth-1200)/2+'px'}}>
                 {/* <div id="dragModalTitle"  className={style['pushDataTitle']}>朗通智能提醒 <span className={style['pushDataHide']} onClick={this.hidePushData}>收起</span></div> */}
                 <div className={style['pushDataTitle']}>朗通智能提醒 <span className={style['pushDataHide']} onClick={this.hidePushData}>收起</span></div>
-                {mrId&&<iframe id='embedPage'  src={url} frameborder="0" width="400" height="560"></iframe>}
-                {!mrId&&<div className={style['pushEmpty']}>
+                {hospitalId&&<iframe id='embedPage'  src={url} frameborder="0" width="400" height="560"></iframe>}
+                {!hospitalId&&<div className={style['pushEmpty']}>
                         <div className={style['pushEmptyBox']}>
                             <img className={style['pushEmptyImg']} src={pushEmpty} alt=""/>
-                            <p>等待内容输入中…</p>
+                            <p className={style['pushEmptyTxt']}>等待内容输入中…</p>
                         </div>
                 </div>}
 

src/components/PushData/index.less

@@ -32,6 +32,9 @@
 .pushEmptyImg{
     width: 130px;
 }
+.pushEmptyTxt{
+    margin: 15px 0 0 0;
+}
 .pushWrapper{
     width:402px;
     // height:600px;

src/containers/PushDataContainer.js

@@ -13,6 +13,7 @@ function mapStateToProps(state){
         planCode:mrInfo.mode,
         windowHeight:state.homePage.windowHeight,
         windowWidth:state.homePage.windowWidth,
+        hospitalId:state.historyTemplates.HospitalInfo.id
     }
 }
 

src/store/reducers/print.js

@@ -12,7 +12,7 @@ const initState = {
   mrInfo:{
     update:0,
     mrId:'',
-    mode: ''
+    mode: 'plan_default'
   }
 };
 export default function(state = initState, action) {