窍笔后台管理字段改为字典

src/assets/css/layout.less

@@ -128,4 +128,5 @@
 
 .notify_overlap{
   bottom: 16px !important;
+  cursor: pointer;
 }

src/router/index.js

@@ -302,6 +302,7 @@ export const backStageManage = [
         name: 'Administrator_Index',
         meta: {
           title: '后台管理',
+          notLogin:true
         },
         component: () => import('@/views/backStageManage/index/index.vue'),
       },
@@ -310,6 +311,7 @@ export const backStageManage = [
         name: 'Administrator_login',
         meta: {
           title: '后台管理-登录',
+          notLogin:true
         },
         component: () => import('@/views/backStageManage/login/index.vue'),
       },
@@ -362,7 +364,6 @@ router.beforeEach((to, from, next) => {
       Cookies.remove("token")
       Store.commit('SET_PERMISSION',null)
       localStorage.removeItem('vuex')
-      localStorage.removeItem('showMessage')
     }
     next()
   }

src/store/modules/admin.js

@@ -13,7 +13,7 @@ export default {
     SET_ADMIN_PERMISSION(state,permission){
       state.permission = permission
     },
-    SET_ADMIN_DICTIONARIES(state,dictionaries){
+    SET_DICTIONARIES(state,dictionaries){
       state.dictionaries = dictionaries
     },
     SET_TENANT_TYPE(state,tenantType){

src/utils/common.js

@@ -1,6 +1,7 @@
 
 import { Message } from 'element-ui'
 import Config from '@/config'
+import Store from '@/store';
 export default {
    /**
    * 防抖
@@ -184,4 +185,25 @@ export default {
 
     return arr
   },
+
+  /**
+   * 字典数组转对象
+   * @param {*} field 字典字段
+   * @returns 
+   */
+  arrToObjByDict(field){
+    var data = Store.state.admin.dictionaries
+    if(!data){
+        return {}
+    }
+    var arr = data[field]
+    if(!arr || arr.length == 0){
+        return {}
+    }
+    var obj = {}
+    arr.forEach(item=>{
+        obj[item.dictChildValue] = item.dictChildLabel
+    })
+    return obj
+}
 }

src/views/backStageManage/application/vision/components/form/versionForm.vue

@@ -19,6 +19,11 @@
                         <el-radio v-for="(item, key) in status" :key="key" :label="parseInt(key)">{{item}}</el-radio>
                     </el-radio-group>
                 </el-form-item>
+                <el-form-item label="强制更新：" prop="updateType">
+                    <el-radio-group v-model="form.updateType">
+                        <el-radio v-for="(item, key) in updateType" :key="key" :label="parseInt(key)">{{item}}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
             
                 <el-form-item label="备注：" prop="remark">
                     <el-input v-model="form.remark" placeholder="请输入备注" maxlength="50" />
@@ -89,6 +94,7 @@ const currentForm = {
     versionNum:null,
     fileGuid:null,
     status: 1,
+    updateType:0,
     applicationCode:'4e95e3d926a2a4befa5d913acc0aa9f5',
     applyId:14,
     remark:null,

src/views/backStageManage/application/vision/components/mixins/commonData.js

@@ -1,11 +1,15 @@
+
+
 export default{
     data() {
-        return {
-            status:{
-                1:"已保存",
-                2:"调试",
-                3:"已发布"
-            },
-        }
+        return {}
+    },
+    computed:{
+        status(){
+            return this.$commonJS.arrToObjByDict('QIAO_BI_VERSION_STATUS')
+        },
+        updateType(){
+            return this.$commonJS.arrToObjByDict('QIAO_BI_VERSION_UPDATE_TYPE')
+        },
     },
 }

src/views/backStageManage/application/vision/vision.vue

@@ -71,6 +71,13 @@
                 </div>
               </template>
             </el-table-column>
+            <el-table-column prop="updateType" label="更新类型" width="100px">
+              <template slot-scope="scope">
+                <div>
+                  {{ updateType[scope.row.updateType] }}
+                </div>
+              </template>
+            </el-table-column>
             <el-table-column prop="remark" label="备注"></el-table-column>
             <el-table-column prop="createTime" label="创建时间"></el-table-column>
 

src/views/backStageManage/examine/examine/components/mixins/commonData.js

@@ -1,18 +1,16 @@
 export default{
     data() {
-        return {
-            examineType:{
-                1:'注册审核任务',
-                2:'版本发布审核任务'
-            },
-            status:{
-                0:"未完成",
-                1:'已完成'
-            },
-            auditResult:{
-                0:'不通过',
-                1:'通过'
-            }
-        }
+        return {}
     },
+    computed:{
+        examineType(){
+            return this.$commonJS.arrToObjByDict('QIAO_BI_BUSINESS_TASK_TYPE')
+        },
+        status(){
+            return this.$commonJS.arrToObjByDict('QIAO_BI_BUSINESS_TASK_STATE')
+        },
+        auditResult(){
+            return this.$commonJS.arrToObjByDict('QIAO_BI_BUSINESS_TASK_RESULT')
+        },
+    }
 }

src/views/backStageManage/layout/Layout.vue

@@ -47,16 +47,18 @@ export default {
     this.showMessage()
     this.getDict()
   },
-  deactivated(){
-    this.$s.setStr('showMessage',false)
+  mounted(){
+  },
+  beforeDestroy(){
+    // sessionStorage.setItem('showMessage','')
   },
   methods:{
     showMessage(){
-      var showMessage = this.$s.getStr('showMessage')
+      var showMessage = sessionStorage.getItem('showMessage')
       if(showMessage){
         return
       }
-      this.$s.setStr('showMessage',true)
+      sessionStorage.setItem('showMessage',true)
       this.expirationNotice()
       this.taskReminder()
       
@@ -71,7 +73,7 @@ export default {
       this.$api.getExpirePersons(params).then(response=>{
         if(response.code == 200 && response.data.total){
           var num = response.data.total
-          var html = `<div>您所在企业下有<span style="color:red;">${num}</span>个账号即将到期，具体详情请前往人员管理查看<div>`
+          var html = `<div>您所在企业下有<span style="color:red;">${num}</span>个账号即将到期，具体详情请点击前往人员管理查看<div>`
           var that = this
           var message = this.$notify({
             title: '到期通知',
@@ -109,7 +111,7 @@ export default {
       this.$api.queryAuditTask(params).then(response=>{
             if(response.code == 200){
               var num = response.data.total
-              var html = `<div>您还有<span style="color:red;">${num}</span>个任务待处理，具体详情请前往任务中心查看<div>`
+              var html = `<div>您还有<span style="color:red;">${num}</span>个任务待处理，具体详情请点击前往任务中心查看<div>`
               var that = this
               var message =  this.$notify({
                 title: '任务提醒',
@@ -139,10 +141,11 @@ export default {
     },
     getDict() {
       var params = {
-        type:'TENANT_TYPE'
+        types:['TENANT_TYPE','QIAO_BI_VERSION_STATUS','QIAO_BI_PAID_CODE_STATUS','QIAO_BI_BUSINESS_TASK_TYPE','QIAO_BI_BUSINESS_TASK_STATE','QIAO_BI_BUSINESS_TASK_RESULT','QIAO_BI_VERSION_UPDATE_TYPE']
       }
       this.$api.getSysDictByType(params).then(response => {
         this.$store.commit('SET_TENANT_TYPE', response.data.TENANT_TYPE)
+        this.$store.commit('SET_DICTIONARIES', response.data)
       })
     },
   }

src/views/backStageManage/login/component/register.vue

@@ -163,7 +163,7 @@
     methods: {
         getTenantType(){
             var params = {
-                type:'TENANT_TYPE'
+                types:['TENANT_TYPE']
             }
             this.$api.getSysDictByType(params).then(response => {
                 this.tenantType = response.data.TENANT_TYPE

src/views/backStageManage/login/index.vue

@@ -173,11 +173,12 @@ export default {
               Storage.setStr('password', this.form.password)
               Storage.setStr('phoneNum', this.form.phoneNum)
               this.$message.success('登录成功')
-              this.$router.push(
+              var router = this.$router.resolve(
                 {
                   path:'/administrator/home',
                 }
               )
+              window.open(router.href,'_self')
             }
           }).catch(error=>{
             this.btnLoading = false

src/views/backStageManage/paymentCode/paymentCode/components/mixins/commonData.js

@@ -1,17 +1,15 @@
 export default{
     data() {
         return {
-            status:{
-                0:"未使用",
-                1:"锁定",
-                2:"已使用",
-                3:"已退款"
-            },
+            
         }
     },
     computed: {
         tenantType(){
             return this.$store.state.admin.tenantType
+        },
+        status(){
+            return this.$commonJS.arrToObjByDict('QIAO_BI_PAID_CODE_STATUS')
         }
     },
     methods: {