Merge branch 'dev/new1' into dev5.3.4

src/common/less/variables.less

@@ -18,6 +18,7 @@
 
 @btn-text-color: #fff;
 @text-color: #333;
+
 @placeholder-color: #716e6e;
 
 @link-hover-decoration: underline;

src/components/Information/index.less

@@ -1,6 +1,6 @@
 .title {
   clear: both;
-  font-size: 22px;
+  font-size: 22px !important;
   margin-bottom: 15px;
   text-align:center;
   padding-top: 15px;

src/components/Operation/index.jsx

@@ -14,6 +14,8 @@ import {dragBox} from '@utils/drag';
 import store from '@store';
 import $ from 'jquery';
 
+import loading from '@common/images/loading.gif';
+
 class Operation extends Component {
   constructor(props) {
     super(props)
@@ -285,7 +287,7 @@ class Operation extends Component {
   render() {
     const { showPrint, closePrint, showPreview, closePreview } = this;
     const { visible, preVisible,diagShow } = this.props.print;
-    const {winWidth,cancelDelTag} = this.props;
+    const {winWidth,cancelDelTag,loadingShow} = this.props;
     const {zIndex,type,le} = this.state;
     return <div className={style['container']} style={{left:le}}>
       <span className={style['button']} onClick={showPrint}><img src={printImg} /> 打印病历</span>
@@ -297,6 +299,9 @@ class Operation extends Component {
       {visible?<PrintPreviewContainer visible={visible} onClose={closePrint} />:null}
       {preVisible?<PreviewContainer visible={preVisible} onClose={closePreview} />:null}
       
+      {loadingShow?<div className={style['mask']}>
+          <img src={loading} className={style['load']}/>
+      </div>:""}
       <ConfirmModal
         visible={diagShow}        //改为全局控制
         confirm={() => { this.makeSure() }}

src/components/Operation/index.less

@@ -167,4 +167,26 @@
     height: 1px;
     margin: 8px auto 0 auto;
     background: #D8D8D8;
+}
+
+.mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: #000;
+    opacity: .4;
+    filter:alpha(opacity=40);
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=40);";
+    z-index: 100;
+}
+.load{
+    width: 40px;
+    height: 40px;
+    position: absolute;
+    top: 50%;
+    left:50%;
+    margin-top: -20px;
+    margin-left: -20px;
 }

src/components/PreviewBody/index.less

@@ -163,11 +163,17 @@ table{
   .printBtn {
     display: none !important;
   }
+  p,span,td,div {
+    font-size: 12px !important;
+  }
   .infos {
     td {
       font-size: 12px !important;
       padding: 4px 5px 4px 0px !important;
       line-height: 18px !important;
+      span {
+        font-size: 12px !important;
+      }
     }
   }
 }

src/containers/OperationContainer.js

@@ -26,6 +26,7 @@ function mapStateToProps(state) {
     const {print,homePage} = state;
     return ({
         print,
+        loadingShow:homePage.loadingShow,
         winWidth:homePage.windowWidth,
         chronicMagItem: state.diagnosticList.chronicMagItem,//慢病疾病
         chronicDesease:state.mainSuit.chronicDesease,//主诉存的慢病

src/store/async-actions/print.js

@@ -2,6 +2,7 @@ import {
     json
 } from "../../utils/ajax";
 import store from '@store';
+import {MODI_LOADING} from '@store/types/homePage.js';
 import Notify from '@commonComp/Notify';
 import {
     getAllDataList,
@@ -10,8 +11,37 @@ import {
     filterDataArr,
     filterOtherDataArr
 } from '@utils/tools';
-
-export const saveMessage = (bool) => {
+export const getConceptDetails = (bool) => {
+    let baseList = store.getState();
+    let disLis = baseList.diagnosticList.diagnosticList||[];
+    let tmpLis  = [];
+    for(let i = 0;i < disLis.length;i++){
+        let obj = {}
+        obj.name = disLis[i].name
+        obj.type = 7
+        obj.position = 3
+        tmpLis.push(obj)
+    }
+    json('/conceptDetail/getConceptDetails', {
+        "conceptIntorduces": tmpLis
+    }).then((res)=>{//conceptIntroduceDTO
+        let data = res.data;
+        if (data.code == 0) {
+            realSaveData(bool,data.data)
+        } else {
+            console.log(res)
+            realSaveData(bool)
+        }
+    }).catch((err)=>{
+        realSaveData(bool)
+        console.log(err)
+    })
+}
+export const saveMessage=(bool)=>{
+    store.dispatch({type:MODI_LOADING,flag:true});
+    getConceptDetails(bool)
+}
+export const realSaveData = (bool,list) => {
     let baseList = store.getState();
     const readMode = baseList.typeConfig.readMode;          //回读模式
     let state = baseList.patInfo.message;
@@ -40,6 +70,7 @@ export const saveMessage = (bool) => {
     pacsData.checkedListImport = jsonData.checkedListImport
     json('/inquiryInfo/saveInquiry', {
         "doctorId": state.doctorId,
+        "conceptIntroduceDTO":list||[],
         "hospitalDeptId": state.hospitalDeptId,
         "hospitalId": state.hospitalId,
         "patientId": state.patientId,         //患者id              
@@ -102,7 +133,9 @@ export const saveMessage = (bool) => {
         } else {
           Notify.info(data.msg);
         }
+        store.dispatch({type:MODI_LOADING,flag:false});
     }).catch(function(){
+        store.dispatch({type:MODI_LOADING,flag:false});
         Notify.info('保存失败，请稍后再试！');
     });
     if(bool){

src/store/reducers/homePage.js

@@ -11,6 +11,7 @@ const initState = {
   addItems:{},
   commSymHide:false,
   loadingFlag:true,
+  loadingShow:false,
   boxTop:0,
   boxLeft:0,
   allModules:[],

src/utils/config.js

@@ -1,13 +1,13 @@
 // const host='http://192.168.3.1:5050';//赵
 // const host='http://192.168.3.100:5050';//王峰
 // const host='http://192.168.2.121: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.2.241: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'; //周铁刚
 // const newIcssVisitUrl = '223.93.170.82:13000';    //icss服务访问地址（跳转目的地），不能加http://
-const imageUrlPrefix = 'http://192.168.2.236:82';
+const imageUrlPrefix = 'http://192.168.2.241:82';
 module.exports={
     host,
     prefix:'/api/icss',            //带权限验证的api