bug

src/views/main-navbar.vue

@@ -10,7 +10,7 @@
             <icon-svg name="zhedie"></icon-svg>
           </el-menu-item>
         </el-menu>
-        <a class="site-navbar__brand-lg" style="text-transform: none;" href="javascript:;">{{ pageLanguage.XjSysManage }}</a>
+        <a class="site-navbar__brand-lg" style="text-transform: none;" href="javascript:;">旭捷内部项目管理系统</a>
         <a class="site-navbar__brand-mini" href="javascript:;">{{ pageLanguage.abbreviation }}</a>
       </h1>
 
@@ -50,7 +50,7 @@
                         <img src="~@/assets/img/avatar.png" :alt="userName">{{ userName }}
                       </span>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item @click.native="logoutHandle()">{{ pageLanguage.logout }}</el-dropdown-item>
+              <el-dropdown-item @click.native="logoutHandle()">退出</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </el-menu-item>
@@ -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({

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,

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: '',

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: [],

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: [],

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,

src/views/modules/sys/user-add-or-update.vue

@@ -45,10 +45,10 @@
                          :key="index"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item >
+<!--          <el-form-item >
           <span slot="label" style="" @click="getBaseList(93)"><a herf="#">{{buttons.site||'工厂'}}</a></span>
           <el-input v-model="dataForm.site" style="width: 150px;" placeholder="工厂"></el-input>
-        </el-form-item>
+        </el-form-item>-->
 
         </el-form>
         <el-form>