数据判断有误

src/components/AddAssistCheck/Textarea/index.jsx

@@ -10,6 +10,8 @@ class Textarea extends Component {
     };
     this.$dom = React.createRef();
     this.handleInput = this.handleInput.bind(this);
+    this.handleFocus = this.handleFocus.bind(this);
+    this.handleBlur = this.handleBlur.bind(this);
   }
   handleInput(e){
     const {handleChangeAssistValue,idx,handlePush} = this.props;
@@ -44,6 +46,13 @@ class Textarea extends Component {
       this.$dom.current.innerText = value||'';
     }
   }
+  handleFocus(e){
+    console.log(e.target)
+    
+  }
+  handleBlur(e){
+    console.log(e.target)
+  }
   render() {
     const {value} = this.props;
     return (
@@ -51,6 +60,8 @@ class Textarea extends Component {
           contenteditable={true}
           ref={this.$dom}
           onInput={this.handleInput}
+          onFocus={this.handleFocus}
+          onBlur={this.handleBlur}
           onPropertyChange={this.handleInput}
       ></div>
     );

src/components/Operation/index.jsx

@@ -98,7 +98,7 @@ class Operation extends Component {
     let baseList = store.getState();
     let jsonData = getAllDataList(baseList);
     let jsonStr = getAllDataStringList(baseList);
-    let flg = isAllClear(jsonData,jsonStr);
+    let flg = isAllClear(jsonData,jsonStr,baseList);
     if(flg){
       this.setState({
         type: type,
@@ -167,9 +167,11 @@ class Operation extends Component {
   saveHis(type) {
     const { diagShowTmp } = this.props;
     let flg = this.getAllData();
+    console.log(flg)
     if(flg){
       this.setState({
         title: '',
+        sex:'3',
         type: type,
         okText: '保存',
         borderColor: '#3B9ED0',
@@ -186,7 +188,8 @@ class Operation extends Component {
     let jsonStr = getAllDataStringList(baseList);
     let whichSign = baseList.typeConfig.typeConfig;
     let tmpLis = baseList.tabTemplate.items;
-    // console.log(jsonStr.present,'2222')
+    console.log(jsonStr,'文本')
+    console.log(jsonData,'结构')       //测试需要用到，不要删了
     for(let i = 0;i <tmpLis.length;i++){
       let dataStr = tmpLis[i].preview;
       let jsStr = tmpLis[i].dataJson;
@@ -218,7 +221,7 @@ class Operation extends Component {
         return false;
       }
     }
-    let flg = isAllClear(jsonData,jsonStr)
+    let flg = isAllClear(jsonData,jsonStr,baseList)
     if(!flg){
       Notify.info('模板数据不能为空')
       return false
@@ -242,7 +245,7 @@ class Operation extends Component {
       />
       <div className={style['line']}></div>
       <div className={style['iptWrap']}>
-        <p>请选择模板性别归属(错误引用页面显示可能有误)</p>
+        <p>请选择模板性别归属(错误引用，显示可能有误)</p>
         <span className={style['commonSex']} id="commonSex" onClick={this.changeRadio.bind(this,1)}><img src={check_right} alt=""/><i style={{color:'#000'}}>通用</i></span>
         <span id="maleSex" onClick={this.changeRadio.bind(this,2)}><img src={check_circle} alt=""/><i>男</i></span>
         <span id="femaleSex" onClick={this.changeRadio.bind(this,3)}><img src={check_circle} alt=""/><i>女</i></span>

src/store/actions/pushMessage.js

@@ -206,7 +206,7 @@ export const addBilling = (state, action) => {
 	return res;
 }
 export const clearAllPushMessage = (state, action) => {
-	const res = JSON.parse(JSON.stringify(state));
+  const res = JSON.parse(JSON.stringify(state));
 	res.advice = action.data;
 	res.AdviceStr = action.saveText;
 	res.tips = {};

src/utils/tools.js

@@ -248,7 +248,8 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
         });
         store.dispatch({
             type: CLEAR_ALL_PUSH_MESSAGE,
-            data:{}
+            data:{},
+            saveText:'',
         });
         storageLocal.remove('emrParam');
        // Notify.success('页面已清空')
@@ -583,12 +584,14 @@ function didPushParamChange(){
   return true;
 }
 //判断页面所有数据是否为空
-function isAllClear(jsonData,jsonStr){
+function isAllClear(jsonData,jsonStr,baseList){
+  console.log(baseList.checkBody.isEmpty)
   if (      //结构化和文本数据都为空
     JSON.stringify(jsonData.advice) == '{}' &&
     jsonData.chief.length < 1 &&
     jsonData.present.length < 1 &&
-    jsonData.other.length < 1 &&
+    // jsonData.other.length < 1 && 
+    baseList.checkBody.isEmpty &&
     jsonData.vital.length < 1 &&
     jsonData.diag.length < 1 &&
     jsonData.pacs.length < 1 &&