浏览代码

问题修改

1178232204@qq.com 3 年之前
父节点
当前提交
4448f3b826

+ 1 - 0
src/components/ATabs/index.less

@@ -6,6 +6,7 @@
   padding: 0 10px 10px;
   padding: 0 10px 10px;
   margin:0 10px;
   margin:0 10px;
   height: calc(100vh - 60px);
   height: calc(100vh - 60px);
+  overflow-y: auto;
   .ant-tabs-nav{
   .ant-tabs-nav{
     height: 40px;
     height: 40px;
   }
   }

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

@@ -33,20 +33,20 @@ function FieldProblem() {
         pages: 1,
         pages: 1,
         current: 1,
         current: 1,
         size: 15,
         size: 15,
-        solveTimeStart: getCurrentDataFront().split('/').join('-') + ' 00:00:00',
-        solveTimeEnd: getCurrentData().split('/').join('-') + ' 23:23:59'
+        behospitalStartDate: getCurrentDataFront().split('/').join('-') + ' 00:00:00',
+        behospitalEndDate: getCurrentData().split('/').join('-') + ' 23:23:59'
     });
     });
     const [date, setDate] = useState({
     const [date, setDate] = useState({
-        solveTimeStart: getCurrentDataFront().split('/').join('-') + ' 00:00:00',
-        solveTimeEnd: getCurrentData().split('/').join('-') + ' 23:23:59'
+        behospitalStartDate: getCurrentDataFront().split('/').join('-') + ' 00:00:00',
+        behospitalEndDate: getCurrentData().split('/').join('-') + ' 23:23:59'
     });
     });
     const [form] = Form.useForm();
     const [form] = Form.useForm();
     let data = {
     let data = {
         pages: 1,
         pages: 1,
         current: 1,
         current: 1,
         size: size,
         size: size,
-        solveTimeStart: getCurrentDataFront().split('/').join('-') + ' 00:00:00',
-        solveTimeEnd: getCurrentData().split('/').join('-') + ' 23:23:59'
+        behospitalStartDate: getCurrentDataFront().split('/').join('-') + ' 00:00:00',
+        behospitalEndDate: getCurrentData().split('/').join('-') + ' 23:23:59'
     }
     }
     //表格数据
     //表格数据
     function getColumnResultPage(param) {
     function getColumnResultPage(param) {
@@ -117,19 +117,19 @@ function FieldProblem() {
     }
     }
     const onFinish = (value) => {
     const onFinish = (value) => {
         if (value.time) {
         if (value.time) {
-            value.solveTimeStart = moment(value.time[0]).format('YYYY-MM-DD 00:00:00');
-            value.solveTimeEnd = moment(value.time[1]).format('YYYY-MM-DD 23:23:59');
+            value.behospitalStartDate = moment(value.time[0]).format('YYYY-MM-DD 00:00:00');
+            value.behospitalEndDate = moment(value.time[1]).format('YYYY-MM-DD 23:23:59');
         }
         }
         delete value.time
         delete value.time
         const param = {
         const param = {
             ...data,
             ...data,
             ...value,
             ...value,
         }
         }
-        setDate({ solveTimeStart: value.solveTimeStart, solveTimeEnd: value.solveTimeEnd })
+        setDate({ behospitalStartDate: value.behospitalStartDate, behospitalEndDate: value.behospitalEndDate })
         setCurrent(1)
         setCurrent(1)
         setParams(param)
         setParams(param)
         getColumnResultPage(param);
         getColumnResultPage(param);
-        getColumnResultNumber({ solveTimeStart: value.solveTimeStart, solveTimeEnd: value.solveTimeEnd })
+        getColumnResultNumber({ behospitalStartDate: value.behospitalStartDate, behospitalEndDate: value.behospitalEndDate })
     };
     };
     const onReset = () => {
     const onReset = () => {
         setCurrent(1)
         setCurrent(1)

+ 13 - 13
src/components/FieldRules/addRules.js

@@ -97,18 +97,18 @@ function ContentForm(props) {
                 });
                 });
                 setTableList(columnList);
                 setTableList(columnList);
                 setList(data)
                 setList(data)
-                // if (type == 2) {
-                //     data.forEach((item, i) => {
-                //         detail.columnList.forEach(it => {
-                //             if (item.getTableNameDTO.tableCname == it.tableCname) {
-                //                 let colList = [[]]
-                //                 colList[0] = data[i].DTOList
-                //                 setColList([...colList])
-                //             }
-                //         });
+                if (type == 2) {
+                    data.forEach((item, i) => {
+                        detail.columnList.forEach(it => {
+                            if (item.getTableNameDTO.tableCname == it.tableCname) {
+                                let colList = [[]]
+                                colList[0] = data[i].getColumnNameDTOList
+                                setColList([...colList])
+                            }
+                        });
 
 
-                //     });
-                // }
+                    });
+                }
             }
             }
         })
         })
     }
     }
@@ -338,12 +338,12 @@ function ContentForm(props) {
                         <Radio value={'0'}>否</Radio>
                         <Radio value={'0'}>否</Radio>
                     </Radio.Group>
                     </Radio.Group>
                 </Form.Item>
                 </Form.Item>
-                <Form.Item label="标准值维护" rules={[{ max: 30, message: '标准值不能超过30个字符' }]}>
+                <Form.Item label="标准值维护"  >
                     {
                     {
                         standardValueList.map((it, i) => {
                         standardValueList.map((it, i) => {
                             return (
                             return (
                                 <div className='box-2' key={i} >
                                 <div className='box-2' key={i} >
-                                    <Form.Item name={['standardValueList', i, 'tit']} style={{ width: 159 }} getValueFromEvent={getValueFromEvent}>
+                                    <Form.Item name={['standardValueList', i, 'tit']} style={{ width: 159 }} getValueFromEvent={getValueFromEvent} rules={[{ max: 30, message: '标准值不能超过30个字符' }]}>
                                         <Input autoComplete='off' placeholder="请输入" />
                                         <Input autoComplete='off' placeholder="请输入" />
                                     </Form.Item>
                                     </Form.Item>
                                     <img onClick={() => modifyStand(i)} src={i == 0 ? add : del} />
                                     <img onClick={() => modifyStand(i)} src={i == 0 ? add : del} />

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

@@ -165,7 +165,7 @@ function FieldRules() {
                         tableCname: data.tableCname,
                         tableCname: data.tableCname,
                         tableEname: data.tableEname,
                         tableEname: data.tableEname,
                         disable: true,
                         disable: true,
-                        id: data.id
+                        id: data.columnId
                     }],
                     }],
                     standardValueList: [{
                     standardValueList: [{
                         tit: data.standardvalue,
                         tit: data.standardvalue,