diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index 3b90181..35e79d5 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -10,7 +10,7 @@
- {{ pageLanguage.XjSysManage }}
+ 旭捷内部项目管理系统
{{ pageLanguage.abbreviation }}
@@ -50,7 +50,7 @@
{{ userName }}
- {{ pageLanguage.logout }}
+ 退出
@@ -349,9 +349,9 @@ export default {
},
// 退出
logoutHandle() {
- this.$confirm(this.pageLanguage.logoutMsg, this.pageLanguage.prompt, {
- confirmButtonText: this.pageButton.confirmButton,
- cancelButtonText: this.pageButton.cancelButton,
+ this.$confirm('确定进行[退出]操作?', '提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$http({
diff --git a/src/views/modules/customCase/case-dtl.vue b/src/views/modules/customCase/case-dtl.vue
index dc6df1e..4fd78f9 100644
--- a/src/views/modules/customCase/case-dtl.vue
+++ b/src/views/modules/customCase/case-dtl.vue
@@ -222,10 +222,13 @@ export default {
title: '',
statusList: [
{key: 10, value: '草稿'},
+ {key: 15, value: '暂停'},
{key: 20, value: '待受理'},
{key: 30, value: '已受理'},
{key: 40, value: '进行中'},
- {key: 50, value: '已关闭'}
+ {key: 45, value: '已完成'},
+ {key: 50, value: '已关闭'},
+ {key: 90, value: '已取消'}
],
tagNo: '',
visible: false,
diff --git a/src/views/modules/customCase/case-update.vue b/src/views/modules/customCase/case-update.vue
index 72b7d79..85b846f 100644
--- a/src/views/modules/customCase/case-update.vue
+++ b/src/views/modules/customCase/case-update.vue
@@ -175,10 +175,13 @@ export default {
title: '',
statusList: [
{key: 10, value: '草稿'},
+ {key: 15, value: '暂停'},
{key: 20, value: '待受理'},
{key: 30, value: '已受理'},
{key: 40, value: '进行中'},
- {key: 50, value: '已关闭'}
+ {key: 45, value: '已完成'},
+ {key: 50, value: '已关闭'},
+ {key: 90, value: '已取消'}
],
// innerStatusList: ['待确认', '未开始', '进行中', '待测试', '已完成'],
tagNo: '',
diff --git a/src/views/modules/customCase/project-case.vue b/src/views/modules/customCase/project-case.vue
index dd39fbf..1061685 100644
--- a/src/views/modules/customCase/project-case.vue
+++ b/src/views/modules/customCase/project-case.vue
@@ -163,10 +163,13 @@ export default {
dataList: [],
statusList: [
{key: 10, value: '草稿'},
+ {key: 15, value: '暂停'},
{key: 20, value: '待受理'},
{key: 30, value: '已受理'},
{key: 40, value: '进行中'},
- {key: 50, value: '已关闭'}
+ {key: 45, value: '已完成'},
+ {key: 50, value: '已关闭'},
+ {key: 90, value: '已取消'}
],
cusGroupList: [],
sysNameList: [],
diff --git a/src/views/modules/customCase/xj-case.vue b/src/views/modules/customCase/xj-case.vue
index 8774875..0a6c104 100644
--- a/src/views/modules/customCase/xj-case.vue
+++ b/src/views/modules/customCase/xj-case.vue
@@ -151,20 +151,25 @@ export default {
},
dataList: [],
statusList: [
+ {key: 15, value: '暂停'},
{key: 20, value: '待受理'},
{key: 30, value: '已受理'},
{key: 40, value: '进行中'},
- {key: 50, value: '已关闭'}
+ {key: 45, value: '已完成'},
+ {key: 50, value: '已关闭'},
+ {key: 90, value: '已取消'}
],
innerStatusList: [
{key: 10, value: '待受理'},
+ {key: 15, value: '暂停'},
{key: 20, value: '已受理'},
{key: 30, value: '已分配'},
{key: 40, value: '进行中'},
{key: 50, value: '待测试'},
{key: 60, value: '待升级'},
{key: 70, value: '已处理'},
- {key: 80, value: '已关闭'}
+ {key: 80, value: '已关闭'},
+ {key: 90, value: '已取消'}
],
cusGroupList: [],
sysNameList: [],
diff --git a/src/views/modules/customCase/xj-update.vue b/src/views/modules/customCase/xj-update.vue
index 3ba71c8..b7a1abc 100644
--- a/src/views/modules/customCase/xj-update.vue
+++ b/src/views/modules/customCase/xj-update.vue
@@ -193,21 +193,25 @@ export default {
return {
title: '',
statusList: [
- {key: 10, value: '草稿'},
+ {key: 15, value: '暂停'},
{key: 20, value: '待受理'},
{key: 30, value: '已受理'},
{key: 40, value: '进行中'},
- {key: 50, value: '已关闭'}
+ {key: 45, value: '已完成'},
+ {key: 50, value: '已关闭'},
+ {key: 90, value: '已取消'}
],
innerStatusList: [
{key: 10, value: '待受理'},
+ {key: 15, value: '暂停'},
{key: 20, value: '已受理'},
{key: 30, value: '已分配'},
{key: 40, value: '进行中'},
{key: 50, value: '待测试'},
{key: 60, value: '待升级'},
{key: 70, value: '已处理'},
- {key: 80, value: '已关闭'}
+ {key: 80, value: '已关闭'},
+ {key: 90, value: '已取消'}
],
tagNo: '',
visible: false,
diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index f15b2d7..4c79ad3 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -45,10 +45,10 @@
:key="index">
-
+