:bookmark: :bookmark: :bookmark: 3.3.0

src/config/env.js

@@ -3,7 +3,7 @@
 const env = process.env
 const baseUrl = ''
 // 图表库为avue和pig2套地址
-const iconfontVersion = ['567566_qo5lxgtishg', '667895_w5qqtkhezap']
+const iconfontVersion = ['567566_qo5lxgtishg', '667895_v7uduh4zui']
 const iconfontUrl = '//at.alicdn.com/t/font_$key.css'
 const codeUrl = `${window.location.origin}/code`
 const actUrl = `${window.location.origin}/act/modeler.html?modelId=`

src/const/crud/admin/tenant.js

@@ -41,6 +41,7 @@ export const tableOption = {
     },
     {
       label: '租户编号',
+      type: 'number',
       prop: 'code',
       rules: [{
         required: true,

src/page/index/top/index.vue

@@ -66,7 +66,7 @@
         placement="bottom">
         <div class="top-bar__item">
           <i
-            :class="isFullScren?'icon-tuichuquanping':'icon-quanping'"
+            :class="isFullScren?'icon-zuixiaohua':'icon-quanpingzuidahua'"
             @click="handleScreen"/>
         </div>
       </el-tooltip>

src/views/admin/dept/index.vue

@@ -70,7 +70,7 @@
                 prop="parentId">
                 <el-input
                   v-model="form.parentId"
-                  :disabled="formEdit"
+                  disabled
                   placeholder="请输入父级节点"/>
               </el-form-item>
               <el-form-item

src/views/admin/role/index.vue

@@ -248,13 +248,7 @@ export default {
         return delObj(row.roleId)
       }).then(() => {
         this.getList(this.page)
-        this.list.splice(index, 1)
-        _this.$message({
-          showClose: true,
-          message: '删除成功',
-          type: 'success'
-        })
-      }).catch(function() {
+        this.$notify.success('删除成功')
       })
     },
     create(row, done, loading) {
@@ -264,12 +258,7 @@ export default {
       addObj(this.form).then(() => {
         this.getList(this.page)
         done()
-        this.$notify({
-          title: '成功',
-          message: '创建成功',
-          type: 'success',
-          duration: 2000
-        })
+        this.$notify.success('创建成功')
       }).catch(() => {
         loading()
       })
@@ -281,12 +270,7 @@ export default {
       putObj(this.form).then(() => {
         this.getList(this.page)
         done()
-        this.$notify({
-          title: '成功',
-          message: '修改成功',
-          type: 'success',
-          duration: 2000
-        })
+        this.$notify.success('修改成功')
       }).catch(() => {
         loading()
       })
@@ -296,20 +280,7 @@ export default {
       this.menuIds = this.$refs.menuTree.getCheckedKeys().join(',').concat(',').concat(this.$refs.menuTree.getHalfCheckedKeys().join(','))
       permissionUpd(roleId, this.menuIds).then(() => {
         this.dialogPermissionVisible = false
-        fetchMenuTree()
-          .then(response => {
-            this.form = response.data.data
-            return fetchRoleTree(roleId)
-          })
-          .then(response => {
-            this.checkedKeys = response.data.data
-            this.$notify({
-              title: '成功',
-              message: '修改成功',
-              type: 'success',
-              duration: 2000
-            })
-          })
+        this.$notify.success('修改成功')
       })
     }
   }

src/views/admin/user/index.vue

@@ -269,7 +269,7 @@
                 })
             },
             update(row, index, done, loading) {
-                if (this.form.phone.indexOf('*') > 0) {
+                if (this.form.phone && this.form.phone.indexOf('*') > 0) {
                     this.form.phone = undefined
                 }
                 putObj(this.form).then(() => {

src/views/admin/user/info.vue

@@ -130,6 +130,7 @@
 import { handleImg, openWindow } from '@/util/util'
 import { mapState } from 'vuex'
 import store from '@/store'
+import { getStore } from '@/util/store'
 import request from '@/router/axios'
 
 export default {
@@ -150,7 +151,8 @@ export default {
       avatarUrl: '',
       show: false,
       headers: {
-        Authorization: 'Bearer ' + store.getters.access_token
+        'Authorization': 'Bearer ' + store.getters.access_token,
+        'TENANT-ID': getStore({ name: 'tenantId' })
       },
       ruleForm2: {
         username: '',

src/views/gen/index.vue

@@ -21,7 +21,7 @@
       <el-row :gutter="20">
         <el-col :span="4">
           <div class="grid-content bg-purple">
-            <el-select v-model="q.id" placeholder="请选择数据源">
+            <el-select v-model="q.id" placeholder="请选择数据源" @change="search">
               <el-option
                 v-for="item in dataSourceList"
                 :key="item.id"
@@ -153,6 +153,8 @@
         handleDown(this.formData).then(() => {
           done()
           this.box = false
+        }).catch(()=>{
+            done()
         })
       },
       getdataSourceList() {

src/views/mp/wxaccountfans/index.vue

@@ -17,13 +17,13 @@
 <template>
   <div class="execution">
     <basic-container>
-      <el-row :gutter="20">
-        <el-col :span="6">
+      <el-row :gutter="12">
+        <el-col :span="4">
           <div class="grid-content bg-purple">
             <el-input v-model="q.nickname" placeholder="请输入昵称"/>
           </div>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="4">
           <div class="grid-content bg-purple">
             <el-select v-model="q.account" placeholder="请选择公众号">
               <el-option
@@ -34,7 +34,7 @@
             </el-select>
           </div>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="4">
           <div class="grid-content bg-purple">
             <el-button type="primary" icon="el-icon-search" @click="search">搜索</el-button>
             <el-button type="primary" icon="el-icon-sort" @click="asyncFans">同步</el-button>