zls

src/pages/resource/openScreen/edit.jsx

@@ -249,13 +249,13 @@ const header = props => {
         return current && current < moment().startOf('day');
     }
 
-    function disabledDateTime() {
-        return {
-            disabledHours: () => range(0, moment().hour()),
-            disabledMinutes: () => range(0, moment().minute() + 1),
-            disabledSeconds: () => [],
-        };
-    }
+    // function disabledDateTime() {
+    //     return {
+    //         disabledHours: () => range(0, moment().hour()),
+    //         disabledMinutes: () => range(0, moment().minute() + 1),
+    //         disabledSeconds: () => [],
+    //     };
+    // }
     // range(moment().second(), moment().second())
 
 
@@ -286,7 +286,7 @@ const header = props => {
             type: FieldTypes.Select,
             dict: [{
                 name: "H5样例",
-                value: "H5样例"
+                value: "H5"
             },
             ],
             value: data.targetType,
@@ -341,11 +341,11 @@ const header = props => {
                 //   <DatePicker showTime = {data.invalidTime}  disabledDate={disabledDate} onChange={onChange} onOk={onOk} />
 
                 // </div>, 
-                // <DatePicker disabledDate={disabledDate} onChange={ontime}></DatePicker>,
+                // <DatePicker disabledDate={disabledDate} onChange={ontime}></DatePicker>,showTime={{ format: 'HH:mm' }}
                 <DatePicker
-                    // showToday = {false}showTime={{ format: 'HH:mm' }}
+                    showToday = {false}
                     disabledDate={disabledDate}
-                    disabledTime={disabledDateTime}
+                    // disabledTime={disabledDateTime}
                     showTime={{ format: 'YYYY-MM-DD HH:mm:ss' }}
 
                 />,
@@ -378,10 +378,12 @@ const header = props => {
 
         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');
+            values.invalidTime === 'Invalid date'? null : 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('提交成功！')
@@ -390,6 +392,8 @@ const header = props => {
                 message.error(err.msg || err.message)
             })
         } else {
+            
+            values.invalidTime === 'Invalid date'? null : moment(values.invalidTime).format('YYYY-MM-DD HH:mm:ss');
             request({ ...apis.openScreen.post, data: { ...values } }).then((data) => {
                 console.log('提交成功！')
                 cancelPage();

src/pages/resource/openScreen/index.jsx

@@ -99,6 +99,7 @@ function header(props) {
             dataIndex: 'targetType',
             key: 'targetType',
             align: 'center',
+            render: (x, row) => <><span>{row.targetType === 'H5' ? 'H5样例' :''}</span></>
         },
         {
             title: '关联业务',