diff --git a/src/api/exemption/exemption.js b/src/api/exemption/exemption.js index 60ae69e..de6a831 100644 --- a/src/api/exemption/exemption.js +++ b/src/api/exemption/exemption.js @@ -22,11 +22,19 @@ export const saveItem = params => { }; export const updateItem = params => { return request({ - url: '/blade-desk/QA/RaiseHand/update', + url: '/blade-desk/QA/RaiseHand/updateSubmit', method: 'post', data: params, }); }; +//修改接口 +// export const updateItem = params => { +// return request({ +// url: '/blade-desk/QA/RaiseHand/update', +// method: 'post', +// data: params, +// }); +// }; export const detailItem = id => { return request({ url: '/blade-desk/QA/RaiseHand/detail', diff --git a/src/views/exemption/components/addDialog.vue b/src/views/exemption/components/addDialog.vue index 9485746..899ef9e 100644 --- a/src/views/exemption/components/addDialog.vue +++ b/src/views/exemption/components/addDialog.vue @@ -117,7 +117,7 @@ export default { prop: 'postName', span: 24, disabled: true, - rules: [{ required: true, message: '请输入岗位', trigger: 'blur' }], + rules: [{ required: false, message: '请输入岗位', trigger: 'blur' }], }, { label: '发生时间', @@ -311,7 +311,7 @@ export default { try { let res; - if (this.infoTitle === '修改') { + if (this.infoTitle === '重新提交') { console.log('修改模式,需要调用修改接口'); // 调用修改接口 res = await updateItem(params); diff --git a/src/views/exemption/components/detailsDialog.vue b/src/views/exemption/components/detailsDialog.vue index d72e668..4cbecd8 100644 --- a/src/views/exemption/components/detailsDialog.vue +++ b/src/views/exemption/components/detailsDialog.vue @@ -12,14 +12,14 @@ > {{ reportUserName }} - {{ detailData.reportUserId || '-' }} + {{ detailData.reportUserId || ' ' }} - {{ detailData.postName || '-' }} - {{ detailData.notes || '-' }} - {{ detailData.reason || '-' }} - {{ detailData.measure || '-' }} - {{ detailData.raiseHandReason || '-' }} - {{ detailData.amount || '-' }} + {{ detailData.postName || ' ' }} + {{ detailData.notes || ' ' }} + {{ detailData.reason || ' ' }} + {{ detailData.measure || ' ' }} + {{ detailData.raiseHandReason || ' ' }} + {{ detailData.amount || ' ' }} @@ -105,7 +105,7 @@ export default { reportUserName() { const userId = this.detailData.reportUserId; if (!userId || Object.keys(this.userMapObj).length === 0) { - return userId || '-'; + return userId || ' '; } return this.userMapObj[userId] || userId; }, @@ -131,7 +131,7 @@ export default { getApprovalData(index, field) { const all = this.detailData.all || []; const item = all[index]; - return item ? (item[field] || '-') : '-'; + return item ? (item[field] || ' ') : ' '; }, closeDialog() { this.openShow = false; @@ -170,12 +170,12 @@ export default { this.active = 3; // 待业务主管审批 - 第3步激活 break; case 3: - case 4: - this.active = 3; // 驳回/退回 - 显示到当前步骤 + this.active = 4; // 驳回/退回 - 显示到当前步骤 break; - case 5: - this.active = 3; // 业务主管审批通过 - 第3步完成 + case 4: + this.active = 5; // 业务主管审批通过 - 第3步完成 break; + default: this.active = 0; // 初始状态 - 第0步 } diff --git a/src/views/exemption/index.vue b/src/views/exemption/index.vue index e9e8925..cc60837 100644 --- a/src/views/exemption/index.vue +++ b/src/views/exemption/index.vue @@ -37,13 +37,14 @@ 修改重新提交 + 审核 删除 @@ -297,7 +298,7 @@ export default { // 修改 updateDialog(row) { this.infoShow = true; - this.infoTitle = '修改'; + this.infoTitle = '重新提交'; this.rowItem = row; }, // 关闭