合并

src/pages/activity/drainage/Detail.jsx

@@ -36,13 +36,11 @@ const header = (props) => {
       console.log(data, '3333333333333')
       if (data.total != 0) {
         setTotal(data)
-        // console.log(data.total, '3333333333333')
-
         setDatas(tableData(data.records))
         // content = data.records[0]
         console.log('json: ', eval('(' + data.records[0].content + ')'))
         setContent(eval('(' + data.records[0].content + ')'))
-        setColumns(tableTitle(eval('(' + data.records[0].content + ')')))
+        setColumns(tableTitle(data.records))
       }
       else {
         setDatas([])
@@ -57,11 +55,13 @@ const header = (props) => {
     })
   }
   function tableData (data) {
-    console.log('data', data)
+    console.log('tabledata', data)
     return data.map((row, inx) => {
       return eval('(' + row.content + ')').reduce((acc, col) => {
         const r = {
+
           key: inx + 1,
+          createDate:row.createDate,
           [`${col.key}`]: col.value,
           ...acc,
         }
@@ -72,14 +72,21 @@ const header = (props) => {
   }
 
   function tableTitle (data) {
-    return data.map((item) => {
+   tableTitle = eval('(' + data[0].content + ')')
+    const cols = [{
+      title: "提交时间",
+      dataIndex: "createDate",
+      key: "createDate",
+      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+    }]
+    return cols.concat( tableTitle.map((item) => {
       const col = {
         title: item.label,
         dataIndex: item.key,
         key: item.key
       }
       return col
-    })
+    }))
   }
 
 
@@ -106,7 +113,7 @@ const header = (props) => {
 
   function excelPort () {
     // const fieldsValue = getFieldsValue()
-    console.log("111111")
+  
     request({ ...apis.activity.exporttaDrainageRecord, params: { drainageId: drainageId, startTime: fromTime(startDate), endTime: fromTime(endDate) } })
       .then(response => {
         download(response)