luolei 5 سال پیش
والد
کامیت
ce215f93cd

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

@@ -29,13 +29,14 @@ class SearchList extends React.Component {
       const {windowHeight,pageTop,height,refreshScroller} = this.props;
       const {windowHeight,pageTop,height,refreshScroller} = this.props;
     }
     }
     handleClearVal(){
     handleClearVal(){
-        const { handleChangeValue } = this.props;
+        const { handleChangeValue,handleChangeIpt } = this.props;
         this.textInput.current.value = '';
         this.textInput.current.value = '';
         this.textInput.current.focus();
         this.textInput.current.focus();
         this.setState({
         this.setState({
             val:'',
             val:'',
             show:false
             show:false
         });
         });
+        handleChangeIpt('');
         handleChangeValue('');
         handleChangeValue('');
     }
     }
     handleInput(e){
     handleInput(e){

+ 8 - 3
src/components/Operation/index.jsx

@@ -39,8 +39,8 @@ class Operation extends Component {
       value:'',//科室name
       value:'',//科室name
       folder:'',//文件夹
       folder:'',//文件夹
       folderName:'',
       folderName:'',
-      folderNameVal:'',//选中文件夹名称
-      folderId:'',//选中文件夹名称
+      folderNameVal:'未分类文件夹',//选中文件夹名称
+      folderId:'11',//选中文件夹名称
       folderListShow:false, //文件夹列表展示
       folderListShow:false, //文件夹列表展示
       showSaveModule:false, //保存病例模板
       showSaveModule:false, //保存病例模板
     }
     }
@@ -404,6 +404,12 @@ class Operation extends Component {
     }
     }
   }
   }
   handleChangeIpt(val){//搜索科室
   handleChangeIpt(val){//搜索科室
+    if(val == ''){
+      this.setState({
+        deptId:'',
+      })
+      return
+    }
     this.setState({
     this.setState({
       value:val
       value:val
     })
     })
@@ -576,7 +582,6 @@ class Operation extends Component {
         saveOrderFolder = {saveOrderFolder}
         saveOrderFolder = {saveOrderFolder}
         patInfo={patInfo}
         patInfo={patInfo}
         title = '管理文件夹'>
         title = '管理文件夹'>
-
         </FolderOrder>
         </FolderOrder>
     </div>;
     </div>;
   }
   }

+ 1 - 4
src/components/TemplateItems/index.jsx

@@ -15,7 +15,7 @@ import Empty from '@components/Empty';
 import $ from 'jquery';
 import $ from 'jquery';
 import store from '@store';
 import store from '@store';
 import { initCommonItemList,findTemplateNorms,getFloderListAll } from '@store/async-actions/tabTemplate';
 import { initCommonItemList,findTemplateNorms,getFloderListAll } from '@store/async-actions/tabTemplate';
-import {windowEventHandler,getWindowInnerHeight} from '@utils/tools'
+import { windowEventHandler,getWindowInnerHeight } from '@utils/tools'
 
 
 class TemplateItems extends React.Component {
 class TemplateItems extends React.Component {
     constructor(props) {
     constructor(props) {
@@ -95,9 +95,6 @@ class TemplateItems extends React.Component {
                 })
                 })
             }
             }
         }
         }
-        
-        
-
     }
     }
     floderAction(e,id){
     floderAction(e,id){
         e&&e.stopPropagation()
         e&&e.stopPropagation()

+ 1 - 0
src/store/reducers/tabTemplate.js

@@ -202,6 +202,7 @@ export default (state = initDataList, action) => {
   }
   }
   if (action.type === INIT_ADMIN_ITEMS) {//标准模板数据
   if (action.type === INIT_ADMIN_ITEMS) {//标准模板数据
     const newState = Object.assign({}, state);
     const newState = Object.assign({}, state);
+    // action.state[0].slide=1
     newState.adminItems = action.state
     newState.adminItems = action.state
     let tmpLis = [];
     let tmpLis = [];
     for(let k = 0;k < action.state.length;k++){
     for(let k = 0;k < action.state.length;k++){