Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

src/components/AddAssistCheck/index.jsx

@@ -145,9 +145,9 @@ class AddAssistCheck extends React.Component {
                     cancel={this.handleCancel}
                     okText="删除"
                     cancelText='取消'
-                    okBorderColor={'#3B9ED0'}
-                    okColor={'#fff'}
-                    oKBg={'#3B9ED0'}
+                    // okBorderColor={'#3B9ED0'}
+                    // okColor={'#fff'}
+                    // oKBg={'#3B9ED0'}
                 >
                     <p className={styles['center']}>是否删除该辅检项？</p>
                 </ConfirmModal>

src/components/AddInspect/index.jsx

@@ -331,9 +331,9 @@ class Inspect extends React.Component {
                     cancel={this.handleCancel}
                     okText="删除"
                     cancelText='取消'
-                    okBorderColor={'#3B9ED0'}
-                    okColor={'#fff'}
-                    oKBg={'#3B9ED0'}
+                    // okBorderColor={'#3B9ED0'}
+                    // okColor={'#fff'}
+                    // oKBg={'#3B9ED0'}
                 >
                     <p className={styles['center']}>{toastText}</p>
                 </ConfirmModal>

src/components/Treat/index.jsx

@@ -27,9 +27,10 @@ class Treat extends Component {
     }
     
     hideTreat() {
-        const { hideTreat,clearTreat } = this.props;
+        const { hideTreat,clearTreat, hideDrugInfo } = this.props;
         clearTreat && clearTreat();
         hideTreat && hideTreat();
+        hideDrugInfo && hideDrugInfo();
         // windowRemoveEventHandler('mousemove',handleMove,document)
     }
     handlePrescription() {

src/components/TreatDesc/DrugInfo/index.jsx

@@ -60,22 +60,24 @@ class DrugInfo extends Component {
                     <div className={style['drug-title1']} >{drugInfo.title}说明书</div>
                     {drugInfo.drugDesc.map((item, index) =>{
                         return <div className={style['drug-desc-item']} id={item.title.trim()}>
-                            <span className={style['drug-desc-title']} >{item.title.trim()}</span> 
+                            <div className={style['drug-desc-title']} >{item.title.trim()}</div> 
                             <div className={style['drug-desc-content']} dangerouslySetInnerHTML ={{__html: item.content}}></div> 
                         </div>
                     })}
                     <div className={style['content-menu-box']}>
-                        <div className={style['content-menu']}>
-                            {drugInfo.drugDesc.map((item, index) => {
-                                return (<div >
-                                    <div className={style['details-menu-title-box']}>
-                                        {index === 0 ? '' : <div className={style['details-content-menu-line']}></div>}
-                                        <span onClick={this.handleClickMenu.bind(this, index, item, drugInfo.drugDesc)} className={style['details-content-menu-name']} style = {index === currentIndex ? {color:'#0089be'} : ''}>
-                                            <span className={style['details-content-menu-circle']} style = {index === currentIndex ? {background:'#0089be'} : ''}></span>{item.title}
-                                        </span>
-                                    </div>
-                                </div>)
-                            })}
+                        <div className={style['content-menu-wrapper']}>
+                            <div className={style['content-menu']}>
+                                {drugInfo.drugDesc.map((item, index) => {
+                                    return (<div >
+                                        <div className={style['details-menu-title-box']}>
+                                            {index === 0 ? '' : <div className={style['details-content-menu-line']}></div>}
+                                            <span onClick={this.handleClickMenu.bind(this, index, item, drugInfo.drugDesc)} className={style['details-content-menu-name']} style = {index === currentIndex ? {color:'#0089be'} : ''}>
+                                                <span className={style['details-content-menu-circle']} style = {index === currentIndex ? {background:'#0089be'} : ''}></span>{item.title}
+                                            </span>
+                                        </div>
+                                    </div>)
+                                })}
+                            </div>
                         </div>
                     </div>
                 </div> }

src/components/TreatDesc/DrugInfo/index.less

@@ -55,11 +55,11 @@
     display: inline-block;
     font-weight: bold;
     font-size: 14px;
-    height: 100%;
-    float: left;
-    width: 190px;
-    text-align-last:justify;    /*chrome*/
-    text-justify: distribute;   /*ff*/
+    // height: 100%;
+    // float: left;
+    // width: 190px;
+    // text-align-last:justify;    /*chrome*/
+    // text-justify: distribute;   /*ff*/
 }
 .drug-desc-title::before {
     content: '【'
@@ -76,16 +76,21 @@
 }
 .drug-desc-content {
     /*width: 100%;*/
-    margin-left: 210px;
-    margin-right: 160px;
+    margin: 0px 160px 0px 10px;
 }
 
 .content-menu-box {
     position: absolute;
     top: 50px;
-    right: -20px;
-    width: 200px;
+    right: 20px;
+    width: 160px;
     height: 80%;
+    overflow: hidden;
+    
+}
+.content-menu-wrapper {
+    width: 200px;
+    height: 100%;
     overflow-y: auto;
 }
 .content-menu {