|
@@ -127,8 +127,8 @@ const header = props => {
|
127
|
127
|
},
|
128
|
128
|
{
|
129
|
129
|
title: '新增人',
|
130
|
|
- dataIndex: 'pointPrice',
|
131
|
|
- key: 'pointPrice',
|
|
130
|
+ dataIndex: 'addUserName',
|
|
131
|
+ key: 'addUserName',
|
132
|
132
|
align: 'center',
|
133
|
133
|
},
|
134
|
134
|
{
|
|
@@ -136,19 +136,21 @@ const header = props => {
|
136
|
136
|
dataIndex: 'createDate',
|
137
|
137
|
key: 'createDate',
|
138
|
138
|
align: 'center',
|
|
139
|
+ render: (x, row) => <><span>{row.createDate?`${moment(row.createDate).format('YYYY-MM-DD')}`:''}</span></>,
|
139
|
140
|
},
|
140
|
141
|
{
|
141
|
142
|
title: '修改人',
|
142
|
|
- dataIndex: 'status',
|
143
|
|
- key: 'status',
|
|
143
|
+ dataIndex: 'updateUserName',
|
|
144
|
+ key: 'updateUserName',
|
144
|
145
|
align: 'center',
|
145
|
146
|
// render: (status) => <><span>{status == 1 ? '是' : '否'}</span></>
|
146
|
147
|
},
|
147
|
148
|
{
|
148
|
149
|
title: '修改时间',
|
149
|
|
- dataIndex: 'inventory',
|
150
|
|
- key: 'inventory',
|
|
150
|
+ dataIndex: 'updateDate',
|
|
151
|
+ key: 'updateDate',
|
151
|
152
|
align: 'center',
|
|
153
|
+ render: (x, row) => <><span>{row.updateDate?`${moment(row.updateDate).format('YYYY-MM-DD')}`:''}</span></>,
|
152
|
154
|
},
|
153
|
155
|
|
154
|
156
|
{
|
|
@@ -319,13 +321,14 @@ const header = props => {
|
319
|
321
|
if (noticeId) {
|
320
|
322
|
values.noticeId = noticeId
|
321
|
323
|
request({ ...apis.openScreen.put, urlData: { id: noticeId }, data: { ...values } }).then((data) => {
|
|
324
|
+ message.info('提交成功!')
|
322
|
325
|
cancelPage();
|
323
|
326
|
}).catch((err) => {
|
324
|
327
|
message.error(err.msg || err.message)
|
325
|
328
|
})
|
326
|
329
|
} else {
|
327
|
330
|
request({ ...apis.openScreen.post, data: { ...values } }).then((data) => {
|
328
|
|
- console.log('success')
|
|
331
|
+ console.log('提交成功!')
|
329
|
332
|
cancelPage();
|
330
|
333
|
}).catch((err) => {
|
331
|
334
|
message.error(err.msg || err.message)
|
|
@@ -362,7 +365,7 @@ const header = props => {
|
362
|
365
|
footer={null}
|
363
|
366
|
>
|
364
|
367
|
<ModalDatas></ModalDatas>
|
365
|
|
- {/* <Table rowSelection={rowSelection} rowKey="goodsList" dataSource={data} columns={columns} pagination={false} /> */}
|
|
368
|
+
|
366
|
369
|
</Modal>
|
367
|
370
|
</div>
|
368
|
371
|
</>
|