Bläddra i källkod

其他史引用显示文本

zhouna 5 år sedan
förälder
incheckning
20cb527cf0
3 ändrade filer med 12 tillägg och 11 borttagningar
  1. 10 9
      src/store/async-actions/fetchModules.js
  2. 1 1
      src/store/reducers/otherHistory.js
  3. 1 1
      src/utils/config.js

+ 10 - 9
src/store/async-actions/fetchModules.js

@@ -1,15 +1,15 @@
-import {json,expJson} from '@utils/ajax.js';
-import {SET,PRESET} from '@types/checkBody.js';
+import {json,expJson} from '@utils/ajax';
+import {SET,PRESET} from '@types/checkBody';
 import {SETDATA} from '@store/types/otherHistory';
 import store from '@store';
-import {getEMRParams,didPushParamChange,inspectAndAssist,fullfillText,checkFullfillText,deepClone} from '@utils/tools.js';
+import {getEMRParams,didPushParamChange,inspectAndAssist,fullfillText,checkFullfillText,deepClone,filterDataArr} from '@utils/tools';
 import {Notify} from '@commonComp';
 import {billing} from '@store/async-actions/pushMessage';
 import {SETOTHERHISTORY,ISREAD} from "../types/homePage";
 import config from "@config/index";
 import {CURRENT_CHRONIC} from '@store/types/currentIll';
-import {MODI_LOADING} from '@store/types/homePage.js';
-import {GET_ALL_HIS,FILTER_ALL_HIS} from '@store/types/emergencyHis.js';
+import {MODI_LOADING} from '@store/types/homePage';
+import {GET_ALL_HIS,FILTER_ALL_HIS} from '@store/types/emergencyHis';
 import {SET_IMPORT_CHECKBODY_LABEL} from "../types/checkBody";
 
 const api={
@@ -120,17 +120,18 @@ export const getOtherHisRecord = ()=>{
               save:[objStr[0]]
             });
           }else{
+            const text = filterDataArr(objStr);
             dispatch({
               type:SETOTHERHISTORY,
-              data:arr,
-              period:{
+              data:[{tagType:8,name:'',controlType:0,value:text}],
+              /*period:{
                 yjs_1: obj.yjs_1,
                 yjs_2: obj.yjs_2,
                 yjs_3: obj.yjs_3,
                 yjs_4: obj.yjs_4,
               },
-              selecteds:obj.otherHistorySelecteds,
-              save:objStr
+              selecteds:obj.otherHistorySelecteds,*/
+              save:[text]
             });
           }
         }

+ 1 - 1
src/store/reducers/otherHistory.js

@@ -4,7 +4,7 @@ import {SETDATA,CONFIRMSELECTED,SETRADIO,SETNUMBER,SETOTHERCHECKBOX,SETOTHERTEXT
 import {confirm,setRadioValue,setNumberValue,setCheckBoxValue,setCheckText,setSearchData,insertLabelData,clearOtherHistory,
   changeTextLabel,setOtherInput,setTextModeValue,addLabelItem,otherEditClear,backspaceText,changeNumLabelVal,multipleComfirn,
   removeId,delSingleLable,setRadioInputValue} from '../actions/otherHistory';
-import config from '@config/index.js';
+import config from '@config/index';
 
 const block = Object.assign(JSON.parse(config.textLabel),{full:true});//空白时保留一个自由文本标签
 const initState = {data:[block],isEmpty:true,saveText:[],selecteds:[],focusIndex:'',editClear:true};

+ 1 - 1
src/utils/config.js

@@ -2,7 +2,7 @@
 // const host='http://192.168.3.100:5050';//王峰
 // const host='http://192.168.2.241: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.3.11:5050';//王宇
 //const host='http://192.168.2.164:8080';
 // const host='http://192.168.3.117:5050'; //周铁刚