cookie修改

src/api/index.js

@@ -1,5 +1,4 @@
 import api from './request';
-import { getCookie,setCookie } from '@utils/index'
 import { Modal } from 'antd';
 const axios=require('axios');
 // axios.defaults.baseURL = 'http://192.168.2.237:8871';//'http://192.168.2.237:8871/';
@@ -73,7 +72,6 @@ function interceptors(){
             localStorage.removeItem("systemId");
             localStorage.removeItem("hospitalId");
             localStorage.removeItem("software");
-		    setCookie();
 		    const isOverTime = localStorage.getItem("overTime");
 		    if(!isOverTime){
 			  /*   console.log(444,res)

src/components/AHeader/index.js

@@ -4,7 +4,7 @@ import { useState, useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import MyMessage from "../MyMessage";
 import { panesNow } from '@reducers/tabPanes.js';
-import { getTimeDetail,getCookie,setCookie } from '@utils/index';
+import { getTimeDetail } from '@utils/index';
 import logo from '@images/logo.png';
 import msg from '@images/msg.png';
 import me from '@images/me.png';
@@ -33,8 +33,8 @@ function AHeader({ history, hideName }) {
     //const [unReadNum,setUnReadNum] = useState(0);
     const [systemName,setSystemName] = useState("");
     //const [userName,setUserName] = useState("");
-    const userName = getCookie("userName");
-    const hospitalId = getCookie("hospitalId");
+    const userName = localStorage.getItem("userName");
+    const hospitalId = localStorage.getItem("hospitalId");
     const softwareArr = JSON.parse(localStorage.getItem("software"));
 
     const { user, unReadNum } = useSelector((state) => {
@@ -46,7 +46,6 @@ function AHeader({ history, hideName }) {
         localStorage.removeItem("systemId");
         localStorage.removeItem("hospitalId");
         localStorage.removeItem("software")
-        setCookie();
         dispatch(panesNow([]));
         history.push('/login');
     }
@@ -96,7 +95,7 @@ function AHeader({ history, hideName }) {
     }
     //获取系统、用户名称用于页头显示
     function getSysName(){
-		setSystemName(getCookie("systemName"));
+		setSystemName(localStorage.getItem("systemName"));
     }
     /*function handleUserInfo(data){
         const { userInfo, software } = data;

src/components/BlockLossManage/editBlock.js

@@ -6,7 +6,7 @@ import apiObj from '@api/index';
 import BlockContext from './block-context';
 import moment from "moment";
 import "moment/locale/zh-cn"
-import { getCookie, disabledDate, getDaysBetween } from '@utils/index'
+import { disabledDate, getDaysBetween,getValueFromEvent } from '@utils/index'
 const { post, api, xPost } = apiObj;
 const { TextArea } = Input;
 function EditBlock(props) {
@@ -87,7 +87,7 @@ function EditBlock(props) {
             behospitalCode: values.behospitalCode,
             endDate: values.endDate,
             startDate: values.startDate,
-            isPlacefile: getCookie('isPlacefile')
+            isPlacefile: localStorage.getItem('isPlacefile')
         }
         post(api.dataRepari, params).then((res) => {
             if (res.data.code === 200) {
@@ -233,7 +233,7 @@ function EditBlock(props) {
                         : ''}
                 </Col>
                 <Col span={24} hidden={type == 3} style={{ marginTop: 15 }}>
-                    <Form.Item label="住院序号" name="behospitalCode" rules={[{ max: 30, message: '住院序号不能超过30个字符' }]}>
+                    <Form.Item label="住院序号" name="behospitalCode" rules={[{ max: 30, message: '住院序号不能超过30个字符' }]} getValueFromEvent={getValueFromEvent}>
                         <Input placeholder="请输入" autoComplete='off' onChange={change} />
                     </Form.Item>
                 </Col>

src/components/DiagManager/addDiag.js

@@ -1,195 +1,194 @@
 import React, {
-  useState,useContext,useEffect
+	useState, useContext, useEffect
 } from 'react';
 import { Form, Input, Select, message } from 'antd';
 import apiObj from '@api/index';
-import { getCookie,setCookie } from '@utils/index';
 import './index.less'
-import {Modal} from "antd/lib/index";
+import { Modal } from "antd/lib/index";
 import {
-  LinkOutlined
+	LinkOutlined
 } from '@ant-design/icons';
 const { post, api } = apiObj;
 
 
-function AddDiag({formData,matchChange,visible,cancel,onOk,title,termSType,termType,flag}) {
-  const [form] = Form.useForm();
-  const { Option } = Select;
-  const [unsaved, setUnsaved] = useState(false);//修改未保存弹窗
-  const [icdcode,setIcdcode] = useState((formData||"").code);
-  const [dataList, setDataList] = useState([]);//当前页列表数据
-  const [formList, setFormList] = useState([]);//当前页列表数据
-  const [source, setSource] = useState(0);//来源
-  //const TREMTYPE=100;			//常亮，术语类型1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作
-	const hospitalId = getCookie('hospitalId')
-  useEffect(() => {
-	setIcdcode(formData.code)
-	form.setFieldsValue(formData)
-  }, [formData]);
-  //标准术语搜索
-  function handleSearch(val){
-    const txt = val.trim();
-	if(txt===""){
-		const list = []
-		setDataList(list);
-	}else{
-		post(api.index, {inputStr:txt,type:termSType,hospitalId:hospitalId}).then((res) => {
-		if (res.data.code === "0") {
-			const list = res.data.data.nameList||[];
+function AddDiag({ formData, matchChange, visible, cancel, onOk, title, termSType, termType, flag }) {
+	const [form] = Form.useForm();
+	const { Option } = Select;
+	const [unsaved, setUnsaved] = useState(false);//修改未保存弹窗
+	const [icdcode, setIcdcode] = useState((formData || "").code);
+	const [dataList, setDataList] = useState([]);//当前页列表数据
+	const [formList, setFormList] = useState([]);//当前页列表数据
+	const [source, setSource] = useState(0);//来源
+	//const TREMTYPE=100;			//常亮，术语类型1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作
+	const hospitalId = localStorage.getItem('hospitalId')
+	useEffect(() => {
+		setIcdcode(formData.code)
+		form.setFieldsValue(formData)
+	}, [formData]);
+	//标准术语搜索
+	function handleSearch(val) {
+		const txt = val.trim();
+		if (txt === "") {
+			const list = []
 			setDataList(list);
+		} else {
+			post(api.index, { inputStr: txt, type: termSType, hospitalId: hospitalId }).then((res) => {
+				if (res.data.code === "0") {
+					const list = res.data.data.nameList || [];
+					setDataList(list);
+				}
+			})
 		}
+	}
+	//剂型搜索
+	function handleSearch1(val) {
+		const txt = val.trim();
+		if (txt === "") {
+			const list = []
+			setFormList(list);
+		} else {
+			post(api.index, { inputStr: txt, type: 15, hospitalId: hospitalId }).then((res) => {
+				if (res.data.code === "0") {
+					const list = res.data.data.nameList || [];
+					setFormList(list);
+				}
+			})
+		}
+	}
+	//选中（修改）标准词时
+	function handleChange(val, item) {
+		console.log(33, item)
+		setSource(item.source)
+		setIcdcode(item.code);
+	}
+	//保存匹配，先验证输入
+	function saveMatching() {
+		form.validateFields().then(function (values) {
+			console.log('values:', values, form.getFieldsValue())
+			const param = {
+				conceptId: parseFloat(values.uniqueName) || formData.conceptId,
+				formConceptId: parseFloat(values.form) || formData.formConceptId,
+				type: termType,
+				hospitalId: parseInt(hospitalId),
+				source: source == 0 ? formData.source : source,
+				hisName: values.hisName
+			}
+			if (flag === 3) {
+				param.id = formData.id
+			}
+			console.log(param)
+			onOk(param)
 		})
 	}
-  }
-  //剂型搜索
-  function handleSearch1(val){
-    const txt = val.trim();
-  	if(txt===""){
-  		const list = []
-  		setFormList(list);
-  	}else{
-  		post(api.index, {inputStr:txt,type:15,hospitalId:hospitalId}).then((res) => {
-		if (res.data.code === "0") {
-  			const list = res.data.data.nameList||[];
-  			setFormList(list);
-  		}
-  		})
-  	}
-  }
-  //选中（修改）标准词时
-  function handleChange(val,item){
-	console.log(33,item)
-	setSource(item.source)
-	setIcdcode(item.code);
-  }
-  //保存匹配，先验证输入
-  function saveMatching(){
-	form.validateFields().then(function(values){
-	  console.log('values:',values,form.getFieldsValue())
-	  const param={
-		  conceptId:parseFloat(values.uniqueName)||formData.conceptId,
-		  formConceptId:parseFloat(values.form)||formData.formConceptId,
-		  type:termType,
-		  hospitalId:parseInt(hospitalId),
-		  source:source==0?formData.source:source,
-		  hisName:values.hisName
-	  }
-	  if(flag===3){
-		  param.id=formData.id
-	  }
-	  console.log(param)
-	  onOk(param)
-	})
-  }
-  //关闭新增/编辑弹窗
-  function saveCancel(){
-    //有未保存修改时弹窗提醒
-	// const newFormData = form.getFieldsValue();
- //    const isChange = newFormData.hisName!==formData.hisName||newFormData.conceptId!==formData.conceptId;//form.isFieldsTouched(['hisName','conceptId']);
- //    if(isChange){
-	//   setUnsaved(true);
-	// }else{
-	  cancel();
-	  form.resetFields();	//清空表单值
-	// }
-  }
-  //不保存当前修改，退出弹窗
- //  function unsavedOk() {
+	//关闭新增/编辑弹窗
+	function saveCancel() {
+		//有未保存修改时弹窗提醒
+		// const newFormData = form.getFieldsValue();
+		//    const isChange = newFormData.hisName!==formData.hisName||newFormData.conceptId!==formData.conceptId;//form.isFieldsTouched(['hisName','conceptId']);
+		//    if(isChange){
+		//   setUnsaved(true);
+		// }else{
+		cancel();
+		form.resetFields();	//清空表单值
+		// }
+	}
+	//不保存当前修改，退出弹窗
+	//  function unsavedOk() {
 	// setUnsaved(false);
 	// cancel();	//关闭新增/修改弹窗
 	// form.resetFields();	//清空表单值
- //  }
-  //未保存提醒弹窗关闭
- //  function unsavedCancel() {
+	//  }
+	//未保存提醒弹窗关闭
+	//  function unsavedCancel() {
 	// setUnsaved(false)
- //  }
-  return (
-	  <Modal
-		  title={title}
-		  okText='确定'
-		  cancelText='关闭'
-		  width={'65%'}
-		  visible={visible}
-		  onOk={saveMatching}
-		  onCancel={saveCancel}
-		  forceRender={true}
-		  initialValues={formData}
-		  maskClosable={false}
-	  >
-	  <Form
-		  labelCol={{ span: 7 }}
-		  wrapperCol={{ span: 15 }}
-		  className='clearfix'
-		  form={form}
-		  name="register"
-	  >
-
-		<div className="his-info info-box">
-			<p className='title'>医院术语</p>
-		  	<div className="item-box">
-			  <Form.Item
-				  name="hisName"
-				  label={termType==4?'医院诊断名称': termType==5?'医院药品名称':'手术/操作名称'}
-				  rules={[
-					{
-					  required: true,
-					  message: '不能为空',
-					},{ max: 30,message:'不能超过30个字符'}
-				  ]}
-			  >
-				<Input placeholder="请输入" autoComplete='off'/>
-			  </Form.Item>
-			</div>
-		</div>
-		<div className="info-p">
-		<LinkOutlined />
-		<p>相互关联</p>
-		</div>
-		<div className="lt-info info-box">
-		  <p className='title'>标准术语</p>
-		  <div className="item-box">
-			<Form.Item
-				name="uniqueName"
-				label={termType==4?'标准诊断名称': termType==5?'标准药品名称':'手术/操作名称'}
-				rules={[
-				  {
-					required: true,
-					message: '不能为空',
-				  },{ max: 30,message:'不能超过30个字符'}
-				]}
+	//  }
+	return (
+		<Modal
+			title={title}
+			okText='确定'
+			cancelText='关闭'
+			width={'65%'}
+			visible={visible}
+			onOk={saveMatching}
+			onCancel={saveCancel}
+			forceRender={true}
+			initialValues={formData}
+			maskClosable={false}
+		>
+			<Form
+				labelCol={{ span: 7 }}
+				wrapperCol={{ span: 15 }}
+				className='clearfix'
+				form={form}
+				name="register"
 			>
-			  <Select placeholder="请输入"
-					  autoComplete='off'
-					  onSearch={handleSearch}
-					  onChange={handleChange}
-					  filterOption={false}
-					  showSearch>
-				{dataList.map(d => <Option key={d.id} source={d.source} code={d.code}>{d.name}</Option>)}
-			  </Select>
-			</Form.Item>
-			{termType==5?
-			<Form.Item
-				name="form"
-				label="药品剂型"
-			>
-			  <Select placeholder="请输入"
-					  autoComplete='off'
-					  onSearch={handleSearch1}
-					  filterOption={false}
-					  showSearch>
-				{formList.map(d => <Option key={d.id} source={d.source} code={d.code}>{d.name}</Option>)}
-			  </Select>
-			</Form.Item>
-			:
-			<Form.Item label={termType==4?'ICD-10编码':'手术/操作代码'}>
-			  {icdcode}
-			</Form.Item>}
-		  </div>
-		</div>
-		<p className='linked-term'>已关联标准术语：{(formData||{}).uniqueName}</p>
-	  </Form>
-	  </Modal>
-  );
+
+				<div className="his-info info-box">
+					<p className='title'>医院术语</p>
+					<div className="item-box">
+						<Form.Item
+							name="hisName"
+							label={termType == 4 ? '医院诊断名称' : termType == 5 ? '医院药品名称' : '手术/操作名称'}
+							rules={[
+								{
+									required: true,
+									message: '不能为空',
+								}, { max: 30, message: '不能超过30个字符' }
+							]}
+						>
+							<Input placeholder="请输入" autoComplete='off' />
+						</Form.Item>
+					</div>
+				</div>
+				<div className="info-p">
+					<LinkOutlined />
+					<p>相互关联</p>
+				</div>
+				<div className="lt-info info-box">
+					<p className='title'>标准术语</p>
+					<div className="item-box">
+						<Form.Item
+							name="uniqueName"
+							label={termType == 4 ? '标准诊断名称' : termType == 5 ? '标准药品名称' : '手术/操作名称'}
+							rules={[
+								{
+									required: true,
+									message: '不能为空',
+								}, { max: 30, message: '不能超过30个字符' }
+							]}
+						>
+							<Select placeholder="请输入"
+								autoComplete='off'
+								onSearch={handleSearch}
+								onChange={handleChange}
+								filterOption={false}
+								showSearch>
+								{dataList.map(d => <Option key={d.id} source={d.source} code={d.code}>{d.name}</Option>)}
+							</Select>
+						</Form.Item>
+						{termType == 5 ?
+							<Form.Item
+								name="form"
+								label="药品剂型"
+							>
+								<Select placeholder="请输入"
+									autoComplete='off'
+									onSearch={handleSearch1}
+									filterOption={false}
+									showSearch>
+									{formList.map(d => <Option key={d.id} source={d.source} code={d.code}>{d.name}</Option>)}
+								</Select>
+							</Form.Item>
+							:
+							<Form.Item label={termType == 4 ? 'ICD-10编码' : '手术/操作代码'}>
+								{icdcode}
+							</Form.Item>}
+					</div>
+				</div>
+				<p className='linked-term'>已关联标准术语：{(formData || {}).uniqueName}</p>
+			</Form>
+		</Modal>
+	);
 }
 
 export default AddDiag;

src/components/DiagManager/index.js

@@ -2,7 +2,6 @@ import React, { useState, useEffect } from 'react';
 import { Empty,ConfigProvider,Spin,Form, Input, Button, Table, Select, Space, Modal, message, Row, Col } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import AddDiag from './addDiag'
-import { getCookie } from '@utils/index'
 import '@common/common.less';
 import apiObj from '@api/index';
 
@@ -54,7 +53,7 @@ function DiagManager() {
   }
   //表格数据
   function getDiseasePage(param) {  //type（必填）： 类型：1-化验、3-辅检、4-诊断、5-药品、6-手术和操作
-  const hospitalId = getCookie('hospitalId')
+  const hospitalId = localStorage.getItem('hospitalId')
   setloading(true)
     post(api.getTermPage, {...(param || params),type:4,hospitalId:hospitalId}).then((res) => {
       if (res.data.code === 200) {

src/components/DrugManager/index.js

@@ -1,7 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { Empty,ConfigProvider,Spin,Form, Input, Button, Table, Select, Space, Modal, message, Row, Col } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
-import { getCookie } from '@utils/index'
 import AddTerm from '../DiagManager/addDiag'
 import '@common/common.less';
 import apiObj from '@api/index';
@@ -55,7 +54,7 @@ function DrugManager() {
   }
   //表格数据
   function getDrugeryPage(param) {  //type（必填）： 类型：1-化验、3-辅检、4-诊断、5-药品、6-手术和操作
-	const hospitalId = getCookie('hospitalId')
+	const hospitalId = localStorage.getItem('hospitalId')
 	setloading(true)
 	post(api.getTermPage, {...(param || params),type:5,hospitalId:hospitalId}).then((res) => {
 	  if (res.data.code === 200) {

src/components/FieldProblem/editProblem.js

@@ -6,7 +6,7 @@ import apiObj from '@api/index';
 import BlockContext from './problem-context';
 import moment from "moment";
 import "moment/locale/zh-cn"
-import { getCookie, disabledDate, getDaysBetween } from '@utils/index'
+import { disabledDate, getDaysBetween,getValueFromEvent } from '@utils/index'
 const { post, api, xPost } = apiObj;
 const { TextArea } = Input;
 function EditBlock(props) {
@@ -86,7 +86,7 @@ function EditBlock(props) {
             behospitalCode: values.behospitalCode,
             dateEnd: values.endDate,
             dateStart: values.startDate,
-            isPlacefile: getCookie('isPlacefile')
+            isPlacefile: localStorage.getItem('isPlacefile')
         }
         post(api.dataCheck, params).then((res) => {
             if (res.data.code === 200) {
@@ -245,7 +245,7 @@ function EditBlock(props) {
                         : ''}
                 </Col>
                 <Col span={24} hidden={type == 3} style={{ marginTop: 15 }}>
-                    <Form.Item label="住院序号" name="behospitalCode" rules={[{ max: 30, message: '住院序号不能超过30个字符' }]}>
+                    <Form.Item label="住院序号" name="behospitalCode" rules={[{ max: 30, message: '住院序号不能超过30个字符' }]} getValueFromEvent={getValueFromEvent}>
                         <Input placeholder="请输入" autoComplete='off' onChange={change} />
                     </Form.Item>
                 </Col>

src/components/FieldProblem/index.js

@@ -7,7 +7,7 @@ import './index.less'
 import apiObj from '@api/index';
 import EditProblem from './editProblem';
 import ProblemContext from './problem-context';
-import { getCookie,getValueFromEvent, disabledDate, getDaysBetween } from '@utils/index'
+import { getValueFromEvent, disabledDate, getDaysBetween } from '@utils/index'
 const { post, api, xPost } = apiObj;
 const { Option } = Select;
 function FieldProblem() {
@@ -61,7 +61,7 @@ function FieldProblem() {
     }
     function getColumnResultNumber(param) {
         post(api.getColumnResultNumber, {
-            hospitalId: getCookie('hospitalId'),
+            hospitalId: localStorage.getItem('hospitalId'),
             ...param
         }).then((res) => {
             if (res.data.code === 200) {

src/components/OrgManager/index.js

@@ -6,7 +6,7 @@ import AddSubOrg from './AddSubOrg';
 import './index.less';
 import apiObj from '@api/index';
 import OrgContext from './org-context';
-import { pickCheckedTreeIds, getValueFromEvent, getCookie } from '@utils/index'
+import { pickCheckedTreeIds, getValueFromEvent } from '@utils/index'
 
 const { post, api, xPost } = apiObj;
 const { Option } = Select;
@@ -18,7 +18,7 @@ function OrgManager() {
         //     setTableHt(window.innerHeight - 260);
         // });
         //刷新列表
-        setOrgType(getCookie('hosType'))
+        setOrgType(localStorage.getItem('hosType'))
         getTableData();
         //解绑事件
         // return function clear() {
@@ -39,7 +39,7 @@ function OrgManager() {
     const [orgName, setOrgName] = useState('');      //上级组织名称，新增修改用
     const [orgDetail, setOrgDetail] = useState(null);
     const [typeId, setTypeId] = useState('');
-    const [orgType, setOrgType] = useState(getCookie('hosType'));
+    const [orgType, setOrgType] = useState(localStorage.getItem('hosType'));
     // const [hisTypeList, setHisTypeList] = useState([]);
     const [type, setType] = useState('');
     //从state中取出状态、类型列表

src/components/RegularManage/index.js

@@ -1,7 +1,6 @@
 import React, { useState, useEffect, useRef } from 'react';
 import { Form, Input, Button, Table, Row, Col, Select, Modal, DatePicker, Space } from 'antd';
 import { DeleteOutlined, PlusOutlined } from '@ant-design/icons';
-import { getCookie } from '@utils/index'
 import { getValueFromEvent } from '@utils/index'
 import '@common/common.less';
 import apiObj from '@api/index';

src/components/SurgeryManager/index.js

@@ -2,7 +2,6 @@ import React, { useState, useEffect } from 'react';
 import { Empty,ConfigProvider,Spin,Form, Input, Button, Table, Select, Space, Modal, message, Row, Col } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import AddTerm from '../DiagManager/addDiag'
-import { getCookie } from '@utils/index'
 import '@common/common.less';
 import apiObj from '@api/index';
 
@@ -54,7 +53,7 @@ function SurgManager() {
   }
   //表格数据
   function getSurgeryPage(param) {  //type（必填）： 类型：1-化验、3-辅检、4-诊断、5-药品、6-手术和操作
-  const hospitalId = getCookie('hospitalId')
+  const hospitalId = localStorage.getItem('hospitalId')
   setloading(true)
 	post(api.getTermPage, {...(param || params),type:6,hospitalId:hospitalId}).then((res) => {
 	  if (res.data.code === 200) {

src/components/SysChoose/index.js

@@ -8,7 +8,6 @@ import iconLb from '@images/lb.png';
 import iconHis from '@images/his.png';
 import rightIcon from '@images/right.png';
 import {message} from "antd/lib/index";
-import { getCookie,setCookie } from "@utils/index";
 import apiObj from '@api/index';
 
 const {api,xPost,interceptors} = apiObj;
@@ -42,7 +41,7 @@ function SysChoose({history}) {
         setSysId(id);		////选中的平台id
         setHisList(his);		//医院列表
         setSysName(checkOrg.name);	//选中的平台名称
-        setCookie('isPlacefile',id == 2?0:1);
+        localStorage.setItem('isPlacefile',id == 2?0:1);
     }
     //获取组织列表
     function getOrgList(){
@@ -53,9 +52,9 @@ function SysChoose({history}) {
                 setOrgList(software);
                 setSysName(software[0].name);
                 setSysId(software[0].id);
-                setCookie('userId',userInfo.id);
-			    setCookie('userName',userInfo.name);
-                setCookie('isPlacefile',userInfo.id == 2?0:1);
+                localStorage.setItem('userId',userInfo.id);
+			    localStorage.setItem('userName',userInfo.name);
+                localStorage.setItem('isPlacefile',userInfo.id == 2?0:1);
                 dispatch(setUser(userInfo));
                 localStorage.setItem('software', JSON.stringify(software));
                 //默认显示第一个系统的组织
@@ -76,8 +75,8 @@ function SysChoose({history}) {
         dispatch(setSys({sysId,sysName,hisId:id}));
         localStorage.setItem('systemId', sysId || sysid);
         localStorage.setItem('hospitalId',id);
-	    setCookie('systemName',sysName);
-        setCookie('hosType', type);
+	    localStorage.setItem('systemName',sysName);
+        localStorage.setItem('hosType', type);
         interceptors();
         history.push("/manage");
     }