Browse Source

清除时若页面为慢病内容则重新获取模板

liucf 6 years ago
parent
commit
c1adeae455
3 changed files with 16 additions and 8 deletions
  1. 4 2
      src/components/Operation/index.jsx
  2. 10 4
      src/containers/OperationContainer.js
  3. 2 2
      src/utils/config.js

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

@@ -259,7 +259,7 @@ class Operation extends Component {
     }
   }
   makeSure() {
-    const { save, clear, saveDataAll,diagShowTmp } = this.props;
+    const { save, clear, saveDataAll,diagShowTmp ,chronicMagItem,chronicDesease} = this.props;
     const { type } = this.state;
     if (type == 1) {
       diagShowTmp(false)
@@ -268,7 +268,9 @@ class Operation extends Component {
     } else if (type == 2) {
       diagShowTmp(false)
       this.setState({ title: '' })
-      clear();
+      // 慢病标识
+      const chronicFlag = chronicMagItem&&chronicMagItem.name || chronicDesease&&chronicDesease.name?true:false;
+      clear(chronicFlag);
     } else if (type == 3) {
       if (this.state.title.trim() == '') {
         Notify.error('请输入模板名称')

+ 10 - 4
src/containers/OperationContainer.js

@@ -10,14 +10,16 @@ import {
 } from "../store/types/print";
 import {saveMessage,clearMessages} from "../store/async-actions/print";
 import {saveTemplateDetail} from '@store/async-actions/tabTemplate';
-import {saveClickNum} from '@store/async-actions/homePage';
+import {saveClickNum,getInitModules} from '@store/async-actions/homePage';
 
 // function mapStateToProps({print}) {
 function mapStateToProps(state) {
     const {print,homePage} = state;
     return ({
         print,
-        winWidth:homePage.windowWidth
+        winWidth:homePage.windowWidth,
+        chronicMagItem: state.diagnosticList.chronicMagItem,//慢病疾病
+        chronicDesease:state.mainSuit.chronicDesease,//主诉存的慢病
     });
 }
 
@@ -47,8 +49,12 @@ function mapDispatchToProps(dispatch) {
             dispatch(saveClickNum);
             dispatch(() => saveMessage())
         },
-        clear: () => {
-            clearMessages()
+        clear: (flag) => {
+            clearMessages();
+            // 清除时如果是慢病模板则重新获取模板
+            if(flag){
+                dispatch(getInitModules);
+            }
         },
         saveDataAll(val,sex){
           dispatch(saveTemplateDetail(val,sex))

+ 2 - 2
src/utils/config.js

@@ -1,7 +1,7 @@
 // const host='http://192.168.3.1:5050';//赵
 // const host='http://192.168.3.100:5050';//王峰
-const host='http://192.168.2.241:5050';//后端接口访问地址
-// const host='http://192.168.2.236:5050';//后端接口访问地址
+// const host='http://192.168.2.241:5050';//后端接口访问地址
+const host='http://192.168.2.236:5050';//后端接口访问地址
 // const host='http://192.168.3.11:5050';//王宇
 //const host='http://192.168.2.164:8080';
 // const host='http://192.168.3.117:5050'; //周铁刚