diff --git a/src/api/demo/index.js b/src/api/demo/index.js index 79646c9..68cfee7 100644 --- a/src/api/demo/index.js +++ b/src/api/demo/index.js @@ -309,6 +309,11 @@ export default { url: '/custom/engineParamDetailPojo/selectParamListAndModel', method: 'get' }, + //填写人退回 + HANDLE_FILLER_BACK: { + url: '/custom/todoTaskPojo/todoReturn', + method: 'post' + }, GET_ENGINE_DETAIL_QUERY: { url: '/custom/engineParamDetailPojo/selectParamList', method: 'get' diff --git a/src/custom/apaas-custom-mydemo/custom-page/model-query.vue b/src/custom/apaas-custom-mydemo/custom-page/model-query.vue index 293e1fd..8bc8cce 100644 --- a/src/custom/apaas-custom-mydemo/custom-page/model-query.vue +++ b/src/custom/apaas-custom-mydemo/custom-page/model-query.vue @@ -1775,6 +1775,9 @@ export default { loadTreeData() { const request = { ...api.GET_ENGINE_DETAIL_QUERY, + params: { + tcData: 'tc' + }, disableSuccessMsg: true } this.$request(request) diff --git a/src/custom/apaas-custom-mydemo/custom-page/modelDetail.vue b/src/custom/apaas-custom-mydemo/custom-page/modelDetail.vue index 466ca28..816a82e 100644 --- a/src/custom/apaas-custom-mydemo/custom-page/modelDetail.vue +++ b/src/custom/apaas-custom-mydemo/custom-page/modelDetail.vue @@ -764,7 +764,10 @@ export default { label: '填写部门', showOverflowTooltip: true, minWidth: '120', - align: 'center' + align: 'center', + formatter: ({ cellValue }) => { + return this.formatDepartmentDisplay(cellValue) + } }, { prop: 'remarks', @@ -868,7 +871,10 @@ export default { label: '填写部门', showOverflowTooltip: true, minWidth: '120', - align: 'center' + align: 'center', + formatter: ({ cellValue }) => { + return this.formatDepartmentDisplay(cellValue) + } }, { prop: 'remarks', @@ -1761,10 +1767,7 @@ export default { item.number || (this.pagination.currentPage - 1) * this.pagination.pageSize + index + 1 } - // 如果接口返回的 department 字段存在,格式化显示(只显示最后一节) - if (item.department) { - processedItem.department = this.formatDepartmentDisplay(item.department) - } + // department 保持原值,不进行格式化 return processedItem }) @@ -2515,8 +2518,8 @@ export default { return { ...item, parameterType: item.parameterType || item.type || '', - number: item.number || index + 1, - department: item.department ? this.formatDepartmentDisplay(item.department) : (item.department || '') + number: item.number || index + 1 + // department 保持原值,不进行格式化 } }) // 从接口返回的数据中获取状态(优先从 resp.data 中获取,其次从 result 中获取) @@ -2734,8 +2737,8 @@ export default { return { ...item, parameterType: item.parameterType || item.type || '', - number: item.number || startIndex + index + 1, - department: item.department ? this.formatDepartmentDisplay(item.department) : (item.department || '') + number: item.number || startIndex + index + 1 + // department 保持原值,不进行格式化 } }) // 从 GET_MODEL_DETAIL 接口返回的数据中获取状态(优先从 resp.data 中获取,其次从 result 中获取) diff --git a/src/custom/apaas-custom-mydemo/custom-page/todo.vue b/src/custom/apaas-custom-mydemo/custom-page/todo.vue index a315b2c..5c85465 100644 --- a/src/custom/apaas-custom-mydemo/custom-page/todo.vue +++ b/src/custom/apaas-custom-mydemo/custom-page/todo.vue @@ -39,6 +39,10 @@
查看
+ +
+ 退回 +