diff --git a/src/api/workbench.js b/src/api/workbench.js index ba85510..f45320e 100644 --- a/src/api/workbench.js +++ b/src/api/workbench.js @@ -66,8 +66,8 @@ export function getByFlowManagerId (query) { export function saveDetailProcs (query) { return request({ url: '/lz_management/flowChart/saveDetailProcs', - method: 'get', - params: query + method: 'post', + data: query }) } diff --git a/src/components/getPersonnel/index.vue b/src/components/getPersonnel/index.vue index e963503..dc7fa3e 100644 --- a/src/components/getPersonnel/index.vue +++ b/src/components/getPersonnel/index.vue @@ -209,8 +209,8 @@ export default { // 关闭弹窗 close () { // console.log('isShow: ', this.isShow) - // this.show = true - // this.$emit('update:isShow', false) + this.show = true + this.$emit('update:isShow', false) // this.$forceUpdate() }, // 关闭弹窗 diff --git a/src/router/kpi_route.js b/src/router/kpi_route.js index 42b4b2f..79ba48b 100644 --- a/src/router/kpi_route.js +++ b/src/router/kpi_route.js @@ -48,6 +48,7 @@ export default [ component: (resolve) => require(['@/views/kpi/workbench/assessmentGroup/edit'], resolve), meta: { title: '编辑考评组', + pop: true, isNav: false, hidden: true } diff --git a/src/utils/common.js b/src/utils/common.js index 7b13b67..08336af 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -40,6 +40,7 @@ export function personlGetForm (arr = []) { }) } const key = 'staffId' + arr = arr.sort((a, b) => a[key] - b[key]) params.list = arr for (let i in arr) { if (i < 1) { params.title = params.title + (i === '0' ? '' : ',') + arr[i].name } @@ -64,6 +65,8 @@ export function departGetForm (arr = []) { } const key = 'departmentId' const key1 = 'departmentName' + arr = arr.sort((a, b) => a[key] - b[key]) + console.log('arr: ', arr) params.list = arr for (let i in arr) { if (i < 1) { diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/Approval.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/Approval.vue index 9d34452..ac4dc45 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/components/Approval.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/Approval.vue @@ -12,7 +12,7 @@