问题修改

src/components/BlockLossManage/index.js

@@ -29,8 +29,8 @@ function BlockLossManage() {
         pages: 1,
         current: 1,
         size: 15,
-        asc:['status'],
-        desc:['gmt_modified'],
+        asc: ['status'],
+        desc: ['gmt_modified'],
         startDate: getCurrentDataFront().split('/').join('-') + ' 00:00:00',
         endDate: getCurrentData().split('/').join('-') + ' 23:23:59'
     });
@@ -39,8 +39,8 @@ function BlockLossManage() {
         pages: 1,
         current: 1,
         size: size,
-        asc:['status'],
-        desc:['gmt_modified'],
+        asc: ['status'],
+        desc: ['gmt_modified'],
         startDate: getCurrentDataFront().split('/').join('-') + ' 00:00:00',
         endDate: getCurrentData().split('/').join('-') + ' 23:23:59'
     }
@@ -113,7 +113,7 @@ function BlockLossManage() {
         setCurrent(1)
         setParams(param)
         getBlockLossPage(param);
-        blockLossTypeGather({startDate:value.startDate, endDate:value.endDate})
+        blockLossTypeGather({ startDate: value.startDate, endDate: value.endDate })
     };
     const onReset = () => {
         setCurrent(1)
@@ -138,7 +138,7 @@ function BlockLossManage() {
         { title: '文书标题', dataIndex: 'recTitle', key: 'recTitle' },
         {
             title: '丢失原因', dataIndex: 'lossCause', key: 'lossCause', render: (text, record) => {
-                return record.lossCause || '-';
+                return record.lossCause ? record.lossCause.length > 15 ? <span title={record.lossCause}>{record.lossCause.substring(0, 15) + '...'}</span> : record.lossCause : '-';
             }
         },
         {
@@ -163,7 +163,7 @@ function BlockLossManage() {
         },
         {
             title: '核查结果', key: 'isAudited', render: (text, record) => {
-                return (<span className={(record.isAudited === '0') ? 'delete' : (record.isAudited === '1') ? 'adopt' : 'disable'}>{record.isAudited == 0 ? '审核未通过' : record.isAudited == 1 ? '审核通过' : record.isAudited == 2 ? '未核查' : '-'}</span>);
+                return (<span className={(record.isAudited === '0') ? 'delete' : (record.isAudited === '1') ? 'adopt' : 'disable'}>{record.isAudited == 0 ? '核查未通过' : record.isAudited == 1 ? '核查通过' : record.isAudited == 2 ? '未核查' : '-'}</span>);
             }
         },
         {
@@ -188,6 +188,7 @@ function BlockLossManage() {
                         <Col span={6} key={0}>
                             <Form.Item label="日期" name="time">
                                 <RangePicker
+                                    allowClear={false}
                                     disabledDate={disabledDate} // 限制日期不可选
                                     placeholder={['开始时间', '结束时间']}
                                 />

src/components/FieldProblem/index.js

@@ -32,7 +32,7 @@ function FieldProblem() {
         pages: 1,
         current: 1,
         size: 15,
-        desc:['isSolved','solveTime'],
+        desc: ['isSolved', 'solveTime'],
         behospitalStartDate: getCurrentDataFront().split('/').join('-') + ' 00:00:00',
         behospitalEndDate: getCurrentData().split('/').join('-') + ' 23:23:59'
     });
@@ -41,7 +41,7 @@ function FieldProblem() {
         pages: 1,
         current: 1,
         size: size,
-        desc:['isSolved','solveTime'],
+        desc: ['isSolved', 'solveTime'],
         behospitalStartDate: getCurrentDataFront().split('/').join('-') + ' 00:00:00',
         behospitalEndDate: getCurrentData().split('/').join('-') + ' 23:23:59'
     }
@@ -206,6 +206,7 @@ function FieldProblem() {
                         <Col span={6} key={0}>
                             <Form.Item label="日期" name="time">
                                 <RangePicker
+                                    allowClear={false}
                                     disabledDate={disabledDate}
                                     placeholder={['开始时间', '结束时间']}
                                 />

src/components/FieldRules/addRules.js

@@ -113,7 +113,7 @@ function ContentForm(props) {
         })
     }
     //表选择
-    function tablechange(i, value, options) {
+    function tablechange(i, value, options,ins) {
         console.log(value);
         const formData = form.getFieldsValue();
         if (value) {
@@ -128,6 +128,12 @@ function ContentForm(props) {
             setColList([...colList])
         }
         let columnList = formData.columnList;
+        if(ins == 1){
+            columnList[i].tableEname = value
+        }else{
+            columnList[i].tableCname = value
+        }
+        
         columnList[i].columnCname = undefined
         columnList[i].columnEname = undefined
         form.setFieldsValue({
@@ -282,19 +288,19 @@ function ContentForm(props) {
                                     <div className='item'>
                                         <div className='item-box'>
                                             <Form.Item label="表名称（中文）" rules={[{ required: true }]} style={{ width: '50%' }} name={['columnList', i, 'tableCname']} labelAlign="right" >
-                                                <Select allowClear showSearch onChange={(value, option) => tablechange(i, value, option)} onSearch={cnameSearch} style={{ width: 160 }} placeholder="请选择">
+                                                <Select allowClear showSearch onChange={(value, option) => tablechange(i, value, option,1)} onSearch={cnameSearch} style={{ width: 160 }} placeholder="请选择">
                                                     {tableList.map((item) => {
                                                         return (
-                                                            <Option value={item.tableCname} key={item.index}>{item.tableCname}</Option>
+                                                            <Option value={item.tableEname} key={item.index}>{item.tableCname}</Option>
                                                         )
                                                     })}
                                                 </Select>
                                             </Form.Item>
                                             <Form.Item label="表名称（英文）" rules={[{ required: true }]} name={['columnList', i, 'tableEname']} labelAlign="right">
-                                                <Select allowClear showSearch onChange={(value, option) => tablechange(i, value, option)} onSearch={enameSearch} style={{ width: 160 }} placeholder="请选择" >
+                                                <Select allowClear showSearch onChange={(value, option) => tablechange(i, value, option,2)} onSearch={enameSearch} style={{ width: 160 }} placeholder="请选择" >
                                                     {tableList.map((item) => {
                                                         return (
-                                                            <Option value={item.tableEname} key={item.index}>{item.tableEname}</Option>
+                                                            <Option value={item.tableCname} key={item.index}>{item.tableEname}</Option>
                                                         )
                                                     })}
                                                 </Select>

src/components/FieldRules/index.js

@@ -24,24 +24,27 @@ function FieldRules() {
     const [selectedRowKeys, setSelectedRowKeys] = useState([]);
     const [tableList, setTableList] = useState([]);//表名称
     const [colList, setColList] = useState([]);//字段名称
+    const [tableCname, setTableCname] = useState(null);//字段名称
+    const [tableEname, setTableEname] = useState(null);//字段名称
+    const [disable, setDisable] = useState(true);//字段名称
     const [filedDetail, setFiledDetail] = useState(null);//详情数据
     const [params, setParams] = useState({
         pages: 1,
         current: 1,
         size: 15,
-        desc:['gmt_create']
+        desc: ['gmt_create']
     });
     const [form] = Form.useForm();
     let data = {
         pages: 1,
         current: 1,
         size: size,
-        desc:['gmt_create']
+        desc: ['gmt_create']
     }
     useEffect(() => {
         getRegular()
         getTableName()
-        getColumnName()
+        getColumnName('', '', '', '')
         getColumnVerifyPage();
     }, []);
     //表格数据
@@ -67,10 +70,12 @@ function FieldRules() {
         })
     }
     //获取字段名
-    function getColumnName(columnCname, columnEname) {
+    function getColumnName(columnCname, columnEname, tableCname, tableEname) {
         const param = {
             columnCname: columnCname,
-            columnEname: columnEname
+            columnEname: columnEname,
+            tableCname: tableCname,
+            tableEname: tableEname
         }
         post(api.getColumnName, param).then((res) => {
             if (res.data.code === 200) {
@@ -102,11 +107,11 @@ function FieldRules() {
     }
     //字段名称搜索(中文)
     function colmeSearch(val) {
-        getColumnName(val, '')
+        getColumnName(val, '', tableCname, '')
     }
     //字段名称搜索(英文)
     function coleneSearch(val) {
-        getColumnName('', val)
+        getColumnName('', val, '', tableEname)
     }
     //正则式名称搜索
     function onSearch(val) {
@@ -211,6 +216,17 @@ function FieldRules() {
     function onSelectChange(selectedRowKeys) {
         setSelectedRowKeys(selectedRowKeys);
     };
+    function tableCnameChange(val) {
+        setTableCname(val)
+        setDisable(false)
+        getColumnName('', '', val, '')
+    }
+    function tableEnameChange(val) {
+        setTableEname(val)
+        getColumnName('', '', '', val)
+        setDisable(false)
+    }
+
     //返回
     function goBack() {
         setAddVisible(false);
@@ -296,7 +312,7 @@ function FieldRules() {
                     <Row gutter={24}>
                         <Col span={6} key={0}>
                             <Form.Item label="表名称（中文）" name="tableCname">
-                                <Select showSearch allowClear onSearch={cnameSearch} placeholder="请选择">
+                                <Select showSearch allowClear onChange={tableCnameChange} onSearch={cnameSearch} placeholder="请选择">
                                     {tableList.map((item) => {
                                         return (
                                             <Option value={item.tableCname} key={item.tableCname}>{item.tableCname}</Option>
@@ -307,7 +323,7 @@ function FieldRules() {
                         </Col>
                         <Col span={6} key={1}>
                             <Form.Item label="表名称（英文）" name="tableEname">
-                                <Select showSearch allowClear onSearch={enameSearch} placeholder="请选择">
+                                <Select showSearch allowClear onChange={tableEnameChange} onSearch={enameSearch} placeholder="请选择">
                                     {tableList.map((item) => {
                                         return (
                                             <Option value={item.tableEname} key={item.tableEname}>{item.tableEname}</Option>
@@ -318,7 +334,7 @@ function FieldRules() {
                         </Col>
                         <Col span={6} key={2}>
                             <Form.Item label="字段名称（中文）" name="columnCname">
-                                <Select showSearch allowClear onSearch={colmeSearch} placeholder="请选择">
+                                <Select showSearch allowClear onSearch={colmeSearch} placeholder="请选择" disabled={disable}>
                                     {colList.map((item) => {
                                         return (
                                             <Option value={item.columnCname} key={item.columnCname}>{item.columnCname}</Option>
@@ -329,7 +345,7 @@ function FieldRules() {
                         </Col>
                         <Col span={6} key={3}>
                             <Form.Item label="字段名称（英文）" name="columnEname">
-                                <Select showSearch allowClear onSearch={coleneSearch} placeholder="请选择">
+                                <Select showSearch allowClear onSearch={coleneSearch} placeholder="请选择" disabled={disable}>
                                     {colList.map((item) => {
                                         return (
                                             <Option value={item.columnEname} key={item.columnEname}>{item.columnEname}</Option>