|
@@ -20,6 +20,7 @@ const header = props => {
|
20
|
20
|
|
21
|
21
|
const [visible, setVisible] = useState()
|
22
|
22
|
const [formsdate, setFormsDate] = useState({})
|
|
23
|
+ const [time, setTime] = useState()
|
23
|
24
|
// const [page, changePage] = useState({})
|
24
|
25
|
useEffect(() => {
|
25
|
26
|
|
|
@@ -40,6 +41,7 @@ const header = props => {
|
40
|
41
|
}).then((data) => {
|
41
|
42
|
console.log(data, 'data')
|
42
|
43
|
setData(data)
|
|
44
|
+ setTime(data.invalidTime)
|
43
|
45
|
setsample({
|
44
|
46
|
sampleId: data.targetId,
|
45
|
47
|
sampleName: data.targetName
|
|
@@ -57,6 +59,8 @@ const header = props => {
|
57
|
59
|
|
58
|
60
|
const [h5data, setH5data] = useState({})
|
59
|
61
|
const [name, setName] = useState()
|
|
62
|
+
|
|
63
|
+
|
60
|
64
|
|
61
|
65
|
useEffect(() => {
|
62
|
66
|
|
|
@@ -75,6 +79,8 @@ const header = props => {
|
75
|
79
|
...apis.openScreen.getSample, params: { ...params }
|
76
|
80
|
}).then((data) => {
|
77
|
81
|
setH5data(data)
|
|
82
|
+
|
|
83
|
+
|
78
|
84
|
}).catch((err) => {
|
79
|
85
|
message.error(err.msg || err.message)
|
80
|
86
|
})
|
|
@@ -315,7 +321,9 @@ const header = props => {
|
315
|
321
|
name: "否",
|
316
|
322
|
value: "0"
|
317
|
323
|
},],
|
318
|
|
- value: data.status === undefined || data.status === null? null : data.status + "",
|
|
324
|
+
|
|
325
|
+ // row.status === 1 &&moment(row.invalidTime) > moment() ? '是' :'否'
|
|
326
|
+ value: data.status === undefined || data.status === null? null : data.status === 1 && moment(time) > moment() ? "1" : "0" ,
|
319
|
327
|
|
320
|
328
|
rules: [
|
321
|
329
|
{ required: true, message: '请选择有效发布状态' },
|