zhoulisen 5 years ago
parent
commit
1d0253b4a2
2 changed files with 17 additions and 12 deletions
  1. 16
    12
      src/pages/resource/openScreen/edit.jsx
  2. 1
    0
      src/pages/resource/openScreen/index.jsx

+ 16
- 12
src/pages/resource/openScreen/edit.jsx View File

249
         return current && current < moment().startOf('day');
249
         return current && current < moment().startOf('day');
250
     }
250
     }
251
 
251
 
252
-    function disabledDateTime() {
253
-        return {
254
-            disabledHours: () => range(0, moment().hour()),
255
-            disabledMinutes: () => range(0, moment().minute() + 1),
256
-            disabledSeconds: () => [],
257
-        };
258
-    }
252
+    // function disabledDateTime() {
253
+    //     return {
254
+    //         disabledHours: () => range(0, moment().hour()),
255
+    //         disabledMinutes: () => range(0, moment().minute() + 1),
256
+    //         disabledSeconds: () => [],
257
+    //     };
258
+    // }
259
     // range(moment().second(), moment().second())
259
     // range(moment().second(), moment().second())
260
 
260
 
261
 
261
 
286
             type: FieldTypes.Select,
286
             type: FieldTypes.Select,
287
             dict: [{
287
             dict: [{
288
                 name: "H5样例",
288
                 name: "H5样例",
289
-                value: "H5样例"
289
+                value: "H5"
290
             },
290
             },
291
             ],
291
             ],
292
             value: data.targetType,
292
             value: data.targetType,
341
                 //   <DatePicker showTime = {data.invalidTime}  disabledDate={disabledDate} onChange={onChange} onOk={onOk} />
341
                 //   <DatePicker showTime = {data.invalidTime}  disabledDate={disabledDate} onChange={onChange} onOk={onOk} />
342
 
342
 
343
                 // </div>, 
343
                 // </div>, 
344
-                // <DatePicker disabledDate={disabledDate} onChange={ontime}></DatePicker>,
344
+                // <DatePicker disabledDate={disabledDate} onChange={ontime}></DatePicker>,showTime={{ format: 'HH:mm' }}
345
                 <DatePicker
345
                 <DatePicker
346
-                    // showToday = {false}showTime={{ format: 'HH:mm' }}
346
+                    showToday = {false}
347
                     disabledDate={disabledDate}
347
                     disabledDate={disabledDate}
348
-                    disabledTime={disabledDateTime}
348
+                    // disabledTime={disabledDateTime}
349
                     showTime={{ format: 'YYYY-MM-DD HH:mm:ss' }}
349
                     showTime={{ format: 'YYYY-MM-DD HH:mm:ss' }}
350
 
350
 
351
                 />,
351
                 />,
378
 
378
 
379
         values.targetId = sample.sampleId
379
         values.targetId = sample.sampleId
380
         values.targetName = sample.sampleName
380
         values.targetName = sample.sampleName
381
+
382
+       
381
         if (noticeId) {
383
         if (noticeId) {
382
             values.noticeId = noticeId
384
             values.noticeId = noticeId
383
 
385
 
384
-            values.invalidTime = moment(values.invalidTime).format('YYYY-MM-DD HH:mm:ss');
386
+            values.invalidTime === 'Invalid date'? null : moment(values.invalidTime).format('YYYY-MM-DD HH:mm:ss');
385
             console.log('3333333', values)
387
             console.log('3333333', values)
386
             request({ ...apis.openScreen.put, urlData: { id: noticeId }, data: { ...values } }).then((data) => {
388
             request({ ...apis.openScreen.put, urlData: { id: noticeId }, data: { ...values } }).then((data) => {
387
                 message.info('提交成功!')
389
                 message.info('提交成功!')
390
                 message.error(err.msg || err.message)
392
                 message.error(err.msg || err.message)
391
             })
393
             })
392
         } else {
394
         } else {
395
+            
396
+            values.invalidTime === 'Invalid date'? null : moment(values.invalidTime).format('YYYY-MM-DD HH:mm:ss');
393
             request({ ...apis.openScreen.post, data: { ...values } }).then((data) => {
397
             request({ ...apis.openScreen.post, data: { ...values } }).then((data) => {
394
                 console.log('提交成功!')
398
                 console.log('提交成功!')
395
                 cancelPage();
399
                 cancelPage();

+ 1
- 0
src/pages/resource/openScreen/index.jsx View File

99
             dataIndex: 'targetType',
99
             dataIndex: 'targetType',
100
             key: 'targetType',
100
             key: 'targetType',
101
             align: 'center',
101
             align: 'center',
102
+            render: (x, row) => <><span>{row.targetType === 'H5' ? 'H5样例' :''}</span></>
102
         },
103
         },
103
         {
104
         {
104
             title: '关联业务',
105
             title: '关联业务',