日期可修改

src/components/AddInspect/SlidePic/index.jsx

@@ -79,16 +79,6 @@ class SlideSelect extends Component {
       show:!tmpShow
     })
   }
-  setEdit(){
-    this.setState({
-      canEdit:false
-    },()=>{
-      $(".canEdit").focus()
-      $(".canEdit").blur(()=>{
-        this.setState({canEdit:true})
-      })
-    })
-  }
   handleDel(time){
     const {handleDelClick,item} = this.props;
     this.setState({
@@ -127,17 +117,19 @@ class SlideSelect extends Component {
       refreshScroller()&&refreshScroller().scrollYTo(290);
     })*/
   }
-  handleInput(e,item){
+  handleInput(e,item,sign){
     const {setTipValue} = this.props
-    setTipValue(item,e.target.value)
-    let type = getArrow(item.minValue,item.maxValue,e.target.value||null)
-    this.setState({
-      value:e.target.value,
-      style:type
-    })
+    setTipValue(item,e.target.value,sign)
+    if(sign == 2){
+      let type = getArrow(item.minValue,item.maxValue,e.target.value||null)
+      this.setState({
+        style:type
+      })
+    }
   }
   handleBlur(){
     const {handlePush} = this.props;
+    $('.canEdit').attr('disabled','disabled')
     handlePush && handlePush({mode:8});       //右侧推送
   }
   checkOnOff(item){
@@ -145,6 +137,10 @@ class SlideSelect extends Component {
     checkOnOff(item)
     handlePush && handlePush({mode:8});       //右侧推送
   }
+  setEdit(e){
+    $('.canEdit').blur().attr('disabled','disabled')
+    $(e.target).removeAttr('disabled').focus()
+  }
   render() {
     const {item,idx,time} = this.props;
     const {canEdit,activeInd,activeName,value,style} = this.state;
@@ -157,7 +153,18 @@ class SlideSelect extends Component {
               <span className={styles.smallname}></span>
               <span className={styles.edit}></span>
               <span className={styles.maxmin}></span>
-              <span className={styles.pass}>检验时间：{item.time}</span>
+              <span className={styles.pass}>检验时间：
+                <input disabled="disabled" type="text" 
+                    class="canEdit" 
+                    onDoubleClick={(e)=>this.setEdit(e)}
+                    style={{color:style==2||style==4?'red':style==1?'#D949FF':'#333'}}
+                    placeholder='(填写)'
+                    autoComplete="off"
+                    value={item.time}
+                    onInput={(e)=>{this.handleInput(e,item,1)}}
+                    onBlur={()=>{this.handleBlur()}}
+                    />
+              </span>
               <span id="addClose" className={styles.partDel} onClick={()=>{this.handleDel(item.time)}}></span>
             </tr>
           </table>
@@ -172,19 +179,30 @@ class SlideSelect extends Component {
           <span className={styles.bigname}>{item.name}</span>
           <span className={styles.smallname}>{item.uniqueName}</span>
           <span className={styles.edit}>
-            <input disabled={canEdit} type="text" 
-              class="canEdit" 
-              onDoubleClick={this.setEdit}
+            <input disabled="disabled" type="text" 
+              class="canEdit"
+              onDoubleClick={(e)=>this.setEdit(e)}
               style={{color:style==2||style==4?'red':style==1?'#D949FF':'#333'}}
               placeholder='(填写)'
               autoComplete="off"
-              value={value}
-              onInput={(e)=>{this.handleInput(e,item)}}
+              value={item.value||item.otherValue}
+              onInput={(e)=>{this.handleInput(e,item,2)}}
               onBlur={()=>{this.handleBlur()}}
               /><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}>检验时间：{item.time}</span>
+          <span className={styles.pass}>检验时间：
+            <input disabled="disabled" type="text" 
+                class="canEdit" 
+                onDoubleClick={(e)=>this.setEdit(e)}
+                style={{color:style==2||style==4?'red':style==1?'#D949FF':'#333'}}
+                placeholder='(填写)'
+                autoComplete="off"
+                value={item.time}
+                onInput={(e)=>{this.handleInput(e,item,1)}}
+                onBlur={()=>{this.handleBlur()}}
+                />
+          </span>
           <span id="addClose" className={styles.partDel} onClick={()=>{this.handleDel(item.time)}}></span>
           <DelToast show={time==item.time&&activeInd?true:false}
                     name={activeName}

src/containers/Inspect.js

@@ -16,7 +16,7 @@ import {
   clearLabel,
   delPartItem,
   setContext,
-  setTip,
+  setTips,
   searchType,
   resetLabel,
   delOnePic,
@@ -99,8 +99,8 @@ function mapDispatchToProps(dispatch) {
       dispatch(delPartItem(idx))
       dispatch(getMRAnalyse())
     },
-    setTipValue(item,value) {
-      dispatch(setTip(item,value))
+    setTipValue(item,value,type) {
+      dispatch(setTips(item,value,type))
     },
     //右侧推送
     fetchPushInfos(obj) {

src/containers/NewAdvice.js

@@ -100,6 +100,7 @@ function mapDispatchToProps(dispatch) {
       dispatch(getMRAnalyse())
     },
     setTipValue(item,value) {
+      console.log(89898)
       dispatch(setTip(item,value))
     },
     //右侧推送

src/store/actions/inspect.js

@@ -1,4 +1,4 @@
-import {SET_CONTEXT,CHECK_ON_OFF,DEL_ONE_PIC,ADD_LABEL,SEARCH_LIST,SET_LABEL,SET_TIP,FILL_ACTIVE,FILL_ACTIVE_DETAIL,GET_EXCEL,CHECK_VALUE_IS_CHANGE,CLEAR_LABEL,RESET_LABEL,CLEAR_ALL_LABEL,DEL_PART_ITEM,DEL_EXCEL_LIST,SEARCH_TYPE} from '../types/inspect';
+import {SET_CONTEXT,CHECK_ON_OFF,DEL_ONE_PIC,ADD_LABEL,SEARCH_LIST,SET_LABEL,SET_TIP_NEW,FILL_ACTIVE,FILL_ACTIVE_DETAIL,GET_EXCEL,CHECK_VALUE_IS_CHANGE,CLEAR_LABEL,RESET_LABEL,CLEAR_ALL_LABEL,DEL_PART_ITEM,DEL_EXCEL_LIST,SEARCH_TYPE} from '../types/inspect';
 
 export const setLabel = (idx,sign) => ({          //搜索后点击选中的结果
     type:SET_LABEL,
@@ -63,10 +63,11 @@ export const setContext = (obj) => ({
     type:SET_CONTEXT,
     obj
 })
-export const setTip = (item,value) => ({
-    type:SET_TIP,
+export const setTips = (item,value,sign) => ({
+    type:SET_TIP_NEW,
     item,
-    value
+    value,
+    sign
 })
 export const searchType = (value) => ({
     type:SEARCH_TYPE,

src/store/async-actions/inspect.js

@@ -24,12 +24,15 @@ export const getSearchList = (val) => {
                 const data = res.data.data;let curDate=[];
                 if(type==2){
                     curDate = data && data.lisDetailNames
+                    for (let i = 0;i < curDate.length;i++) {
+                        curDate[i]['detailName'] = curDate[i]['uniqueName']
+                        curDate[i]['flg'] = 0;
+                    }
                 }else{
                     let arr = data.lisNames,tmp=[];
                     for (var key in arr) {
                         let obj = {}
                         obj['uniqueName'] = arr[key];
-                        obj['detailName'] = arr[key];
                         obj['value'] = '';
                         obj['otherValue']='';
                         obj['name'] = arr[key];

src/store/reducers/inspect.js

@@ -11,7 +11,7 @@ import {
   DEL_EXCEL_LIST,
   ADD_LABEL,
   SET_CONTEXT,
-  SET_TIP,
+  SET_TIP_NEW,
   SEARCH_TYPE,
   DEL_ONE_PIC,
   CHECK_ON_OFF,
@@ -89,21 +89,30 @@ export default (state = initSearchList, action) => {
         return newState;
     }
 
-    if (action.type == SET_TIP) {    
+    if (action.type == SET_TIP_NEW) {
         const newState = Object.assign({}, state);
         let tempArr = newState.labelListBig;
         let tempArrs = newState.labelListSmall;
         let tmpLis = action.item
+        tempArr = tempArr.filter((item)=>{
+            item.time = action.value
+            return item
+        })
         tempArrs = tempArrs.filter((item)=>{
             if(item.time == tmpLis.time){
-                if(isNumber(action.value-0)){
-                    item.value = action.value
+                if(action.sign ==1){
+                    item.time = action.value
                 }else{
-                    item.otherValue = action.value
+                    if(isNumber(action.value-0)){
+                        item.value = action.value
+                    }else{
+                        item.otherValue = action.value
+                    }
                 }
             }
             return item
         })
+        newState.labelListBig = [...tempArr]
         newState.labelListSmall = [...tempArrs]
         return newState;
     }
@@ -268,6 +277,7 @@ export default (state = initSearchList, action) => {
       const newState = Object.assign({}, state);
         newState.labelListBig = action.params[8].content.labelListBig
         newState.labelListSmall = action.params[8].content.labelListSmall;       
+        newState.totalOrder = action.params[8].content.totalOrder;       
       return newState;
 
     }
@@ -275,71 +285,12 @@ export default (state = initSearchList, action) => {
       let newState = Object.assign({}, state);
       newState.labelListBig = [];
       newState.labelListSmall = [];
+      newState.totalOrder = [];
       return newState;
     }
     return state;
 }
 
-function getExcelString(action,newState,tmpArr,tmpArr2) {
-  let tmpString = '';
-  if(JSON.stringify(action.data||{}) != '{}' && action.data.lisExcelRes.length > 0){
-    action.data.lisExcelRes.map((item)=>{
-        item.lisExcelItem.map((part)=>{
-            if(part.type == 1){
-                if(part.max != '' && (part.value-0) > (part.max-0) ) {
-                    let rate = (part.value/part.max).toFixed(2);
-                    let tmpStr = part.mealName+','+part.itemName+','+part.value+' '+part.unit+'升高'+rate+';'
-                    tmpString += tmpStr;
-                }else if(part.min != '' && (part.value-0) < (part.min-0) ){
-                    let rate = (part.value/part.min).toFixed(2);
-                    let tmpStr = part.mealName+','+part.itemName+','+part.value+' '+part.unit+'降低'+rate+';'
-                    tmpString += tmpStr;
-                }else{
-                    let tmpStr = part.mealName+','+part.itemName+','+part.value+' '+part.unit+'异常;'
-                    tmpString += tmpStr;
-                }
-            }else{
-                let tmpStr = part.mealName+','+part.itemName+','+part.value+' '+part.unit+'正常;'
-                tmpString += tmpStr;
-            }
-        })
-    })
-    newState.pushItem = getPushList(tmpArr,tmpArr2);
-    newState.pushItems = getPushLists(tmpArr,tmpArr2);
-    newState.inspectStrPlus = getStringPlus(newState.pushItems)
-  }else{
-    newState.inspectStrPlus = '';
-    newState.pushItem = []
-  }
-}
-function getString(lists) {
-    let tmpString = '';
-    lists.map((item)=>{
-        if(item.show == true){
-            item.details.map((part)=>{
-                if(part.value){
-                    if(typeof(part.value) == "number"){
-                        if(part.maxValue != '' && (part.value-0) > (part.maxValue-0) ) {
-                            let rate = (part.value/part.maxValue).toFixed(2);
-                            let tmpStr = item.name+','+part.name+','+part.value+' '+part.labelSuffix+'升高'+rate+';'
-                            tmpString += tmpStr;
-                        }else if(part.minValue != '' && (part.value-0) < (part.minValue-0) ){
-                            let rate = (part.value/part.minValue).toFixed(2);
-                            let tmpStr = item.name+','+part.name+','+part.value+' '+part.labelSuffix+'降低'+rate+';'
-                            tmpString += tmpStr;
-                        }else{
-                            let tmpStr = item.name+','+part.name+','+part.value+' '+part.labelSuffix+';'
-                            tmpString += tmpStr;
-                        }
-                    }else{
-                        tmpString += item.name+','+part.name+','+part.value+' '+part.labelSuffix+';'
-                    }
-                }
-            })
-        }
-    })
-    return tmpString;
-}
 function isNumber(obj) {  
     return typeof obj === 'number' && !isNaN(obj)  
 }

src/store/reducers/newAdvice.js

@@ -68,7 +68,6 @@ export default (state = initSearchList, action) => {
         tempBigOrder = tempArr.filter((item)=>item.check)
         tempSmallOrder = tempArrs.filter((item)=>item.check)
         newState.drugOrder=[...tempBigOrder]
-        console.log(newState.drugOrder,77777,tempBigOrder,1111)
         newState.operationOrder=[...tempSmallOrder]
         return newState;
     }
@@ -95,7 +94,7 @@ export default (state = initSearchList, action) => {
         const newState = Object.assign({}, state);
         let tempArr = newState.labelListBig;
         let tmpLis = action.item
-
+        console.log(action,888888)
         for(let i= 0;i < tempArr.length;i++){
             if(tmpLis.time == tempArr[i].time){
                 tempArr[i].value = action.value

src/store/types/inspect.js

@@ -12,7 +12,7 @@ export const DEL_PART_ITEM = 'DEL_PART_ITEM';
 export const DEL_EXCEL_LIST = 'DEL_EXCEL_LIST';
 export const ADD_LABEL = 'ADD_LABEL';
 export const SET_CONTEXT = 'SET_CONTEXT';
-export const SET_TIP = 'SET_TIP';
+export const SET_TIP_NEW = 'SET_TIP_NEW';
 export const SEARCH_TYPE = 'SEARCH_TYPE';
 export const DEL_ONE_PIC = 'DEL_ONE_PIC';
 export const CHECK_ON_OFF = 'CHECK_ON_OFF';

src/utils/tools.js

@@ -930,7 +930,6 @@ function getEMRParams(){
     newAdvice,
   } = state;
   const diag = [];
-  console.log(state,7777777)
   for(let i = 0; i < diagnosticList.diagnosticList.length; i++) {
     diag.push({"dateValue": "","name": "","uniqueName": diagnosticList.diagnosticList[i].name})
   }