浏览代码

删除无用组件;互斥项字数限制放开

liucf 6 年之前
父节点
当前提交
88c4d20430

+ 0 - 78
src/common/components/CheckBox/Multiple/index.jsx

@@ -1,78 +0,0 @@
-import React,{Component} from 'react';
-import style from './index.less';
-import PropTypes from 'prop-types';
-
-class Multiple extends React.Component{
-  constructor(props){
-    super(props);
-    this.handleChange = this.handleChange.bind(this);
-    this.state = {
-      ban:false,
-      wu:false,
-      noBanWu:false//不点伴无
-    }
-  }
-
-  handleClick(e){
-    e.stopPropagation();
-  }
-
-  handleChange(item,e){
-    e.stopPropagation();
-    const {handleClick} = this.props;
-   // handleClick && handleClick(item.name); 
-   // console.log(2222,item);
-
-  }
-
-  getSelectedStyle(it){
-    // const {isSelect,first,then} = this.props;
-    const isSelect = it.isSelect;
-    const {ban,wu} = this.state;
-    if(ban && isSelect){//伴、初为
-      return style.selectBtn;
-    }
-    else if(wu && isSelect){//无、后为
-      return `${style.selectBtn} ${style.thenSel}`;
-    }
-    else if(isSelect){
-      return style.selectBtn;
-    }
-    else{
-       return style.btn
-    }
-
-  }
-
-  getTabs(){
-    const {datas} =this.props;
-    let pushData = datas && datas.filter(function(item){
-      return item.name
-    });
-    // 没有标签的暂时过滤
-    let list = pushData && pushData.map((it,i)=>{
-        return <p onClick={this.handleChange.bind(this,it)} contentEditable='false' className={this.getSelectedStyle(it)}>{it.name}</p>
-      })
-      return list;
-  }
-
-  render(){
-    const selectStyle = this.props.style;
-    const {name} = this.props;
-    return <div className={style['multiple']} onClick={this.handleClick.bind(this)} style={selectStyle}>
-      {this.props.children}
-      <div className={style['multiple-con']}>
-        {/*<p onClick={this.handleChange.bind(this,name)} contentEditable='false' className={this.getSelectedStyle()}>{name}</p>*/}
-        {this.getTabs()}
-      </div>
-    </div>
-  }
-}
-
-Multiple.propTypes = {
-    handleClick:PropTypes.func,
-    isSelect:PropTypes.bool,
-    name:PropTypes.string
-};
-
-export default Multiple;

+ 0 - 48
src/common/components/CheckBox/Multiple/index.less

@@ -1,48 +0,0 @@
-
-.multiple{
-  // width: 200px;
-  // height: 44px;
-  // line-height: 44px;
-  margin-left: 10px;
-  display: inline-block;
-  vertical-align: top;
-
-  .btn{
-    height: 44px;
-    line-height: 44px;
-    // width: 100%;
-    font-size: 12px;
-    text-align: left;
-    border: none;
-    color:#000000;
-    background: #fff;
-    // padding-left: 40px;
-    padding: 0 10px 0 30px;
-    cursor: pointer;
-  }
-  .selectBtn{
-    height: 44px;
-    line-height: 44px;
-    // width: 100%;
-    font-size: 12px;
-    text-align: left;
-    border: none;
-    color:#000000;
-    background: rgba(59,158,208,0.1);
-    // padding-left: 40px;
-    padding: 0 10px 0 30px;
-    cursor: pointer;
-    background-image: url(../../../images/first.png);
-    background-repeat: no-repeat;
-    background-position: 12px 15px;
-  }
-
-  .thenSel{
-    background-image: url(../../../images/then.png);
-  }
-  
-  .multiple-con{
-
-  }
-}
-

+ 0 - 64
src/common/components/CheckBox/Select/index.jsx

@@ -1,64 +0,0 @@
-import React,{Component} from 'react';
-import style from './index.less';
-import PropTypes from 'prop-types';
-
-/*
-多选组件
-datas:父组件传来的数据(数组)
-name:标签名;
-isSelect:是否选中;
-noSpecialFlag:无殊标识, 2选中其他 1选中无殊 0默认无选中;
-*/
-
-class Select extends React.Component{
-  constructor(props){
-    super(props);
-    this.handleChange = this.handleChange.bind(this);
-  }
-
-  handleClick(e){
-    e.stopPropagation();
-  }
-
-  handleChange(name,e){
-    e.stopPropagation();
-    const {handleClick,parentId,checkBoxId,flag} = this.props;
-    const items = {
-      name,
-      parentId,
-      checkBoxId,
-      flag
-    }
-   handleClick && handleClick(items);     
-  }
-
-  getTab(){
-    const {noSpecialFlag,datas} = this.props;
-    if(noSpecialFlag==2){//无殊
-      let list = datas.map((it,i)=>{
-        return <p contentEditable='false' className={`${style['btn']} ${style['nospecialDis']}`}>{it.name}</p>
-      })
-      return list;
-    }else{
-      let list = datas.map((it,i)=>{
-        return <p onClick={this.handleChange.bind(this,it.name)} contentEditable='false' className={!it.isSelect ? style['btn']:style['selectBtn']}>{it.name}</p>
-      })
-      return list;
-    }
-  }
-
-  render(){
-    return <div className={style['select']} onClick={this.handleClick.bind(this)}>
-      {this.props.children}
-      {this.getTab()}
-    </div>
-  }
-}
-
-Select.propTypes = {
-    handleClick:PropTypes.func,
-    handleChange:PropTypes.func,
-    datas:PropTypes.array
-};
-
-export default Select;

+ 0 - 44
src/common/components/CheckBox/Select/index.less

@@ -1,44 +0,0 @@
-// @import "~@less/variables.less";
-.select{
-  // width: 200px;
-  // height: 44px;
-  // line-height: 44px;
-  display: inline-block;
-  vertical-align: top;
-  margin-left: 10px;
-  .btn{
-    height: 44px;
-    line-height: 44px;
-    // width: 100%;
-    font-size: 12px;
-    text-align: left;
-    border: none;
-    color:#000000;
-    background: #fff;
-    padding: 0 10px 0 30px;
-    cursor: pointer;
-  }
-  .selectBtn{
-    height: 44px;
-    line-height: 44px;
-    width: 100%;
-    font-size: 12px;
-    text-align: left;
-    border: none;
-    color:#000000;
-    background: rgba(59,158,208,0.1);
-    padding: 0 10px 0 30px;
-    cursor: pointer;
-    background-image: url(../../../images/first.png);
-    background-repeat: no-repeat;
-    background-position: 12px 15px;
-  } 
-
-  .nospecialDis{
-    color:#000000;
-    opacity: 0.3;
-    filter:alpha(opacity=30);
-    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=30);";
-    cursor: auto;
-  }
-}

+ 0 - 131
src/common/components/CheckBox/index.jsx

@@ -1,131 +0,0 @@
-import React,{Component} from 'react';
-import PropTypes from 'prop-types';
-import style from './index.less';
-import Select from './Select';
-import Multiple from './Multiple';
-
-class CheckBox extends React.Component{
-  constructor(props){
-    super(props);
-    this.handleBtnConfirm = this.handleBtnConfirm.bind(this);
-    this.handleBtnClear = this.handleBtnClear.bind(this);
-    this.handleFirst = this.handleFirst.bind(this);
-    this.handleThen = this.handleThen.bind(this);
-    this.handleNospencial = this.handleNospencial.bind(this);
-    this.preventClick = this.preventClick.bind(this);
-    this.handleSpenc = this.handleSpenc.bind(this);
-    this.state={
-      widthStyle:'small',//控制下拉框的宽度big--初为 后为;small--一列展示
-      multiple:false,//true为三列,false为一列
-    }
-  }
-
-
-  preventClick(e){
-    //阻止冒泡,冒泡会使下拉框消失
-    e.stopPropagation();
-  }
-
-  getCheckItems(){
-    const items = [];
-    const {selectVal,isClear,checks,noSpecialFlag} = this.props;
-    const that = this;
-    checks&&checks.map((v,i)=>{
-      if(that.state.multiple){//三列显示
-        items[i] = <Multiple {...v} handleClick={this.props.handleCheckBoxClick} key={v.id} selectVal={selectVal} isClear={isClear} />
-      }else{//一列
-        items[i] = <Select {...v} handleClick={this.props.handleCheckBoxClick} key={v.id} selectVal={selectVal} isClear={isClear} noSpecialFlag={noSpecialFlag} />
-      }
-      
-    })
-    return items;
-  }
-
-  handleSpenc(e,code){
-    e.stopPropagation();
-    // console.log(3333,e,code);
-    if(code == 1){//伴
-
-    }else if(code == 2){//无
-
-    }
-  }
-
-
-  getTabs(){
-    //datas为questionDetailList
-    const {datas,handleCheckBoxClick,firstChoo} = this.props; 
-    let list = datas.length>0 && datas.map((it,ind)=>{
-      if(it.code){
-          return <p contentEditable='false' onClick={(e)=>{this.handleSpenc(e,it.code)}} className={firstChoo?`${style['nospecial']} ${style['firstSel']}`:style['nospecial']}>{it.name}</p>
-        }else {
-          return <Multiple {...it} handleClick={this.props.handleCheckBoxClick} key={it.id} />
-        }    
-    })
-    return list;
-  }
-
-  handleBtnConfirm(e){//确定
-    e.stopPropagation();
-    const {confirmCheckBox,showCheckBox,checkBoxId} = this.props;
-    const data = {
-      showCheckBox,
-    }
-    confirmCheckBox && confirmCheckBox(checkBoxId);   
-  }
-
-  handleBtnClear(e,){//清空
-    e.stopPropagation();
-    const {clearCheckBox,showCheckBox,checkBoxId} = this.props;
-    clearCheckBox && clearCheckBox(checkBoxId);
-  }
-
-  handleFirst(){//初为
-    const {firstChoo} = this.props;
-    firstChoo && firstChoo(true);
-  }
-
-  handleThen(){//后为
-    const {thenChoo} = this.props;
-    thenChoo && thenChoo(false);
-  }
-
-  handleNospencial(e){
-    e.stopPropagation();
-    const {noSpecialClick} = this.props;
-    noSpecialClick && noSpecialClick();
-  }
-
-  getNoSpecial(){
-    // noSpecialFlag 0默认无选中,1选中标签,2选中无殊
-    const {noSpecial,noSpecialFlag,noSpecialClick} = this.props;
-    return noSpecialFlag==1?<p className={`${style['nospecial']} ${style['nospecialDis']}`} style={{display:this.state.multiple?'none':'block'}}>个人史无殊</p> : <p className={noSpecial?`${style['nospecial']} ${style['firstSel']}`:style['nospecial']} style={{display:this.state.multiple?'none':'block'}} onClick={this.handleNospencial}>个人史无殊</p>
-  }
-
-  render(){
-    const {showCheckBox,selectVal,firstC,thenC,firstArr,showDrop} = this.props;
-    const firstStyle = firstC;
-    const thenStyle = thenC;
-    {/*return <div className={`cb-box ${style['cb-container']}`} style={{display:'inline-block'}} onClick={this.preventClick}>*/}
-    return <div style={{display:'inline-block'}} onClick={this.preventClick}>
-      {this.getTabs()}
-      {/*<div className={style['multiple-tab']} style={{display:this.state.multiple?'inline-block':'none'}}>
-        <p contentEditable='false' onClick={this.handleFirst} className={firstStyle?`${style['nospecial']} ${style['firstSel']}`:style['nospecial']}>初为</p>
-        <p contentEditable='false' onClick={this.handleThen} className={thenStyle?`${style['nospecial']} ${style['thenSel']}`:style['nospecial']}>后为</p>
-      </div>
-      {this.state.multiple?'':this.getNoSpecial()}
-      <div className={style['multiple-con']}>{this.getCheckItems()}</div>
-      <div className={style['btn']}>
-        <button onClick={this.handleBtnClear} className={style['clear']}>清空选项</button>
-        <button onClick={this.handleBtnConfirm} className={style['confirm']}>确定</button> 
-      </div>*/}       
-    </div>
-  }
-}
-
-CheckBox.propTypes = {
-    handleClick:PropTypes.func,
-    datas:PropTypes.array
-};
-export default CheckBox;
-

+ 0 - 70
src/common/components/CheckBox/index.less

@@ -1,70 +0,0 @@
-
-.cb-container{
-  min-width: 216px;
-  padding: 10px;
-  position: absolute;
-  top: 25px;
-  left: 0px;
-  background: #fff;
-  z-index: 10;
-  box-shadow: 0 10px 20px 0 rgba(194,194,194,0.50);
-}
-.clear{
-  width: 88px;
-  height: 44px;
-  line-height: 44px;
-  font-size: 12px;
-  color:#FF0000;
-  border: none;
-  background: #fff;
-  float: left;
-  margin-top: 10px;
-}
-.confirm{
-  width: 88px;
-  height: 44px;
-  line-height: 44px;
-  color:#3B9ED0;
-  font-size: 12px;
-  border: 1px solid #3B9ED0;
-  background: #fff;
-  margin-left: 20px;
-  float: right;
-  margin-top: 10px;
-}
-.multiple-tab{
-  vertical-align: top;
-}
-.multiple-con{
-  display: inline-block;
-}
-.btn{
-
-}
-.nospecial{
-  height: 44px;
-  line-height: 44px;
-  cursor: pointer;
-  color:#000000;
-  padding: 0 10px 0 30px;
-  border-bottom: 1px solid #EAEDF1;
-}
-.nospecialDis{
-  color:#000000;
-  opacity: 0.3;
-  filter:alpha(opacity=30);
-  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=30);";
-  cursor: auto;
-}
-.firstSel{
-  background: rgba(59,158,208,0.1);
-  background-image: url(../../images/first.png);
-  background-repeat: no-repeat;
-  background-position: 12px 15px;
-}
-.thenSel{
-  background: rgba(59,158,208,0.1);
-  background-image: url(../../images/then.png);
-  background-repeat: no-repeat;
-  background-position: 12px 15px;
-}

+ 0 - 92
src/common/components/MixCheckBox/index.jsx

@@ -1,92 +0,0 @@
-import React,{Component} from 'react';
-import PropTypes from 'prop-types';
-import style from './index.less';
-import Select from '../CheckBox/Select';
-import Radio from '../RadioB';
-import Normal from '../Normal';
-import CheckBox from '../CheckBox';
-import className from 'classnames';
-import Multiple from '../CheckBox/Multiple';
-
-/***
-单选多选混合组件
-接收参数:
-datas:数据源,为数组,必须;
-showDrop:控制填写单显示与隐藏,必须;
-confirmCheckBox:点击确定,必须
-clearCheckBox:点击清空,必须
-noSpecial:无殊选中标识,true为选中,有无殊时必须;
-noSpecialFlag:互斥标识,2选中其他 1选中无殊 0默认无选中;
-noSpecialClick:无殊点击事件;
-handleRadioClick:单选点击事件,有单选列时必须;
-handleCheckBoxClick:多选点击事件,有多选时必须;
-**/
-
-class MixCheckBox extends React.Component{
-  constructor(props){
-    super(props);
-    this.handleBtnConfirm = this.handleBtnConfirm.bind(this);
-    this.handleBtnClear = this.handleBtnClear.bind(this);
-  }
-
-  getLabs(){
-    const {datas,noSpecial,noSpecialFlag,noSpecialClick,checkBoxId,flag} = this.props;
-    let list = datas && datas.map((v,i)=>{
-      if(+v.formPosition == 1){//正常无殊
-         return <Normal datas={v.questionDetailList} noSpecialFlag={noSpecialFlag} noSpecial={noSpecial} noSpecialClick={noSpecialClick}/>
-      }else{
-        if(v.controlType==1 && v.formPosition !== 1){//单选
-          return <Radio datas={v.questionDetailList} handleClick={this.props.handleCheckBoxClick} parentId={v.id} disabled={noSpecialFlag}/>;
-        }else if(v.controlType==2){//2多选
-          return <Select datas={v.questionDetailList} handleClick={this.props.handleCheckBoxClick} parentId={v.id} noSpecialFlag={noSpecialFlag} checkBoxId={checkBoxId} flag={flag}/>
-        }
-        /*else if(v.controlType==4 || v.controlType==99){//4 伴/无 99推送
-          return <Multiple datas={v.questionDetailList} handleClick={this.props.handleCheckBoxClick} parentId={v.id} />
-        }*/
-      }
-    })
-    return list;
-  }
-
-  handleBtnConfirm(e){//确定
-    e.stopPropagation();
-    const {confirmCheckBox,checkBoxId,flag} = this.props;
-    let item = {
-      checkBoxId,
-      flag
-    };
-    confirmCheckBox && confirmCheckBox(item);   
-  }
-
-  handleBtnClear(e){//清空
-    e.stopPropagation();
-    const {clearCheckBox,checkBoxId,flag} = this.props;
-    let item = {
-      checkBoxId,
-      flag
-    };
-    clearCheckBox && clearCheckBox(item);
-  }
-
-  getContainerStyle(){
-    const {showDrop} = this.props;
-    const isShow = showDrop?'':style['ishide'];
-    return className(style['cb-container'],isShow);
-  }
-  render(){
-    return <div className={this.getContainerStyle()} >
-          <div style={{whiteSpace: 'nowrap'}}>{this.getLabs()}</div>
-          <div className={style['btn']}>
-            <button onClick={this.handleBtnClear} className={style['clear']}>清空选项</button>
-            <button onClick={this.handleBtnConfirm} className={style['confirm']}>确定</button> 
-          </div>         
-        </div>
-    }
-}
-
-MixCheckBox.propTypes = {
-    handleClick:PropTypes.func,
-    items:PropTypes.array
-};
-export default MixCheckBox;
-

+ 0 - 70
src/common/components/MixCheckBox/index.less

@@ -1,70 +0,0 @@
-@import "~@less/variables.less";
-.cb-container{
-  // width: 277px;
-  min-width: 216px;
-  padding: 10px;
-  position: absolute;
-  top: 25px;
-  left: -62px;
-  background: #fff;
-  z-index: 12;
-  box-shadow: 0 10px 20px 0 rgba(194,194,194,0.50);
-}
-.clear{
-  width: 88px;
-  height: 44px;
-  line-height: 44px;
-  font-size: 12px;
-  color:#FF0000;
-  border: none;
-  background: #fff;
-  float: left;
-}
-.confirm{
-  width: 88px;
-  height: 44px;
-  line-height: 44px;
-  color:#3B9ED0;
-  font-size: 12px;
-  border: 1px solid #3B9ED0;
-  background: #fff;
-  margin-left: 20px;
-  float: right;
-}
-.sentence{
-  width: 100%;
-  height: 54px;
-  border-bottom: 1px solid #EAEDF1;
-  margin-bottom: 15px;
-  span{
-    color:#000000;
-    display: inline-block;
-    height: 44px;
-    line-height: 44px;
-    padding: 0 10px 0 30px;
-  }
-}
-.selected-span{
-  background: rgba(59,158,208,0.1);
-  background-image: url(../../images/first.png);
-  background-repeat: no-repeat;
-  background-position: 12px 15px;
-}
-.disabled{
-  opacity: 0.3;
-  filter:alpha(opacity=30);
-  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=30);";
-}
-.multiple-tab{
-  // width: 200px;
-  vertical-align: top;
-}
-.multiple-con{
-  // width: 140px;
-  margin-left: 10px;
-  display: inline-block;
-  vertical-align: top;
-}
-.ishide{
-  .hide;
-}

+ 1 - 1
src/common/components/NumberUnitPan/index.jsx

@@ -108,7 +108,7 @@ class NumberUnitPan extends Component{
           <td><span onClick={this.handleSelect}>0</span></td>
           <td><span onClick={this.handleSelect}>~</span></td>
           <td><span onClick={this.handleSelect}>/</span></td>
-          <td><span onClick={this.handleSelect}>日</span></td>
+          <td onClick={(e)=>e.stopPropagation()}></td>
           <td className={style['imgN']}><img src={backspace} onClick={this.handleBack.bind(this)} /></td>
         </tr>
         <tr>

+ 0 - 2
src/common/components/index.js

@@ -15,7 +15,6 @@ import Calendar from "./Calendar";
 import SearchOption from "./SearchOption";
 import InspectCommon from "./InspectCommon";
 import Notify from "./Notify";
-import MixCheckBox from "./MixCheckBox";
 import EditableSpan from "./EditableSpan";
 import Textarea from "./Textarea";
 import NumberUnitPan from "./NumberUnitPan";
@@ -42,7 +41,6 @@ module.exports = {
     SearchOption,
     InspectCommon,
     Notify,
-    MixCheckBox,
     EditableSpan,
     Textarea,
     NumberUnitPan,

+ 0 - 77
src/components/ChronicInfo/index.less

@@ -91,30 +91,6 @@
           padding-left: 5px;
           cursor: default;
         }
-        .infoBox{
-          position: absolute;
-          top:27px;
-          width: 388px;
-          background: #fff;
-          z-index: 66;
-          border: 1px solid #EAEDF1;
-          box-shadow: 0 5px 10px 0 rgba(0,0,0,0.10);
-          .infoTitle{
-            height: 40px;
-            line-height: 40px;
-            padding-left: 18px;
-            background: #DFEAFE;
-            img{
-              vertical-align: text-top;
-            }
-            .closeIcon{
-              float: right;
-            }
-          }
-          .infoCon{
-            padding: 15px 26px 25px;
-          }
-        }
       }
       .marTop{
         margin-top: 10px;
@@ -131,62 +107,9 @@
         color:#3B9ED0;
         cursor: pointer;
       }
-      .mainList{
-        .listBtn{
-          display: inline-block;
-          width: 96px;
-          height: 26px;
-          line-height: 26px;
-          text-align: center;
-          border: 1px solid #EAEDF1;
-          border-radius: 4px;
-        }
-        .listResult{
-          line-height: 26px;
-          i{
-            cursor: pointer;
-          }
-        }
-        .mainBox{
-          top: 65px;
-          .infoOption{
-            padding: 20px 0;
-          }
-          .infoConBtn{
-            text-align: right;
-            border-top: 1px solid #EAEDF1;
-            padding-top: 10px;
-            span{
-              color:#3B9ED0;
-              display: inline-block;
-              width: 66px;
-              height: 32px;
-              line-height: 32px;
-              text-align: center;
-              border: 1px solid #3B9ED0;
-              border-radius: 4px;
-            }
-          }
-        }
-      }
       .infoOption{
         padding: 20px 0;
       }
-      .infoConBtn{
-        text-align: right;
-        border-top: 1px solid #EAEDF1;
-        padding-top: 10px;
-        span{
-          color:#3B9ED0;
-          display: inline-block;
-          width: 66px;
-          height: 32px;
-          line-height: 32px;
-          text-align: center;
-          border: 1px solid #3B9ED0;
-          border-radius: 4px;
-        }
-      }
       .list:last-child{
         border-bottom:none;
       }

+ 0 - 39
src/components/MixMultCheck/index.jsx

@@ -1,39 +0,0 @@
-import React,{Component} from 'react';
-import {InlineTag,MixCheckBox} from '@commonComp';
-import style from './index.less';
-
-class MixMultCheck extends Component{
-  constructor(props){
-    super(props);
-    this.handleShow = this.handleShow.bind(this);
-  }
-  getStyle(){
-    return style['container'];
-  }
-  handleShow(e){
-    e.stopPropagation();
-    const {minCheckBoxShow,i,boxMark} = this.props;
-    const showInx = boxMark+i+'0';
-    minCheckBoxShow&&minCheckBoxShow({ikey:showInx});
-  }
-  render(){
-    const v = this.props.item;
-    const {showArr,i,boxMark,totalHide} = this.props;
-    const showInx = boxMark+i+'0';
-    return <div className={this.getStyle()}>
-              <span onClick={this.handleShow}>{v.name}</span>
-               <MixCheckBox datas={v.questionMapping}
-                     showDrop={!totalHide&&(showArr&&showArr[showInx])}
-                     checkBoxId={v.id}
-                     confirmCheckBox={null}
-                     clearCheckBox={null}
-                     noSpecialClick={null}
-                     handleRadioClick={null}
-                     handleCheckBoxClick={null}
-                     noSpecial={false}
-                     noSpecialFlag={false} />
-        </div>;
-  }
-}
-
-export default MixMultCheck;

+ 0 - 4
src/components/MixMultCheck/index.less

@@ -1,4 +0,0 @@
-@import "~@less/variables.less";
-.container{
-  .tag;
-}

+ 4 - 3
src/components/SpreadDrop/index.jsx

@@ -467,9 +467,10 @@ class ListItem extends Component{
     const pos = isSpecialPos?style['independent']:'';
     return <ul className={classNames(style['row'],pos)} onBlur={(e)=>e.stopPropagation()}>
       {datas&&datas.map((it,i)=>{
-        /*return <li onClick={(e)=>this.handleClick(e,it,i)}
-                   className={this.getClass(it.id)}>{it.labelPrefix}{it.name}{it.labelSuffix}</li>*/
-          return <li onClick={(e)=>this.handleClick(e,it,i)} className={this.getClass(it.id)} title={it.name.length>8?it.name:''}>{it.name&&it.name.length>8?it.name.slice(0,8)+'...':it.name}</li>
+        if(isSpecialPos){
+          return <li onClick={(e)=>this.handleClick(e,it,i)} className={this.getClass(it.id)}>{it.name}</li>
+        }
+        return <li onClick={(e)=>this.handleClick(e,it,i)} className={this.getClass(it.id)} title={it.name.length>8?it.name:''}>{it.name&&it.name.length>8?it.name.slice(0,8)+'...':it.name}</li>
       })}
     </ul>;
   }

+ 1 - 4
src/config/index.js

@@ -14,14 +14,11 @@ export default {
       '32':'process',           //现病史子模板--病程变化
       '322':'currentEmptySon',  //现病史-空模板-子模板
     },
-    textId:'text',        //自由文本标签的id,
+    // textId:'text',        //自由文本标签的id,
     textLabel:'{"tagType":"8","id":"","name":""}',
     _textLabel:'{"tagType":"8","id":"","name":","}',//查体每个标签后面加逗号(1-29/改成中文逗号3-18)
     tagType:"8",
     tongYId:7,      //主诉通用特征描述id
-    addSId:8,      //主诉添加症状id
-    addOthSId:21,      //现病史 添加其他症状id
-    banId:10,       //伴 id
     limited:30,    //主诉限制字数
     limitText:"已超过30字符(含标点),请修改主诉",    //主诉限制提示
     delayTime:500,      //延迟搜索的时间

+ 0 - 74
src/containers/CheckBox.js

@@ -1,74 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import CheckBox from '@commonComp/CheckBox';
-import {CONFIRN_CHECKBOX,CLEAR_CHECKBOX,SHOW_CHECKBOX,CHECKED,FIRST,THEN,NOSPECIAL} from '@store/types/checkBox';
-
-
-function mapStateToProps(state){
-  return{
-    showCheckBox:state.checkBox.showCheckBox,
-    selectVal:state.checkBox.selectVal,
-    isClear:state.checkBox.isClear,
-    firstC:state.checkBox.firstC,
-    thenC:state.checkBox.thenC,
-    thenArr:state.checkBox.thenArr,
-    firstArr:state.checkBox.firstArr,
-    change:state.checkBox.change,
-    noSpecial:state.checkBox.noSpecial,//无殊选中
-    noSpecialFlag:state.checkBox.noSpecialFlag,//互斥
-  }
-}
-
-
-function mapDispatchToProps (dispatch){
-  return{
-    handleCheckBoxClick:(info)=>{//点击复选框标签
-        dispatch({
-          type:CHECKED,
-          value:info
-        })
-      },
-    showBox:(info)=>{//点击症状标签
-      dispatch({
-        type:SHOW_CHECKBOX,
-        showCheckBox:info
-      })
-    },
-    clearCheckBox:(info)=>{//清空
-      dispatch({
-        type:CLEAR_CHECKBOX,
-        checkBoxId:info.checkBoxId
-      })
-    },
-    confirmCheckBox:(info)=>{//确定
-      dispatch({
-        type:CONFIRN_CHECKBOX,
-        checkBoxId:info.checkBoxId
-      })
-    },
-    firstChoo:(info)=>{//初为
-      dispatch({
-        type:FIRST,
-        change:info
-      })
-    },
-    thenChoo:(info)=>{//后为
-      dispatch({
-        type:THEN,
-        change:info
-      })
-    },
-    noSpecialClick:()=>{//点击无殊
-      dispatch({
-        type:NOSPECIAL
-      })
-    }
-  }
-}
-
-
-const CheckBoxContainer = connect(
-    mapStateToProps,
-    mapDispatchToProps
-)(CheckBox);
-export default CheckBoxContainer;

+ 0 - 70
src/containers/MixCheckBox.js

@@ -1,70 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import MixCheckBox from '@commonComp/MixCheckBox';
-import {CONFIRN_CHECKBOX,CLEAR_CHECKBOX,SHOW_CHECKBOX,CHECKED,FIRST,THEN,NOSPECIAL,RADIO} from '@store/types/checkBox';
-import {SHOW_MIXBOX} from '@store/types/currentIll';
-
-
-function mapStateToProps(state){
-  return{
-    // showCheckBox:state.mixCheckBox.showCheckBox,//是否展示下拉框
-    selectVal:state.mixCheckBox.selectVal,//多选选中的值
-    // radioVals:state.mixCheckBox.radioVals,//选中的值
-    radioFlag:state.mixCheckBox.radioFlag,//防止点击单选项不更新
-    // noSpecial:state.mixCheckBox.noSpecial,//无殊选中
-    noSpecialFlag:state.mixCheckBox.noSpecialFlag,//互斥
-    // showDrop:state.mixCheckBox.showDrop,
-    mixDatas:state.mixCheckBox.zayin,
-    updateDrop:state.mainSuit.showDrop
-  }
-}
-
-
-function mapDispatchToProps (dispatch){
-  return{
-    /*handleCheckBoxClick:(info)=>{//点击复选框标签
-        dispatch({
-          type:CHECKED,
-          value:info
-        })
-      },
-    showMixBox:(info)=>{//点击症状标签
-      dispatch({
-        type:SHOW_MIXBOX,
-        showCheckBox:info
-      })
-    },
-    clearCheckBox:(info)=>{//清空
-      dispatch({
-        type:CLEAR_CHECKBOX,
-        checkBoxId:info
-      })
-    },
-    confirmCheckBox:(info)=>{//确定
-      dispatch({
-        type:CONFIRN_CHECKBOX,
-        checkBoxId:info
-      })
-    },
-    handleRadioClick:(info)=>{//点击复选框标签
-        dispatch({
-          type:RADIO,
-          id:info.id,
-          parentId:info.parentId
-        })
-      },
-    noSpecialClick:(name)=>{//点击无殊
-      dispatch({
-        type:NOSPECIAL,
-        name
-      })
-    }*/
-  }
-}
-
-
-const MixCheckBoxContainer = connect(
-    mapStateToProps,
-    mapDispatchToProps
-)(MixCheckBox);
-export default MixCheckBoxContainer;

+ 0 - 34
src/containers/MixMultCheck.js

@@ -1,34 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import MixMultCheck from '@components/MixMultCheck';
-import {SETDROPSHOW} from '@types/homePage.js';
-import {HIDE,RESET} from '@store/types/homePage.js';
-
-
-function mapStateToProps(state){
-  return{
-    totalHide:state.homePage.totalHide
-  }
-}
-
-
-function mapDispatchToProps (dispatch){
-  return{
-    minCheckBoxShow(obj){
-      dispatch({
-        type:SETDROPSHOW,
-        data:obj
-      });
-      dispatch({
-        type: RESET
-      });
-    }
-  }
-}
-
-
-const MixMultCheckContainer = connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(MixMultCheck);
-export default MixMultCheckContainer;

+ 1 - 1
src/containers/eleType.js

@@ -1,4 +1,4 @@
-import MixCheckBox from '@containers/MixCheckBox';
+
 import RadioDrop from "@containers/RadioDrop";
 import RadioInpDrop from "@containers/RadioInpDrop";
 import NumberDrop from "@containers/NumberDrop";

+ 0 - 171
src/store/actions/checkBox.js

@@ -1,171 +0,0 @@
-
-export const confirn=(state,action)=>{//确定
-    const res=Object.assign({},state);
-    res.showCheckBox = false;
-    let checkBoxId = action.checkBoxId;
-    let datas = res.datas;
-    for(let i=0; i<datas.length; i++){
-      if(datas[i].id == checkBoxId){
-        datas[i].showDrop = false;
-      }
-    }
-
-    return res;
-};
-
-export const clear = (state,action)=>{//清空选项
-  const res=Object.assign({},state);
-  // res.selectVal = [];
-  // 清空多选
-  let values = res.checks;
-  for(let i=0; i<values.length; i++){
-    values[i].isSelect = false;
-  }
-  res.showCheckBox = false;
-  
-
-  return res;
-};
-
-export const showCheckBox = (state,action)=>{//点击症状显示下拉
-  const res=Object.assign({},state);
-  console.log(res,action);
-  let show = action.showCheckBox;
-  res.showCheckBox = !action.showCheckBox;
-  res.showDrop = !res.showDrop;
-  let inlineDatas = res.datas;
-  let id = action.id;
-  for(let i=0; i<inlineDatas.length; i++){
-    if(inlineDatas[i].id == id){
-      inlineDatas[i].showDrop = !inlineDatas[i].showDrop;
-    }
-  }
-
-  return res;
-};
-
-export const checked = (state,action)=>{//选择下拉选项
-  const res=Object.assign({},state);
-  res.noSpecialFlag = 1;//互斥
-  let item = action.value.name;
-  let parentId = action.value.parentId;
-  let change = res.change;
-  let firstC = res.firstC;
-  let thenC = res.thenC;
-  let values = res.checks;
-  // let values = res.zayin[0].questionMapping;
-  let firstArr = [];
-  let thenArr = [];
-
-  if(firstC && change){//初为
-    for(let i=0; i<values.length; i++){
-      if(values[i].name == item){
-        values[i].isSelect = !values[i].isSelect;
-        values[i].first = true;
-        values[i].then = false;
-      }
-    }
-    firstArr.push(item);
-    // firstArr += item+',';
-    res.firstArr = firstArr;
-    const theIndex = res.thenArr.indexOf(item);
-    if(theIndex !== -1){
-      res.thenArr.splice(theIndex,1)
-    }
-  }
-
-  else if(thenC){//后为
-    for(let k=0; k<values.length; k++){
-      if(values[k].name == item){
-        values[k].isSelect = !values[k].isSelect;
-        values[k].then = true;
-        values[k].first = false;
-      }
-    }
-    // thenArr += item+',';
-    thenArr.push(item);
-    res.thenArr = thenArr;
-    const firIndex = res.firstArr.indexOf(item);
-    if(firIndex !== -1){
-      res.firstArr.splice(firIndex,1)
-    }
-  }
-
-else{//无鼠标点击顺序
-  for(let i=0; i<values.length; i++){
-    if(values[i].name == item){
-      values[i].isSelect = !values[i].isSelect;
-    }
-  }
-  let selected = values.filter(function(item){
-    return item.isSelect;
-  });
-
-  let checkVals = [];
-  // 如果没有选中项,就让无殊恢复默认
-  
-  if(selected.length == 0){
-    res.noSpecialFlag = 0; //只有多选时,还有单选需另外处理
-  }else{
-    for(let k=0; k<selected.length; k++){
-      // checkVals += selected[k].name + ",";
-      checkVals.push(selected[k].name+ ",");
-    }
-  }
-   
-  res.selectVal = checkVals;
-}
-  return res;
-};
-
-export const firstChoo = (state,action)=>{//点击初为
-  const res=Object.assign({},state);
-  res.firstC = !res.firstC;
-  res.change = action.change;
-  let values = res.checks;
-  if(!res.firstC){//取消初为
-    let firstSelected = values.filter(function(item){
-      return item.first;
-    });
-    if(firstSelected){//有选中项
-      for(let j=0; j<firstSelected.length; j++){
-        firstSelected[j].first = false;
-        firstSelected[j].isSelect = false;
-      }
-    }
-  }
-  return res;
-};
-
-export const thenChoo = (state,action)=>{//点击后为
-  const res=Object.assign({},state);
-  res.thenC = !res.thenC;
-  res.change = action.change;
-  let values = res.checks;
-  if(!res.thenC){//取消后为
-    let thenSelected = values.filter(function(item){
-      return item.then;
-    });
-    if(thenSelected){//有选中项
-      for(let j=0; j<thenSelected.length; j++){
-        thenSelected[j].then = false;
-        thenSelected[j].isSelect = false;
-      }
-    }
-  }
-  return res;
-};
-
-export const noSpecial = (state,action)=>{//点击无殊
-  const res=Object.assign({},state);
-  res.noSpecial = !res.noSpecial;//无殊选中标识
-  res.noSpecialFlag = res.noSpecial? 2 : 0;//互斥
-  // res.noSpecialFlag = 2;
-  console.log(res);
-  return res;
-};
-
-
-
-
-

+ 0 - 166
src/store/actions/mixCheckBox.js

@@ -1,166 +0,0 @@
-
-export const showMixCheckBox = (state,action)=>{//点击症状显示下拉
-  const res=Object.assign({},state);
-  let show = action.showCheckBox;
-  res.showCheckBox = !res.showCheckBox; 
-
-  res.showDrop = !res.showDrop;
-  let inlineDatas = res.zayin;
-  let id = action.id;
-  for(let i=0; i<inlineDatas.length; i++){
-    if(inlineDatas[i].id == id){
-      inlineDatas[i].showDrop = !inlineDatas[i].showDrop;
-    }
-  }
-  return res;
-};
-
-export const confirnMix=(state,action)=>{//确定
-    const res=Object.assign({},state);
-    res.showCheckBox = false;
-    res.showDrop = false;
-    let checkBoxId = action.checkBoxId;
-    let datas = res.zayin;
-    for(let i=0; i<datas.length; i++){
-      if(datas[i].id == checkBoxId){
-        datas[i].showDrop = false;
-      }
-    }
-    let allDatas = res.zayin[0].questionMapping;
-    let seleDatas = "";
-    for(let k=0; k<allDatas.length; k++){
-      let detailList = allDatas[k].questionDetailList;
-      for(let j=0; j<detailList.length; j++){
-        if(detailList[j].isSelect){
-          seleDatas+=detailList[j].name;
-        }
-      }
-    }
-    res.totalSele = seleDatas || res.normalData;
-    return res;
-};
-
-export const clearMix = (state,action)=>{//清空选项
-  const res=Object.assign({},state);
-  res.noSpecialFlag = 0;//无殊标识恢复默认
-  let allDatas = res.zayin[0].questionMapping;
-    for(let k=0; k<allDatas.length; k++){
-      let detailList = allDatas[k].questionDetailList;
-      for(let j=0; j<detailList.length; j++){
-        detailList[j].isSelect = false;
-      }
-    }
-    // 如果要恢复标签,则让 res.totalSele = ""
-  return res;
-};
-
-
-export const radio = (state,action)=>{//点击单选
-
-  const res=Object.assign({},state);
-  res.noSpecialFlag = 1;//互斥
-  res.radioFlag = !res.radioFlag;
-  const datas = res.zayin[0].questionMapping;
-  const id = action.id;
-  const parentId = action.parentId;
-  let radioVals = res.radioVals;
-  let radioCheckVal = '';
-  for(let i=0; i<datas.length; i++){
-    if(datas[i].id == parentId){
-      let radioList = datas[i].questionDetailList;
-      for(let k=0; k<radioList.length; k++){
-        radioList[k].isSelect = false;
-        if(radioList[k].id==id){
-          radioList[k].isSelect = true;
-          radioCheckVal = radioList[k].name;
-        }
-      }
-    }
-  }
-  radioVals[parentId] = radioCheckVal;
-  res.radioVals = radioVals;
-  return res;
-};
-
-
-export const mixChecked = (state,action)=>{//点击下拉选项
-  const res=Object.assign({},state);console.log("现病史",res);
-  res.noSpecialFlag = 1;//互斥
-  let item = action.value.name;
-  let parentId = action.value.parentId;
-  let change = res.change;
-  let firstC = res.firstC;
-  let thenC = res.thenC;
-  let values = res.zayin[0].questionMapping;
-  let firstArr = [];
-  let thenArr = [];
-
-  // 初为后为数据还待矫正!!!
-  if(firstC && change){//初为
-    for(let i=0; i<values.length; i++){
-      if(values[i].name == item){
-        values[i].isSelect = !values[i].isSelect;
-        values[i].first = true;
-        values[i].then = false;
-      }
-    }
-    firstArr.push(item);
-    // firstArr += item+',';
-    res.firstArr = firstArr;
-    const theIndex = res.thenArr.indexOf(item);
-    if(theIndex !== -1){
-      res.thenArr.splice(theIndex,1)
-    }
-  }
-
-  else if(thenC){//后为
-    for(let k=0; k<values.length; k++){
-      if(values[k].name == item){
-        values[k].isSelect = !values[k].isSelect;
-        values[k].then = true;
-        values[k].first = false;
-      }
-    }
-    // thenArr += item+',';
-    thenArr.push(item);
-    res.thenArr = thenArr;
-    const firIndex = res.firstArr.indexOf(item);
-    if(firIndex !== -1){
-      res.firstArr.splice(firIndex,1)
-    }
-  }
-
-else{//无鼠标点击顺序
-  let checkVals = [];
-  for(let i=0; i<values.length; i++){
-    if(values[i].id == parentId){
-      let dataList = values[i].questionDetailList;
-      for(let j=0; j<dataList.length; j++){
-        if(dataList[j].name == item){
-          dataList[j].isSelect = !dataList[j].isSelect;
-        }
-      }
-      // values[i].isSelect = !values[i].isSelect;
-      let selected = dataList.filter(function(item){
-        return item.isSelect;
-      });
-      for(let k=0; k<selected.length; k++){
-        checkVals.push(selected[k].name+ ",");
-      }
-    }
-  }
-   
-  res.selectVal = checkVals;
-}
-  return res;
-};
-
-
-export const mixNoSpecial = (state,action)=>{//点击无殊
-  const res=Object.assign({},state);
-  res.noSpecial = !res.noSpecial;//无殊选中标识
-  res.noSpecialFlag = res.noSpecial? 2 : 0;//互斥
-  // res.noSpecialFlag = 2;
-  res.normalData = action.name;
-  return res;
-};

+ 0 - 4
src/store/index.js

@@ -7,12 +7,10 @@ import {
 import thunk from "redux-thunk";
 import historyTemplates from './reducers/historyTemplates';
 import tabTemplate from './reducers/tabTemplate';
-import checkBox from './reducers/checkBox';
 import patInfo from './reducers/patInfo';
 import print from './reducers/print';
 import preview from './reducers/preview';
 import otherHistory from './reducers/otherHistory';
-import mixCheckBox from './reducers/mixCheckBox';
 import diagnosticList from './reducers/diagnosticList';
 import inspect from './reducers/inspect';
 import assistCheck from './reducers/assistCheck';
@@ -41,12 +39,10 @@ const enhancer = composeEnhancers(
 
 const rootReducer = combineReducers({
     tabTemplate,
-    checkBox,
     patInfo,
     print,
     preview,
     otherHistory,
-    mixCheckBox,
     diagnosticList,
     historyTemplates,
     inspect,

+ 0 - 159
src/store/reducers/checkBox.js

@@ -1,159 +0,0 @@
-import {CONFIRN_CHECKBOX,CLEAR_CHECKBOX,SHOW_CHECKBOX,CHECKED,FIRST,THEN,NOSPECIAL} from '../types/checkBox';
-import {confirn,clear,showCheckBox,checked,firstChoo,thenChoo,noSpecial} from '../actions/checkBox'
-
-const initState = {
-  showCheckBox:false,
-  selectVal:[],
-  isClear:false,
-  type:null,
-  firstC:false,
-  firstArr:[],
-  thenC:false,
-  thenArr:[],
-  change:null,
-  noSpecial:false,
-  noSpecialFlag:0,//0默认,1选中标签,2选中无殊
-  showDrop:false,
-  checks:[
-        {
-          id:1,
-          name:'个人史无殊',
-          value:'个人史无殊',
-          isSelect:false,
-          style:null,
-          mutual:0 ,//互斥
-          disabled:false,
-          first:false,//初为
-          then:false,//后为
-          changeForT:false
-        },
-        {
-          id:2,
-          name:'出生地',
-          value:'出生地',
-          isSelect:false,
-          style:null,
-          mutual:1,
-          disabled:false,
-          first:false,
-          then:false,
-          changeForT:false
-        },
-        {
-          id:3,
-          name:'职业',
-          value:'职业',
-          isSelect:false,
-          style:null,
-          mutual:1,
-          disabled:false,
-          first:false,
-          then:false,
-          changeForT:false
-        },
-        {
-          id:4,
-          name:'烟酒嗜好',
-          value:'烟酒嗜好',
-          isSelect:false,
-          style:null,
-          mutual:1,
-          disabled:false,
-          first:false,
-          then:false,
-          changeForT:false
-        },
-        {
-          id:5,
-          name:'疫区拘留',
-          value:'疫区拘留',
-          isSelect:false,
-          style:null,
-          mutual:1,
-          disabled:false,
-          first:false,
-          then:false,
-          changeForT:false
-        },
-        {
-          id:6,
-          name:'疫区拘留11',
-          value:'疫区拘留11',
-          isSelect:false,
-          style:null,
-          mutual:1,
-          disabled:false,
-          first:false,
-          then:false,
-          changeForT:false
-        },
-        {
-          id:7,
-          name:'疫区拘留22',
-          value:'疫区拘留22',
-          isSelect:false,
-          style:null,
-          mutual:1,
-          disabled:false,
-          first:false,
-          then:false,
-          changeForT:false
-        }
-      ],
-      datas:[
-        {
-          id:11,
-          prefix:'',
-          showText:'主诉通用特征',
-          value:'反复',
-          suffix:'',
-          hasDrop:true,
-          showDrop:false
-        },
-        {
-          id:22,
-          prefix:'',
-          showText:'添加症状',
-          suffix:'',
-          hasDrop:true,
-          showDrop:false
-        },
-        {
-          id:33,
-          prefix:'',
-          showText:'主诉时间',
-          suffix:'',
-          hasDrop:true,
-          showDrop:false
-        },
-        {
-          id:44,
-          prefix:'',
-          showText:'添加病程变化',
-          suffix:'',
-          hasDrop:false,
-          showDrop:false
-        },
-      ]
-};
-
-export default function (state = initState, action) {
-    switch (action.type) {
-    case CONFIRN_CHECKBOX:
-      return confirn(state,action);
-    case CLEAR_CHECKBOX:
-      return clear(state,action);
-    case SHOW_CHECKBOX:
-      return showCheckBox(state,action);
-    case CHECKED://点击复选框选项
-      return checked(state,action);
-    case FIRST:
-      return firstChoo(state,action);
-    case THEN:
-      return thenChoo(state,action);
-    case NOSPECIAL:
-      return noSpecial(state,action);
-    default:
-      return state;
-  }
-}

+ 0 - 293
src/store/reducers/mixCheckBox.js

@@ -1,293 +0,0 @@
-import {CONFIRN_CHECKBOX,CLEAR_CHECKBOX,SHOW_CHECKBOX,CHECKED,RADIO,NOSPECIAL} from '../types/checkBox';
-import {SHOW_MIXBOX,CHECK_MIXBOX} from '../types/currentIll';
-import {confirn,showCheckBox,checked,noSpecial} from '../actions/checkBox'
-import {clearMix,radio,showMixCheckBox,confirnMix,mixChecked,mixNoSpecial} from '../actions/mixCheckBox'
-
-const initState = {
-  //showCheckBox:false,
-  selectVal:[],//多选选中的值
-  radioVals:[],//单选选中的值
-  radioFlag:false,//解决点击单选状态不更新
-  noSpecial:false,
-  noSpecialFlag:0,//0默认,1选中标签,2选中无殊
-  showDrop:false
-  /*checks:[
-        {
-          id:1,
-          name:'个人史无殊',
-          value:'个人史无殊',
-          isSelect:false,
-          style:null,
-          mutual:0 ,//互斥
-          disabled:false,
-          first:false,//初为
-          then:false,//后为
-          changeForT:false
-        },
-        {
-          id:2,
-          name:'收缩期收缩期收缩',
-          value:'收缩期收缩期收缩',
-          isSelect:false,
-          style:null,
-          mutual:1,
-          disabled:false,
-          first:false,
-          then:false,
-          changeForT:false
-        },
-        {
-          id:3,
-          name:'职业',
-          value:'职业',
-          isSelect:false,
-          style:null,
-          mutual:1,
-          disabled:false,
-          first:false,
-          then:false,
-          changeForT:false
-        },
-        {
-          id:4,
-          name:'烟酒嗜好',
-          value:'烟酒嗜好',
-          isSelect:false,
-          style:null,
-          mutual:1,
-          disabled:false,
-          first:false,
-          then:false,
-          changeForT:false
-        },
-        {
-          id:5,
-          name:'疫区拘留',
-          value:'疫区拘留',
-          isSelect:false,
-          style:null,
-          mutual:1,
-          disabled:false,
-          first:false,
-          then:false,
-          changeForT:false
-        },
-        {
-          id:6,
-          name:'疫区拘留11',
-          value:'疫区拘留11',
-          isSelect:false,
-          style:null,
-          mutual:1,
-          disabled:false,
-          first:false,
-          then:false,
-          changeForT:false
-        },
-        {
-          id:7,
-          name:'疫区拘留22',
-          value:'疫区拘留22',
-          isSelect:false,
-          style:null,
-          mutual:1,
-          disabled:false,
-          first:false,
-          then:false,
-          changeForT:false
-        }
-      ],
-  radioItems:[
-    {
-      id:0,
-      type:'radio',
-      name:1,
-      items:[
-        {
-          id:11,
-          prefix:'',
-          showText:'',
-          value:'听诊区未闻及明显心脏杂音',
-          isSelect:false,
-          hasDrop:true,
-          disabled:false
-        },
-        {
-          id:12,
-          prefix:'',
-          showText:'添加症状',
-          isSelect:false,
-          value:'阵发',
-          hasDrop:true,
-          disabled:false
-        },
-        {
-          id:13,
-          prefix:'',
-          showText:'',
-          value:'加重',
-          isSelect:false,
-          hasDrop:true,
-          disabled:false
-        },
-        {
-          id:14,
-          prefix:'',
-          showText:'添加病程变化',
-          value:'间断',
-          isSelect:false,
-          hasDrop:false,
-          disabled:false
-        },
-      ]
-    },
-    {
-      id:1,
-      type:'radio',
-      name:2,
-      items:[
-        {
-          id:21,
-          prefix:'',
-          showText:'',
-          value:'收缩期收缩期收缩',
-          isSelect:false,
-          hasDrop:true,
-          disabled:false
-        },
-        {
-          id:22,
-          prefix:'',
-          showText:'未闻及',
-          isSelect:false,
-          value:'舒张期',
-          hasDrop:true,
-          disabled:false
-        }
-      ]
-    },
-    {
-      id:2,
-      type:'radio',
-      name:3,
-      items:[
-        {
-          id:31,
-          prefix:'',
-          showText:'',
-          value:'收缩期收缩期收缩',
-          isSelect:false,
-          hasDrop:true,
-          disabled:false
-        },
-        {
-          id:32,
-          prefix:'',
-          showText:'添加症状',
-          isSelect:false,
-          value:'舒张期',
-          hasDrop:true,
-          disabled:false
-        },
-        {
-          id:33,
-          prefix:'',
-          showText:'',
-          value:'全期',
-          isSelect:false,
-          hasDrop:true,
-          disabled:false
-        }
-      ]
-    },
-    {
-      id:3,
-      type:'radio',
-      name:3,
-      items:[
-        {
-          id:31,
-          prefix:'',
-          showText:'',
-          value:'收缩期收缩期收缩',
-          isSelect:false,
-          hasDrop:true,
-          disabled:false
-        },
-        {
-          id:32,
-          prefix:'',
-          showText:'添加症状',
-          isSelect:false,
-          value:'舒张期',
-          hasDrop:true,
-          disabled:false
-        },
-        {
-          id:33,
-          prefix:'',
-          showText:'',
-          value:'全期',
-          isSelect:false,
-          hasDrop:true,
-          disabled:false
-        }
-      ]
-    },
-    
-      ],
-  mixDatas:[
-    {
-      id:11,
-      prefix:'',
-      showText:'其他症状',
-      value:'反复',
-      suffix:'',
-      hasDrop:true,
-      showDrop:false
-    },
-    {
-      id:22,
-      prefix:'',
-      showText:'添加症状',
-      suffix:'',
-      hasDrop:true,
-      showDrop:false
-    },
-    {
-      id:33,
-      prefix:'',
-      showText:'有无治疗',
-      suffix:'',
-      hasDrop:true,
-      showDrop:false
-    },
-    {
-      id:44,
-      prefix:'',
-      showText:'添加病程变化',
-      suffix:'',
-      hasDrop:false,
-      showDrop:false
-    },
-      ]*/
-};
-
-export default function (state = initState, action) {
-    switch (action.type) {
-    case CONFIRN_CHECKBOX:
-      return confirnMix(state,action);
-    case CLEAR_CHECKBOX:
-      return clearMix(state,action);
-    case SHOW_MIXBOX:
-      return showMixCheckBox(state,action);
-    case CHECK_MIXBOX://点击复选框选项
-      return mixChecked(state,action);
-    case RADIO:
-      return radio(state,action);
-    case NOSPECIAL:
-      return mixNoSpecial(state,action);
-    default:
-      return state;
-  }
-}

+ 0 - 9
src/store/types/checkBox.js

@@ -1,9 +0,0 @@
-export const CONFIRN_CHECKBOX = 'CONFIRN_CHECKBOX';
-export const CLEAR_CHECKBOX = 'CLEAR_CHECKBOX';
-export const SHOW_CHECKBOX = 'SHOW_CHECKBOX';
-export const CHECKED = 'CHECKED';
-export const FIRST = 'FIRST';//初为
-export const THEN = 'THEN';//后为
-export const NOSPECIAL = 'NOSPECIAL';//点击无殊
-
-export const RADIO = 'RADIO';//复选框中的单选