Merge branch 'master' of http://47.107.53.207:3000/ymy/oms

src/api/system/dept.ts

@@ -0,0 +1,68 @@
+import request from '@/benyun/utils/request'
+
+// 查询部门列表
+export function listDept(query:any) {
+  return request({
+    url: '/system/dept/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询部门列表（排除节点）
+export function listDeptExcludeChild(deptId:string) {
+  return request({
+    url: '/system/dept/list/exclude/' + deptId,
+    method: 'get'
+  })
+}
+
+// 查询部门详细
+export function getDept(deptId:string) {
+  return request({
+    url: '/system/dept/' + deptId,
+    method: 'get'
+  })
+}
+
+// 查询部门下拉树结构
+export function treeselect() {
+  return request({
+    url: '/system/dept/treeselect',
+    method: 'get'
+  })
+}
+
+// 根据角色ID查询部门树结构
+export function roleDeptTreeselect(roleId:string) {
+  return request({
+    url: '/system/dept/roleDeptTreeselect/' + roleId,
+    method: 'get'
+  })
+}
+
+// 新增部门
+export function addDept(data:any) {
+  return request({
+    url: '/system/dept',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改部门
+export function updateDept(data:any) {
+  return request({
+    url: '/system/dept',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除部门
+export function delDept(deptId:string) {
+  return request({
+    url: '/system/dept/' + deptId,
+    method: 'delete'
+  })
+}

src/api/system/user.ts

@@ -0,0 +1,127 @@
+import request from '@/benyun/utils/request'
+import {parseStrEmpty} from "@/benyun/utils/benyuntech";
+
+// 查询用户列表
+export function listUser(query:any) {
+  return request({
+    url: '/system/user/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询用户详细
+export function getUser(userId:string) {
+  return request({
+    url: '/system/user/' + parseStrEmpty(userId),
+    method: 'get'
+  })
+}
+
+// 新增用户
+export function addUser(data:any) {
+  return request({
+    url: '/system/user',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改用户
+export function updateUser(data:any) {
+  return request({
+    url: '/system/user',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除用户
+export function delUser(userId:string) {
+  return request({
+    url: '/system/user/' + userId,
+    method: 'delete'
+  })
+}
+
+// 用户密码重置
+export function resetUserPwd(userId:string, password:string) {
+  const data = {
+    userId,
+    password
+  }
+  return request({
+    url: '/system/user/resetPwd',
+    method: 'put',
+    data: data
+  })
+}
+
+// 用户状态修改
+export function changeUserStatus(userId:string, status:string) {
+  const data = {
+    userId,
+    status
+  }
+  return request({
+    url: '/system/user/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+// 查询用户个人信息
+export function getUserProfile() {
+  return request({
+    url: '/system/user/profile',
+    method: 'get'
+  })
+}
+
+// 修改用户个人信息
+export function updateUserProfile(data:any) {
+  return request({
+    url: '/system/user/profile',
+    method: 'put',
+    data: data
+  })
+}
+
+// 用户密码重置
+export function updateUserPwd(oldPassword:string, newPassword:string) {
+  const data = {
+    oldPassword,
+    newPassword
+  }
+  return request({
+    url: '/system/user/profile/updatePwd',
+    method: 'put',
+    params: data
+  })
+}
+
+// 用户头像上传
+export function uploadAvatar(data:any) {
+  return request({
+    url: '/system/user/profile/avatar',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询授权角色
+export function getAuthRole(userId:string) {
+  return request({
+    url: '/system/user/authRole/' + userId,
+    method: 'get'
+  })
+}
+
+// 保存授权角色
+export function updateAuthRole(data:any) {
+  return request({
+    url: '/system/user/authRole',
+    method: 'put',
+    params: data
+  })
+}

src/components/skuModal/productModal.vue

@@ -36,6 +36,9 @@ export default class ProductModal extends Vue {
   mulit?:boolean
 
   config:any={
+    attr:{
+      calculateH:true
+    },
     search:{
       attr:{
         size:'mini',
@@ -105,10 +108,7 @@ export default class ProductModal extends Vue {
         field:'stock',
         width:80
       }]
-    },
-    // request:{
-    //   url:'/system/maindataMaterial/page'
-    // }
+    }
   }
   brandData:Array<any>=[]
   

src/components/supplierModal/supplierModal.vue

@@ -42,6 +42,9 @@ export default class SupplierModal extends Vue {
 	zIndex?:number
 
   config:any={
+    attr:{
+      calculateH:true
+    },
     search:{
       attr:{
         size:'mini',

src/layout/components/Navbar.vue

@@ -7,7 +7,7 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
+        <!-- <search id="header-search" class="right-menu-item" /> -->
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
@@ -26,9 +26,9 @@
           <!-- <router-link to="/user/profile"> -->
             <el-dropdown-item @click.native="jumpUser">个人中心</el-dropdown-item>
           <!-- </router-link> -->
-          <el-dropdown-item @click.native="setting = true">
+          <!-- <el-dropdown-item @click.native="setting = true">
             <span>布局设置</span>
-          </el-dropdown-item>
+          </el-dropdown-item> -->
           <el-dropdown-item divided @click.native="logout">
             <span>退出登录</span>
           </el-dropdown-item>

src/router/index.ts

@@ -42,6 +42,20 @@ export const constantRoutes: Array<any> = [
       }
     ]
   },
+  {
+    path: '/user',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: 'profile',
+        component: () => import('@/views/system/user/profile/index.vue'),
+        name: 'Profile',
+        meta: { title: '个人中心', icon: 'user' }
+      }
+    ]
+  },
   {
     path:'/order',
     name:'Order',

src/views/components/bar01.vue

@@ -33,9 +33,21 @@ export default class Bar02 extends Vue {
         text: '每月订单量',
         left: 'center'
       },
+      tooltip: {
+        trigger: 'axis',
+        axisPointer: {
+          type: 'shadow'
+        }
+      },
+      grid: {
+        left: '3%',
+        right: '4%',
+        bottom: '3%',
+        containLabel: true
+      },
       xAxis: {
         type: 'category',
-        data: ['8月', '9月', '10月', '11月', '12月', '1月','2月','3月','4月','5月','6月','7月']
+        data: ['2022/08', '2022/09', '2022/10', '2022/11', '2022/12', '2023/01','2023/02','2023/03','2023/04','2023/05','2023/06','2023/07']
       },
       yAxis: {
         type: 'value'
@@ -45,6 +57,7 @@ export default class Bar02 extends Vue {
           data: [0, 0, 0, 0, 0, 0, 0, 0,100,460,600, 660],
           type: 'bar',
           showBackground: true,
+          barWidth: '60%',
           backgroundStyle: {
             color: 'rgba(180, 180, 180, 0.2)'
           },

src/views/components/line01.vue

@@ -0,0 +1,83 @@
+<template>
+  <div class="chart" :id="id"></div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue, Watch } from 'vue-property-decorator'
+import * as echarts from 'echarts';
+type EChartsOption = echarts.EChartsOption;
+
+@Component
+export default class Line01 extends Vue {
+  id=this.randomString();
+
+  mounted(){
+    this.init()
+  }
+
+  randomString(){
+    const str = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+    let result = '';
+    for (let i = 10; i > 0; --i) 
+      result += str[Math.floor(Math.random() * str.length)];
+    return result;
+  }
+  init(){
+    let chartDom:any = document.getElementById(this.id);
+    let myChart = echarts.init(chartDom);
+    let option: EChartsOption;
+
+    option = {
+      title: {
+        text: '每月成交量和退货量',
+      },
+      tooltip: {
+        trigger: 'axis'
+      },
+      legend: {
+        data: ['成交量', '退货量',]
+      },
+      grid: {
+        left: '3%',
+        right: '4%',
+        bottom: '3%',
+        containLabel: true
+      },
+      toolbox: {
+        feature: {
+          // saveAsImage: {}
+        }
+      },
+      xAxis: {
+        type: 'category',
+        boundaryGap: false,
+        data: ['2022/08', '2022/09', '2022/10', '2022/11', '2022/12', '2023/01','2023/02','2023/03','2023/04','2023/05','2023/06','2023/07']
+      },
+      yAxis: {
+        type: 'value'
+      },
+      series: [
+        {
+          name: '成交量',
+          type: 'line',
+          data: [0, 0, 0, 0, 0, 0, 0, 0,70,380,500, 580]
+        },
+        {
+          name: '退货量',
+          type: 'line',
+          data: [0, 0, 0, 0, 0, 0, 0, 0,10,40,50, 62]
+        }
+      ]
+    };
+
+    option && myChart.setOption(option);
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.chart{
+  height: 100%;
+  width: 100%;
+}
+</style>

src/views/components/pie01.vue

@@ -30,7 +30,7 @@ export default class Pie01 extends Vue {
 
     option = {
       title: {
-        text: '月区域订单量',
+        text: '区域月订单量',
         left: 'center'
       },
       tooltip: {
@@ -42,7 +42,7 @@ export default class Pie01 extends Vue {
       },
       series: [
         {
-          name: 'Access From',
+          name: '当前数据',
           type: 'pie',
           radius: '50%',
           data:

src/views/components/pie02.vue

@@ -42,7 +42,7 @@ export default class Pie02 extends Vue {
       },
       series: [
         {
-          name: 'Access From',
+          name: '当前数据',
           type: 'pie',
           radius: ['40%', '70%'],
           avoidLabelOverlap: false,

src/views/components/rose.vue

@@ -40,9 +40,9 @@ export default class Rose extends Vue {
         show: true,
         feature: {
           mark: { show: true },
-          dataView: { show: true, readOnly: false },
-          restore: { show: true },
-          saveAsImage: { show: true }
+          // dataView: { show: true, readOnly: false },
+          // restore: { show: true },
+          // saveAsImage: { show: true }
         }
       },
       series: [

src/views/index.vue

@@ -15,6 +15,9 @@
       <div class="bottom-box">
         <bar01 />
       </div>
+      <div class="bottom-box">
+        <line01 />
+      </div>
     </div>
   </div>
 </template>
@@ -25,8 +28,9 @@ import pie01 from './components/pie01.vue'
 import rose from './components/rose.vue'
 import pie02 from './components/pie02.vue'
 import bar01 from './components/bar01.vue'
+import Line01 from './components/line01.vue'
 
-@Component({components:{pie01,rose,pie02,bar01}})
+@Component({components:{pie01,rose,pie02,bar01,Line01}})
 export default class IndexView extends Vue {
 
   mounted(){

src/views/oms/order/components/addOrder.vue

@@ -21,6 +21,11 @@
             <template v-slot:sourceFrom_desc='{ value }'>
               {{ getFromText(value.sourceFrom) }}
             </template>
+            <template v-slot:shopName="{value}">
+              <el-input :placeholder="!orderValue.id?'请选择标签':''" :value="value.shopName" :disabled="orderValue.id?true:false" size="small" class="myinpuy-with-select" clearable>
+                <el-button slot="append" v-if="!orderValue.id" icon="el-icon-more" @click="showShop"></el-button>
+              </el-input>
+            </template>
             <template v-slot:labels="{value}">
               <el-input :placeholder="!orderValue.id?'请选择标签':''" :value="value.labels" :disabled="orderValue.id?true:false" size="small" class="myinpuy-with-select" clearable>
                 <el-button slot="append" v-if="!orderValue.id" icon="el-icon-more" @click="showLabels"></el-button>
@@ -150,10 +155,16 @@
           <by-form :propConfig="newInvoicesConfig" ref="invoicesform"></by-form>
         </el-collapse-item>
       </el-collapse>
+      <!-- 商品 -->
       <product-sku-modal ref="product" :mulit="true" @confirm="confirmProduct" />
+      <!-- 赠品 -->
       <product-sku-modal ref="productGift" :mulit="true" @confirm="confirmProductGift" />
+
       <add-product-modal ref="addProductModal" @handleSuccess="handleSuccess" :mask="false" />
       <edit-product-modal ref="editProductModal" @handleSuccess="handleSuccess" />
+      <!-- 店铺 -->
+      <shop-modal ref="shopModal" @shopSelect="shopSelect" />
+      <!-- 标签 -->
       <labels-modal ref="labelsModal" @onChange="onChangeLabel" />
     </template>
     <template #footer v-if="!orderValue.id">
@@ -173,7 +184,8 @@ import { add,multiply,subtract,divide } from '@/benyun/utils/accuracy'
 import AddProductModal from "./addProductModal.vue";
 import EditProductModal from "./editProductModal.vue";
 import LabelsModal from "./labelsModal.vue";
-@Component({components:{AddProductModal,EditProductModal,LabelsModal}})
+import ShopModal from "./shopModal.vue";
+@Component({components:{AddProductModal,EditProductModal,LabelsModal,ShopModal}})
 export default class AddOrder extends Vue {
   value=false;
   num:any=0;
@@ -221,14 +233,15 @@ export default class AddOrder extends Vue {
         span:6,
         label:'店铺名称',
         prop:'shopName',
-        component:'by-input',
-        compConfig:{
-          attr:{
-            type:'integer',
-            placeholder:'请输入店铺名称',
-            clearable:true
-          }
-        }
+        slot:true,
+        // component:'by-input',
+        // compConfig:{
+        //   attr:{
+        //     type:'integer',
+        //     placeholder:'请输入店铺名称',
+        //     clearable:true
+        //   }
+        // }
       },{
         span:6,
         label:'线上订单',
@@ -874,6 +887,15 @@ export default class AddOrder extends Vue {
   setShow(v:boolean){
     this.value = v;
   }
+  showShop(){
+    (this.$refs.shopModal as any).setShow(true);
+  }
+  shopSelect(data:any){
+    let value:any = (this.$refs.baseform as any).getValue();
+    value.shopId = data.id;
+    value.shopName = data.shopName;
+    (this.$refs.baseform as any).setValue(value);
+  }
   setDetail(data:any){
     this.orderValue = data;
     if(this.orderValue.isPay == 0 || this.orderValue.isPay == 1){
@@ -908,8 +930,21 @@ export default class AddOrder extends Vue {
     this.$emit('handleSuccess');
     this.getData();
   }
-  //修改支付单号[]
+  //修改支付单号
   payStatusHandle(item:any,status:string){
+    if(status == 'Invalid'){
+      this.$confirm('此操作将永久作废单号为：'+item.outerPayId+' 的订单支付, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.payStatusRequest(item,status)
+      }).catch(() => {});
+    }else{
+      this.payStatusRequest(item,status)
+    }
+  }
+  payStatusRequest(item:any,status:string){
     this.load = true;
     updateStatus({id:item.id, status}).then((res:any)=>{
       this.load = false;

src/views/oms/order/components/shopModal.vue

@@ -0,0 +1,143 @@
+<template>
+  <vxe-modal v-model="value" id="shopModel" title="选择店铺" width="70%" height="80%" show-zoom resize transfer show-footer v-loading="load">
+    <module-view :propConfig="config" ref="view" v-loading="load" @pagination="pagination" @onRefresh="getList" 
+    @resert="queryList" @search="queryList" />
+    <template #footer>
+      <div class="btn">
+        <el-button plain size="small" @click="value = false">取消</el-button>
+        <el-button type="primary" size="small" @click="btn">确定</el-button>
+      </div>
+    </template>
+  </vxe-modal>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue, Watch } from "vue-property-decorator";
+import { query } from '@/api/shop'
+@Component({components:{}})
+export default class ShopModal extends Vue {
+  value=false;
+  load=false;
+  timeNum = 0;
+  isSearch=false;
+  config:any={
+    attr:{
+      calculateH:true
+    },
+    search:{
+      attr:{
+        size:'small'
+      },
+      columns:[
+        [{
+          label:'店铺名称',
+          prop:'shopName',
+          component:'by-input',
+          compConfig:{}
+        },{
+          label:'店铺简称',
+          prop:'shortName',
+          component:'by-input',
+          compConfig:{}
+        },{
+          label:'所属平台',
+          prop:'channelName',
+          component:'by-input',
+          compConfig:{}
+        }]
+      ]
+    },
+    tool:{
+      tools:{
+        search:true,
+        refresh:true
+      }
+    },
+    table:{
+      attr:{
+        triggerRowCheck:'row',
+        size:'mini',
+        seq:true,
+        radio:true,
+        align:'center',
+      },
+      columns:[{
+        title:'店铺名称',
+        field:'shopName'
+      },{
+        title:'店铺简称',
+        field:'shortName',
+
+      },{
+        title:'所属平台',
+        field:'channelName',
+      }]
+    }
+  }
+  mounted(){
+    this.getList();
+  }
+  //分页
+  pagination(){
+    if(this.isSearch){
+      this.queryList();
+    }else{
+      this.getList()
+    }
+  }
+  //列表请求（只有分页，不包含搜素条件）
+  getList(){
+    if(!this.$refs.view){
+      if(this.timeNum > 5){
+        return
+      }
+      setTimeout(()=>{
+        this.getList()
+      },500) 
+      this.timeNum ++;
+      return
+    }
+    this.isSearch = false;
+    let data = (this.$refs.view as any).getPage();
+    this.requestList(data);
+  }
+  //列表请求（包含分页和搜素条件）
+  queryList(){
+    this.isSearch = true;
+    let data = (this.$refs.view as any).getQuery();
+    this.requestList(data);
+  }
+  requestList(data:any){
+    this.load = true;
+    query(data).then((res:any) => {
+      this.load = false;
+      (this.$refs.view as any).setTableValue(res.data.records);
+      let page = {
+        pageNo: res.data.current, //当前页
+        pageSize: res.data.size, //每页条数
+        total: res.data.total //总条数
+      };
+      (this.$refs.view as any).setPage(page)
+
+    }).catch(()=>{
+      this.load = false;
+    })
+  }
+  setShow(v:boolean){
+    this.value = v
+  }
+  btn(){
+    let data = (this.$refs.view as any).getSelectData();
+    if(data.length == 0){
+      this.$message('请选择店铺！');
+      return
+    }
+    this.$emit('shopSelect',data[0]);
+    this.value = false;
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/views/oms/shop/index.vue

@@ -34,12 +34,14 @@ export default class Shop extends Vue {
           prop:'shortName',
           component:'by-input',
           compConfig:{}
-        },{
-          label:'店铺状态',
-          prop:'shopStatus',
-          component:'by-input',
-          compConfig:{}
-        },{
+        },
+        // {
+        //   label:'店铺状态',
+        //   prop:'shopStatus',
+        //   component:'by-input',
+        //   compConfig:{}
+        // },
+        {
           label:'授权状态',
           prop:'authStatus',
           component:'by-select',
@@ -69,12 +71,14 @@ export default class Shop extends Vue {
           prop:'channelName',
           component:'by-input',
           compConfig:{}
-        },{
-          label:'同步发货',
-          prop:'enableSyncSend',
-          component:'by-input',
-          compConfig:{}
-        },{
+        },
+        // {
+        //   label:'同步发货',
+        //   prop:'enableSyncSend',
+        //   component:'by-input',
+        //   compConfig:{}
+        // },
+        {
           label:'创建时间',
           prop:'createTime',
           component:'by-date-picker',
@@ -107,24 +111,26 @@ export default class Shop extends Vue {
         title:'店铺名称',
         field:'shopName',
         isDetail:true,
-        width:150
+        // width:150
       },{
         title:'店铺简称',
         field:'shortName',
         width:150
-      },{
-        title:'店铺分组',
-        field:'shopGroup',
-        width:150
-      },{
-        title:'店铺网址',
-        field:'shopUrl',
-        width:150
-      },{
-        title:'店铺站点',
-        field:'shopSite',
-        width:150
-      },{
+      },
+      // {
+      //   title:'店铺分组',
+      //   field:'shopGroup',
+      //   width:150
+      // },{
+      //   title:'店铺网址',
+      //   field:'shopUrl',
+      //   width:150
+      // },{
+      //   title:'店铺站点',
+      //   field:'shopSite',
+      //   width:150
+      // },
+      {
         title:'公司编号',
         field:'companyCode',
         width:150
@@ -145,171 +151,175 @@ export default class Shop extends Vue {
         field:'authStatus',
         width:150,
         component:shopTag
-      },{
-        title:'授权开始时间',
-        field:'authBegin',
-        width:150
-      },{
-        title:'授权过期时间',
-        field:'authExpired',
-        width:150
-      },{
-        title:'授权修改时间',
-        field:'authModified',
-        width:150
-      },{
-        title:'店铺状态',
-        field:'shopStatus',
-        width:150
-      },{
-        title:'退款状态',
-        field:'refundStatus',
-        width:150
-      },{
-        title:'身份证',
-        field:'sendIdCard',
-        width:150
-      },{
-        title:'联系电话',
-        field:'sendPhone',
-        width:150
-      },{
-        title:'发货店址',
-        field:'sendAddress',
-        width:150
-      },{
-        title:'发货时效',
-        field:'sendTimeEffect',
-        width:150
-      },{
-        title:'退货手机号',
-        field:'returnPhone',
-        width:150
-      },{
-        title:'退货人',
-        field:'returnName',
-        width:150
-      },{
-        title:'退货地址',
-        field:'returnAdress',
-        width:150
-      },{
-        title:'同步发货',
-        field:'enableSyncSend',
-        width:150
-      },{
-        title:'揽收轨迹同步发货',
-        field:'enableTrackSyncSend',
-        width:150
-      },{
-        title:'拆分订单整单发货',
-        field:'enableSplitOrderFullSend',
-        width:150
-      },{
-        title:'同步库存',
-        field:'enableSynvStore',
-        width:150
-      },{
-        title:'订单下载',
-        field:'enableSyncOrder',
-        width:150
-      },{
-        title:'天猫物流升级',
-        field:'enableTmallLogistics',
-        width:150
-      },{
-        title:'下载截止时间',
-        field:'endPullTime',
-        width:150
-      },{
-        title:'最晚截单时间',
-        field:'endInterceptTime',
-        width:150
-      },{
-        title:'最晚出库时间',
-        field:'endDeliveryTime',
-        width:150
-      },{
-        title:'淘宝消息通知',
-        field:'enableTaobaoMessageNotice',
-        width:150
-      },{
-        title:'商品下载',
-        field:'enableSkuDownload',
-        width:150
-      },{
-        title:'开启链接库存同步',
-        field:'enableLinkSync',
-        width:150
-      },{
-        title:'是否虾皮SIP',
-        field:'shopeeSip',
-        width:150
-      },{
-        title:'支付宝授权状态',
-        field:'alipayAuthStatus',
-        width:150
-      },{
-        title:'京东授权状态',
-        field:'jdAuthStatus',
-        width:150
-      },{
-        title:'东账号拒绝申请原因',
-        field:'jdRejectReason',
-        width:150
-      },{
-        title:'启用分销',
-        field:'enableDistribution',
-        width:150
-      },{
-        title:'菜鸟(青龙)电子面单',
-        field:'enableCainiaoElectronicBill',
-        width:150
-      },{
-        title:'售后单下载',
-        field:'enableSyncAfterSale',
-        width:150
-      },{
-        title:'开通AG',
-        field:'enableAg',
-        width:150
-      },{
-        title:'确认收货自动退款',
-        field:'enableAutoRefund',
-        width:150
-      },{
-        title:'开启跨境操作',
-        field:'enableCbec',
-        width:150
-      },{
-        title:'创建来源',
-        field:'createSource',
-        width:150
-      },{
-        title:'标签',
-        field:'labels',
-        width:150
-      },{
-        title:'服务市场订购版本',
-        field:'subscriptionVersion',
-        width:150
-      },{
-        title:'创建时间',
-        field:'createTime',
-        width:150
-      },{
-        title:'操作',
-        action:true,
-        width:100,
-        plugins:[{
-          name:'删除',
-          event:{
-            click:(item:any) => {
-              this.del(item);
-            }
-          }
-        }]
-      }]
+      },
+      // {
+      //   title:'授权开始时间',
+      //   field:'authBegin',
+      //   width:150
+      // },{
+      //   title:'授权过期时间',
+      //   field:'authExpired',
+      //   width:150
+      // },{
+      //   title:'授权修改时间',
+      //   field:'authModified',
+      //   width:150
+      // },
+      // {
+      //   title:'店铺状态',
+      //   field:'shopStatus',
+      //   width:150
+      // }
+      // ,{
+      //   title:'退款状态',
+      //   field:'refundStatus',
+      //   width:150
+      // },{
+      //   title:'身份证',
+      //   field:'sendIdCard',
+      //   width:150
+      // },{
+      //   title:'联系电话',
+      //   field:'sendPhone',
+      //   width:150
+      // },{
+      //   title:'发货店址',
+      //   field:'sendAddress',
+      //   width:150
+      // },{
+      //   title:'发货时效',
+      //   field:'sendTimeEffect',
+      //   width:150
+      // },{
+      //   title:'退货手机号',
+      //   field:'returnPhone',
+      //   width:150
+      // },{
+      //   title:'退货人',
+      //   field:'returnName',
+      //   width:150
+      // },{
+      //   title:'退货地址',
+      //   field:'returnAdress',
+      //   width:150
+      // },{
+      //   title:'同步发货',
+      //   field:'enableSyncSend',
+      //   width:150
+      // },{
+      //   title:'揽收轨迹同步发货',
+      //   field:'enableTrackSyncSend',
+      //   width:150
+      // },{
+      //   title:'拆分订单整单发货',
+      //   field:'enableSplitOrderFullSend',
+      //   width:150
+      // },{
+      //   title:'同步库存',
+      //   field:'enableSynvStore',
+      //   width:150
+      // },{
+      //   title:'订单下载',
+      //   field:'enableSyncOrder',
+      //   width:150
+      // },{
+      //   title:'天猫物流升级',
+      //   field:'enableTmallLogistics',
+      //   width:150
+      // },{
+      //   title:'下载截止时间',
+      //   field:'endPullTime',
+      //   width:150
+      // },{
+      //   title:'最晚截单时间',
+      //   field:'endInterceptTime',
+      //   width:150
+      // },{
+      //   title:'最晚出库时间',
+      //   field:'endDeliveryTime',
+      //   width:150
+      // },{
+      //   title:'淘宝消息通知',
+      //   field:'enableTaobaoMessageNotice',
+      //   width:150
+      // },{
+      //   title:'商品下载',
+      //   field:'enableSkuDownload',
+      //   width:150
+      // },{
+      //   title:'开启链接库存同步',
+      //   field:'enableLinkSync',
+      //   width:150
+      // },{
+      //   title:'是否虾皮SIP',
+      //   field:'shopeeSip',
+      //   width:150
+      // },{
+      //   title:'支付宝授权状态',
+      //   field:'alipayAuthStatus',
+      //   width:150
+      // },{
+      //   title:'京东授权状态',
+      //   field:'jdAuthStatus',
+      //   width:150
+      // },{
+      //   title:'东账号拒绝申请原因',
+      //   field:'jdRejectReason',
+      //   width:150
+      // },{
+      //   title:'启用分销',
+      //   field:'enableDistribution',
+      //   width:150
+      // },{
+      //   title:'菜鸟(青龙)电子面单',
+      //   field:'enableCainiaoElectronicBill',
+      //   width:150
+      // },{
+      //   title:'售后单下载',
+      //   field:'enableSyncAfterSale',
+      //   width:150
+      // },{
+      //   title:'开通AG',
+      //   field:'enableAg',
+      //   width:150
+      // },{
+      //   title:'确认收货自动退款',
+      //   field:'enableAutoRefund',
+      //   width:150
+      // },{
+      //   title:'开启跨境操作',
+      //   field:'enableCbec',
+      //   width:150
+      // },{
+      //   title:'创建来源',
+      //   field:'createSource',
+      //   width:150
+      // },{
+      //   title:'标签',
+      //   field:'labels',
+      //   width:150
+      // },{
+      //   title:'服务市场订购版本',
+      //   field:'subscriptionVersion',
+      //   width:150
+      // },{
+      //   title:'创建时间',
+      //   field:'createTime',
+      //   width:150
+      // },{
+      //   title:'操作',
+      //   action:true,
+      //   width:100,
+      //   plugins:[{
+      //     name:'删除',
+      //     event:{
+      //       click:(item:any) => {
+      //         this.del(item);
+      //       }
+      //     }
+      //   }]
+      // }
+    ]
     },
     modal:{
       tool:{
@@ -407,283 +417,283 @@ export default class Shop extends Vue {
               }
             }
           }],
-          [{
-            label:'APP KEY',
-            prop:'appKey',
-            component:'by-input'
-          },{
-            label:'APP SECRET',
-            prop:'appSecret',
-            component:'by-input'
-          },{
-            label:'ACCESSTOKEN',
-            prop:'accessToken',
-            component:'by-input'
-          },{
-            label:'REFRESHTOKEN',
-            prop:'refreshToken',
-            component:'by-input'
-          }],
-          [{
-            label:'会话用户编号',
-            prop:'sessionUid',
-            component:'by-input'
-          },{
-            label:'授权开始时间',
-            prop:'authBegin',
-            component:'by-date-picker'
-          },{
-            label:'授权过期时间',
-            prop:'authExpired',
-            component:'by-date-picker'
-          },{
-            label:'授权修改时间',
-            prop:'authModified',
-            component:'by-date-picker'
-          }],
-          [{
-            label:'京东授权状态',
-            prop:'jdAuthStatus',
-            component:'by-input'
-          },{
-            label:'京东拒绝申请原因',
-            prop:'jdRejectReason',
-            component:'by-input'
-          },{
-            label:'身份证号',
-            prop:'sendIdCard',
-            component:'by-input'
-          },{
-            label:'联系电话',
-            prop:'sendPhone',
-            component:'by-input'
-          }],
-          [{
-            label:'发货地址',
-            prop:'sendTimeEffect',
-            component:'by-input'
-          },{
-            label:'标签',
-            prop:'labels',
-            component:'by-input'
-          },{
-            span:12,
-            label:'发货地址',
-            prop:'sendAddress',
-            component:'by-input'
-          }],
-          [{
-            label:'服务市场订购版本',
-            prop:'subscriptionVersion',
-            component:'by-input'
-          },{
-            label:'退货手机',
-            prop:'returnPhone',
-            component:'by-input'
-          },{
-            label:'退货人',
-            prop:'returnName',
-            component:'by-input'
-          },{
-            label:'退货邮编',
-            prop:'returnZip',
-            component:'by-input'
-          }],
-          [{
-            label:'支付宝授权状态',
-            prop:'alipayAuthStatus',
-            component:'by-input'
-          },{
-            label:'菜鸟电子面单',
-            prop:'enableCainiaoElectronicBill',
-            component:'by-input'
-          },{
-            span:12,
-            label:'退货地址',
-            prop:'returnAdress',
-            component:'by-input'
-          }],
-          [{
-            label:'下载截止时间',
-            prop:'endPullTime',
-            component:'by-date-picker'
-          },{
-            label:'最晚截单时间',
-            prop:'endInterceptTime',
-            component:'by-date-picker'
-          },{
-            label:'最晚出库时间',
-            prop:'endDeliveryTime',
-            component:'by-date-picker'
-          },{
-            label:'淘宝消息通知',
-            prop:'enableTaobaoMessageNotice',
-            component:'by-input'
-          }],
-          [{
-            label:'拆分订单整单发货',
-            prop:'enableSplitOrderFullSend',
-            component:'by-switch',
-            compConfig:{
-              attr:{
-                activeValue:1,
-                inactiveValue:0
-              }
-            }
-          },{
-            label:'同步库存',
-            prop:'enableSynvStore',
-            component:'by-switch',
-            compConfig:{
-              attr:{
-                activeValue:1,
-                inactiveValue:0
-              }
-            }
-          },{
-            label:'订单下载',
-            prop:'enableSyncOrder',
-            component:'by-switch',
-            compConfig:{
-              attr:{
-                activeValue:1,
-                inactiveValue:0
-              }
-            }
-          },{
-            label:'天猫物流升级',
-            prop:'enableTmallLogistics',
-            component:'by-switch',
-            compConfig:{
-              attr:{
-                activeValue:1,
-                inactiveValue:0
-              }
-            }
-          }],
-          [{
-            label:'商品下载',
-            prop:'enableSkuDownload',
-            component:'by-switch',
-            compConfig:{
-              attr:{
-                activeValue:1,
-                inactiveValue:0
-              }
-            }
-          },{
-            label:'开启链接库存同步',
-            prop:'enableLinkSync',
-            component:'by-switch',
-            compConfig:{
-              attr:{
-                activeValue:1,
-                inactiveValue:0
-              }
-            }
-          },{
-            label:'是否虾皮SIP',
-            prop:'shopeeSip',
-            component:'by-switch',
-            compConfig:{
-              attr:{
-                activeValue:1,
-                inactiveValue:0
-              }
-            }
-          },{
-            label:'同步发货',
-            prop:'enableSyncSend',
-            component:'by-switch',
-            compConfig:{
-              attr:{
-                activeValue:1,
-                inactiveValue:0
-              }
-            }
-          }],
-          [{
-            label:'店铺状态',
-            prop:'shopStatus',
-            component:'by-switch',
-            compConfig:{
-              attr:{
-                activeValue:1,
-                inactiveValue:0
-              }
-            }
-          },{
-            label:'退款状态',
-            prop:'refundStatus',
-            component:'by-switch',
-            compConfig:{
-              attr:{
-                activeValue:'1',
-                inactiveValue:'0'
-              }
-            }
-          },{
-            label:'启用分销',
-            prop:'enableDistribution',
-            component:'by-switch',
-            compConfig:{
-              attr:{
-                activeValue:1,
-                inactiveValue:0
-              }
-            }
-          },{
-            label:'揽收轨迹同步发货',
-            prop:'enableTrackSyncSend',
-            component:'by-switch',
-            compConfig:{
-              attr:{
-                activeValue:1,
-                inactiveValue:0
-              }
-            }
-          }],
-          [{
-            label:'售后单下载',
-            prop:'enableSyncAfterSale',
-            component:'by-switch',
-            compConfig:{
-              attr:{
-                activeValue:1,
-                inactiveValue:0
-              }
-            }
-          },{
-            label:'开通AG',
-            prop:'enableAg',
-            component:'by-switch',
-            compConfig:{
-              attr:{
-                activeValue:1,
-                inactiveValue:0
-              }
-            }
-          },{
-            label:'确认收货自动退款',
-            prop:'enableAutoRefund',
-            component:'by-switch',
-            compConfig:{
-              attr:{
-                activeValue:1,
-                inactiveValue:0
-              }
-            }
-          },{
-            label:'开启跨境操作',
-            prop:'enableCbec',
-            component:'by-switch',
-            compConfig:{
-              attr:{
-                activeValue:1,
-                inactiveValue:0
-              }
-            }
-          }]
+          // [{
+          //   label:'APP KEY',
+          //   prop:'appKey',
+          //   component:'by-input'
+          // },{
+          //   label:'APP SECRET',
+          //   prop:'appSecret',
+          //   component:'by-input'
+          // },{
+          //   label:'ACCESSTOKEN',
+          //   prop:'accessToken',
+          //   component:'by-input'
+          // },{
+          //   label:'REFRESHTOKEN',
+          //   prop:'refreshToken',
+          //   component:'by-input'
+          // }],
+          // [{
+          //   label:'会话用户编号',
+          //   prop:'sessionUid',
+          //   component:'by-input'
+          // },{
+          //   label:'授权开始时间',
+          //   prop:'authBegin',
+          //   component:'by-date-picker'
+          // },{
+          //   label:'授权过期时间',
+          //   prop:'authExpired',
+          //   component:'by-date-picker'
+          // },{
+          //   label:'授权修改时间',
+          //   prop:'authModified',
+          //   component:'by-date-picker'
+          // }],
+          // [{
+          //   label:'京东授权状态',
+          //   prop:'jdAuthStatus',
+          //   component:'by-input'
+          // },{
+          //   label:'京东拒绝申请原因',
+          //   prop:'jdRejectReason',
+          //   component:'by-input'
+          // },{
+          //   label:'身份证号',
+          //   prop:'sendIdCard',
+          //   component:'by-input'
+          // },{
+          //   label:'联系电话',
+          //   prop:'sendPhone',
+          //   component:'by-input'
+          // }],
+          // [{
+          //   label:'发货地址',
+          //   prop:'sendTimeEffect',
+          //   component:'by-input'
+          // },{
+          //   label:'标签',
+          //   prop:'labels',
+          //   component:'by-input'
+          // },{
+          //   span:12,
+          //   label:'发货地址',
+          //   prop:'sendAddress',
+          //   component:'by-input'
+          // }],
+          // [{
+          //   label:'服务市场订购版本',
+          //   prop:'subscriptionVersion',
+          //   component:'by-input'
+          // },{
+          //   label:'退货手机',
+          //   prop:'returnPhone',
+          //   component:'by-input'
+          // },{
+          //   label:'退货人',
+          //   prop:'returnName',
+          //   component:'by-input'
+          // },{
+          //   label:'退货邮编',
+          //   prop:'returnZip',
+          //   component:'by-input'
+          // }],
+          // [{
+          //   label:'支付宝授权状态',
+          //   prop:'alipayAuthStatus',
+          //   component:'by-input'
+          // },{
+          //   label:'菜鸟电子面单',
+          //   prop:'enableCainiaoElectronicBill',
+          //   component:'by-input'
+          // },{
+          //   span:12,
+          //   label:'退货地址',
+          //   prop:'returnAdress',
+          //   component:'by-input'
+          // }],
+          // [{
+          //   label:'下载截止时间',
+          //   prop:'endPullTime',
+          //   component:'by-date-picker'
+          // },{
+          //   label:'最晚截单时间',
+          //   prop:'endInterceptTime',
+          //   component:'by-date-picker'
+          // },{
+          //   label:'最晚出库时间',
+          //   prop:'endDeliveryTime',
+          //   component:'by-date-picker'
+          // },{
+          //   label:'淘宝消息通知',
+          //   prop:'enableTaobaoMessageNotice',
+          //   component:'by-input'
+          // }],
+          // [{
+          //   label:'拆分订单整单发货',
+          //   prop:'enableSplitOrderFullSend',
+          //   component:'by-switch',
+          //   compConfig:{
+          //     attr:{
+          //       activeValue:1,
+          //       inactiveValue:0
+          //     }
+          //   }
+          // },{
+          //   label:'同步库存',
+          //   prop:'enableSynvStore',
+          //   component:'by-switch',
+          //   compConfig:{
+          //     attr:{
+          //       activeValue:1,
+          //       inactiveValue:0
+          //     }
+          //   }
+          // },{
+          //   label:'订单下载',
+          //   prop:'enableSyncOrder',
+          //   component:'by-switch',
+          //   compConfig:{
+          //     attr:{
+          //       activeValue:1,
+          //       inactiveValue:0
+          //     }
+          //   }
+          // },{
+          //   label:'天猫物流升级',
+          //   prop:'enableTmallLogistics',
+          //   component:'by-switch',
+          //   compConfig:{
+          //     attr:{
+          //       activeValue:1,
+          //       inactiveValue:0
+          //     }
+          //   }
+          // }],
+          // [{
+          //   label:'商品下载',
+          //   prop:'enableSkuDownload',
+          //   component:'by-switch',
+          //   compConfig:{
+          //     attr:{
+          //       activeValue:1,
+          //       inactiveValue:0
+          //     }
+          //   }
+          // },{
+          //   label:'开启链接库存同步',
+          //   prop:'enableLinkSync',
+          //   component:'by-switch',
+          //   compConfig:{
+          //     attr:{
+          //       activeValue:1,
+          //       inactiveValue:0
+          //     }
+          //   }
+          // },{
+          //   label:'是否虾皮SIP',
+          //   prop:'shopeeSip',
+          //   component:'by-switch',
+          //   compConfig:{
+          //     attr:{
+          //       activeValue:1,
+          //       inactiveValue:0
+          //     }
+          //   }
+          // },{
+          //   label:'同步发货',
+          //   prop:'enableSyncSend',
+          //   component:'by-switch',
+          //   compConfig:{
+          //     attr:{
+          //       activeValue:1,
+          //       inactiveValue:0
+          //     }
+          //   }
+          // }],
+          // [{
+          //   label:'店铺状态',
+          //   prop:'shopStatus',
+          //   component:'by-switch',
+          //   compConfig:{
+          //     attr:{
+          //       activeValue:1,
+          //       inactiveValue:0
+          //     }
+          //   }
+          // },{
+          //   label:'退款状态',
+          //   prop:'refundStatus',
+          //   component:'by-switch',
+          //   compConfig:{
+          //     attr:{
+          //       activeValue:'1',
+          //       inactiveValue:'0'
+          //     }
+          //   }
+          // },{
+          //   label:'启用分销',
+          //   prop:'enableDistribution',
+          //   component:'by-switch',
+          //   compConfig:{
+          //     attr:{
+          //       activeValue:1,
+          //       inactiveValue:0
+          //     }
+          //   }
+          // },{
+          //   label:'揽收轨迹同步发货',
+          //   prop:'enableTrackSyncSend',
+          //   component:'by-switch',
+          //   compConfig:{
+          //     attr:{
+          //       activeValue:1,
+          //       inactiveValue:0
+          //     }
+          //   }
+          // }],
+          // [{
+          //   label:'售后单下载',
+          //   prop:'enableSyncAfterSale',
+          //   component:'by-switch',
+          //   compConfig:{
+          //     attr:{
+          //       activeValue:1,
+          //       inactiveValue:0
+          //     }
+          //   }
+          // },{
+          //   label:'开通AG',
+          //   prop:'enableAg',
+          //   component:'by-switch',
+          //   compConfig:{
+          //     attr:{
+          //       activeValue:1,
+          //       inactiveValue:0
+          //     }
+          //   }
+          // },{
+          //   label:'确认收货自动退款',
+          //   prop:'enableAutoRefund',
+          //   component:'by-switch',
+          //   compConfig:{
+          //     attr:{
+          //       activeValue:1,
+          //       inactiveValue:0
+          //     }
+          //   }
+          // },{
+          //   label:'开启跨境操作',
+          //   prop:'enableCbec',
+          //   component:'by-switch',
+          //   compConfig:{
+          //     attr:{
+          //       activeValue:1,
+          //       inactiveValue:0
+          //     }
+          //   }
+          // }]
         ]
       }
     }

src/views/system/user/authRole.vue

@@ -0,0 +1,117 @@
+<template>
+  <div class="app-container">
+    <h4 class="form-header h4">基本信息</h4>
+    <el-form ref="form" :model="form" label-width="80px">
+      <el-row>
+        <el-col :span="8" :offset="2">
+          <el-form-item label="用户昵称" prop="nickName">
+            <el-input v-model="form.nickName" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" :offset="2">
+          <el-form-item label="登录账号" prop="userName">
+            <el-input  v-model="form.userName" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <h4 class="form-header h4">角色信息</h4>
+    <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="table" @selection-change="handleSelectionChange" :data="roles.slice((pageNum-1)*pageSize,pageNum*pageSize)">
+      <el-table-column label="序号" type="index" align="center">
+        <template slot-scope="scope">
+          <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
+      <el-table-column label="角色编号" align="center" prop="roleId" />
+      <el-table-column label="角色名称" align="center" prop="roleName" />
+      <el-table-column label="权限字符" align="center" prop="roleKey" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
+
+    <el-form label-width="100px">
+      <el-form-item style="text-align: center;margin-left:-120px;margin-top:30px;">
+        <el-button type="primary" @click="submitForm()">提交</el-button>
+        <el-button @click="close()">返回</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { getAuthRole, updateAuthRole } from "@/api/system/user";
+
+export default {
+  name: "AuthRole",
+  data() {
+    return {
+       // 遮罩层
+      loading: true,
+      // 分页信息
+      total: 0,
+      pageNum: 1,
+      pageSize: 10,
+      // 选中角色编号
+      roleIds:[],
+      // 角色信息
+      roles: [],
+      // 用户信息
+      form: {}
+    };
+  },
+  created() {
+    const userId = this.$route.params && this.$route.params.userId;
+    if (userId) {
+      this.loading = true;
+      getAuthRole(userId).then((response) => {
+        this.form = response.user;
+        this.roles = response.roles;
+        this.total = this.roles.length;
+        this.$nextTick(() => {
+          this.roles.forEach((row) => {
+            if (row.flag) {
+              this.$refs.table.toggleRowSelection(row);
+            }
+          });
+        });
+        this.loading = false;
+      });
+    }
+  },
+  methods: {
+    /** 单击选中行数据 */
+    clickRow(row) {
+      this.$refs.table.toggleRowSelection(row);
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.roleIds = selection.map((item) => item.roleId);
+    },
+    // 保存选中的数据编号
+    getRowKey(row) {
+      return row.roleId;
+    },
+    /** 提交按钮 */
+    submitForm() {
+      const userId = this.form.userId;
+      const roleIds = this.roleIds.join(",");
+      updateAuthRole({ userId: userId, roleIds: roleIds }).then((response) => {
+        this.$modal.msgSuccess("授权成功");
+        this.close();
+      });
+    },
+    /** 关闭按钮 */
+    close() {
+      const obj = { path: "/system/user" };
+      this.$tab.closeOpenPage(obj);
+    },
+  },
+};
+</script>

src/views/system/user/index.vue

@@ -0,0 +1,672 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--部门数据-->
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="deptName"
+            placeholder="请输入部门名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree
+            :data="deptOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            default-expand-all
+            highlight-current
+            @node-click="handleNodeClick"
+          />
+        </div>
+      </el-col>
+      <!--用户数据-->
+      <el-col :span="20" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="用户名称" prop="userName">
+            <el-input
+              v-model="queryParams.userName"
+              placeholder="请输入用户名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="手机号码" prop="phonenumber">
+            <el-input
+              v-model="queryParams.phonenumber"
+              placeholder="请输入手机号码"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-select
+              v-model="queryParams.status"
+              placeholder="用户状态"
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in dict.type.sys_normal_disable"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="dateRange"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['system:user:add']"
+            >新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="success"
+              plain
+              icon="el-icon-edit"
+              size="mini"
+              :disabled="single"
+              @click="handleUpdate"
+              v-hasPermi="['system:user:edit']"
+            >修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="danger"
+              plain
+              icon="el-icon-delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDelete"
+              v-hasPermi="['system:user:remove']"
+            >删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="info"
+              plain
+              icon="el-icon-upload2"
+              size="mini"
+              @click="handleImport"
+              v-hasPermi="['system:user:import']"
+            >导入</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="['system:user:export']"
+            >导出</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
+          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+            <template slot-scope="scope">
+              <el-switch
+                v-model="scope.row.status"
+                active-value="0"
+                inactive-value="1"
+                @change="handleStatusChange(scope.row)"
+              ></el-switch>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            align="center"
+            width="160"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope" v-if="scope.row.userId !== 1">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:user:edit']"
+              >修改</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['system:user:remove']"
+              >删除</el-button>
+              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
+                <span class="el-dropdown-link">
+                  <i class="el-icon-d-arrow-right el-icon--right"></i>更多
+                </span>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
+                    v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
+                  <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
+                    v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+
+    <!-- 添加或修改用户配置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="用户昵称" prop="nickName">
+              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="归属部门" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="手机号码" prop="phonenumber">
+              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="邮箱" prop="email">
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
+              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="用户性别">
+              <el-select v-model="form.sex" placeholder="请选择性别">
+                <el-option
+                  v-for="dict in dict.type.sys_user_sex"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="状态">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in dict.type.sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="岗位">
+              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
+                <el-option
+                  v-for="item in postOptions"
+                  :key="item.postId"
+                  :label="item.postName"
+                  :value="item.postId"
+                  :disabled="item.status == 1"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="角色">
+              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
+                <el-option
+                  v-for="item in roleOptions"
+                  :key="item.roleId"
+                  :label="item.roleName"
+                  :value="item.roleId"
+                  :disabled="item.status == 1"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+          </div>
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus } from "@/api/system/user";
+import { getToken } from "@/benyun/utils/auth";
+import { treeselect } from "@/api/system/dept";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "User",
+  dicts: ['sys_normal_disable', 'sys_user_sex'],
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      userList: null,
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      // 是否显示弹出层
+      open: false,
+      // 部门名称
+      deptName: undefined,
+      // 默认密码
+      initPassword: undefined,
+      // 日期范围
+      dateRange: [],
+      // 岗位选项
+      postOptions: [],
+      // 角色选项
+      roleOptions: [],
+      // 表单参数
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/system/user/importData"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userName: undefined,
+        phonenumber: undefined,
+        status: undefined,
+        deptId: undefined
+      },
+      // 列信息
+      columns: [
+        { key: 0, label: `用户编号`, visible: true },
+        { key: 1, label: `用户名称`, visible: true },
+        { key: 2, label: `用户昵称`, visible: true },
+        { key: 3, label: `部门`, visible: true },
+        { key: 4, label: `手机号码`, visible: true },
+        { key: 5, label: `状态`, visible: true },
+        { key: 6, label: `创建时间`, visible: true }
+      ],
+      // 表单校验
+      rules: {
+        userName: [
+          { required: true, message: "用户名称不能为空", trigger: "blur" },
+          { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
+        ],
+        nickName: [
+          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+        ],
+        password: [
+          { required: true, message: "用户密码不能为空", trigger: "blur" },
+          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
+        ],
+        email: [
+          {
+            type: "email",
+            message: "请输入正确的邮箱地址",
+            trigger: ["blur", "change"]
+          }
+        ],
+        phonenumber: [
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ]
+      }
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    this.getList();
+    this.getTreeselect();
+    this.getConfigKey("sys.user.initPassword").then(response => {
+      this.initPassword = response.msg;
+    });
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.userList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.deptId = data.id;
+      this.handleQuery();
+    },
+    // 用户状态修改
+    handleStatusChange(row) {
+      let text = row.status === "0" ? "启用" : "停用";
+      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
+        return changeUserStatus(row.userId, row.status);
+      }).then(() => {
+        this.$modal.msgSuccess(text + "成功");
+      }).catch(function() {
+        row.status = row.status === "0" ? "1" : "0";
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        userId: undefined,
+        deptId: undefined,
+        userName: undefined,
+        nickName: undefined,
+        password: undefined,
+        phonenumber: undefined,
+        email: undefined,
+        sex: undefined,
+        status: "0",
+        remark: undefined,
+        postIds: [],
+        roleIds: []
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.userId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    // 更多操作触发
+    handleCommand(command, row) {
+      switch (command) {
+        case "handleResetPwd":
+          this.handleResetPwd(row);
+          break;
+        case "handleAuthRole":
+          this.handleAuthRole(row);
+          break;
+        default:
+          break;
+      }
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.getTreeselect();
+      getUser().then(response => {
+        this.postOptions = response.posts;
+        this.roleOptions = response.roles;
+        this.open = true;
+        this.title = "添加用户";
+        this.form.password = this.initPassword;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getTreeselect();
+      const userId = row.userId || this.ids;
+      getUser(userId).then(response => {
+        this.form = response.data;
+        this.postOptions = response.posts;
+        this.roleOptions = response.roles;
+        this.form.postIds = response.postIds;
+        this.form.roleIds = response.roleIds;
+        this.open = true;
+        this.title = "修改用户";
+        this.form.password = "";
+      });
+    },
+    /** 重置密码按钮操作 */
+    handleResetPwd(row) {
+      this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        closeOnClickModal: false,
+        inputPattern: /^.{5,20}$/,
+        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
+      }).then(({ value }) => {
+          resetUserPwd(row.userId, value).then(response => {
+            this.$modal.msgSuccess("修改成功，新密码是：" + value);
+          });
+        }).catch(() => {});
+    },
+    /** 分配角色操作 */
+    handleAuthRole: function(row) {
+      const userId = row.userId;
+      this.$router.push("/system/user-auth/role/" + userId);
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.userId != undefined) {
+            updateUser(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addUser(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const userIds = row.userId || this.ids;
+      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
+        return delUser(userIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/user/export', {
+        ...this.queryParams
+      }, `user_${new Date().getTime()}.xlsx`)
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download('system/user/importTemplate', {
+      }, `user_template_${new Date().getTime()}.xlsx`)
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    }
+  }
+};
+</script>

src/views/system/user/profile/index.vue

@@ -0,0 +1,91 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="6" :xs="24">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>个人信息</span>
+          </div>
+          <div>
+            <div class="text-center">
+              <userAvatar :user="user" />
+            </div>
+            <ul class="list-group list-group-striped">
+              <li class="list-group-item">
+                <svg-icon icon-class="user" />用户名称
+                <div class="pull-right">{{ user.userName }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="phone" />手机号码
+                <div class="pull-right">{{ user.phonenumber }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="email" />用户邮箱
+                <div class="pull-right">{{ user.email }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="tree" />所属部门
+                <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="peoples" />所属角色
+                <div class="pull-right">{{ roleGroup }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="date" />创建日期
+                <div class="pull-right">{{ user.createTime }}</div>
+              </li>
+            </ul>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col :span="18" :xs="24">
+        <el-card>
+          <div slot="header" class="clearfix">
+            <span>基本资料</span>
+          </div>
+          <el-tabs v-model="activeTab">
+            <el-tab-pane label="基本资料" name="userinfo">
+              <userInfo :user="user" />
+            </el-tab-pane>
+            <el-tab-pane label="修改密码" name="resetPwd">
+              <resetPwd :user="user" />
+            </el-tab-pane>
+          </el-tabs>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import userAvatar from "./userAvatar";
+import userInfo from "./userInfo";
+import resetPwd from "./resetPwd";
+import { getUserProfile } from "@/api/system/user";
+
+export default {
+  name: "Profile",
+  components: { userAvatar, userInfo, resetPwd },
+  data() {
+    return {
+      user: {},
+      roleGroup: {},
+      postGroup: {},
+      activeTab: "userinfo"
+    };
+  },
+  created() {
+    this.getUser();
+  },
+  methods: {
+    getUser() {
+      getUserProfile().then(response => {
+        this.user = response.data;
+        this.roleGroup = response.roleGroup;
+        this.postGroup = response.postGroup;
+      });
+    }
+  }
+};
+</script>

src/views/system/user/profile/resetPwd.vue

@@ -0,0 +1,68 @@
+<template>
+  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
+    <el-form-item label="旧密码" prop="oldPassword">
+      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password/>
+    </el-form-item>
+    <el-form-item label="新密码" prop="newPassword">
+      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password/>
+    </el-form-item>
+    <el-form-item label="确认密码" prop="confirmPassword">
+      <el-input v-model="user.confirmPassword" placeholder="请确认密码" type="password" show-password/>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" size="mini" @click="submit">保存</el-button>
+      <el-button type="danger" size="mini" @click="close">关闭</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import { updateUserPwd } from "@/api/system/user";
+
+export default {
+  data() {
+    const equalToPassword = (rule, value, callback) => {
+      if (this.user.newPassword !== value) {
+        callback(new Error("两次输入的密码不一致"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      user: {
+        oldPassword: undefined,
+        newPassword: undefined,
+        confirmPassword: undefined
+      },
+      // 表单校验
+      rules: {
+        oldPassword: [
+          { required: true, message: "旧密码不能为空", trigger: "blur" }
+        ],
+        newPassword: [
+          { required: true, message: "新密码不能为空", trigger: "blur" },
+          { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }
+        ],
+        confirmPassword: [
+          { required: true, message: "确认密码不能为空", trigger: "blur" },
+          { required: true, validator: equalToPassword, trigger: "blur" }
+        ]
+      }
+    };
+  },
+  methods: {
+    submit() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
+            this.$modal.msgSuccess("修改成功");
+          });
+        }
+      });
+    },
+    close() {
+      this.$tab.closePage();
+    }
+  }
+};
+</script>

src/views/system/user/profile/userAvatar.vue

@@ -0,0 +1,172 @@
+<template>
+  <div>
+    <div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" /></div>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened"  @close="closeDialog">
+      <el-row>
+        <el-col :xs="24" :md="12" :style="{height: '350px'}">
+          <vue-cropper
+            ref="cropper"
+            :img="options.img"
+            :info="true"
+            :autoCrop="options.autoCrop"
+            :autoCropWidth="options.autoCropWidth"
+            :autoCropHeight="options.autoCropHeight"
+            :fixedBox="options.fixedBox"
+            @realTime="realTime"
+            v-if="visible"
+          />
+        </el-col>
+        <el-col :xs="24" :md="12" :style="{height: '350px'}">
+          <div class="avatar-upload-preview">
+            <img :src="previews.url" :style="previews.img" />
+          </div>
+        </el-col>
+      </el-row>
+      <br />
+      <el-row>
+        <el-col :lg="2" :md="2">
+          <el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
+            <el-button size="small">
+              选择
+              <i class="el-icon-upload el-icon--right"></i>
+            </el-button>
+          </el-upload>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 2}" :md="2">
+          <el-button icon="el-icon-plus" size="small" @click="changeScale(1)"></el-button>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 1}" :md="2">
+          <el-button icon="el-icon-minus" size="small" @click="changeScale(-1)"></el-button>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 1}" :md="2">
+          <el-button icon="el-icon-refresh-left" size="small" @click="rotateLeft()"></el-button>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 1}" :md="2">
+          <el-button icon="el-icon-refresh-right" size="small" @click="rotateRight()"></el-button>
+        </el-col>
+        <el-col :lg="{span: 2, offset: 6}" :md="2">
+          <el-button type="primary" size="small" @click="uploadImg()">提 交</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import store from "@/store";
+import { VueCropper } from "vue-cropper";
+import { uploadAvatar } from "@/api/system/user";
+
+export default {
+  components: { VueCropper },
+  props: {
+    user: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      // 是否显示弹出层
+      open: false,
+      // 是否显示cropper
+      visible: false,
+      // 弹出层标题
+      title: "修改头像",
+      options: {
+        img: store.getters.avatar, //裁剪图片的地址
+        autoCrop: true, // 是否默认生成截图框
+        autoCropWidth: 200, // 默认生成截图框宽度
+        autoCropHeight: 200, // 默认生成截图框高度
+        fixedBox: true // 固定截图框大小 不允许改变
+      },
+      previews: {}
+    };
+  },
+  methods: {
+    // 编辑头像
+    editCropper() {
+      this.open = true;
+    },
+    // 打开弹出层结束时的回调
+    modalOpened() {
+      this.visible = true;
+    },
+    // 覆盖默认的上传行为
+    requestUpload() {
+    },
+    // 向左旋转
+    rotateLeft() {
+      this.$refs.cropper.rotateLeft();
+    },
+    // 向右旋转
+    rotateRight() {
+      this.$refs.cropper.rotateRight();
+    },
+    // 图片缩放
+    changeScale(num) {
+      num = num || 1;
+      this.$refs.cropper.changeScale(num);
+    },
+    // 上传预处理
+    beforeUpload(file) {
+      if (file.type.indexOf("image/") == -1) {
+        this.$modal.msgError("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。");
+      } else {
+        const reader = new FileReader();
+        reader.readAsDataURL(file);
+        reader.onload = () => {
+          this.options.img = reader.result;
+        };
+      }
+    },
+    // 上传图片
+    uploadImg() {
+      this.$refs.cropper.getCropBlob(data => {
+        let formData = new FormData();
+        formData.append("avatarfile", data);
+        uploadAvatar(formData).then(response => {
+          this.open = false;
+          this.options.img = response.imgUrl;
+          store.commit('SET_AVATAR', this.options.img);
+          this.$modal.msgSuccess("修改成功");
+          this.visible = false;
+        });
+      });
+    },
+    // 实时预览
+    realTime(data) {
+      this.previews = data;
+    },
+    // 关闭窗口
+    closeDialog() {
+      this.options.img = store.getters.avatar
+      this.visible = false;
+    }
+  }
+};
+</script>
+<style scoped lang="scss">
+.user-info-head {
+  position: relative;
+  display: inline-block;
+  height: 120px;
+}
+
+.user-info-head:hover:after {
+  content: '+';
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  color: #eee;
+  background: rgba(0, 0, 0, 0.5);
+  font-size: 24px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  cursor: pointer;
+  line-height: 110px;
+  border-radius: 50%;
+}
+</style>

src/views/system/user/profile/userInfo.vue

@@ -0,0 +1,75 @@
+<template>
+  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
+    <el-form-item label="用户昵称" prop="nickName">
+      <el-input v-model="user.nickName" maxlength="30" />
+    </el-form-item> 
+    <el-form-item label="手机号码" prop="phonenumber">
+      <el-input v-model="user.phonenumber" maxlength="11" />
+    </el-form-item>
+    <el-form-item label="邮箱" prop="email">
+      <el-input v-model="user.email" maxlength="50" />
+    </el-form-item>
+    <el-form-item label="性别">
+      <el-radio-group v-model="user.sex">
+        <el-radio label="0">男</el-radio>
+        <el-radio label="1">女</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" size="mini" @click="submit">保存</el-button>
+      <el-button type="danger" size="mini" @click="close">关闭</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import { updateUserProfile } from "@/api/system/user";
+
+export default {
+  props: {
+    user: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      // 表单校验
+      rules: {
+        nickName: [
+          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+        ],
+        email: [
+          { required: true, message: "邮箱地址不能为空", trigger: "blur" },
+          {
+            type: "email",
+            message: "请输入正确的邮箱地址",
+            trigger: ["blur", "change"]
+          }
+        ],
+        phonenumber: [
+          { required: true, message: "手机号码不能为空", trigger: "blur" },
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ]
+      }
+    };
+  },
+  methods: {
+    submit() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          updateUserProfile(this.user).then(response => {
+            this.$modal.msgSuccess("修改成功");
+          });
+        }
+      });
+    },
+    close() {
+      this.$tab.closePage();
+    }
+  }
+};
+</script>