设置UI修改，历史引用不切模式，模板获取不筛选模式

src/components/Banner/ModeChange/index.jsx

@@ -27,7 +27,7 @@ class ModeChange extends Component {
                     <p>说明：</p>
                     <p>该设置只针对问诊模块中的“主诉”、“现病史”、“其他史”功能；</p>
                 </div>
-                <div className={style['btn']} onClick={confirmType}>保存修改</div>
+                <div className={style['btn']} onClick={confirmType}><button>保存修改</button></div>
             </div>
         </div>
       </React.Fragment>,domNode)

src/components/Banner/ModeChange/index.less

@@ -19,13 +19,13 @@
       width: 432px;
       left:50%;
       margin-left: -216px;
-      height: 277px;
+      min-height: 277px;
       background: #fff;
       .oper{
         margin: 20px 30px;
       }
       .explain{
-        margin: 50px 30px 20px;
+        margin: 50px 30px;
         p{
           font-size: 12px;
           line-height: 20px;
@@ -70,17 +70,22 @@
         }
       }
       .btn {
-        .btnCom;
-        width: 80px;
-        height: 34px;
-        background:#3B9ED0;
-        color:#fff;
-        font-size: 14px;
-        line-height: 34px;
-        position: relative;
-        left: 50%;
-        margin-left: -40px;
-        top: 30px;
+        text-align: center;
+        margin-bottom: 20px;
+        button{
+          .btnCom;
+          height: 34px;
+          line-height: 32px;
+          text-align: center;
+          outline: none;
+          border-radius: 4px;
+          cursor: pointer;
+          box-sizing: border-box;
+          margin-left: 20px;
+          background: @blue;
+          color: #fff;
+          margin-right: 20px;
+        }
       }
     }
   }

src/components/Banner/index.jsx

@@ -4,11 +4,8 @@ import style from "./index.less";
 import ReactDom from "react-dom";
 import logo from "../../common/images/logoa.png";
 import setup from "../../common/images/setup.png";
-import close from '../../common/images/icon_close.png';
-import ok from '../../common/images/confirm.png'
 import emergIcon from '../../common/images/emergency.png'
 import {Notify} from '@commonComp';
-// import Emergency from '@components/Emergency';
 import Emergency from '@containers/Emergency';
 import {getAllHis} from '@store/async-actions/fetchModules.js';
 import {timestampToTime,getCurrentDate} from '@utils/tools.js';
@@ -21,11 +18,9 @@ class Banner extends Component {
     super(props)
     this.state = {
       mode: props.typeConfig,
-      zIndex:204,
       emergencyBox:false
     };
     this.showConfigModal = this.showConfigModal.bind(this);
-    this.closeConfigModal = this.closeConfigModal.bind(this);
     this.changeType = this.changeType.bind(this);
     this.confirmType = this.confirmType.bind(this);
     this.showHisModal = this.showHisModal.bind(this);
@@ -35,18 +30,10 @@ class Banner extends Component {
   showConfigModal(){
     this.setState({
       mode:this.props.typeConfig,
-      zIndex:206
     });
     this.props.showConfigModal()
   }
 
-  closeConfigModal(){
-    this.props.closeConfigModal();
-    this.setState({
-      zIndex:204
-    })
-  }
-
   changeType(typeConfig){
     this.setState({
       mode:typeConfig
@@ -54,27 +41,17 @@ class Banner extends Component {
   }
 
   confirmType(){
-    const {typeConfig,confirmType,clearCommS} = this.props;
+    const {typeConfig,confirmType,clearCommS,closeConfigModal} = this.props;
     const mode = this.state.mode;
     // 清空主诉常见症状
     clearCommS();
     if(mode==typeConfig){
-      this.closeConfigModal()
+      closeConfigModal()
       return;
     }
     confirmType&&confirmType(mode);
-    this.closeConfigModal()
-    this.setState({
-      zIndex:204
-    })
+    closeConfigModal()
   }
-  /*componentDidUpdate(){
-    const {failed} = this.props;
-    if(failed){
-      //弹窗提醒
-      Notify.error("模式切换失败，请稍后再试");
-    }
-  }*/
   showHisModal(){
     const {getAllRecord} = this.props;
     // 进入时默认展示当天的病例
@@ -86,20 +63,18 @@ class Banner extends Component {
     getAllRecord&&getAllRecord(item);
     this.setState({
       emergencyBox:true,
-      zIndex:206
     })
   }
   handleHisClose(){
     this.setState({
       emergencyBox:false,
-      zIndex:204
     })
     dragBox('previewWrapper','previewStatic','del')    
   }
   render() {
-    const {visible,disVisible,copyVisible,ifShow,deptName} = this.props;
-    const {mode,zIndex,emergencyBox} = this.state;
-    const {showConfigModal, closeConfigModal, changeType, confirmType} = this;
+    const {visible,ifShow,deptName, closeConfigModal} = this.props;
+    const {mode,emergencyBox} = this.state;
+    const {showConfigModal, changeType, confirmType} = this;
     const domNode = document.getElementById('root');
     return (
       <div className={style["logo"]} >

src/components/HistoryCaseContainer/HistoryList/index.jsx

@@ -62,7 +62,7 @@ class HistoryCaseContainer extends React.Component {
         const {activeHis} = this.state
         this.setState({visible:false})
         store.dispatch(showHistory(false))
-        store.dispatch({type: CONFIRM_TYPE, confirmType: activeHis.sign});
+        //store.dispatch({type: CONFIRM_TYPE, confirmType: activeHis.sign});
         store.dispatch(getHistempDetail(activeHis))
         if(didPushParamChange()){
           store.dispatch(billing())

src/components/Operation/index.less

@@ -52,10 +52,8 @@
         outline: none;
         border-radius: 4px;
         cursor: pointer;
-        color: #000;
         border: 1px solid #3B9ED0;
         box-sizing: border-box;
-        background: #fff;
         margin-left:20px;
         background: #3B9ED0;
         color: #fff;

src/components/OtherHistory/index.jsx

@@ -58,7 +58,6 @@ class OtherHistory extends Component{
   render(){
     const {hasMain,totalHide,searchData,isRead,type,fetchPushInfos,handleInput,saveText} = this.props;
     const {boxLeft,boxTop} = this.state;
-    const {hasMain,searchData,totalHide,isRead,type,fetchPushInfos,handleInput,saveText,boxTop,boxLeft} = this.props;
     //智能模式有数据时不切换文本，文本模式有数据时不切换智能
     if(+type===1){      //文本模式
       return <Textarea title='其他史' boxMark='3'

src/containers/OtherHistory.js

@@ -2,10 +2,10 @@ import React from 'react';
 import {connect} from 'react-redux';
 import OtherHistory from "../components/OtherHistory";
 import {SETSELECTED,CLEARSELECTED,CONFIRMSELECTED,SELECTOTHERSEARCHDATA,SETDATA,SETTEXTMODEVALUE,OTHEREDICLEAR} from '@types/otherHistory';
-import {HIDE,RESET,ISREAD} from '@store/types/homePage.js';
-import {getModule,setOtherHisModule} from '@store/async-actions/fetchModules.js';
+import {HIDE,RESET,ISREAD} from '@store/types/homePage';
+import {getModule,setOtherHisModule} from '@store/async-actions/fetchModules';
 import {billing} from '@store/async-actions/pushMessage';
-import {didPushParamChange,filterDataArr,fullfillText} from '@utils/tools.js';
+import {didPushParamChange,filterDataArr,fullfillText} from '@utils/tools';
 
 function mapStateToProps(state){
   const {otherHistory,homePage,typeConfig,mainSuit} = state;

src/store/async-actions/fetchModules.js

@@ -93,7 +93,7 @@ export const getOtherHisRecord = ()=>{
     const param = {
       hospitalCode:message.hospitalCode,
       patientCode:message.patientCode,
-      sign:mode
+      /*sign:mode*/
     };
     json(api.getOtherHisRecord,param).then((res)=>{
       if(res.data.code=='0'){
@@ -215,7 +215,7 @@ export function setOtherHisModule(){
     const otherModel = initData.otherHisModel;
     const block = Object.assign(JSON.parse(config.textLabel),{full:true});
     const mode = state.typeConfig.typeConfig;
-    const model = otherModel&&otherModel.length>0?[...otherModel]:[block];     //查体模板
+    const model = otherModel&&otherModel.length>0?[...otherModel]:[block];     //其他史模板
     const arr = deepClone(initData.otherHis);        //最近其他史数据
     const arrSave = deepClone(initData.otherHisSave);    //最近其他史saveText
     const selects = initData.otherSelecteds?[...initData.otherSelecteds]:[];  //其他史杂音类选中项