v6

src/components/AddAssistCheck/Textarea/index.jsx

@@ -82,11 +82,13 @@ class Textarea extends Component {
     $(this.$dom.current).off("paste");
   }
   handleFocus(){     //ie8下提示语挡住输入框，导致输入框无法聚焦
+    this.textInput.current.previousSibling.focus();
+    console.log(111111111111, this.textInput.current);
     store.dispatch(embedPush({
       action: "pacs",
       mode: 1
     }))
-    this.textInput.current.previousSibling.focus();
+    // this.textInput.current.previousSibling.focus();
   }
   render() {
     const {idx,disabled} = this.props;
@@ -97,6 +99,8 @@ class Textarea extends Component {
             ref={this.$dom}
             onInput={this.handleInput}
             onKeyUp={this.handleInput}
+            // 2020/9/9 解决有内容后再次点击无法推送的bug 
+            onClick={this.handleFocus}
         ></div>
         <p ref={this.textInput} onClick={this.handleFocus} className={`${style.textareaWarring} ${setFontColorSize(2)}`}></p>
       </div>

src/components/AddAssistCheck/index.jsx

@@ -245,7 +245,8 @@ class AddAssistCheck extends React.Component {
                 </ScrollArea>
               </div>
               <div className={`${styles.pointerFinger} ${setFontColorSize(2,2)}`}>
-                <p>报告日期：<span>
+                {/* <p>报告日期：<span> */}
+                <p><span>
                   <input disabled="disabled" type="text" 
                       class="canEdit"
                       onDoubleClick={(e)=>this.setEdit(e)}

src/components/AddAssistCheck/index.less

@@ -60,6 +60,7 @@
     border-radius: 4px;
     color: #000;
     .pointerFinger {
+       border-bottom: 1px dashed #333;
       width: 260px;
       position: absolute;
       right: 0;
@@ -85,7 +86,7 @@
         margin: 0 6px;
         vertical-align: top;
         span {
-          border-bottom: 1px dashed #333;
+          // border-bottom: 1px dashed #333;
           box-sizing: border-box;
           margin-right: 0;
           display: inline-block;

src/components/AddInspect/SlidePic/index.jsx

@@ -160,7 +160,12 @@ class SlideSelect extends Component {
     //   mode: 1
     // }))
     // $('.canEdit').blur().attr('disabled','disabled')
+
     $(e.target).removeAttr('disabled').focus()
+    store.dispatch(embedPush({
+      action: "lis",
+      mode: 1
+    }))
   }
   render() {
     const {item,idx,activeIdx,activeSign} = this.props;
@@ -174,7 +179,8 @@ class SlideSelect extends Component {
               <span className={styles.smallname}></span>
               <span className={styles.edit}></span>
               <span className={styles.maxmin}></span>
-              <span className={styles.pass}>检验时间：
+              {/* <span className={styles.pass}>检验时间： */}
+              <span className={styles.pass}>
                 <input disabled="disabled" type="text" 
                     class="canEdit" 
                     onDoubleClick={(e)=>this.setEdit(e)}
@@ -212,7 +218,8 @@ class SlideSelect extends Component {
               /><img style={{display:style==1||style==2?'inline-block':'none'}} src={style==1?down:style==2?up:''} />{item.units}
           </span>
           <span className={styles.maxmin}>{normalVal(item.minValue,item.maxValue)}</span>
-          <span className={styles.pass}>检验时间：
+          {/* <span className={styles.pass}>检验时间： */}
+          <span className={styles.pass}>
             <input disabled="disabled" type="text" 
                 class="canEdit" 
                 onDoubleClick={(e)=>this.setEdit(e)}

src/components/PatInfo/index.jsx

@@ -145,7 +145,7 @@ class PatInfo extends Component {
   // 获取焦点推送
   inputOnFocus(){
     store.dispatch(embedPush({
-      action: "patientia",
+      action: "info",
       mode: 1
     }))
   }

src/components/PreviewBody/Inspect/index.jsx

@@ -3,6 +3,7 @@ import { normalVal,getStatusImg } from '@utils/tools';
 
 const PreviewInspect = (props) => {
   const { dataJson, toTime ,dateTime,showDetails  } = props;
+  // console.log(dataJson.labelListSmall,'dataJson.labelListSmall');
     return <tr className={style['patInfoFst']}>
       <td className={style['patInfoSec']}>检验：</td>
       <td className={style['patInfoSec']}>
@@ -29,7 +30,8 @@ const PreviewInspect = (props) => {
                       {normalVal(item.minValue, item.maxValue)}
                       {/* {normalVal(3.9, 6.1)} */}
                     </td>
-                    <td className={style.assistTableTdFor}>{item.time == '' ? ('导入时间：' + dateTime) : '检验时间：' + toTime(item.time)
+                    {/* <td className={style.assistTableTdFor}>{item.time == '' ? ('导入时间：' + dateTime) : '检验时间：' + toTime(item.time) */}
+                  <td className={style.assistTableTdFor}>{item.time == '' ?  + dateTime  :  item.time
                     }</td>
                   </tr>
                 // </table>

src/containers/OperationContainer.js

@@ -103,6 +103,7 @@ function mapDispatchToProps(dispatch) {
     },
     clear: (flag) => {
       clearMessages();
+      // console.log('清除数据');
       // dispatch(getOtherHisRecord());      //清除后重新获取其他史记录
       // 清除时如果是慢病模板则重新获取模板
       if (flag) {

src/store/actions/print.js

@@ -56,7 +56,7 @@ export const clearMrId = (state, action) => {
   res.mrInfo = {
     update: 0,
     mrId: '',
-    mode: '',
+    mode: 'patientia',
   };
   return res;
 };

src/store/async-actions/print.js

@@ -16,6 +16,7 @@ import {
   formatTextInfo,
   delHistoryDataList,
 } from '@utils/tools';
+import { embedPush } from '@store/async-actions/pushMessage'
 export const getConceptDetails = (bool) => {
     let baseList = store.getState();
     let isPreIcss = baseList.typeConfig.isPreIcss;
@@ -370,4 +371,9 @@ export const clearMessages = () => {
     // let whichSign = baseList.typeConfig.mode;
     // pushAllDataList(whichSign,'clear');
     delHistoryDataList()
+    // store.dispatch(embedPush({
+    //   action: "patientia",
+    //   mode: 1
+    // }))
+
 };

src/store/reducers/print.js

@@ -12,7 +12,7 @@ const initState = {
   mrInfo:{
     update:0,
     mrId:'',
-    mode: 'plan_default'
+    mode: 'patientia'
   }
 };
 export default function(state = initState, action) {

src/store/types/print.js

@@ -6,4 +6,4 @@ export const CLOSE_PREVIEW = 'CLOSE_PREVIEW';
 export const DIAG_SHOW = 'DIAG_SHOW';
 export const CLEAR_SEARCH_PARAM='CLEAR_SEARCH_PARAM';
 export const SET_MR_INFO='SET_MR_INFO';
-export const CLEAR_MR_INFO = 'CLEAR_MR_INFO';
+export const CLEAR_MR_INFO = 'CLEAR_MR_INFO';

src/utils/tools.js

@@ -38,7 +38,7 @@ import down from '@images/down.png';
 import $ from 'jquery';
 import {CLEAR_SEARCH_PARAM} from "../store/types/print";
 
-
+// import { embedPush } from '@store/async-actions/pushMessage'
 /***
  * 工具函数
  *
@@ -344,13 +344,11 @@ const delHistoryDataList = () =>{
   store.dispatch({
     type: CLEAR_MR_INFO,
   });
-
-
-
-
   store.dispatch({
     type: ISREAD,
   });
+  
+
 }