Merge branch 'optimize' of http://192.168.2.236:10080/zhouna/newICSS into optimize

src/components/Advice/Textarea/index.jsx

@@ -18,7 +18,7 @@ class Textarea extends Component {
   handleInput(e){
     e.stopPropagation();
     const {handleChangeAssistValue,idx,handlePush} = this.props;
-    const text = e.target.innerText || e.target.innerHTML;
+    const text =  e.target.innerHTML;
     const stimer = this.state.timer;
     handleChangeAssistValue&&handleChangeAssistValue(text);
    
@@ -36,7 +36,7 @@ class Textarea extends Component {
     //   // this.$dom.current.innerText?(this.$dom.current.innerText = next.value||''):(this.$dom.current.innerHTML = next.value||'');
     // }
     if(next.isRead != isRead && next.value || next.isRead != isRead && next.value!=this.props.value){      //value对比解决复诊不显示bug
-      next.value ? this.$dom.current.innerText = next.value :  this.$dom.current.innerText = '' 
+      next.value ? this.$dom.current.innerHTML = next.value :  this.$dom.current.innerHTML = '' 
       // this.$dom.current.innerText?(this.$dom.current.innerText = next.value||''):(this.$dom.current.innerHTML = next.value||'');
     }
     if(next.typeConfig != typeConfig) {
@@ -46,7 +46,7 @@ class Textarea extends Component {
   componentDidMount(){
     const {value} = this.props;
     if(value && value.trim()){
-      this.$dom.current.innerText = value
+      this.$dom.current.innerHTML = value
       // this.$dom.current.focus()
       // this.$dom.current.innerText ? (this.$dom.current.innerText = value) : (this.$dom.current.innerHTML = value)
     //   this.$dom.current.nextSibling.innerText?(this.$dom.current.nextSibling.innerText = ''):(this.$dom.current.nextSibling.innerHTML = '')
@@ -62,6 +62,7 @@ class Textarea extends Component {
             ref={this.$dom}
             onInput={this.handleInput}
             onKeyUp={this.handleInput}
+            onkeydown={(e) => {e.stopPropagation()}}
         ></div>
       </div>
     );

src/components/AssessResult/AssessHis/index.jsx

@@ -7,9 +7,9 @@ import loadingIcon from '@common/images/loading.gif';
 import ChooseItem from "../ChooseItem";
 import ScaleItem from "../ScaleItem";
 import ChartItem from "../ChartItem";
-import printIcon from '@common/images/team.png';
 import tableIcon from '@common/images/table.png';
 import ScaleTableHis from '@components/ScaleTableHis';
+import { dragBox } from '@utils/drag';
 import $ from "jquery";
 
 class AssessResultHis extends Component {
@@ -99,10 +99,11 @@ class AssessResultHis extends Component {
   showScaleFn(item){
     const { list,inquiryId } = this.props;
     const obj = list&&list[inquiryId];
+    dragBox('dragModalWrap','dragModalTitle','del')
     if(item){
       this.setState({
         tableName:item.name,
-        tableId:item.id,
+        tableId:item.conceptId,
         showScale:!this.state.showScale
       });
     }else{

src/components/ChronicInfo/index.jsx

@@ -389,7 +389,7 @@ class ChronicInfo extends React.Component{
                             </span>
                             {formulaId&&formulaId==v.conceptId&&<MiniToast title={it.content.name}
                                 icon={allTableIcon}
-                                confirmText={chronicMagItem?'加入病例记录':'确定'}
+                                confirmText={chronicMagItem?'加入病历记录':'确定'}
                                 show={formulaId&&formulaId==v.conceptId?true:false}
                                 close={this.closeFormula.bind(this,it)}
                                 confirm={this.addFormula.bind(this,it,v,i,j)}
@@ -453,7 +453,7 @@ class ChronicInfo extends React.Component{
                             </span>
                             <MiniToast title='结果选择'
                                 icon={checkIcon}
-                                confirmText={chronicMagItem?'加入病例记录':'确定'}
+                                confirmText={chronicMagItem?'加入病历记录':'确定'}
                                 show={optionId&&optionId==v.conceptId?true:false}
                                 close={this.closeOption}
                                 confirm={this.confirmOption.bind(this,v,i,j)}
@@ -500,7 +500,7 @@ class ChronicInfo extends React.Component{
     const {comfirnFlag,flag,ff} = this.state;
     const {chronicMagItem,chronicDesease,data,showHide,slideUp} = this.props;
     const scaleFooter = <Footer print={true}
-                                footText={showHide.isPop||!chronicMagItem?"确定":"加入病例记录"}
+                                footText={showHide.isPop||!chronicMagItem?"确定":"加入病历记录"}
                                 handlePrint={this.onPrint}
                                 handleConfirm={this.comfirnTable}/>;
     if(data&&data.length>0){

src/containers/eleType.js

@@ -20,7 +20,7 @@ import Multiple from '@containers/Multiple';
 //单选类型
 export function singleRadio(params){
   const data = params.item;
-  const {i,hideTag,boxMark,showArr,selecteds,boxTop,boxLeft,importLabel} = params;
+  const {i,hideTag,boxMark,showArr,selecteds,importLabel} = params;
   let isHigh=importLabel&&importLabel.includes(data.id);
   const showInx = boxMark+i+'0';    //单括号多标签的情况下需要识别同一个标签内多个下拉组件的显示状态
   switch (+data.controlType){

src/modules/HomePage/index.jsx

@@ -55,8 +55,7 @@ class HomePage extends Component {
     }
     render() {
         const {flag,setPushEmergencyIdx,sysConfig} = this.props;
-        return <div className={style['home-page']}>
-        {/* return <div className={style['home-page']} onClick={this.props.hideAllDrop}> */}
+        return <div className={style['home-page']} onClick={this.props.hideAllDrop}>
             <BannerContainer />
             {/* <InfoTitle /> */}
             <BodyContainer></BodyContainer>

src/store/actions/pushMessage.js

@@ -73,7 +73,8 @@ function getAdviceStr(advice) {
 	if(adviceInput)  { 
 		AdviceStr = AdviceStr +'; ' + adviceInput;
 	}	
-	
+	let reg=/<[^>]+>/gim;
+	AdviceStr = AdviceStr.replace(reg,"");
 	return AdviceStr;
 }
 

src/store/async-actions/fetchModules.js

@@ -6,11 +6,11 @@ import {getEMRParams,didPushParamChange,inspectAndAssist,fullfillText,checkFullf
 import {Notify} from '@commonComp';
 import {billing} from '@store/async-actions/pushMessage';
 import {SETOTHERHISTORY,ISREAD} from "../types/homePage";
-import {SAVE_TABLE_RESULT,SET_CHRONIC_PUSHS} from "../types/pushMessage";
 import config from "@config/index";
 import {CURRENT_CHRONIC} from '@store/types/currentIll';
 import {MODI_LOADING} from '@store/types/homePage.js';
 import {GET_ALL_HIS,FILTER_ALL_HIS} from '@store/types/emergencyHis.js';
+import {SET_IMPORT_CHECKBODY_LABEL} from "../types/checkBody";
 
 const api={
   // getSpreadModule:'/questionInfo/getByIds',
@@ -159,7 +159,14 @@ export function pregetCheckbodyData(flag){     //flag=true获取到数据后立
     };
     json(api.getBigPush,param).then((res)=>{
       if(+res.data.code === 0){
-        const data = res.data.data&&res.data.data.moduleVital;
+        const obj = res.data.data;
+        const data = obj&&obj.moduleVital;
+        const vitalIds = obj&&obj.vitalIds;
+        //查体高亮标签
+        dispatch({
+          type:SET_IMPORT_CHECKBODY_LABEL,
+          labels:vitalIds
+        });
         dispatch({
           type:PRESET,
           data:data

src/store/async-actions/print.js

@@ -79,9 +79,11 @@ export const saveMessage = (bool) => {
                 Notify.success('历史病历保存成功');
             }
         } else {
-            console.log(res)
+          Notify.info(data.msg);
         }
-    })
+    }).catch(function(){
+        Notify.info('保存失败，请稍后再试！');
+    });
     if(bool){
         json('/printRecord/savePrintRecords', {
             "dataJson": JSON.stringify(getAllDataList(baseList)),

src/store/async-actions/pushMessage.js

@@ -136,7 +136,7 @@ export const getConceptDetail = (item) => {
         }
 
         json(api.getConceptDetail, params).then((res) => {
-            if(res.data.code == '0') {
+            if(res.data.code == '0'&& res.data.data.details && res.data.data.details.length > 0) {
                 if(item.position == '1') {  //右侧提示信息
                     dispatch({
                         type: SET_CLICK_DIAG,