diff --git a/api/app/lib/controllers/data/appointed.js b/api/app/lib/controllers/data/appointed.js index 937e8154..91159b43 100644 --- a/api/app/lib/controllers/data/appointed.js +++ b/api/app/lib/controllers/data/appointed.js @@ -4,9 +4,9 @@ const moment = require('moment') async function appoint(ctx) { try { const models = ctx.fs.dc.models - const { recordId, performerId, handleOpinions } = ctx.request.body + const { recordId, performerId, handleAdvice, handleState } = ctx.request.body await models.Report.update({ - performerId, handleOpinions + performerId, handleAdvice, handleState }, { where: { id: recordId } }) ctx.status = 204; } catch (error) { diff --git a/api/app/lib/controllers/data/vehicle.js b/api/app/lib/controllers/data/vehicle.js index e27834f7..59aa5408 100644 --- a/api/app/lib/controllers/data/vehicle.js +++ b/api/app/lib/controllers/data/vehicle.js @@ -29,7 +29,7 @@ async function get(ctx) { ctx.status = 200; ctx.body = { vehicleRes: vehicleRes.filter(item => item.dataValues.name === '标志牌' || item.dataValues.name === '养护责任牌') - , conserveData + , conserveData, vehicleR: vehicleRes } } catch (error) { ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`); diff --git a/api/app/lib/models/report.js b/api/app/lib/models/report.js index 00a2c074..0e1293c7 100644 --- a/api/app/lib/models/report.js +++ b/api/app/lib/models/report.js @@ -1,5 +1,3 @@ -/* eslint-disable*/ - 'use strict'; module.exports = dc => { diff --git a/web/client/src/sections/fillion/components/feedback/nominateModalcopy.js b/web/client/src/sections/fillion/components/feedback/nominateModalcopy.js index f20adfe6..bd563d2b 100644 --- a/web/client/src/sections/fillion/components/feedback/nominateModalcopy.js +++ b/web/client/src/sections/fillion/components/feedback/nominateModalcopy.js @@ -36,10 +36,12 @@ const NominateModal = (props) => { } }) setDepUsers(processedUsers) + form.resetFields(['nameId']) + } const handleFinish = () => { form.validateFields().then(values => { - dispatch(appointTask({ recordId: recordId, performerId: values.nameId, handleOpinions: values.handleOpinions })).then((res) => { + dispatch(appointTask({ recordId: recordId, performerId: values.nameId, handleAdvice: values.handleOpinions, handleState: '已指派' })).then((res) => { if (res.success) { setSelectedUserId(null) queryData() diff --git a/web/client/src/sections/fillion/components/operationalTable.js b/web/client/src/sections/fillion/components/operationalTable.js index 86ac33f3..12083ad2 100644 --- a/web/client/src/sections/fillion/components/operationalTable.js +++ b/web/client/src/sections/fillion/components/operationalTable.js @@ -1988,19 +1988,19 @@ const OperaTionalTable = (props) => { const query = {} setRowSelected([]); const res = await dispatch(getOperaTional(query)); - setCounts(res.payload.data) + setCounts(res.payload.data?.vehicleR) return { ...res, - total: res.payload.data ? res.payload.data.count : 0 + total: res.payload.data ? res.payload.data?.vehicleR.count : 0 } } if (rewkeys == 'huoyun') { const query = {} setRowSelected([]); const res = await dispatch(getShippingList(query)); - setCounts(res.payload.data) + setCounts(res.payload.data?.vehicleR) return { ...res, - total: res.payload.data ? res.payload.data.count : 0 + total: res.payload.data ? res.payload.data?.vehicleR.count : 0 } } if (rewkeys == 'chuzu') { @@ -2038,7 +2038,7 @@ const OperaTionalTable = (props) => { setCounts(res.payload.data) return { ...res, - total: res.payload.data ? res.payload.data.count : 0 + total: res.payload.data ? res.payload.data : 0 } } }} diff --git a/web/client/src/sections/quanju/containers/footer/guanli/index.js b/web/client/src/sections/quanju/containers/footer/guanli/index.js index 9265d77c..86ef4f34 100644 --- a/web/client/src/sections/quanju/containers/footer/guanli/index.js +++ b/web/client/src/sections/quanju/containers/footer/guanli/index.js @@ -88,8 +88,8 @@ const Guanli = (props) => { width={`200px`} />)} - : } diff --git a/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js b/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js index b0aba75d..a63be065 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js @@ -74,8 +74,8 @@ const Rightbottom = (props) => { width={`200px`} />)} - : }