诊断样式修改

src/common/components/ItemBox/index.jsx

@@ -19,8 +19,8 @@ class ItemBox extends Component {
     this.handleClick = this.handleClick.bind(this);
   }
   getBoxStyle(){
-    const {boxHeight,boxWidth,boxLineHeight,marginTop} = this.props;
-    return {width:boxWidth?boxWidth:undefined,height:boxHeight?boxHeight:undefined,lineHeight:boxLineHeight?boxLineHeight:'22px',marginTop:marginTop};
+    const {boxHeight,boxWidth,boxLineHeight,marginTop,backgroundColor} = this.props;
+    return {width:boxWidth?boxWidth:undefined,height:boxHeight?boxHeight:undefined,lineHeight:boxLineHeight?boxLineHeight:'22px',marginTop:marginTop,backgroundColor:backgroundColor?backgroundColor:''};
   }
 
   handleClick(e){
@@ -29,11 +29,11 @@ class ItemBox extends Component {
   }
 
   render(){
-    const {title,children,editable,className,handleFocus,onchange,fuzhen,border,handleBlur,titleTop} = this.props;
+    const {title,children,editable,className,handleFocus,onchange,fuzhen,border,handleBlur,titleTop,backgroundColor} = this.props;
     // console.log(title,editable)
     return <div className={style["box"]+" "+"clearfix"} >
       <div className={style["title"] + ' ' + className} style={{marginTop:titleTop?'22px':''}}>{title}</div>
-      <div className={`${style["content"]} ${border?style["border"]:''}`} contentEditable={editable} style={this.getBoxStyle()} onFocus={handleFocus} onInput={onchange} onClick={(e)=>{this.handleClick(e);}} onBlur={handleBlur}>
+      <div className={`${style["content"]} ${border?style["border"]:''} ${backgroundColor?style["noBorder"]:''}`} contentEditable={editable} style={this.getBoxStyle()} onFocus={handleFocus} onInput={onchange} onClick={(e)=>{this.handleClick(e);}} onBlur={handleBlur}>
         {fuzhen?children||fuzhen:children}
       </div>
     </div>

src/common/components/ItemBox/index.less

@@ -22,8 +22,12 @@
     padding:5px;
     outline: none;
     border-bottom:1px @part-border-color dashed;
+    border-radius: 4px;
   }
   .border {
       border:1px @part-border-color dashed !important;
   }
+  .noBorder{
+    border: none;
+  }
 }

src/components/AddAssistCheck/index.jsx

@@ -3,6 +3,7 @@ import { SearchOption, Calendar ,ConfirmModal,Notify} from '@commonComp';
 import styles from './index.less';
 import $ from 'jquery';
 import Textarea from './Textarea';
+import more from '@common/images/addItem1.png';
 
 class AddAssistCheck extends React.Component {
     constructor(props) {
@@ -151,6 +152,7 @@ class AddAssistCheck extends React.Component {
             <div className={styles.wrapper}>
                 {this.getAssistLabel()}
                 <div id="searchWrapAssist" style={{position:"relative"}}>
+                    <img src={more} style={{verticalAlign:'middle',marginRight:'2px'}}/>
                     <span className={`${styles.staticTag}`} onClick={(e) => this.handleSearchShow(e)} id="assistCheck">添加辅检项目</span>
                     <SearchOption handleChangeValue={handleChangeValue} visible={this.state.show}>
                         {this.getSearchList(list)}

src/components/AddAssistCheck/index.less

@@ -2,17 +2,18 @@
 
 .staticTag {
     cursor: pointer;
-    color: #767676;
+    // color: #767676;
+    color: @blue;
     /*padding-top: 6px;*/
     box-sizing: border-box;
     display: inline-block;
     position: relative;
-    &:before {
+    /* &:before {
         content: '\300C';
     }
     &:after {
         content: '\300D';
-    }
+    } */
 }
 .searchLi {
     height: 44px;

src/components/AddInspect/index.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { SearchOption, InspectCommon, Calendar ,Notify,ConfirmModal} from '@commonComp';
+import { SearchOption, InspectCommon, Calendar ,Notify,ConfirmModal,Add} from '@commonComp';
 import { deepClone } from '@utils/tools';
 import styles from './index.less';
 import date1 from './img/date1.png';
@@ -7,7 +7,7 @@ import date2 from './img/date2.png';
 import close from './img/close.png';
 import store from '@store';
 import $ from 'jquery';
-
+import more from '@common/images/addItem1.png';
 class Inspect extends React.Component {
     constructor(props) {
         super(props);
@@ -35,6 +35,7 @@ class Inspect extends React.Component {
         this.showDetails = this.showDetails.bind(this)
         this.delConfirm = this.delConfirm.bind(this)
         this.handleCancel = this.handleCancel.bind(this)
+        this.handleSearchShow = this.handleSearchShow.bind(this)
     }
     delConfirm(){//弹窗确定
         const{delPartItem,handleCloseExcel} = this.props;
@@ -104,6 +105,7 @@ class Inspect extends React.Component {
     handleSearchShow(e) {
         let tmpShow = this.state.show;
         this.setState({ show: !tmpShow })
+        console.trace(789,this.state.show);
         // e.stopPropagation();
     }
     handleFillShow(e,idx) {
@@ -374,6 +376,7 @@ class Inspect extends React.Component {
                     </ul>
                 </div>
                 <div style={{position:"relative"}}>
+                    <img src={more} style={{verticalAlign:'middle',marginRight:'2px'}}/>
                     <span id="searchWrap" className={`${styles.staticTag}`} onClick={(e) => this.handleSearchShow(e)}>添加化验项</span>
                     <SearchOption handleChangeValue={handleChangeValue} visible={this.state.show}>
                         {this.getSearchList(list)}

src/components/AddInspect/index.less

@@ -52,16 +52,17 @@
 
 .staticTag {
     cursor: pointer;
-    color: #767676;
+    // color: #767676;
+    color: @blue;
     padding-top: 10px;
     display: inline-block;
     position: relative;
-    &:before {
+    /* &:before {
         content: '\300C';
     }
     &:after {
         content: '\300D';
-    }
+    } */
 }
 .labelWrap {
     .table {

src/components/Advice/index.jsx

@@ -69,7 +69,7 @@ class Advice extends Component{
     })
 
     return  <div className={`${'mainsuit-box'} ${style['main-suit']}`}>
-      <ItemBox title='医嘱' editable={false}>
+      <ItemBox title='医嘱' editable={false} border={true} marginTop="10px">
         <div className={style['billing']}>
           {advice.assay && advice.assay.length > 0 || advice.check && advice.check.length > 0 ? <h1>开单项目</h1> : ''}
             {advice.assay && <span className={style['treat-input']}> {advice.assay}</span>}

src/components/CurrentIll/index.jsx

@@ -4,6 +4,7 @@ import {Button,InlineTag,ItemBox,Notify,Textarea} from '@commonComp';
 import TailInlineTag from '@commonComp/TailInlineTag';
 import chooseType from '@containers/eleType.js';
 import SearchDrop from '@components/SearchDrop';
+import {filterDataArr} from '@utils/tools'
 
 class CurrentIll extends Component{
   constructor(props){
@@ -35,7 +36,9 @@ class CurrentIll extends Component{
     // 判断主诉是否为空
     const {mainData,mainText,setData,moduleNum,mainIds,data,changeEditIll,editClear} = this.props;
     const that = this;
-    if(mainData.length == 0 && !mainText[0]){
+    let mainFinallyText = filterDataArr(mainText);console.log(88,mainText,mainFinallyText);
+    // if(mainData.length == 0 && !mainText[0]){
+    if(!mainFinallyText){
       //弹窗提醒
       Notify.error("无法操作，请先输入主诉");
       this.setState({

src/components/Diagnosis/index.jsx

@@ -5,7 +5,7 @@ import DiagnosticList from '@containers/DiagnosticList.js';
 // import TreatDrug from '@containers/TreatDrug.js'
 import DiagResultSearch from '@containers/DiagResultSearch'
 import $ from 'jquery';
-
+import more from '@common/images/addItem1.png';
 
 class Diagnosis extends Component {
     constructor(props) {
@@ -43,9 +43,12 @@ class Diagnosis extends Component {
         
         
         return (<div>
-            <ItemBox  id="diagnosis" title='诊断'  boxHeight='auto' titleTop='22px'>
+            <ItemBox  id="diagnosis" title='诊断'  boxHeight='auto' titleTop='22px' marginTop='9px' backgroundColor='#EAF7FD'>
                 <DiagnosticList></DiagnosticList>
-                <div><span id='addDiag' className={style['add-diag']} onClick={this.handleshowSearch}>添加诊断结果</span></div>
+                <div style={{marginLeft:'10px'}}>
+                    <img src={more} style={{verticalAlign:'middle',marginRight:'2px'}}/>
+                    <span id='addDiag' className={style['add-diag']} onClick={this.handleshowSearch}>添加诊断结果</span>
+                </div>
                 <DiagResultSearch></DiagResultSearch>
                 
             </ItemBox>

src/components/Diagnosis/index.less

@@ -1,13 +1,16 @@
+@import "~@less/variables.less";
 .add-diag {
     height: 50px;
     line-height: 50px;
-    padding: 0 10px;
-    color: #767676;
+    // padding: 0 10px;
+    // margin-left: 10px;
+    // color: #767676;
+    color: @blue;
     cursor: pointer;
 }
-.add-diag:before{
+/* .add-diag:before{
     content: '「';
 }
 .add-diag:after{
     content: '」';
-}
+} */

src/components/DiagnosticList/index.jsx

@@ -83,7 +83,7 @@ class DiagnosticList extends Component {
                         return (<div draggable={true} className={style['diag-box'] + ' clearfix'}  key={item.id} >
                                     {index === 0 ? '' : <span className={style['diag-up']} onClick={() => {this.upDiagnostic(index)}}><img src={diagUp}/></span>}
                                     {list.length === 1 ? '' : index !== 0 ? '' : <span onClick={() => {this.downDiagnostic(index)}} className={style['diag-down']}><img src={diagDown}/></span>}
-                                    <span className={style['diag-number']}>{index === 0 ? '主' : index+1}</span>
+                                    <span className={style['diag-number']} style={{fontWeight:index === 0 ?'bold':'normal'}}>{index === 0 ? '主' : index+1}</span>
                                     <span className={style['diag-name']} onClick={()=>{this.handleClickDiag(item)}}>{item.name}<span></span></span> 
                                     {item.type === 1 ? <span className={style['diag-first']}>初诊</span> :<span className={style['diag-second']}> 复诊</span>}
                                     <span className={style['treat']} onClick={() =>{this.showTreat(item)}}>治疗方案</span>

src/components/DiagnosticList/index.less

@@ -7,6 +7,7 @@
     line-height: 50px;
     border-bottom: 1px dotted #989DA3;
     position: relative;
+    background: #EAF7FD;
 }
 .diag-number {
     display: inline-block;
@@ -40,7 +41,10 @@
 }
 .diag-first {
     background: #EAF7FD;;
-    color: #000;
+    color: #3B9ED0;
+    border: 1px solid #3B9ED0;
+    border-radius: 4px;
+    line-height: 17px;
 }
 
 
@@ -49,6 +53,8 @@
     border-bottom: 1px solid #666;
     box-sizing: border-box;
     position: relative;
+    color:#000;
+    font-weight: bold;
 }
 
 .diag-up, .diag-down {