فهرست منبع

Merge branch 'dev' into test

1178232204@qq.com 3 سال پیش
والد
کامیت
d5cfb7ca79

+ 4 - 5
src/components/DiagManager/addDiag.js

@@ -17,6 +17,7 @@ function AddDiag({matchChange,visible,cancel,onOk,title}) {
   const [unsaved, setUnsaved] = useState(false);//修改未保存弹窗
   const [unsaved, setUnsaved] = useState(false);//修改未保存弹窗
   const [icdcode,setIcdcode] = useState((formData||{}).code);
   const [icdcode,setIcdcode] = useState((formData||{}).code);
   const [dataList, setDataList] = useState([]);//当前页列表数据
   const [dataList, setDataList] = useState([]);//当前页列表数据
+  const [source, setSource] = useState(0);//来源
   //const TREMTYPE=100;			//常亮,术语类型1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作
   //const TREMTYPE=100;			//常亮,术语类型1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作
   //const initialValues = formData;
   //const initialValues = formData;
 
 
@@ -41,16 +42,14 @@ function AddDiag({matchChange,visible,cancel,onOk,title}) {
   //选中(修改)标准词时
   //选中(修改)标准词时
   function handleChange(val,item){
   function handleChange(val,item){
 	console.log(33,item)
 	console.log(33,item)
-	form.setFieldsValue({
-	  source:item.source,
-	});
+	setSource(item.source)
 	setIcdcode(item.code);
 	setIcdcode(item.code);
   }
   }
   //保存匹配,先验证输入
   //保存匹配,先验证输入
   function saveMatching(){
   function saveMatching(){
 	form.validateFields().then(function(values){
 	form.validateFields().then(function(values){
 	  console.log('values:',values,form.getFieldsValue())
 	  console.log('values:',values,form.getFieldsValue())
-	  onOk({...values,type:4,hospitalId:form.hospitalId})
+	  onOk({...values,type:4,hospitalId:form.hospitalId,source:source})
 	})
 	})
   }
   }
   //关闭新增/编辑弹窗
   //关闭新增/编辑弹窗
@@ -114,7 +113,7 @@ function AddDiag({matchChange,visible,cancel,onOk,title}) {
 		  <p className='title'>标准术语</p>
 		  <p className='title'>标准术语</p>
 		  <div className="item-box">
 		  <div className="item-box">
 			<Form.Item
 			<Form.Item
-				name="conceptId"
+				name="uniqueName"
 				label="标准诊断名称"
 				label="标准诊断名称"
 				rules={[
 				rules={[
 				  {
 				  {

+ 1 - 1
src/components/FieldProblem/editProblem.js

@@ -83,7 +83,7 @@ function EditBlock(props) {
         
         
     };
     };
     function cancel() {
     function cancel() {
-        props.userChange()
+        props.cancel()
     }
     }
     return (
     return (
         <>
         <>

+ 1 - 1
src/components/FieldProblem/index.js

@@ -356,7 +356,7 @@ function FieldProblem() {
                     maskClosable={false}
                     maskClosable={false}
                 >
                 >
                     <ProblemContext.Provider value={{ problemDetail, type }}>
                     <ProblemContext.Provider value={{ problemDetail, type }}>
-                        <EditProblem userChange={userChange} />
+                        <EditProblem cancel={cancel} userChange={userChange} />
                     </ProblemContext.Provider>
                     </ProblemContext.Provider>
 
 
                 </Modal>
                 </Modal>

+ 1 - 0
src/components/FieldRules/addRules.js

@@ -68,6 +68,7 @@ function ContentForm(props) {
     const vilidateRules = {
     const vilidateRules = {
         required: '${label}不能为空!',
         required: '${label}不能为空!',
     };
     };
+    console.log(initialValues);
     //获取正则式名称
     //获取正则式名称
     function getRegular(name) {
     function getRegular(name) {
         const param = {
         const param = {

+ 79 - 24
src/components/FieldRules/index.js

@@ -177,11 +177,17 @@ function FieldRules() {
             if (res.data.code === 200) {
             if (res.data.code === 200) {
                 const data = res.data.data;
                 const data = res.data.data;
                 let obj = []
                 let obj = []
-                data.standardvalue.split(';').forEach(it => {
-                    obj.push({
-                        tit: it
-                    })
-                });
+                if (data.standardValueList) {
+                    data.standardValueList.forEach(it => {
+                        obj.push({
+                            tit: it
+                        })
+                    });
+                    console.log(obj);
+                } else {
+                    obj = [{ tit: null }]
+                }
+                delete data.standardValueList
                 const arr = {
                 const arr = {
                     columnList: [{
                     columnList: [{
                         columnCname: data.columnCname,
                         columnCname: data.columnCname,
@@ -219,17 +225,66 @@ function FieldRules() {
     function onSelectChange(selectedRowKeys) {
     function onSelectChange(selectedRowKeys) {
         setSelectedRowKeys(selectedRowKeys);
         setSelectedRowKeys(selectedRowKeys);
     };
     };
-    function tableCnameChange(val) {
-        setTableCname(val)
-        setDisable(false)
-        getColumnName('', '', val, '')
+    function tableCnameChange(value, option) {
+        const formData = form.getFieldsValue();
+        setTableCname(value)
+
+        getColumnName('', '', value, '')
+        if (value) {
+            form.setFieldsValue({
+                tableEname: option.val
+            });
+            setDisable(false)
+        } else {
+            form.setFieldsValue({
+                tableEname: undefined,
+                columnCname:undefined,
+                columnEname:undefined,
+            })
+            setDisable(true)
+        }
+
+    }
+    function tableEnameChange(value, option) {
+        setTableEname(value)
+        getColumnName('', '', '', value)
+        if (value) {
+            form.setFieldsValue({
+                tableCname: option.val
+            });
+            setDisable(false)
+        } else {
+            form.setFieldsValue({
+                tableCname: undefined,
+                columnCname:undefined,
+                columnEname:undefined,
+            })
+            setDisable(true)
+        }
     }
     }
-    function tableEnameChange(val) {
-        setTableEname(val)
-        getColumnName('', '', '', val)
-        setDisable(false)
+    function colchange(value, option, ins) {
+        if (ins == 1) {
+            if (value) {
+                form.setFieldsValue({
+                    columnEname: option.val
+                });
+            } else {
+                form.setFieldsValue({
+                    columnEname: undefined
+                })
+            }
+        } else {
+            if (value) {
+                form.setFieldsValue({
+                    columnCname: option.val
+                });
+            } else {
+                form.setFieldsValue({
+                    columnCname: undefined
+                })
+            }
+        }
     }
     }
-
     //返回
     //返回
     function goBack() {
     function goBack() {
         setAddVisible(false);
         setAddVisible(false);
@@ -315,10 +370,10 @@ function FieldRules() {
                     <Row gutter={24}>
                     <Row gutter={24}>
                         <Col span={6} key={0}>
                         <Col span={6} key={0}>
                             <Form.Item label="表名称(中文)" name="tableCname">
                             <Form.Item label="表名称(中文)" name="tableCname">
-                                <Select showSearch allowClear onChange={tableCnameChange} onSearch={cnameSearch} placeholder="请选择">
+                                <Select showSearch allowClear onChange={(value, option) => tableCnameChange(value, option)} onSearch={cnameSearch} placeholder="请选择">
                                     {tableList.map((item) => {
                                     {tableList.map((item) => {
                                         return (
                                         return (
-                                            <Option value={item.tableCname} key={item.tableCname}>{item.tableCname}</Option>
+                                            <Option value={item.tableCname} val={item.tableEname} key={item.tableCname}>{item.tableCname}</Option>
                                         )
                                         )
                                     })}
                                     })}
                                 </Select>
                                 </Select>
@@ -326,10 +381,10 @@ function FieldRules() {
                         </Col>
                         </Col>
                         <Col span={6} key={1}>
                         <Col span={6} key={1}>
                             <Form.Item label="表名称(英文)" name="tableEname">
                             <Form.Item label="表名称(英文)" name="tableEname">
-                                <Select showSearch allowClear onChange={tableEnameChange} onSearch={enameSearch} placeholder="请选择">
+                                <Select showSearch allowClear onChange={(value, option) => tableEnameChange(value, option)} onSearch={enameSearch} placeholder="请选择">
                                     {tableList.map((item) => {
                                     {tableList.map((item) => {
                                         return (
                                         return (
-                                            <Option value={item.tableEname} key={item.tableEname}>{item.tableEname}</Option>
+                                            <Option value={item.tableEname} val={item.tableCname} key={item.tableEname}>{item.tableEname}</Option>
                                         )
                                         )
                                     })}
                                     })}
                                 </Select>
                                 </Select>
@@ -337,10 +392,10 @@ function FieldRules() {
                         </Col>
                         </Col>
                         <Col span={6} key={2}>
                         <Col span={6} key={2}>
                             <Form.Item label="字段名称(中文)" name="columnCname">
                             <Form.Item label="字段名称(中文)" name="columnCname">
-                                <Select showSearch allowClear onSearch={colmeSearch} placeholder="请选择" disabled={disable}>
-                                    {colList.map((item) => {
+                                <Select showSearch allowClear onChange={(value, option) => colchange(value, option, 1)} onSearch={colmeSearch} placeholder="请选择" disabled={disable}>
+                                    {colList.map((item, i) => {
                                         return (
                                         return (
-                                            <Option value={item.columnCname} key={item.columnCname}>{item.columnCname}</Option>
+                                            <Option value={item.columnCname} val={item.columnEname} key={item.columnCname}>{item.columnCname}</Option>
                                         )
                                         )
                                     })}
                                     })}
                                 </Select>
                                 </Select>
@@ -348,10 +403,10 @@ function FieldRules() {
                         </Col>
                         </Col>
                         <Col span={6} key={3}>
                         <Col span={6} key={3}>
                             <Form.Item label="字段名称(英文)" name="columnEname">
                             <Form.Item label="字段名称(英文)" name="columnEname">
-                                <Select showSearch allowClear onSearch={coleneSearch} placeholder="请选择" disabled={disable}>
-                                    {colList.map((item) => {
+                                <Select showSearch allowClear onChange={(value, option) => colchange(value, option, 2)} onSearch={coleneSearch} placeholder="请选择" disabled={disable}>
+                                    {colList.map((item, i) => {
                                         return (
                                         return (
-                                            <Option value={item.columnEname} key={item.columnEname}>{item.columnEname}</Option>
+                                            <Option value={item.columnEname} val={item.columnCname} key={item.columnEname}>{item.columnEname}</Option>
                                         )
                                         )
                                     })}
                                     })}
                                 </Select>
                                 </Select>

+ 1 - 1
src/components/RegularManage/addRegular.js

@@ -59,7 +59,7 @@ function EditBlock(props) {
                 <Form.Item label="正则式名称" name="name" getValueFromEvent={getValueFromEvent} rules={[{ required: true,message:'请输入正则式名称'},{ max: 30,message:'正则式名称不能超过30个字符' },{ pattern: /^[^\s]*$/,message: '请输入正则式名称',}]}>
                 <Form.Item label="正则式名称" name="name" getValueFromEvent={getValueFromEvent} rules={[{ required: true,message:'请输入正则式名称'},{ max: 30,message:'正则式名称不能超过30个字符' },{ pattern: /^[^\s]*$/,message: '请输入正则式名称',}]}>
                     <Input placeholder="请输入" autoComplete='off'/>
                     <Input placeholder="请输入" autoComplete='off'/>
                 </Form.Item>
                 </Form.Item>
-                <Form.Item label="正则式值" name="val"  rules={[{ required: true,message:'请输入正则式值'},{ max: 512,message:'正则式值不能超过512个字符' },{ pattern: /^[^\s]*$/,message: '请输入正则式值',}]}>
+                <Form.Item label="正则式值" name="val" getValueFromEvent={getValueFromEvent} rules={[{ required: true,message:'请输入正则式值'},{ max: 512,message:'正则式值不能超过512个字符' },{ pattern: /^[^\s]*$/,message: '请输入正则式值',}]}>
                     <TextArea
                     <TextArea
                         autoSize={{ minRows: 5, maxRows: 5 }}
                         autoSize={{ minRows: 5, maxRows: 5 }}
                         placeholder="请输入"
                         placeholder="请输入"

+ 1 - 0
src/components/RegularManage/index.js

@@ -89,6 +89,7 @@ function RegularManage() {
         setTitle(title)
         setTitle(title)
         setType(type)
         setType(type)
         setRegularDetail(record)
         setRegularDetail(record)
+        setFlag(0)
         if (type == 2) {
         if (type == 2) {
             setFlag(record.relation)
             setFlag(record.relation)
         }
         }