diff --git a/src/views/security_commitment/promise_book/components/add.vue b/src/views/security_commitment/promise_book/components/add.vue index 0b94653..9249496 100644 --- a/src/views/security_commitment/promise_book/components/add.vue +++ b/src/views/security_commitment/promise_book/components/add.vue @@ -146,7 +146,7 @@ - + + + + + + @@ -297,6 +302,7 @@ export default { DEPARTMENT_ID: null, POST_ID: '', USER_ID: [], + NICKNAME: '', id: Math.random() } ], @@ -379,6 +385,7 @@ export default { DEPARTMENT_ID: data.coverpeople[i].DEPARTMENT_ID, POST_ID: data.coverpeople[i].POST_ID, USER_ID: [], + NICKNAME: data.coverpeople[i].NICKNAME, id: data.coverpeople[i].PROMISEPEOPLE_ID }) for (let j = 0; j < this.form.coverpeople.length; j++) { @@ -557,7 +564,7 @@ export default { { DEPARTMENT_ID: item.DEPARTMENT_ID, POST_ID: item.POST_ID, USER_ID: item.USER_ID } )) const coverpeople = this.form.coverpeople.map(item => ( - { DEPARTMENT_ID: item.DEPARTMENT_ID, POST_ID: item.POST_ID, USER_ID: item.USER_ID } + { DEPARTMENT_ID: item.DEPARTMENT_ID, POST_ID: item.POST_ID, USER_ID: item.USER_ID, NICKNAME: item.NICKNAME } )) let url if (this.$parent.PROMISE_ID) { diff --git a/src/views/security_commitment/promise_book/components/details.vue b/src/views/security_commitment/promise_book/components/details.vue index fd52cc9..423ef04 100644 --- a/src/views/security_commitment/promise_book/components/details.vue +++ b/src/views/security_commitment/promise_book/components/details.vue @@ -113,7 +113,7 @@ export default { ).then((data) => { const DETAIL = data.COLLATERAL.map(item => ({ value: item.COLLATERAL, id: item.PROMISEDETAIL_ID })) this.dialog.visible = true - this.dialog.data = { ...data.varList, DETAIL, FILEPATH: data.ISGN.FILEPATH, SIGNTIME: data.ISGN.SIGNTIME, COVERPEOPLE: data.COVERPEOPLE[0].USERNAME } + this.dialog.data = { ...data.varList, DETAIL, FILEPATH: data.ISGN.FILEPATH, SIGNTIME: data.ISGN.SIGNTIME, COVERPEOPLE: data.COVERPEOPLE[0].USERNAME, NICKNAME: data.COVERPEOPLE[0].NICKNAME } }).catch((e) => { }) }, diff --git a/src/views/security_commitment/promise_book/components/promise_book_dialog.vue b/src/views/security_commitment/promise_book/components/promise_book_dialog.vue index ca2cd81..dfc5954 100644 --- a/src/views/security_commitment/promise_book/components/promise_book_dialog.vue +++ b/src/views/security_commitment/promise_book/components/promise_book_dialog.vue @@ -9,7 +9,7 @@

{{ dialogData.TYPE === '0' ? '安全生产承诺书' : '安全生产责任状' }}

-
{{ dialogData.COVERPEOPLE }}:
+
{{ dialogData.COVERPEOPLE }}{{ dialogData.NICKNAME }}:
{{ dialogData.TEXT }}
diff --git a/src/views/security_commitment/promise_book/components/see.vue b/src/views/security_commitment/promise_book/components/see.vue index 86b9f4f..894fbe3 100644 --- a/src/views/security_commitment/promise_book/components/see.vue +++ b/src/views/security_commitment/promise_book/components/see.vue @@ -39,6 +39,8 @@ {{ item.POSTNAME }} {{ '人员' + (index + 1) }} {{ item.USERNAME && item.USERNAME.join('、') }} + {{ '岗位名称' + (index + 1) }} + {{ item.NICKNAME }} 承诺内容 @@ -119,6 +121,7 @@ export default { DEPTNAME: data.coverpeople[i].DEPTNAME, POST_ID: data.coverpeople[i].POST_ID, POSTNAME: data.coverpeople[i].POSTNAME, + NICKNAME: data.coverpeople[i].NICKNAME, USER_ID: [], USERNAME: [], id: data.coverpeople[i].PROMISEPEOPLE_ID @@ -135,7 +138,7 @@ export default { }, goView() { this.dialog.visible = true - this.dialog.data = { ...this.form, DETAIL: this.form.DETAIL, FILEPATH: '', SIGNTIME: '', COVERPEOPLE: this.form.coverpeople[0].USERNAME[0] } + this.dialog.data = { ...this.form, DETAIL: this.form.DETAIL, FILEPATH: '', SIGNTIME: '', COVERPEOPLE: this.form.coverpeople[0].USERNAME[0], NICKNAME: this.form.coverpeople[0].NICKNAME } }, goBack() { this.$parent.activeName = 'List'