From 0dac7ba33f77342d2a9a1392c820d10d3b72d76c Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 28 九月 2022 16:02:47 +0800
Subject: [PATCH] '修改'
---
.env.development | 4 ++--
src/views/specialWorkSystem/workTicket/myJobApply/index.vue | 3 +++
src/utils/request.ts | 12 ++++++------
src/views/specialWorkSystem/workTicket/myApproval/index.vue | 5 ++++-
src/views/specialWorkSystem/workTicket/allApplys/index.vue | 5 ++++-
src/views/specialWorkSystem/workFlow/approveRule/components/approveLevelDialog.vue | 16 ++++++++++++++++
6 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/.env.development b/.env.development
index fc8df0c..d739dab 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,10 @@
# 本地环境
ENV = 'development'
-#VITE_API_URL = 'http://192.168.0.35:8008'
+VITE_API_URL = 'http://192.168.0.35:8008'
#李宇飞接口地址
-VITE_API_URL = 'http://192.168.0.50:8008'
+#VITE_API_URL = 'http://192.168.0.50:8008'
#张凤接口地址
#VITE_API_URL = 'http://192.168.0.29:8008'
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 764d2a8..05e9b36 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -66,12 +66,12 @@
} else if (response.data.code && response.data.code === 'A0215') {
ElMessage.error('token失效');
// logOut;
- // useLoginApi()
- // .signOut()
- // .then(() => {
- // Session.clear();
- // window.location.href = '/';
- // });
+ useLoginApi()
+ .signOut()
+ .then(() => {
+ Session.clear();
+ window.location.href = '/';
+ });
}
// if(response.data.code && response.data.code !== '200'){
return Promise.resolve(response);
diff --git a/src/views/specialWorkSystem/workFlow/approveRule/components/approveLevelDialog.vue b/src/views/specialWorkSystem/workFlow/approveRule/components/approveLevelDialog.vue
index 24d4154..8d9185e 100644
--- a/src/views/specialWorkSystem/workFlow/approveRule/components/approveLevelDialog.vue
+++ b/src/views/specialWorkSystem/workFlow/approveRule/components/approveLevelDialog.vue
@@ -14,6 +14,13 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="24" style="margin-bottom: 24px" v-if="approveLevelForm.type === 2">
+ <el-form-item label="审批类型" prop="auditType">
+ <el-select v-model="approveLevelForm.auditType" placeholder="请选择审批类型" class="input-add">
+ <el-option v-for="item in auditTypeList" :key="item.id" :value="item.id" :label="item.name"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
<el-col :span="24" style="margin-bottom: 24px">
<el-form-item label="审批人" prop="unitList">
<el-select v-model="approveLevelForm.unitList" multiple placeholder="请选择审批人" class="input-add">
@@ -104,6 +111,7 @@
userList: [];
timeList: Array<type>;
typeList: Array<type>;
+ auditTypeList: Array<type>;
approveTypeList: Array<type>;
workLevelList: [];
standardList: Array<stand>;
@@ -122,6 +130,7 @@
stepName: null;
stepSerial: number | null;
type: number | null;
+ auditType: number | null;
continueTime: number | null;
continueTimeUnit: number | null;
unitList: Array<personType>;
@@ -150,6 +159,7 @@
stepName: null,
stepSerial: null,
type: null,
+ auditType: null,
continueTime: null,
continueTimeUnit: null,
unitList: [],
@@ -158,6 +168,7 @@
approveLevelFormRule: {
stepName: [{ required: true, message: '请填写层次名称', trigger: 'blur' }],
type: [{ required: true, message: '请选择审批层级', trigger: 'change' }],
+ auditType: [{ required: true, message: '请选择审批类型', trigger: 'change' }],
unitList: [{ required: true, message: '请选择审批人', trigger: 'change' }],
continueTime: [{ required: true, message: '请填写有效时间', trigger: 'blur' }]
},
@@ -172,6 +183,10 @@
{ id: 1, name: '单人' },
{ id: 2, name: '多人' },
{ id: 3, name: '分析人' }
+ ],
+ auditTypeList: [
+ { id: 0, name: '单审' },
+ { id: 1, name: '会审' },
],
approveTypeList: [
{ id: 1, name: '数值' },
@@ -196,6 +211,7 @@
stepName: null,
stepSerial: null,
type: null,
+ auditType: null,
continueTime: null,
continueTimeUnit: null,
unitList: [],
diff --git a/src/views/specialWorkSystem/workTicket/allApplys/index.vue b/src/views/specialWorkSystem/workTicket/allApplys/index.vue
index 8da1a5c..3923822 100644
--- a/src/views/specialWorkSystem/workTicket/allApplys/index.vue
+++ b/src/views/specialWorkSystem/workTicket/allApplys/index.vue
@@ -109,7 +109,10 @@
审批结果：<span>{{ item.approvalResultDesc }}</span>
</div>
<div class="text">
- 审批类型：<span>{{ item.typeDesc }}</span>
+ 审批层级：<span>{{ item.typeDesc }}</span>
+ </div>
+ <div class="text" v-if="item.auditTypeDesc">
+ 审批类型：<span>{{ item.auditTypeDesc }}</span>
</div>
<div class="text" v-show="item.startApprovalTime != null">
开始时间：<span>{{ item.startApprovalTime }}</span>
diff --git a/src/views/specialWorkSystem/workTicket/myApproval/index.vue b/src/views/specialWorkSystem/workTicket/myApproval/index.vue
index 2d3e22c..116955a 100644
--- a/src/views/specialWorkSystem/workTicket/myApproval/index.vue
+++ b/src/views/specialWorkSystem/workTicket/myApproval/index.vue
@@ -88,7 +88,10 @@
审批结果：<span>{{ item.approvalResultDesc }}</span>
</div>
<div class="text">
- 审批类型：<span>{{ item.typeDesc }}</span>
+ 审批层级：<span>{{ item.typeDesc }}</span>
+ </div>
+ <div class="text" v-if="item.auditTypeDesc">
+ 审批类型：<span>{{ item.auditTypeDesc }}</span>
</div>
<div class="text" v-show="item.startApprovalTime != null">
开始时间：<span>{{ item.startApprovalTime }}</span>
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/index.vue b/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
index a88f732..eadb500 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
@@ -92,6 +92,9 @@
<div class="text">
审批类型：<span>{{ item.typeDesc }}</span>
</div>
+ <div class="text" v-if="item.auditTypeDesc">
+ 审批类型：<span>{{ item.auditTypeDesc }}</span>
+ </div>
<div class="text" v-show="item.startApprovalTime != null">
开始时间：<span>{{ item.startApprovalTime }}</span>
</div>
--
Gitblit v1.9.2