diff --git a/src/views/xgf/flow/components/list.vue b/src/views/xgf/flow/components/list.vue index 27767b3..a0eed0c 100644 --- a/src/views/xgf/flow/components/list.vue +++ b/src/views/xgf/flow/components/list.vue @@ -147,7 +147,8 @@ export default { { KEYWORDS: this.KEYWORDS, STATUS: '1', - EMPLOY_FLAG: '1' + EMPLOY_FLAG: '1', + CHECK_STATUS: '0' } ).then((data) => { this.listLoading = false diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue index 8ef6802..4e38b04 100644 --- a/src/views/xgf/flow/components/sendUtil.vue +++ b/src/views/xgf/flow/components/sendUtil.vue @@ -5,7 +5,7 @@ - + @@ -16,12 +16,12 @@ @@ -29,8 +29,8 @@ - - + + @@ -63,9 +63,14 @@ export default { visible: false, loading: false, form: { - value: null, - DEPARTMENT_ID: null, - USER_ID: null + STATUS: null, + APPOINT_DEPARTMENT_ID: null, + APPOINT_DEPARTMENT_NAME: '', + APPOINT_USER_ID: null, + APPOINT_USER_NAME: '', + user: '', + tm: new Date().getTime(), + list: [] }, heirloom: {}, @@ -86,29 +91,17 @@ export default { this.loading = true this.visible = true this.heirloom = JSON.stringify(e) + this.form.list = e await this.getDepartmentTree() this.loading = false }, - beforeClose() { - this.visible = false - }, - sendMessage(row) { - if (!this.value || this.value === '') { - this.$message.error('请选择是否通过') - return - } - requestFN( - '/xgf/user/approve', - { - list: this.heirloom, - STATUS: this.value, - tm: new Date().getTime() - } - ).then((data) => { - this.$message.success('推送成功') - this.visible = false - this.$emit('refresh', '') - }) + sendMessage() { + requestFN('/xgf/user/approve', this.form) + .then((data) => { + this.$message.success('推送成功') + this.visible = false + this.$emit('refresh', '') + }) }, getDepartmentTree() { return new Promise(resolve => { @@ -122,11 +115,12 @@ export default { }) }) }, - getPeopleList({ id: DEPARTMENT_ID }, index, type, list) { + getPeopleList(e) { + this.form.APPOINT_DEPARTMENT_NAME = e.name requestFN( '/user/listAll', { - DEPARTMENT_ID: DEPARTMENT_ID + DEPARTMENT_ID: e.id } ).then((data) => { this.peopleList = data.userList @@ -134,13 +128,37 @@ export default { console.log(e) }) }, + chooseUser(e) { + const entity = JSON.parse(e) + this.form.APPOINT_USER_ID = entity.USER_ID + this.form.APPOINT_USER_NAME = entity.NAME + }, + handleClose() { this.form = { - value: null, - DEPARTMENT_ID: null, - USER_ID: null + STATUS: '', + APPOINT_DEPARTMENT_ID: '', + APPOINT_DEPARTMENT_NAME: '', + APPOINT_USER_ID: '', + APPOINT_USER_NAME: '', + user: '', + list: [], + tm: new Date().getTime() } this.visible = false + }, + beforeClose() { + this.visible = false + this.form = { + STATUS: '', + APPOINT_DEPARTMENT_ID: '', + APPOINT_DEPARTMENT_NAME: '', + APPOINT_USER_ID: '', + APPOINT_USER_NAME: '', + user: '', + list: [], + tm: new Date().getTime() + } } } } diff --git a/src/views/xgf/flowAppoint/components/QRCode.vue b/src/views/xgf/flowAppoint/components/QRCode.vue new file mode 100644 index 0000000..297e138 --- /dev/null +++ b/src/views/xgf/flowAppoint/components/QRCode.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/xgf/flowAppoint/components/apply.vue b/src/views/xgf/flowAppoint/components/apply.vue new file mode 100644 index 0000000..199811d --- /dev/null +++ b/src/views/xgf/flowAppoint/components/apply.vue @@ -0,0 +1,320 @@ + + + diff --git a/src/views/xgf/flowAppoint/components/list.vue b/src/views/xgf/flowAppoint/components/list.vue new file mode 100644 index 0000000..d76d6df --- /dev/null +++ b/src/views/xgf/flowAppoint/components/list.vue @@ -0,0 +1,241 @@ + + + + diff --git a/src/views/xgf/flowAppoint/components/picture.vue b/src/views/xgf/flowAppoint/components/picture.vue new file mode 100644 index 0000000..57e7255 --- /dev/null +++ b/src/views/xgf/flowAppoint/components/picture.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/xgf/flowAppoint/components/record.vue b/src/views/xgf/flowAppoint/components/record.vue new file mode 100644 index 0000000..e82258d --- /dev/null +++ b/src/views/xgf/flowAppoint/components/record.vue @@ -0,0 +1,198 @@ + + + + diff --git a/src/views/xgf/flowAppoint/components/sendUtil.vue b/src/views/xgf/flowAppoint/components/sendUtil.vue new file mode 100644 index 0000000..4e38b04 --- /dev/null +++ b/src/views/xgf/flowAppoint/components/sendUtil.vue @@ -0,0 +1,168 @@ + + + + + diff --git a/src/views/xgf/flowAppoint/components/user.vue b/src/views/xgf/flowAppoint/components/user.vue new file mode 100644 index 0000000..889dc08 --- /dev/null +++ b/src/views/xgf/flowAppoint/components/user.vue @@ -0,0 +1,250 @@ + + + + + diff --git a/src/views/xgf/flowAppoint/components/users.vue b/src/views/xgf/flowAppoint/components/users.vue new file mode 100644 index 0000000..2d11653 --- /dev/null +++ b/src/views/xgf/flowAppoint/components/users.vue @@ -0,0 +1,513 @@ + + + diff --git a/src/views/xgf/flowAppoint/index.vue b/src/views/xgf/flowAppoint/index.vue new file mode 100644 index 0000000..70cda6e --- /dev/null +++ b/src/views/xgf/flowAppoint/index.vue @@ -0,0 +1,23 @@ + + + + +