Sfoglia il codice sorgente

主诉数组多个空格元素处理

Luolei 6 anni fa
parent
commit
28cd3bac18

+ 2 - 5
src/components/Operation/index.jsx

@@ -6,7 +6,7 @@ import saveHistory from '@common/images/saveHistory.png';
 import PrintPreviewContainer from '@containers/PrintPreviewContainer';
 import PreviewContainer from '@containers/PreviewContainer';
 import { ConfirmModal, Notify } from '@commonComp';
-import {getAllDataList,getAllDataStringList,isAllClear} from '@utils/tools';
+import {getAllDataList,getAllDataStringList,isAllClear,filterArr} from '@utils/tools';
 import store from '@store';
 
 
@@ -80,10 +80,7 @@ class Operation extends Component {
   keepHistory(){
     let baseList = store.getState();
     let jsonStr = getAllDataStringList(baseList);
-    if(JSON.parse(jsonStr.chief).length == 1 && JSON.parse(jsonStr.chief)[0].trim() ==''){
-        Notify.info('主诉不能为空');
-        return false;
-    }else if(jsonStr.chief && JSON.parse(jsonStr.chief).length < 1){
+    if(filterArr(JSON.parse(jsonStr.chief)) == ''){
         Notify.info('主诉不能为空');
         return false;
     }else if(!jsonStr.diag || jsonStr.diag.trim().length < 1){

+ 2 - 5
src/components/PrintPreview/index.jsx

@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import { getAllDataList, getAllDataStringList } from '@utils/tools';
+import { getAllDataList, getAllDataStringList,filterArr } from '@utils/tools';
 import style from "./index.less";
 import PreviewBody from "../PreviewBody";
 import store from '@store';
@@ -12,12 +12,9 @@ class PrintPreview extends Component {
         super(props)
     }
     surePrint(jsonStr){
-        if(JSON.parse(jsonStr.chief).length == 1 && JSON.parse(jsonStr.chief)[0].trim() ==''){
+        if(filterArr(JSON.parse(jsonStr.chief)) == ''){
           Notify.info('主诉不能为空');
             return false;
-        }else if(jsonStr.chief && JSON.parse(jsonStr.chief).length < 1){
-            Notify.info('主诉不能为空');
-            return false;
         }else if(!jsonStr.diag || jsonStr.diag.trim().length < 1){
             Notify.info('诊断不能为空');
             return false;

+ 1 - 1
src/containers/MainSuit.js

@@ -11,7 +11,7 @@ import {filterArr,didPushParamChange} from '@utils/tools.js';
 import config from '@config/index.js';
 import {Notify} from '@commonComp';
 
-function mapStateToProps(state) {
+function mapStateToProps(state) {      //console.log(state)
   return {
     showDrop:state.mainSuit.showDrop,//用于更新
     update:state.mainSuit.update,