From 8c73a7f99090e1df8f4be04422667b7f854424d1 Mon Sep 17 00:00:00 2001 From: liujun Date: Sat, 27 Jan 2024 15:57:50 +0800 Subject: [PATCH 01/11] =?UTF-8?q?13862=20=E9=80=89=E6=8B=A9=E7=AC=AC?= =?UTF-8?q?=E4=BA=8C=E4=B8=AA=E5=AE=A1=E6=89=B9=20=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xgf/flow/components/sendUtil.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue index 8716bc4..8606eb2 100644 --- a/src/views/xgf/flow/components/sendUtil.vue +++ b/src/views/xgf/flow/components/sendUtil.vue @@ -129,10 +129,10 @@ export default { } } else { this.isShow = true - if (this.info.FLOWS_STEP === 0 || this.info.FLOWS_STEP === 3 || this.info.FLOWS_STEP === 4) { + if (this.info.FLOWS_STEP === 2 || this.info.FLOWS_STEP === 3) { await this.getDepartmentTree() this.corpFlag = false - if (this.info.FLOWS_STEP === 4) { + if (this.info.FLOWS_STEP === 3) { this.isShow = false } } else { From f2ec94182e57c1d100c7524dc561557b05dfd072 Mon Sep 17 00:00:00 2001 From: liujun Date: Sat, 27 Jan 2024 16:03:30 +0800 Subject: [PATCH 02/11] =?UTF-8?q?13856=20=E5=AE=A1=E6=A0=B8=E5=AE=8C?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E4=BA=BA=E4=B9=8B=E5=90=8E=EF=BC=8C=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E4=B8=8B=E4=B8=80=E4=B8=AA=E4=BA=BA=EF=BC=8C=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=A1=86=E5=86=85=E4=BF=A1=E6=81=AF=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xgf/flow/components/sendUtil.vue | 1 + src/views/xgf/flowList/components/sendUtil.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue index 8606eb2..84440ab 100644 --- a/src/views/xgf/flow/components/sendUtil.vue +++ b/src/views/xgf/flow/components/sendUtil.vue @@ -236,6 +236,7 @@ export default { APPOINT_DEPARTMENT_NAME: '', APPOINT_USER_ID: '', APPOINT_USER_NAME: '', + OPINION: '', user: '', list: [], tm: new Date().getTime() diff --git a/src/views/xgf/flowList/components/sendUtil.vue b/src/views/xgf/flowList/components/sendUtil.vue index a7fdb5b..6048cfe 100644 --- a/src/views/xgf/flowList/components/sendUtil.vue +++ b/src/views/xgf/flowList/components/sendUtil.vue @@ -1,4 +1,4 @@ - diff --git a/src/views/xgf/flow/components/flowStep.vue b/src/views/xgf/flow/components/flowStep.vue index 45004c3..a517ae3 100644 --- a/src/views/xgf/flow/components/flowStep.vue +++ b/src/views/xgf/flow/components/flowStep.vue @@ -2,9 +2,10 @@ @@ -16,15 +17,21 @@
- 审批人：{{ item.APPOINT_DEPARTMENT_NAME }} + 审批人：{{ item.APPOINT_USER_NAME }} + + + 审批人公司：{{ item.APPOINT_CORP_NAME }} + + + 审批人部门：{{ item.APPOINT_DEPARTMENT_NAME }} 审批状态：{{ item.APPOINT_STATUS === '1' ? '同意' : item.APPOINT_STATUS === '0' ? '不同意' : '' }} - 审批时间：{{ item.APPOINT_USER_NAME }} + 审批时间：{{ item.APPOINT_TIME }} - + 审批意见：{{ item.APPOINT_OPINION }} @@ -56,6 +63,7 @@ export default { visible: false, loading: false, list: [], + title: '审批流程', form: { XGF_USER_ID: '' }, @@ -64,8 +72,6 @@ export default { }, methods: { init(e) { - this.visible = true - this.loading = false this.form.XGF_USER_ID = e.XGF_USER_ID this.getInfo() }, @@ -75,6 +81,17 @@ export default { ).then((data) => { this.list = data.flow.info this.step = data.flow.STEP + if (data.flow.endFlag === '1') { + this.title = '审批中' + } + if (data.flow.endFlag === '2') { + this.title = '审批结束' + } + if (data.flow.endFlag === '-2') { + this.title = '审批驳回' + } + this.visible = true + this.loading = false }).catch((e) => { console.log(e) }) diff --git a/src/views/xgf/flowList/components/list.vue b/src/views/xgf/flowList/components/list.vue index 0b313c5..bbe419b 100644 --- a/src/views/xgf/flowList/components/list.vue +++ b/src/views/xgf/flowList/components/list.vue @@ -41,9 +41,11 @@ - + @@ -59,6 +61,8 @@ + +
@@ -71,9 +75,11 @@ import apply from './apply' import user from './user.vue' import SendUtil from './sendUtil.vue' import UserInfo from '../../flowApply/components/userInfo.vue' +import FlowStep from '../../flow/components/flowStep.vue' +import FlowInfoList from '../../flow/components/flowInfoList.vue' export default { - components: { UserInfo, SendUtil, Pagination, apply, vueQr, user }, + components: { FlowInfoList, FlowStep, UserInfo, SendUtil, Pagination, apply, vueQr, user }, directives: { waves }, data() { return { @@ -156,6 +162,12 @@ export default { handleShow(row) { this.$refs.userInfos.init(row) }, + handleShowStep(row) { + this.$refs.flowStep.init(row) + }, + handleShowFlow(row) { + this.$refs.flowInfo.init(row) + }, approve(row) { this.$refs.sendUtil.init(row) }, From 53f0fc4a3edbd52666d45bb63a9f9c31813f7dac Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 30 Jan 2024 13:49:13 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E3=80=81?= =?UTF-8?q?=E8=82=A1=E4=BB=BD=E7=AB=AF=EF=BC=8C=E7=9B=B8=E5=85=B3=E6=96=B9?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=AF=A6=E6=83=85=E4=BF=A1=E6=81=AF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xgf/flow/components/flowStep.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/xgf/flow/components/flowStep.vue b/src/views/xgf/flow/components/flowStep.vue index a517ae3..70f8404 100644 --- a/src/views/xgf/flow/components/flowStep.vue +++ b/src/views/xgf/flow/components/flowStep.vue @@ -25,10 +25,10 @@ 审批人部门：{{ item.APPOINT_DEPARTMENT_NAME }} - + 审批状态：{{ item.APPOINT_STATUS === '1' ? '同意' : item.APPOINT_STATUS === '0' ? '不同意' : '' }} - + 审批时间：{{ item.APPOINT_TIME }} From 4e58cf0745a66665aa8057afb0b333b1f818e149 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 30 Jan 2024 14:14:55 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E9=94=99=E5=88=AB=E5=AD=97=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xgf/flow/components/flowInfoList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/xgf/flow/components/flowInfoList.vue b/src/views/xgf/flow/components/flowInfoList.vue index 981ccf5..3b55422 100644 --- a/src/views/xgf/flow/components/flowInfoList.vue +++ b/src/views/xgf/flow/components/flowInfoList.vue @@ -15,7 +15,7 @@ fit highlight-current-row> - +