杂音类型确定按钮改为右上角

src/common/less/variables.less

@@ -101,15 +101,11 @@
   line-height: 44px;
   font-size: 12px;
   color:@red;
-  // border: none;
   background: #fff;
-  float: left;
-  // outline: none;
-  // text-align: center;
-  // cursor: pointer;
+  //float: left;
   margin-left: 22px;
   position: relative;
-  bottom: -10px;
+  //bottom: -10px;
 }
 .confirm{
   width: 120px;
@@ -117,16 +113,13 @@
   line-height: 44px;
   color:@blue;
   font-size: 12px;
-  // border: 1px solid @blue;
   background: #fff;
   margin-left: 20px;
-  float: right;
-  // outline: none;
+  //float: right;
   text-align: right;
-  // cursor: pointer;
   font-weight: bold;
   position: relative;
-  bottom: -10px;
+  //bottom: -10px;
   padding-right: 10px;
 }
 :global(.red){

src/components/CommonSymptom/index.jsx

@@ -119,7 +119,13 @@ class CommonSymptom extends Component{
     return <div className={this.getClass()} contenteditable="false" style={{'display':hide?'none':'block'}} ref={this.div} onClick={this.handleOuter}>
       <ul className={style["listBox"]}>
         {mainHis.length>0?<ul className={style["his"]}>
+          <div className='clearfix'>
           <p>最近输入症状：</p>
+          <div className={style['oper']}>
+            <span className={style['clear']} onClick={this.handleClear}>清空选项</span>
+            <span className={style['confirm']} onClick={this.handleConfirm}>确定</span>
+          </div>
+          </div>
           {mainHis.map((it)=>{
             return <li onClick={(e)=>this.handleSelect(e,it)} className={this.getStyle(it.conceptId)} title={it.name.length>5?it.name:''}>{it.name.length>5?it.name.slice(0,4)+'...':it.name}</li>
           })}
@@ -129,10 +135,6 @@ class CommonSymptom extends Component{
           return <li onClick={(e)=>this.handleSelect(e,it)} className={this.getStyle(it.conceptId)} title={it.name.length>5?it.name:''}>{it.name.length>5?it.name.slice(0,4)+'...':it.name}</li>
         })}
       </ul>
-      <div className={style['oper']}>
-        <span className={style['clear']} onClick={this.handleClear}>清空选项</span>
-        <span className={style['confirm']} onClick={this.handleConfirm}>确定</span>
-      </div>
     </div>
   }
 }

src/components/CommonSymptom/index.less

@@ -11,9 +11,11 @@
       color: #3B9ED0;
       border-bottom: 1px solid #EAEDF1;
       p{
-        line-height: 32px;
+        line-height: 44px;
         padding-left: 15px;
         color: #000;
+        width: 180px;
+        float: left;
       }
     }
   .c-title{
@@ -36,20 +38,23 @@
   .clear{
     .btnCom;
     .clear;
+    border: 1px #ff0000 solid;
+    padding: 5px 8px;
     margin-left: 15px;
     bottom: 0;
   }
   .confirm{
     .btnCom;
     .confirm;
+    border: 1px #3B9ED0 solid;
+    padding: 5px 8px;
     width: 75px;
     margin-left: 15px;
     bottom: 0;
-    padding-right: 20px;
   }
   .oper{
-    margin-top: 5px;
     padding-right: 5px;
+    float: right;
   }
 }
 .hide{

src/components/ListItems/index.jsx

@@ -69,15 +69,17 @@ class ListItems extends Component{
     const noPush = tagType===11&&(!pushList||pushList.length===0);
     const noSearch = boxMark==1 && tagType==11 && !pos;       //非第一病程添加症状标签不显示搜索
     return <div className={style["drop-list"]} ref={parDiv} style={this.getStyle()} contentEditable="false" onClick={(e)=>{e.stopPropagation();}}>
-      {noPush?'':<p className={style['orderTips']}>按{order?'从左到右从上到下':'点击'}顺序成文</p>}
+      <div className='clearfix'>
+        {noPush?'':<p className={order?style['orderTips']:style['orderTips-m']}>按{order?'从左到右从上到下':'点击'}顺序成文</p>}
+        <div className={style["oper"]}>
+          <span className={style['clear']} onClick={handleClear}>清空选项</span>
+          <span className={style['confirm']} onClick={this.clickConfirm}>确定</span>
+        </div>
+      </div>
       {this.getLabels()}
       {noSearch && <div className="search">
         <SearchBox show={show} pushIds={this.getPushItemIds(pushList)} onSelect={this.searchSelect.bind(this)} onRef={(child)=>{this.child = child;}}/>
       </div>}
-      <div className="oper clearfix">
-        <span className={style['clear']} onClick={handleClear}>清空选项</span>
-        <span className={style['confirm']} onClick={this.clickConfirm}>确定</span>
-      </div>
     </div>
   }
 }

src/components/ListItems/index.less

@@ -1,22 +1,37 @@
 @import "~@less/mixin.less";
 .drop-list{
   .pop;
-  padding:8px 20px 25px 0;
+  padding:14px 20px 8px 0;
+  min-width: 300px;
 }
 .orderTips{
+  float: left;
   color: #bfbfbf;
-  margin:0 0 0 28px;
+  margin:0 0 10px 28px;
+  max-width: 98px;
+  white-space: initial;
+}
+.orderTips-m{
+  .orderTips;
+  margin-top:10px;
+}
+.oper{
+  float: right;
 }
 .clear{
   .btnCom;
   .clear;
-  height: auto;
-  line-height: unset;
+  border: 1px #ff0000 solid;
+  padding: 5px 8px;
+  /*height: auto;
+  line-height: unset;*/
 }
 .confirm{
   .btnCom;
   .confirm;
-  height: auto;
-  line-height: unset;
+  border: 1px #3B9ED0 solid;
+  padding: 5px 8px;
+ /* height: auto;
+  line-height: unset;*/
   width: 60px;
 }