From 92161782212815c4d0687cb95ef9a8736f3f10a2 Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 20 Dec 2023 15:57:28 +0800 Subject: [PATCH 1/9] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xgf/flow_audit/index.vue | 80 +++---- src/views/xgf/flow_audit/users.vue | 345 ++++++----------------------- 2 files changed, 103 insertions(+), 322 deletions(-) diff --git a/src/views/xgf/flow_audit/index.vue b/src/views/xgf/flow_audit/index.vue index 9c867e7..6151923 100644 --- a/src/views/xgf/flow_audit/index.vue +++ b/src/views/xgf/flow_audit/index.vue @@ -1,14 +1,14 @@ - - - From 94c60d1f6b3c15192ca0375b2f2afa1cb0f74c24 Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 20 Dec 2023 19:51:13 +0800 Subject: [PATCH 2/9] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/classMessage/classMessage/components/edit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/classMessage/classMessage/components/edit.vue b/src/views/classMessage/classMessage/components/edit.vue index 5608382..1a021bb 100644 --- a/src/views/classMessage/classMessage/components/edit.vue +++ b/src/views/classMessage/classMessage/components/edit.vue @@ -96,7 +96,7 @@ - + @@ -115,9 +116,11 @@ import Pagination from '@/components/Pagination' // 通过 el-pagination二次 import { requestFN } from '@/utils/request' import '@riophae/vue-treeselect/dist/vue-treeselect.css' import user from './user.vue' +import UserInfo from './userInfo.vue' export default { components: { + UserInfo, Pagination, user }, data() { @@ -191,28 +194,8 @@ export default { this.$refs.userInfo.init(row) }, // 查看 - async handleShow(row) { - await this.getUserInfoById(row.USER_ID) - this.userInfoDialog = true - this.heirloom = row - console.log(row.SUPERVISION_STATE, row.MANAGER_STATE, row.TERRITORIALITY_STATE) - if (row.SUPERVISION_STATE === 0 || row.MANAGER_STATE === 0 || row.TERRITORIALITY_STATE === 0) { - if (row.SUPERVISION_STATE === 0) { - this.message = row.SUPERVISION_OPINION - this.operator = row.SUPERVISION_USER_NAME - } - if (row.MANAGER_STATE === 0) { - this.message = row.MANAGER_OPINION - this.operator = row.MANAGER_USER_NAME - } - if (row.TERRITORIALITY_STATE === 0) { - this.message = row.TERRITORIALITY_OPINION - this.operator = row.TERRITORIALITY_USER_NAME - } - } else { - this.message = '' - this.operator = '' - } + handleShow(row) { + this.$refs.userInfos.init(row) }, examineShow(row) { this.form.TRAIN_USERS_ID = row.TRAIN_USERS_ID From 69701c7e784a818e268a64f55a43f7169597caf9 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 21 Dec 2023 14:31:20 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=9F=A5=E7=9C=8Bbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/train/training_record/index.vue | 8 +- src/views/train/training_record/users.vue | 199 +++------------------- 2 files changed, 25 insertions(+), 182 deletions(-) diff --git a/src/views/train/training_record/index.vue b/src/views/train/training_record/index.vue index 3ba567b..029f402 100644 --- a/src/views/train/training_record/index.vue +++ b/src/views/train/training_record/index.vue @@ -21,11 +21,11 @@ - + - + @@ -34,7 +34,7 @@ {{ new Date(row.CREATTIME).getFullYear() }} - + @@ -265,8 +95,10 @@ import { requestFN } from '@/utils/request' import '@riophae/vue-treeselect/dist/vue-treeselect.css' import card from './card' import User from './user' +import UserInfo from '../../xgf/flow_audit/userInfo.vue' export default { components: { + UserInfo, User, Pagination, card @@ -317,9 +149,8 @@ export default { }) }, // 查看 - async handleShow(USER_ID) { - await this.getUserInfoById(USER_ID) - this.userInfoDialog = true + handleShow(USER_ID) { + this.$refs.userInfos.init({ XGF_USER_ID: USER_ID }) }, getUserInfoById(id) { return new Promise((resolve, reject) => { @@ -376,6 +207,18 @@ export default { handleCardShow(TRAINUSERS_ID) { // this.$refs.card.init(USER_ID, this.pd.TRAIN_AREA_NAME) this.$refs.user.init({ TRAINUSERS_ID: TRAINUSERS_ID }) + }, + getType(row) { + console.log(row) + if (row.RESULT_STATUS === '1') { + return '审批中' + } + if (row.RESULT_STATUS === '2') { + return '审批通过' + } + if (row.RESULT_STATUS === '3') { + return '审批不通过' + } } } } From ca30fd1136d0979cf71d40b226dc35adb874e052 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 21 Dec 2023 15:15:44 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=9F=A5=E7=9C=8Bbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/train/training_record/users.vue | 3 +-- src/views/xgf/flow_audit/index.vue | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/train/training_record/users.vue b/src/views/train/training_record/users.vue index b272481..05b7294 100644 --- a/src/views/train/training_record/users.vue +++ b/src/views/train/training_record/users.vue @@ -140,7 +140,7 @@ export default { requestFN( '/flowTrain/batchUserList?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, { - TRAININGBATCH_ID: this.pd.TRAININGBATCH_ID + TRAINING_BATCH_ID: this.pd.TRAINING_BATCH_ID } ).then((data) => { this.userList = data.varList @@ -158,7 +158,6 @@ export default { '/flowTrain/getUserDetailById', { USER_ID: id, - // CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID, CER_TYPE: '7498057c4c1f4a11b9a960e66ea04a7a' } ).then((data) => { diff --git a/src/views/xgf/flow_audit/index.vue b/src/views/xgf/flow_audit/index.vue index 6151923..6be2821 100644 --- a/src/views/xgf/flow_audit/index.vue +++ b/src/views/xgf/flow_audit/index.vue @@ -127,7 +127,8 @@ export default { ENTRUST_ENDTIME: this.dates[1], AUDIT_STATUS: this.AUDIT_STATUS, TYPE: 2, - USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID + USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID, + notStepStuatus: '3' } ).then((data) => { this.listLoading = false From d50e99452642146b1e9d676356ac29b87368e063 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 21 Dec 2023 19:55:08 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=9F=A5=E7=9C=8Bbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/train/training_record/index.vue | 3 ++- src/views/xgf/flow_audit/index.vue | 6 +++--- src/views/xgf/flow_audit/users.vue | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/views/train/training_record/index.vue b/src/views/train/training_record/index.vue index 029f402..60e981c 100644 --- a/src/views/train/training_record/index.vue +++ b/src/views/train/training_record/index.vue @@ -114,7 +114,8 @@ export default { VERIFY_START_TIME: this.dates[0], VERIFY_END_TIME: this.dates[1], XGF_NAME: this.XGF_NAME, - USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID + USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID, + STEP_STATUS: '3' } ).then((data) => { this.listLoading = false diff --git a/src/views/xgf/flow_audit/index.vue b/src/views/xgf/flow_audit/index.vue index 6be2821..e730ca8 100644 --- a/src/views/xgf/flow_audit/index.vue +++ b/src/views/xgf/flow_audit/index.vue @@ -41,8 +41,8 @@ flowTrain/batchList