seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

modify the tickect list api and page

pull/141/MERGE^2
hyh123a 2022-04-17 14:53:45 +08:00
parent ac26381747
commit d2c59271a7
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
myems-api/reports/ticket.py
View File

@ -41,6 +41,7 @@ class TicketTypeCollection:
resp.text = json.dumps(result) resp.text = json.dumps(result)
class TicketListCollection: class TicketListCollection:
@staticmethod @staticmethod
def __init__(): def __init__():
@ -67,8 +68,19 @@ class TicketListCollection:
for row in workflow_rows: for row in workflow_rows:
workflow_result[row[0]] = row[1] workflow_result[row[0]] = row[1]
query = (" SELECT id, name "
" FROM workflow_state "
" ORDER BY id ")
cursor.execute(query)
workflow_state_rows = cursor.fetchall()
workflow_state_result = {}
if workflow_state_rows is not None and len(workflow_state_rows) > 0:
for row in workflow_state_rows:
workflow_state_result[row[0]] = row[1]
query = (" SELECT id, title, workflow_id, sn, state_id, creator, gmt_created, gmt_modified " query = (" SELECT id, title, workflow_id, sn, state_id, creator, gmt_created, gmt_modified "
" FROM ticketed_ticketrecord " " FROM ticket_ticketrecord "
" ORDER BY id ") " ORDER BY id ")
cursor.execute(query) cursor.execute(query)
rows = cursor.fetchall() rows = cursor.fetchall()
@ -80,12 +92,12 @@ class TicketListCollection:
for row in rows: for row in rows:
meta_result = {"id": row[0], meta_result = {"id": row[0],
"title": row[1], "title": row[1],
"workflow_name": workflow_result.get(row[2]), "ticket_type": workflow_result.get(row[2]),
"sn": row[3], "sn": row[3],
"state_id": row[4], "state": workflow_state_result.get(row[4]),
"creator": row[5], "creator": row[5],
"gmt_created": row[6], "gmt_created": str(row[6]),
"gmt_modified": row[7] "gmt_modified": str(row[7])
} }
result.append(meta_result) result.append(meta_result)

18
myems-web/src/components/MyEMS/Ticket/TicketApplication.js
View File

@ -117,8 +117,7 @@ const TicketApplication = ({ setRedirect, setRedirectUrl, t }) => {
}) })
.then(json => { .then(json => {
if (isResponseOK) { if (isResponseOK) {
console.log('000', json); console.log('/ticket/list', json);
// console.log('111', typeof(json),json);
setTicketList(json); setTicketList(json);
} else { } else {
toast.error(json.description); toast.error(json.description);
@ -154,18 +153,25 @@ const TicketApplication = ({ setRedirect, setRedirectUrl, t }) => {
); );
const columns = [ const columns = [
{
key: 'a00',
dataField: 'id',
headerClasses: 'border-0',
text: t('ID'),
classes: 'border-0 py-2 align-middle',
sort: true
},
{ {
key: 'a0', key: 'a0',
dataField: 'title', dataField: 'title',
headerClasses: 'border-0', headerClasses: 'border-0',
text: t('Title'), text: t('Title'),
classes: 'border-0 py-2 align-middle', classes: 'border-0 py-2 align-middle',
formatter: nameFormatter,
sort: true sort: true
}, },
{ {
key: 'a1', key: 'a1',
dataField: 'workflow_id', dataField: 'ticket_type',
headerClasses: 'border-0', headerClasses: 'border-0',
text: t('Ticket Type'), text: t('Ticket Type'),
classes: 'border-0 py-2 align-middle', classes: 'border-0 py-2 align-middle',
@ -213,7 +219,7 @@ const TicketApplication = ({ setRedirect, setRedirectUrl, t }) => {
}, },
{ {
key: 'a00', key: 'a000',
dataField: '', dataField: '',
headerClasses: 'border-0', headerClasses: 'border-0',
text: '', text: '',
@ -273,7 +279,7 @@ const TicketApplication = ({ setRedirect, setRedirectUrl, t }) => {
</Form> </Form>
</CardBody> </CardBody>
</Card> </Card>
<DetailedDataTable data={equipmentList} title={t('Ticket List')} columns={columns} pagesize={10} /> <DetailedDataTable data={ticketList} title={t('Ticket List')} columns={columns} pagesize={10} />
</Fragment> </Fragment>
); );
}; };