1178232204@qq.com %!s(int64=3) %!d(string=hai) anos
pai
achega
5dc039cd5f

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

@@ -198,7 +198,6 @@ function BlockLossManage() {
                         <Col span={6} key={0}>
                             <Form.Item label="日期" name="time">
                                 <RangePicker
-                                    allowClear={false}
                                     disabledDate={disabledDate} // 限制日期不可选
                                     placeholder={['开始时间', '结束时间']}
                                     onCalendarChange={val => setDates(val)}

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

@@ -247,14 +247,12 @@ function EditBlock(props) {
                         </div>
                         : ''
                 }
-
-
                 <Form.Item wrapperCol={type == 3 ? { offset: 24, span: 16 } : { offset: 8, span: 16 }} style={{ marginTop: 15 }}>
                     <Space size="middle" >
                         <Button htmlType="button" onClick={e => cancel()}>
                             取消
                         </Button>
-                        <Button type="primary" htmlType="submit" disabled={disable}>
+                        <Button type="primary" htmlType="submit" disabled={disable &&  type == 1}>
                             {type == 1 ? '确定' : '保存'}
                         </Button>
                     </Space>

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

@@ -152,7 +152,12 @@ function ContentForm(props) {
     function colchange(i, value, options,ins) {
         const formData = form.getFieldsValue();
         let columnList = formData.columnList;
-        columnList[i].id = options.key
+        if (value) {
+            columnList[i].id = options.key
+        }else{
+            columnList[i].id = undefined
+        }
+        
         if(ins == 1){
             if (value) {
                 columnList[i].columnEname = options.val

+ 5 - 0
src/components/FieldRules/index.js

@@ -311,8 +311,13 @@ function FieldRules() {
         setCurrent(1)
         setParams(data)
         form.resetFields();
+        getRegular()
+        getTableName()
+        getColumnName('', '', '', '')
         getColumnVerifyPage(data);
         setSelectedRowKeys([])
+        setDisable(true)
+        
     };
     const columns = [
         { title: '序号', dataIndex: 'index', render: (text, record, index) => (current - 1) * params.size + index + 1, width: 60 },