diff --git a/api/app/lib/models/patrol_record_issue_handle.js b/api/app/lib/models/patrol_record_issue_handle.js index af565e1..99bb99c 100644 --- a/api/app/lib/models/patrol_record_issue_handle.js +++ b/api/app/lib/models/patrol_record_issue_handle.js @@ -150,6 +150,23 @@ module.exports = dc => { primaryKey: false, field: "create_time", autoIncrement: false + }, checkOpinion: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "维修情况描述", + primaryKey: false, + field: "check_opinion", + autoIncrement: false + }, + checkImage: { + type: DataTypes.JSONB, + allowNull: true, + defaultValue: null, + comment: null, + primaryKey: false, + field: "check_image", + autoIncrement: false }, }, { tableName: "patrol_record_issue_handle", diff --git a/web/client/src/sections/issueHandle/components/isuue-handle-mdal.js b/web/client/src/sections/issueHandle/components/isuue-handle-mdal.js index 76bc71b..7659e60 100644 --- a/web/client/src/sections/issueHandle/components/isuue-handle-mdal.js +++ b/web/client/src/sections/issueHandle/components/isuue-handle-mdal.js @@ -14,6 +14,7 @@ const FormItem = Form.Item; //state: 1下发未上报 2已上报待审批 3整改完成 上报结果result: status 0 已上报未审批 1 审批通过 2 审批驳回 export default (props) => { const { title, triggerRender, editData = null, onFinish, readOnly, structsUsers, user } = props; + const users = structsUsers?.find(s => s.id == editData?.points?.project?.id)?.users?.map(v => { return { value: v.id, label: v.name } }) const formItemLayout = { labelCol: { span: 7 }, wrapperCol: { span: 16 } }; const formRef = useRef(); @@ -22,8 +23,8 @@ export default (props) => { ...editData?.patrolRecordIssueHandles[0], approvePerson: editData?.patrolRecordIssueHandles[0]?.approvePerson?.name || '', approveDate: editData?.patrolRecordIssueHandles[0]?.approveDate ? moment(editData?.patrolRecordIssueHandles[0]?.approveDate).format('YYYY-MM-DD HH:mm:ss') : "", - repairPerson: JSON.stringify(editData?.patrolRecordIssueHandles[0]?.repairPerson), - checkPerson: JSON.stringify(editData?.patrolRecordIssueHandles[0]?.checkPerson), + repairPerson: users?.find(s => s.value == editData?.patrolRecordIssueHandles[0]?.repairPerson?.id) ? editData?.patrolRecordIssueHandles[0]?.repairPerson?.id : null, + checkPerson: users?.find(s => s.value == editData?.patrolRecordIssueHandles[0]?.checkPerson?.id) ? editData?.patrolRecordIssueHandles[0]?.checkPerson?.id : null, } : {}; if (editData?.patrolRecordIssueHandles?.length > 0) { initialValues.dateRange = [editData?.patrolRecordIssueHandles[0]?.startTime, editData?.patrolRecordIssueHandles[0]?.endTime] @@ -126,7 +127,7 @@ export default (props) => { } - const users = structsUsers?.find(s => s.id == editData?.points?.project?.id)?.users?.map(v => { return { value: JSON.stringify(v), label: v.name } }) + return ( { bodyStyle: { height: 620, overflowY: 'auto' } }} onFinish={async (values) => { - if (editData?.patrolRecordIssueHandles[0]?.state === 2) { + if (editData?.patrolRecordIssueHandles[0]?.state === 2 && title == '审核') { approveHandle(values) return true; } else { values.startTime = values?.dateRange[0]; values.endTime = values?.dateRange[1]; - values.repairPerson = JSON.parse(values.repairPerson) - values.checkPerson = JSON.parse(values.checkPerson) + values.repairPerson = { id: users?.find(s => s.value == values.repairPerson)?.value, name: users?.find(s => s.id == values.value)?.label } + values.checkPerson = { id: users?.find(s => s.value == values.checkPerson)?.value, name: users?.find(s => s.id == values.value)?.label } onFinish && await onFinish(values, editData) //message.success('提交成功'); return true;