bug2812,2811,2809,2807,2806

src/components/Operation/index.jsx

@@ -180,7 +180,7 @@ class Operation extends Component {
       {/* <div className={style.titleTip}></div> */}
       <div className={style['iptWrap']}>
         <div className={style.name}>
-          <span>模版名称：</span>
+          <span>模板名称：</span>
           <input className={style['ipt']}
             placeholder="请输入模板名称"
             type="text"
@@ -353,17 +353,19 @@ class Operation extends Component {
         {
           admin&&type==3?<div className={style.department}>
               <span>科室归属：</span>
-              <Search handleChangeValue={handleChangeValue} handleChangeIpt={handleChangeIpt} value={value} visible={true}>
-                <ul className={style.departLis}>
-                  {
-                    departLis.map((item,idx)=>{
-                      return <li onClick={()=>this.setDeptId(item.id,item.conceptDeptName)}>
-                        {item.conceptDeptName}
-                      </li>
-                    })
-                  }
-                </ul>
-              </Search>
+                <Search handleChangeValue={handleChangeValue} handleChangeIpt={handleChangeIpt} value={value} visible={true}>
+                {
+                  departLis.length>0&&<ul className={style.departLis}>
+                    {
+                      departLis.map((item,idx)=>{
+                        return <li onClick={()=>this.setDeptId(item.id,item.conceptDeptName)}>
+                          {item.conceptDeptName}
+                        </li>
+                      })
+                    }
+                  </ul>
+                }
+                </Search>
               <span style={{paddingRight:0,color:'#777777'}}>(支持汉字关键字搜索)</span>
           </div>:null
         }

src/components/PreviewBody/Inspect/index.jsx

@@ -36,9 +36,9 @@ const PreviewInspect = (props) => {
             return <table style={{ margin: '8px 0', width: '100%' }}>
               {
                 item.show?<tr className={style.assistTableTrFst}>
-                  <td className={style.ediName}>
+                  <td colSpan='4'>
                     <span> {item.name} </span> 
-                    <p>
+                    <p style={{display:item.inpValue?'inline-block':'none'}}>
                       ({item.inpValue})
                       <i></i>
                     </p>

src/components/PreviewBody/index.jsx

@@ -7,6 +7,7 @@ import PreviewInspect from './Inspect';
 import ItemPart from './ItemPart';
 import $ from "jquery";
 import AssessResultHis from '@containers/AssessResultHis';
+import { dragBox } from '@utils/drag';
 
 class PreviewBody extends Component {
   constructor(props) {
@@ -39,6 +40,7 @@ class PreviewBody extends Component {
       return false;
     } else {
       this.onPrint();
+      dragBox('previewPrintWrapper','previewPrintStatic','del')
       this.props.save(true)
     }
   }

src/components/PreviewBody/index.less

@@ -96,6 +96,8 @@ table{
     margin-left: 10px;
     background-color: #EDF8FF;
     padding: 0 5px;
+    max-width: 490px;
+    float: right;
   }
 }
 .assistTableTdFst {

src/components/PushContainer/index.jsx

@@ -71,7 +71,7 @@ class PushContainer extends Component {
    * @param {tab组件切换id} id
    */
   handleActiveClick(id) {
-    if (id == '1') {
+    if (id == '2') {
       store.dispatch(initItemList(1,0));
     }
     store.dispatch(tabChange(id))

src/store/async-actions/patInfo.js

@@ -60,7 +60,7 @@ export const getAdminCheckout = (val1,val2,dispatch) => {
               type: SETADMIN,
               admin:data.data
             });
-            dispatch(getInitModules);     //确保病人信息获取以后再获取模板等数据，否则参数为空
+            dispatch(initItemList(1,''));        //模板列表没有就获取模板列表用于保存时做数据对比是否保存过
         } else {
             console.log(res)
         }
@@ -125,7 +125,6 @@ export const initHistoryDetails = (dispatch) => {
                 dispatch({
                   type:ISREAD
                 });
-                dispatch(initItemList(1,''));        //模板列表没有就获取模板列表用于保存时做数据对比是否保存过
                 dispatch({type:MODI_LOADING,flag:false});
             } else {
                 dispatch({type:MODI_LOADING,flag:false});
@@ -197,6 +196,7 @@ export async function getPatientMessage(dispatch, getState){
     data:Object.assign(data1,data2)
   });
   localStorage.removeItem('deletedTags');
+  dispatch(getInitModules);     //确保病人信息获取以后再获取模板等数据，否则参数为空
   dispatch(getCommonList(5));     //获取常用化验标签列表
   dispatch(getCommonList(6));     //获取常用辅检标签列表if(allModules.length == 0){//模板为空才回读
   dispatch(initHistoryDetails());      //历史病历回读

src/utils/drag.js

@@ -113,13 +113,13 @@ function dragBox(dragWrap,dragTop,type,addDom,img,free) {
     $(document).on('mousemove', handleMove)
     $(document).on('mouseup', handleUp)
   
-    windowEventHandler('resize', ()=>{
-      clearTimeout(timer)
-      timer = setTimeout(()=>{
-        dragBox(dragWrap,dragTop,'del',addDom,img,free)
-        dragBox(dragWrap,dragTop,type,addDom,img,free)
-      }, 200)
-    });
+    // windowEventHandler('resize', ()=>{
+    //   clearTimeout(timer)
+    //   timer = setTimeout(()=>{
+    //     dragBox(dragWrap,dragTop,'del',addDom,img,free)
+    //     dragBox(dragWrap,dragTop,type,addDom,img,free)
+    //   }, 200)
+    // });
     
   }
 }