Преглед на файлове

判断是否为空只判断文本不判断结构

Luolei преди 6 години
родител
ревизия
fb65e9d6a4
променени са 3 файла, в които са добавени 8 реда и са изтрити 8 реда
  1. 2 2
      src/components/Operation/index.jsx
  2. 2 2
      src/components/PrintPreview/index.jsx
  3. 4 4
      src/utils/tools.js

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

@@ -8,7 +8,7 @@ import PreviewContainer from '@containers/PreviewContainer';
 import { ConfirmModal, Notify } from '@commonComp';
 import check_circle from './img/check-circle.png';
 import check_right from './img/check-right.png';
-import {getAllDataList,getAllDataStringList,isAllClear,filterArr} from '@utils/tools';
+import {getAllDataList,getAllDataStringList,isAllClear,filterDataArr} from '@utils/tools';
 import store from '@store';
 import $ from 'jquery';
 
@@ -84,7 +84,7 @@ class Operation extends Component {
   keepHistory(){
     let baseList = store.getState();
     let jsonStr = getAllDataStringList(baseList);
-    if(filterArr(JSON.parse(jsonStr.chief)) == ''){
+    if(filterDataArr(JSON.parse(jsonStr.chief)) == ''){
         Notify.info('主诉不能为空');
         return false;
     }else if(!jsonStr.diag || jsonStr.diag.trim().length < 1){

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

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

+ 4 - 4
src/utils/tools.js

@@ -595,10 +595,10 @@ function isAllClear(jsonData,jsonStr){
     jsonData.lis.labelList.length < 1 &&
     jsonData.lis.getExcelDataList.length < 1 &&
     JSON.stringify(jsonData.advice) == '{}' &&
-    filterArr(JSON.parse(jsonStr.chief)) == '' &&
-    filterArr(JSON.parse(jsonStr.present)) == '' &&
-    filterArr(JSON.parse(jsonStr.other)) == '' &&
-    filterArr(JSON.parse(jsonStr.vital)) == '' &&
+    filterDataArr(JSON.parse(jsonStr.chief)) == '' &&
+    filterDataArr(JSON.parse(jsonStr.present)) == '' &&
+    filterDataArr(JSON.parse(jsonStr.other)) == '' &&           //这里都是filterDataArr不是filterArr,要去符号的
+    filterDataArr(JSON.parse(jsonStr.vital)) == '' &&
     jsonData.diag.length < 1 &&
     jsonData.pacs.length < 1 &&
     jsonData.lis.labelList.length < 1 &&