字段校验添加id字段

src/components/BlockLossManage/index.js

@@ -308,7 +308,7 @@ function BlockLossManage() {
                 </div>
                 <Table
                     columns={columns}
-                    scroll={{ y: 'calc(100vh - 400px)' }}
+                    scroll={{ y: 'calc(100vh - 470px)' }}
                     dataSource={blockList}
                     rowKey={record => record.id}
                     pagination={{

src/components/FieldProblem/index.js

@@ -49,7 +49,7 @@ function FieldProblem() {
     function getColumnResultNumber() {
         post(api.getColumnResultNumber, { hospitalId: getCookie('hospitalId') }).then((res) => {
             if (res.data.code === 200) {
-                const data = res.data.data;
+                const data = res.data.data || [];
                 setProbleData(data)
             }
         })
@@ -263,7 +263,7 @@ function FieldProblem() {
                 </div>
                 <Table
                     columns={columns}
-                    scroll={{ y: 'calc(100vh - 400px)' }}
+                    scroll={{ y: 'calc(100vh - 470px)' }}
                     dataSource={logList}
                     rowKey={record => record.id}
                     pagination={{

src/components/FieldRules/addRules.js

@@ -60,7 +60,7 @@ function ContentForm(props) {
     const [colList, setColList] = useState([]);//字段名称
     const [list, setList] = useState([]);
     const [isChange, seIsChange] = useState(true);
-    const { type,detail } = useContext(FiledContext);
+    const { type, detail } = useContext(FiledContext);
     const { back, form, cancel } = props;
     const initialValues = detail
     const vilidateRules = {
@@ -89,7 +89,7 @@ function ContentForm(props) {
                 });
                 setTableList(columnList);
                 setList(data)
-                if(type == 2){
+                if (type == 2) {
                     data.forEach((item, i) => {
                         detail.columnList.forEach(it => {
                             if (item.getTableNameDTO.tableCname == it.tableCname) {
@@ -97,7 +97,7 @@ function ContentForm(props) {
                                 setColList([...colList])
                             }
                         });
-        
+
                     });
                 }
             }
@@ -109,6 +109,14 @@ function ContentForm(props) {
         seIsChange(false)
         setColList([...colList])
     }
+    function colchange(value, options){
+        const formData = form.getFieldsValue();
+        let columnList = formData.columnList;
+        columnList[options.index].id = options.key
+        form.setFieldsValue({
+            columnList: columnList
+        });
+    }
     //表字段添加
     function modifyData(i) {
         const formData = form.getFieldsValue();
@@ -163,15 +171,16 @@ function ContentForm(props) {
     }
     function addColumnVerify() {
         const formData = form.getFieldsValue();
+        console.log(formData);
         let arr = []
         let url
         formData.standardValueList.forEach(it => {
             arr.push(it.tit)
         });
         formData.standardValueList = arr
-        if(type == 1){
+        if (type == 1) {
             url = api.addColumnVerify
-        }else{
+        } else {
             url = api.updateColumnVerify
             // formData.id = detail.columnId
         }
@@ -245,23 +254,26 @@ function ContentForm(props) {
                                         </div>
                                         <div className='item-box'>
                                             <Form.Item label="字段名称（中文）" rules={[{ required: true }]} style={{ width: '50%' }} name={['columnList', i, 'columnCname']} labelAlign="right">
-                                                <Select allowClear style={{ width: 160 }} placeholder="请选择" disabled={isChange}>
+                                                <Select allowClear onChange={colchange} style={{ width: 160 }} placeholder="请选择" disabled={isChange}>
                                                     {colList.map((item) => {
                                                         return (
-                                                            <Option value={item.columnCname} key={item.columnCname}>{item.columnCname}</Option>
+                                                            <Option value={item.columnCname} key={item.id} index={i}>{item.columnCname}</Option>
                                                         )
                                                     })}
                                                 </Select>
                                             </Form.Item>
                                             <Form.Item label="字段名称（英文）" rules={[{ required: true }]} name={['columnList', i, 'columnEname']} labelAlign="right">
-                                                <Select allowClear style={{ width: 160 }} placeholder="请选择" disabled={isChange}>
+                                                <Select allowClear onChange={colchange} style={{ width: 160 }} placeholder="请选择" disabled={isChange}>
                                                     {colList.map((item) => {
                                                         return (
-                                                            <Option value={item.columnEname} key={item.columnEname}>{item.columnEname}</Option>
+                                                            <Option value={item.columnEname} key={item.id} index={i}>{item.columnEname}</Option>
                                                         )
                                                     })}
                                                 </Select>
                                             </Form.Item>
+                                            <Form.Item hidden={true} name={['columnList', i, 'id']} noStyle>
+                                                <Input />
+                                            </Form.Item>
                                         </div>
                                     </div>
                                     <img onClick={() => modifyData(i)} src={i == 0 ? add : del} />

src/components/FieldRules/index.js

@@ -137,7 +137,8 @@ function FieldRules() {
                     columnCname: undefined,
                     columnEname: undefined,
                     ableCname: undefined,
-                    tableEname: undefined
+                    tableEname: undefined,
+                    id:undefined
                 }],
                 standardValueList: [{
                     tit: ''
@@ -162,6 +163,7 @@ function FieldRules() {
                         columnEname: data.columnEname,
                         tableCname: data.tableCname,
                         tableEname: data.tableEname,
+                        id:data.id
                     }],
                     standardValueList: [{
                         tit: data.standardvalue,
@@ -343,7 +345,7 @@ function FieldRules() {
                     <h2 className="table-title">字段校验规则维护</h2>
                     <Space size="middle">
                         <Button type="primary" icon={<PlusOutlined />} onClick={() => showModal(1)}>新增</Button>
-                        <Button type="primary" icon={<DeleteOutlined />} onClick={() => showDelModal(true)} danger>删除</Button>
+                        <Button type="primary" onClick={() => showDelModal(true)} danger>删除</Button>
                     </Space>
 
                 </div>

src/components/RegularManage/addRegular.js

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

src/components/RegularManage/index.js

@@ -16,7 +16,8 @@ function RegularManage() {
     }, []);
     const [regularList, setRegularList] = useState([]);
     const [total, setTotal] = useState(0);
-    const [title, setTitle] = useState(0);
+    const [title, setTitle] = useState();
+    const [tip, setTip] = useState();
     const [type, setType] = useState(0);//1新增 2修改
     const [visible, setVisible] = useState(false);
     const [delvisible, setDelVisible] = useState(false);
@@ -73,10 +74,12 @@ function RegularManage() {
         setType(type)
         setRegularDetail(record)
     }
-    function cancel() { }
+    function cancel() {
+        setVisible(false)
+    }
     function userChange() {
         setVisible(false)
-        getRegularPage();
+        getRegularPage()
     }
     function onSizeChange(current, pageSize) {
         params.current = current
@@ -98,6 +101,18 @@ function RegularManage() {
         onChange: onSelectChange,
     };
     function onSelectChange(selectedRowKeys) {
+        let arr = []
+        selectedRowKeys.forEach(it => {
+            arr.push(it.split('-')[1])
+        });
+        if (arr.indexOf('1') > 0) {
+            console.log(123);
+            setTip('正则式关联字段校验规则，删除后将取消关联且无法恢复，确认删除这' + selectedRowKeys.length + '条正则式？')
+        } else {
+            console.log(456);
+            setTip('正则式删除后将无法恢复，确认删除这' + selectedRowKeys.length + '条正则式？')
+        }
+
         setSelectedRowKeys(selectedRowKeys);
     };
     const onFinish = (value) => {
@@ -162,8 +177,8 @@ function RegularManage() {
                 <div className="table-header">
                     <h2 className="table-title">正则式维护</h2>
                     <Space size="middle">
-                        <Button type="primary" icon={<PlusOutlined />} onClick={() => showModal('新增正则式', 1,{})}>新增</Button>
-                        <Button type="primary" icon={<DeleteOutlined />} onClick={() => showDelModal(true)} danger>删除</Button>
+                        <Button type="primary" icon={<PlusOutlined />} onClick={() => showModal('新增正则式', 1, {})}>新增</Button>
+                        <Button type="primary" onClick={() => showDelModal(true)} danger>删除</Button>
                     </Space>
 
                 </div>
@@ -173,7 +188,7 @@ function RegularManage() {
                     rowSelection={rowSelection}
                     scroll={{ y: 'calc(100vh - 380px)' }}
                     dataSource={regularList}
-                    rowKey={record => record.id}
+                    rowKey={record => record.id + '-' + record.relation}
                     pagination={{
                         pageSize: size,
                         size: 'small',
@@ -199,14 +214,14 @@ function RegularManage() {
                     forceRender={true}
                 >
                     <RegularContext.Provider value={{ regularDetail, type }}>
-                        <AddRegular userChange={userChange} />
+                        <AddRegular userChange={userChange} cancel={cancel} />
                     </RegularContext.Provider>
 
                 </Modal>
                 : ''}
 
             <Modal
-                title="删除职务职称变更记录"
+                title="删除正则式"
                 okText='确定'
                 cancelText='取消'
                 width={400}
@@ -215,7 +230,7 @@ function RegularManage() {
                 /*confirmLoading={confirmLoading}*/
                 onCancel={() => showDelModal(false)}
             >
-                <p>字段校验规则删除后将无法恢复，确认删除这{selectedRowKeys.length}条变更记录？</p>
+                <p>{tip}</p>
             </Modal>
         </div >
     )

src/components/UserManager/addUser.js

@@ -171,7 +171,7 @@ function AddUser(props) {
     })
   }
   function cancel() {
-    props.userChange()
+    props.cancel()
   }
 
   return (

src/components/UserManager/index.js

@@ -357,7 +357,7 @@ function UserManager() {
           forceRender={true}
         >
           <UserContext.Provider value={{ userId, type, formData, roleList }}>
-            <AddUser userChange={userChange} />
+            <AddUser userChange={userChange} cancel={cancel} />
           </UserContext.Provider>
 
         </Modal>