zls

src/pages/resource/openScreen/edit.jsx

@@ -246,17 +246,19 @@ const header = props => {
 
     function disabledDate(current) {
         // Can not select days before today and today
-        return current && current < moment().endOf('day');
+        // console.log(current && current < moment().endOf('day'))
+        // console.log(current)
+        return current && current < moment().startOf('day');
     }
 
     function disabledDateTime() {
         return {
             disabledHours: () => range(0, moment().hour()),
-            disabledMinutes: () => range(0, moment().minute()+1),
+            disabledMinutes: () => range(0, moment().minute() + 1),
             disabledSeconds: () => [],
         };
     }
-// range(moment().second(), moment().second())
+    // range(moment().second(), moment().second())
 
 
     const fields = [
@@ -296,7 +298,7 @@ const header = props => {
             name: 'targetName',
             // value: data.targetId,
             //   type: FieldTypes.Text,
-            render: <div onClick={e => handleShowModel(data.targetId)}>{sample.sampleName || '选择关联业务'}{console.log(sample, '13')}</div>,
+            render: <div style={{ color: 'blue' }} onClick={e => handleShowModel(data.targetId)}>{sample.sampleName || '选择关联业务'}{console.log(sample, '13')}</div>,
         },
         {
             label: '发布状态',
@@ -343,96 +345,96 @@ const header = props => {
                 // </div>, 
                 // <DatePicker disabledDate={disabledDate} onChange={ontime}></DatePicker>,
                 <DatePicker
-                showToday = {false}
-                disabledDate={disabledDate}
-                disabledTime = { disabledDateTime }
-                showTime={{ defaultValue: moment(data.invalidTime, 'YYYY-MM-DD HH:mm:ss') }}
-                    // showTime={{ data.invalidTime, 'HH:mm:ss' }}
+                    showToday = {false}
+                    disabledDate={disabledDate}
+                    disabledTime={disabledDateTime}
+                    showTime={{ defaultValue: moment(data.invalidTime, 'YYYY-MM-DD HH:mm:ss') }}
+
                 />,
-        //         < DatePicker
-        //             format = "YYYY-MM-DD HH:mm:ss"
-        //             disabledDate = { disabledDate }
-        //             disabledTime = { disabledDateTime }
-        //             showTime
-        // // onChange={onChange}
-        // ></DatePicker >,
+            //         < DatePicker
+            //             format = "YYYY-MM-DD HH:mm:ss"
+            //             disabledDate = { disabledDate }
+            //             disabledTime = { disabledDateTime }
+            //             showTime
+            // // onChange={onChange}
+            // ></DatePicker >,
 
 
-        // type: FieldTypes.DatePicker,
-        value: data.invalidTime != null ? moment(data.invalidTime, 'YYYY-MM-DD HH:mm:ss') : null,
+            // type: FieldTypes.DatePicker,
+            value: data.invalidTime != null ? moment(data.invalidTime, 'YYYY-MM-DD HH:mm:ss') : null,
 
-        help: '下架时间仅支持未来时间，到达未来时间后系统自动将开屏通知发布状态修改为否'
+            help: '下架时间仅支持未来时间，到达未来时间后系统自动将开屏通知发布状态修改为否'
 
         },
-    {
-        label: '权重',
-        name: 'orderNo',
-        type: FieldTypes.Number,
-        value: data.orderNo,
+        {
+            label: '权重',
+            name: 'orderNo',
+            type: FieldTypes.Number,
+            value: data.orderNo,
 
-        help: '用于列表排序，越大越靠前'
+            help: '用于列表排序，越大越靠前'
         },
     ]
 
-const handleSubmit = (values) => {
-
-    values.targetId = sample.sampleId
-    values.targetName = sample.sampleName
-    if (noticeId) {
-        values.noticeId = noticeId
-        
-        values.invalidTime = moment(values.invalidTime).format('YYYY-MM-DD HH:mm:ss');
-        console.log('3333333', values)
-        request({ ...apis.openScreen.put, urlData: { id: noticeId }, data: { ...values } }).then((data) => {
-            message.info('提交成功！')
-            cancelPage();
-        }).catch((err) => {
-            message.error(err.msg || err.message)
-        })
-    } else {
-        request({ ...apis.openScreen.post, data: { ...values } }).then((data) => {
-            console.log('提交成功！')
-            cancelPage();
-        }).catch((err) => {
-            message.error(err.msg || err.message)
-        })
-    }
+    const handleSubmit = (values) => {
 
+        values.targetId = sample.sampleId
+        values.targetName = sample.sampleName
+        if (noticeId) {
+            values.noticeId = noticeId
 
-}
-//model
-const handleShowModel = val => {
-    setVisible(true);
-}
+            values.invalidTime = moment(values.invalidTime).format('YYYY-MM-DD HH:mm:ss');
+            console.log('3333333', values)
+            request({ ...apis.openScreen.put, urlData: { id: noticeId }, data: { ...values } }).then((data) => {
+                message.info('提交成功！')
+                cancelPage();
+            }).catch((err) => {
+                message.error(err.msg || err.message)
+            })
+        } else {
+            request({ ...apis.openScreen.post, data: { ...values } }).then((data) => {
+                console.log('提交成功！')
+                cancelPage();
+            }).catch((err) => {
+                message.error(err.msg || err.message)
+            })
+        }
 
-const handleCancel = val => {
-    setVisible(false);
-}
 
-const cancelPage = () => {
-    router.push({
-        pathname: '/resource/openScreen',
-    });
-}
+    }
+    //model
+    const handleShowModel = val => {
+        setVisible(true);
+    }
+
+    const handleCancel = val => {
+        setVisible(false);
+    }
+
+    const cancelPage = () => {
+        router.push({
+            pathname: '/resource/openScreen',
+        });
+    }
 
-return (
-    <>
-        <div>
-            <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
-            <Modal
-                title="选择关联业务"
-                visible={visible}
-                //  onOk={handleOk}
-
-                onCancel={handleCancel}
-                footer={null}
-            >
-                <ModalDatas></ModalDatas>
-
-            </Modal>
-        </div>
-    </>
-)
+    return (
+        <>
+            <div>
+                <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+                <Modal
+                    title="选择关联业务"
+                    visible={visible}
+                    //  onOk={handleOk}
+
+                    onCancel={handleCancel}
+                    footer={null}
+                >
+                    <ModalDatas></ModalDatas>
+
+                </Modal>
+            </div>
+        </>
+    )
 }
 
 const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);

src/pages/resource/openScreen/index.jsx

@@ -111,7 +111,7 @@ function header(props) {
             dataIndex: 'status',
             key: 'status',
             align: 'center',
-            render: (status) => <><span>{status === 1 ? '是' : status === 0 ? '否':'否'}</span></>
+            render: (x, row) => <><span>{row.status === 1 &&moment(row.invalidTime) > moment() ? '是' :'否'}</span></>
         },
         {
             title: '自动下架时间',