Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/lang/zh.js

@@ -1,285 +1,278 @@
 export default {
   route: {
-    dashboard: "首页",
-    introduction: "简述",
-    documentation: "文档",
-    guide: "引导页",
-    permission: "权限测试页",
-    pagePermission: "页面权限",
-    directivePermission: "指令权限",
-    icons: "图标",
-    components: "组件",
-    componentIndex: "介绍",
-    tinymce: "富文本编辑器",
-    markdown: "Markdown",
-    jsonEditor: "JSON编辑器",
-    dndList: "列表拖拽",
-    splitPane: "Splitpane",
-    avatarUpload: "头像上传",
-    dropzone: "Dropzone",
-    sticky: "Sticky",
-    countTo: "CountTo",
-    componentMixin: "小组件",
-    backToTop: "返回顶部",
-    dragDialog: "拖拽 Dialog",
-    dragKanban: "可拖拽看板",
-    charts: "图表",
-    keyboardChart: "键盘图表",
-    lineChart: "折线图",
-    mixChart: "混合图表",
-    example: "综合实例",
-    nested: "路由嵌套",
-    menu1: "菜单1",
-    "menu1-1": "菜单1-1",
-    "menu1-2": "菜单1-2",
-    "menu1-2-1": "菜单1-2-1",
-    "menu1-2-2": "菜单1-2-2",
-    "menu1-3": "菜单1-3",
-    menu2: "菜单2",
-    Table: "Table",
-    dynamicTable: "动态Table",
-    dragTable: "拖拽Table",
-    inlineEditTable: "Table内编辑",
-    complexTable: "综合Table",
-    treeTable: "树形表格",
-    customTreeTable: "自定义树表",
-    tab: "Tab",
-    form: "表单",
-    createArticle: "创建文章",
-    editArticle: "编辑文章",
-    articleList: "文章列表",
-    errorPages: "错误页面",
-    page401: "401",
-    page404: "404",
-    errorLog: "错误日志",
-    excel: "Excel",
-    exportExcel: "Export Excel",
-    selectExcel: "Export Selected",
-    uploadExcel: "Upload Excel",
-    zip: "Zip",
-    exportZip: "Export Zip",
-    theme: "换肤",
-    clipboardDemo: "Clipboard",
-    i18n: "国际化",
-    permissionManage: "权限管理",
-    adminManage: "用户管理",
-    roleManage: "角色管理",
-    dialysis: "透析管理",
-    paper: "透析管理",
-    advice: "今日医嘱",
-    prepare: "透析准备",
-    dialysisPrintOrder: "打印透析单",
-    details: "透析",
-    data_dictionary: "数据字典",
-    field_config: "字段配置",
-    template: "模版配置",
-    druguse: "医嘱模版",
-    watch: "透析监测",
-    addAdmin: "新增用户",
-    editAdmin: "编辑用户信息",
-    setupPerview: "设置权限",
-    user: "病人管理",
-    createPatient: "新增病人",
-    patientPage: "病人信息",
-    editPatient: "修改病人信息",
-    patient: "病人管理",
-    dialysisSolution: "透析处方",
-    inspection: "检验检查",
-    home: "首页",
-    weight: "干体重",
-    dialysisRecord: "透析记录",
-    scheduling: "排班信息",
-    proeducation: "宣教信息",
-    doctorAdvice: "医嘱信息",
-    dryWeight: "干体重",
-    device: "设备",
-    deviceManage: "设备管理",
-    modemanagement: "型号管理",
-    dialysisMachineManage: "设备管理",
-    workforce: "排班管理",
-    appointment: "排班管理",
-    sign: "治疗签到",
-    remind: "排班提醒",
-    signWeight: "签到称重",
-    deviceZoneManage: "分区管理",
-    deviceGroupManage: "分组管理",
-    deviceNumberManage: "床位管理",
-    service: "我的服务",
-    invoice: "发票管理",
-    invoiceApply: "申请发票",
-    servicePay: "立即支付",
-    serviceOrder: "购买服务",
-    payType: "选择支付方式",
-    weChatPay: "确认支付",
-    completeOrder: "购买结果",
-    orderRecord: "订单详情",
-    recordList: "订单记录",
-    stockManage: "库存管理",
-    goodType: "商品类型",
-    stockIn: "入库管理",
-    stockOut: "出库管理",
-    manufacturer: "厂家",
-    dealer: "经销商",
-    salesReturn: "退货",
-    salesReutrnRecord: "退货记录",
-    warehouseRecord: "入库记录",
-    addStockOut: "出库",
-    cancelStock: "出库退库",
-    cancelStockRecord: "退库记录",
-    stockOutRecord: "出库记录",
-    addStockIn: "入库",
-    stockQuery: "库存查询",
-    workforce_template: "排班模板设置",
-    statistics: "统计分析",
-    config: "库存配置",
-    goodInfo: "商品信息",
-    CourseOfDiseaseManage: "病程管理",
-    RescueRecord: "抢救记录",
-    special_permission_manage: "特殊权限管理",
-    schedule_print: "排班打印",
+    dashboard: '首页',
+    introduction: '简述',
+    documentation: '文档',
+    guide: '引导页',
+    permission: '权限测试页',
+    pagePermission: '页面权限',
+    directivePermission: '指令权限',
+    icons: '图标',
+    components: '组件',
+    componentIndex: '介绍',
+    tinymce: '富文本编辑器',
+    markdown: 'Markdown',
+    jsonEditor: 'JSON编辑器',
+    dndList: '列表拖拽',
+    splitPane: 'Splitpane',
+    avatarUpload: '头像上传',
+    dropzone: 'Dropzone',
+    sticky: 'Sticky',
+    countTo: 'CountTo',
+    componentMixin: '小组件',
+    backToTop: '返回顶部',
+    dragDialog: '拖拽 Dialog',
+    dragKanban: '可拖拽看板',
+    charts: '图表',
+    keyboardChart: '键盘图表',
+    lineChart: '折线图',
+    mixChart: '混合图表',
+    example: '综合实例',
+    nested: '路由嵌套',
+    menu1: '菜单1',
+    'menu1-1': '菜单1-1',
+    'menu1-2': '菜单1-2',
+    'menu1-2-1': '菜单1-2-1',
+    'menu1-2-2': '菜单1-2-2',
+    'menu1-3': '菜单1-3',
+    menu2: '菜单2',
+    Table: 'Table',
+    dynamicTable: '动态Table',
+    dragTable: '拖拽Table',
+    inlineEditTable: 'Table内编辑',
+    complexTable: '综合Table',
+    treeTable: '树形表格',
+    customTreeTable: '自定义树表',
+    tab: 'Tab',
+    form: '表单',
+    createArticle: '创建文章',
+    editArticle: '编辑文章',
+    articleList: '文章列表',
+    errorPages: '错误页面',
+    page401: '401',
+    page404: '404',
+    errorLog: '错误日志',
+    excel: 'Excel',
+    exportExcel: 'Export Excel',
+    selectExcel: 'Export Selected',
+    uploadExcel: 'Upload Excel',
+    zip: 'Zip',
+    exportZip: 'Export Zip',
+    theme: '换肤',
+    clipboardDemo: 'Clipboard',
+    i18n: '国际化',
+    permissionManage: '权限管理',
+    adminManage: '员工管理',
+    roleManage: '权限管理',
+    dialysis: '透析管理',
+    paper: '透析管理',
+    advice: '今日医嘱',
+    prepare: '透析准备',
+    dialysisPrintOrder: '打印透析单',
+    details: '透析',
+    data_dictionary: '数据字典',
+    field_config: '字段配置',
+    template: '模版配置',
+    druguse: '医嘱模版',
+    watch: '透析监测',
+    addAdmin: '新增用户',
+    editAdmin: '编辑用户信息',
+    setupPerview: '设置权限',
+    user: '病人管理',
+    createPatient: '新增病人',
+    patientPage: '病人信息',
+    editPatient: '修改病人信息',
+    patient: '病人管理',
+    dialysisSolution: '透析处方',
+    inspection: '检验检查',
+    home: '首页',
+    weight: '干体重',
+    dialysisRecord: '透析记录',
+    scheduling: '排班信息',
+    proeducation: '宣教信息',
+    doctorAdvice: '医嘱信息',
+    dryWeight: '干体重',
+    device: '设备',
+    deviceManage: '设备管理',
+    modemanagement: '型号管理',
+    dialysisMachineManage: '设备管理',
+    workforce: '排班管理',
+    appointment: '排班管理',
+    sign: '治疗签到',
+    remind: '排班提醒',
+    signWeight: '签到称重',
+    deviceZoneManage: '分区管理',
+    deviceGroupManage: '分组管理',
+    deviceNumberManage: '床位管理',
+    service: '我的服务',
+    invoice: '发票管理',
+    invoiceApply: '申请发票',
+    servicePay: '立即支付',
+    serviceOrder: '购买服务',
+    payType: '选择支付方式',
+    weChatPay: '确认支付',
+    completeOrder: '购买结果',
+    orderRecord: '订单详情',
+    recordList: '订单记录',
+    stockManage: '库存管理',
+    goodType: '商品类型',
+    stockIn: '入库管理',
+    stockOut: '出库管理',
+    manufacturer: '厂家',
+    dealer: '经销商',
+    salesReturn: '退货',
+    salesReutrnRecord: '退货记录',
+    warehouseRecord: '入库记录',
+    addStockOut: '出库',
+    cancelStock: '出库退库',
+    cancelStockRecord: '退库记录',
+    stockOutRecord: '出库记录',
+    addStockIn: '入库',
+    stockQuery: '库存查询',
+    workforce_template: '排班模板设置',
+    statistics: '统计分析',
+    config: '库存配置',
+    goodInfo: '商品信息',
+    CourseOfDiseaseManage: '病程管理',
+    RescueRecord: '抢救记录',
+    special_permission_manage: '特殊权限管理',
+    schedule_print: '排班打印',
 
-    warehouseReceipt: "出入库",
-    warehouseReceiptOther: "其他出入库",
-    stockInOrder: "耗材入库单",
-    salesReturnOrder: "耗材退货单",
-    stockOutOrder: "耗材出库单",
-    cancelStockOrder: "耗材退库单",
-    otherStockInOrder: "其他入库单",
-    otherSalesReturnOrder: "其他退货单",
-    otherStockOutOrder: "其他出库单",
-    otherCancelStockOrder: "其他退库单",
-    stockInOrderAdd: "新增入库单",
-    salesReturnOrderAdd: "新增退货单",
-    stockOutOrderAdd: "新增出库单",
-    cancelStockOrderAdd: "新增退库单",
-    stockInDetail: "入库单详情",
-    salesReturnDetail: "退货单详情",
-    stockOutDetail: "出库单详情",
-    cancelStockDetail: "退库单详情",
-    stockDetail: "明细查询",
+    warehouseReceipt: '出入库',
+    warehouseReceiptOther: '其他出入库',
+    stockInOrder: '耗材入库单',
+    salesReturnOrder: '耗材退货单',
+    stockOutOrder: '耗材出库单',
+    cancelStockOrder: '耗材退库单',
+    otherStockInOrder: '其他入库单',
+    otherSalesReturnOrder: '其他退货单',
+    otherStockOutOrder: '其他出库单',
+    otherCancelStockOrder: '其他退库单',
+    stockInOrderAdd: '新增入库单',
+    salesReturnOrderAdd: '新增退货单',
+    stockOutOrderAdd: '新增出库单',
+    cancelStockOrderAdd: '新增退库单',
+    stockInDetail: '入库单详情',
+    salesReturnDetail: '退货单详情',
+    stockOutDetail: '出库单详情',
+    cancelStockDetail: '退库单详情',
+    stockDetail: '明细查询',
 
-    showconfig: "显示配置",
-    user_detail: "使用明细",
-    systemManage: "系统管理",
-    printTemplate: "打印模版",
-    data_upload: "一键上报",
-    fast_upload: "快捷上报",
-    export: "一键导出",
-    upload_config: "质控上报配置",
-    quality_control: "质控上报",
-    remind_print: "排版提醒打印",
-    system_prescription: "透析方案",
-    integration_config: "集成配置",
-    his_config: "HIS集成配置"
+    showconfig: '显示配置',
+    user_detail: '使用明细',
+    systemManage: '管理中心',
+    printTemplate: '打印模版',
+    data_upload: '一键上报',
+    fast_upload: '快捷上报',
+    export: '一键导出',
+    upload_config: '质控上报配置',
+    quality_control: '质控上报',
+    remind_print: '排版提醒打印',
+    system_prescription: '透析方案',
+    integration_config: '集成配置',
+    his_config: 'HIS集成配置'
   },
   navbar: {
-    logOut: "退出登录",
-    dashboard: "首页",
-    github: "项目地址",
-    screenfull: "全屏",
-    theme: "换肤"
+    logOut: '退出登录',
+    dashboard: '首页',
+    github: '项目地址',
+    screenfull: '全屏',
+    theme: '换肤'
   },
   login: {
-    title: "系统登录",
-    logIn: "登录",
-    username: "账号",
-    password: "密码",
-    any: "随便填",
-    thirdparty: "第三方登录",
-    thirdpartyTips: "本地不能模拟，请结合自己业务进行模拟！！！"
+    title: '系统登录',
+    logIn: '登录',
+    username: '账号',
+    password: '密码',
+    any: '随便填',
+    thirdparty: '第三方登录',
+    thirdpartyTips: '本地不能模拟，请结合自己业务进行模拟！！！'
   },
   documentation: {
-    documentation: "文档",
-    github: "Github 地址"
+    documentation: '文档',
+    github: 'Github 地址'
   },
   permission: {
-    roles: "你的权限",
-    switchRoles: "切换权限"
+    roles: '你的权限',
+    switchRoles: '切换权限'
   },
   guide: {
-    description:
-      "引导页对于一些第一次进入项目的人很有用，你可以简单介绍下项目的功能。本 Demo 是基于",
-    button: "打开引导"
+    description: '引导页对于一些第一次进入项目的人很有用，你可以简单介绍下项目的功能。本 Demo 是基于',
+    button: '打开引导'
   },
   components: {
-    documentation: "文档",
-    tinymceTips:
-      "富文本是管理后台一个核心的功能，但同时又是一个有很多坑的地方。在选择富文本的过程中我也走了不少的弯路，市面上常见的富文本都基本用过了，最终权衡了一下选择了Tinymce。更详细的富文本比较和介绍见",
-    dropzoneTips:
-      "由于我司业务有特殊需求，而且要传七牛 所以没用第三方，选择了自己封装。代码非常的简单，具体代码你可以在这里看到 @/components/Dropzone",
-    stickyTips: "当页面滚动到预设的位置会吸附在顶部",
-    backToTopTips1: "页面滚动到指定位置会在右下角出现返回顶部按钮",
-    backToTopTips2:
-      "可自定义按钮的样式、show/hide、出现的高度、返回的位置 如需文字提示，可在外部使用Element的el-tooltip元素",
-    imageUploadTips:
-      "由于我在使用时它只有vue@1版本，而且和mockjs不兼容，所以自己改造了一下，如果大家要使用的话，优先还是使用官方版本。"
+    documentation: '文档',
+    tinymceTips: '富文本是管理后台一个核心的功能，但同时又是一个有很多坑的地方。在选择富文本的过程中我也走了不少的弯路，市面上常见的富文本都基本用过了，最终权衡了一下选择了Tinymce。更详细的富文本比较和介绍见',
+    dropzoneTips: '由于我司业务有特殊需求，而且要传七牛 所以没用第三方，选择了自己封装。代码非常的简单，具体代码你可以在这里看到 @/components/Dropzone',
+    stickyTips: '当页面滚动到预设的位置会吸附在顶部',
+    backToTopTips1: '页面滚动到指定位置会在右下角出现返回顶部按钮',
+    backToTopTips2: '可自定义按钮的样式、show/hide、出现的高度、返回的位置 如需文字提示，可在外部使用Element的el-tooltip元素',
+    imageUploadTips: '由于我在使用时它只有vue@1版本，而且和mockjs不兼容，所以自己改造了一下，如果大家要使用的话，优先还是使用官方版本。'
   },
   table: {
-    dynamicTips1: "固定表头, 按照表头顺序排序",
-    dynamicTips2: "不固定表头, 按照点击顺序排序",
-    dragTips1: "默认顺序",
-    dragTips2: "拖拽后顺序",
-    title: "标题",
-    importance: "重要性",
-    type: "类型",
-    remark: "点评",
-    search: "搜索",
-    add: "新增",
-    export: "导出",
-    reviewer: "审核人",
-    id: "序号",
-    date: "时间",
-    author: "作者",
-    readings: "阅读数",
-    status: "状态",
-    actions: "操作",
-    edit: "编辑",
-    publish: "发布",
-    draft: "草稿",
-    delete: "删除",
-    cancel: "取 消",
-    confirm: "保 存"
+    dynamicTips1: '固定表头, 按照表头顺序排序',
+    dynamicTips2: '不固定表头, 按照点击顺序排序',
+    dragTips1: '默认顺序',
+    dragTips2: '拖拽后顺序',
+    title: '标题',
+    importance: '重要性',
+    type: '类型',
+    remark: '点评',
+    search: '搜索',
+    add: '新增',
+    export: '导出',
+    reviewer: '审核人',
+    id: '序号',
+    date: '时间',
+    author: '作者',
+    readings: '阅读数',
+    status: '状态',
+    actions: '操作',
+    edit: '编辑',
+    publish: '发布',
+    draft: '草稿',
+    delete: '删除',
+    cancel: '取 消',
+    confirm: '保 存'
   },
   errorLog: {
-    tips: "请点击右上角bug小图标",
-    description:
-      "现在的管理后台基本都是spa的形式了，它增强了用户体验，但同时也会增加页面出问题的可能性，可能一个小小的疏忽就导致整个页面的死锁。好在 Vue 官网提供了一个方法来捕获处理异常，你可以在其中进行错误处理或者异常上报。",
-    documentation: "文档介绍"
+    tips: '请点击右上角bug小图标',
+    description: '现在的管理后台基本都是spa的形式了，它增强了用户体验，但同时也会增加页面出问题的可能性，可能一个小小的疏忽就导致整个页面的死锁。好在 Vue 官网提供了一个方法来捕获处理异常，你可以在其中进行错误处理或者异常上报。',
+    documentation: '文档介绍'
   },
   excel: {
-    export: "导出",
-    selectedExport: "导出已选择项",
-    placeholder: "请输入文件名(默认excel-list)"
+    export: '导出',
+    selectedExport: '导出已选择项',
+    placeholder: '请输入文件名(默认excel-list)'
   },
   zip: {
-    export: "导出",
-    placeholder: "请输入文件名(默认file)"
+    export: '导出',
+    placeholder: '请输入文件名(默认file)'
   },
   theme: {
-    change: "换肤",
-    documentation: "换肤文档",
-    tips:
-      "Tips: 它区别于 navbar 上的 theme-pick, 是两种不同的换肤方法，各自有不同的应用场景，具体请参考文档。"
+    change: '换肤',
+    documentation: '换肤文档',
+    tips: 'Tips: 它区别于 navbar 上的 theme-pick, 是两种不同的换肤方法，各自有不同的应用场景，具体请参考文档。'
   },
   tagsView: {
-    close: "关闭",
-    closeOthers: "关闭其它",
-    closeAll: "关闭所有"
+    close: '关闭',
+    closeOthers: '关闭其它',
+    closeAll: '关闭所有'
   },
   data_config: {
-    patient: "病人管理",
-    scheduling: "排班管理",
-    device: "设备管理",
-    hemodialysis: "血透管理",
-    system: "系统配置",
-    education: "透后宣教",
-    summary: "透析小结",
-    config_name: "名称",
-    config_field: "字段名",
-    config_value: "字段值",
-    remark: "备注",
-    course_disease: "病程",
-    rescue_record: "抢救记录",
-    manage_ment: "设备管理"
+    patient: '病人管理',
+    scheduling: '排班管理',
+    device: '设备管理',
+    hemodialysis: '血透管理',
+    system: '系统配置',
+    education: '透后宣教',
+    summary: '透析小结',
+    config_name: '名称',
+    config_field: '字段名',
+    config_value: '字段值',
+    remark: '备注',
+    course_disease: '病程',
+    rescue_record: '抢救记录',
+    manage_ment: '设备管理'
   }
-};
+}

src/views/layout/components/Navbar.vue

@@ -46,7 +46,7 @@
           </div>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="modifyUserInfoAction">
-              修改个人信息
+              个人信息
             </el-dropdown-item>
             <el-dropdown-item command="modifyOrgInfoAction">
               机构信息
@@ -70,7 +70,12 @@
           <i class="el-icon-arrow-down el-icon--right"></i>
         </span>
         <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item   icon="el-icon-plus" v-for="(item,index) in orgs" :key="index"  :command="item.id">{{item.org_name}}</el-dropdown-item>
+          <el-dropdown-item
+            v-for="(item, index) in orgs"
+            :key="index"
+            :command="item.id"
+            >{{ item.org_name }}</el-dropdown-item
+          >
         </el-dropdown-menu>
       </el-dropdown>
     </div>
@@ -92,7 +97,7 @@
           </div>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="modifyUserInfoAction"
-              >修改个人信息</el-dropdown-item
+              >个人信息</el-dropdown-item
             >
             <el-dropdown-item command="modifyOrgInfoAction"
               >机构信息</el-dropdown-item
@@ -112,7 +117,7 @@
       </div>
       <div>
         <i class="el-icon-question"></i>
-        <span>帮助中心</span>
+        <span @click="toClick">帮助中心</span>
       </div>
     </div>
   </div>
@@ -125,22 +130,20 @@ import { mapGetters } from "vuex";
 import Screenfull from "@/components/Screenfull";
 import ModifyUserInfoDialog from "@/xt_pages/home/modify_user_info_dialog";
 import ModifyOrgInfoDialog from "@/xt_pages/home/modifyOrgInfoDialog";
-import { getFiledConfigList, setFiledConfigList } from '@/utils/data_config' // getConfigList from sessionStorage
+import { getFiledConfigList, setFiledConfigList } from "@/utils/data_config"; // getConfigList from sessionStorage
 import {
   getAdminUserInfoCache,
   cacheAdminUserInfo,
   removeAdminUserInfoCache
-} from '@/utils/admin_info_cache'
-import {
-  getOrgs,changeOrg
-} from '@/api/config'
+} from "@/utils/admin_info_cache";
+import { getOrgs, changeOrg } from "@/api/config";
 export default {
-  inject:['reload'],
+  inject: ["reload"],
   data() {
     return {
-      orgs:[],
-      org_id:this.$store.getters.xt_user.org.id,
-      org_name:this.$store.getters.xt_user.org.org_name,
+      orgs: [],
+      org_id: this.$store.getters.xt_user.org.id,
+      org_name: this.$store.getters.xt_user.org.org_name
 
       // scrm_role_exist: $store.getters.xt_user.scrm_role_exist
     };
@@ -160,69 +163,66 @@ export default {
     }
   },
   methods: {
-    handleOrgCommand(org_id){
+    handleOrgCommand(org_id) {
       let params = {
         org_id: org_id
-      }
-      changeOrg(params).then(response => {
-        if (response.data.state === 1) {
-          // window.location.reload()
-
-          this.$message.success('切换成功')
-          let data = response.data.data
-          this.org_id = data.org.id
-          this.org_name = data.org.org_name
-
-          this.$store.dispatch("ModifyAdminUserOrgInfo", {
-            user: data.user,
-            cur_org_id: data.current_org_id,
-            cur_app_id: data.current_app_id,
-            org: data.org,
-            subscibe: data.subscibe,
-            template_info:data.template_info,
-          });
-
-          this.$store.dispatch("ModifyUrlInfo", {
-            urlfors: data.urlfors
-
-          });
-
-          this.$store.dispatch("ModifyFiled", {
-            fileds: data.fileds
-
-
-          });
-
-
-
-
-          setFiledConfigList(JSON.stringify(data.fileds))
-          cacheAdminUserInfo(JSON.stringify(data))
-
-
-          this.$store.dispatch('xt_GenerateRoutes', this.$store.getters.current_role_urls).then(() => {
-            this.$store.dispatch('VerifyConfigList').then(() => {
-              // alert('token 验证成功')
-              // console.log(this.$store.getters.xt_permission.addRouters)
-              this.$router.addRoutes(this.$store.getters.xt_permission.addRouters) // 动态添加可访问路由表
-              //        next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
-              // this.$router.replace({ path: '/' })
-              window.location.reload()
-              // this.$router.go(0)
-              // this.reload()
-            })
-          })
-
-
-
-
-
-        }else{
-          this.$message.success(response.data.msg)
-        }
-      }).catch(e => {
-        // this.$message.success("网络异常")
-      });
+      };
+      changeOrg(params)
+        .then(response => {
+          if (response.data.state === 1) {
+            // window.location.reload()
+
+            this.$message.success("切换成功");
+            let data = response.data.data;
+            this.org_id = data.org.id;
+            this.org_name = data.org.org_name;
+
+            this.$store.dispatch("ModifyAdminUserOrgInfo", {
+              user: data.user,
+              cur_org_id: data.current_org_id,
+              cur_app_id: data.current_app_id,
+              org: data.org,
+              subscibe: data.subscibe,
+              template_info: data.template_info
+            });
+
+            this.$store.dispatch("ModifyUrlInfo", {
+              urlfors: data.urlfors
+            });
+
+            this.$store.dispatch("ModifyFiled", {
+              fileds: data.fileds
+            });
+
+            setFiledConfigList(JSON.stringify(data.fileds));
+            cacheAdminUserInfo(JSON.stringify(data));
+
+            this.$store
+              .dispatch(
+                "xt_GenerateRoutes",
+                this.$store.getters.current_role_urls
+              )
+              .then(() => {
+                this.$store.dispatch("VerifyConfigList").then(() => {
+                  // alert('token 验证成功')
+                  // console.log(this.$store.getters.xt_permission.addRouters)
+                  this.$router.addRoutes(
+                    this.$store.getters.xt_permission.addRouters
+                  ); // 动态添加可访问路由表
+                  //        next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+                  // this.$router.replace({ path: '/' })
+                  window.location.reload();
+                  // this.$router.go(0)
+                  // this.reload()
+                });
+              });
+          } else {
+            this.$message.success(response.data.msg);
+          }
+        })
+        .catch(e => {
+          // this.$message.success("网络异常")
+        });
     },
 
     handleCommand(command) {
@@ -269,20 +269,22 @@ export default {
         "/org/admin/apps?org=" +
         this.$store.getters.xt_user.org_id
       );
+    },
+    toClick() {
+      window.location.href = "https://testsso.sgjyun.com/help";
     }
   },
   created() {
     getOrgs().then(response => {
       if (response.data.state === 1) {
-          this.orgs = response.data.data.orgs;
-          for (let i =0; i < this.orgs.length; i++){
-            if (this.orgs[i].id == this.org_id){
-              this.org_name = this.orgs[i].org_name
-            }
+        this.orgs = response.data.data.orgs;
+        for (let i = 0; i < this.orgs.length; i++) {
+          if (this.orgs[i].id == this.org_id) {
+            this.org_name = this.orgs[i].org_name;
           }
+        }
       }
     });
-
   }
 };
 </script>
@@ -299,7 +301,7 @@ export default {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  color:#fff;
+  color: #fff;
   .dropdownBox {
     margin-left: 10px;
   }
@@ -519,9 +521,9 @@ export default {
   }
 }
 .dropdownBox {
-    .el-dropdown-link{
-      font-size: 14px;
-      color:#fff;
-    }
+  .el-dropdown-link {
+    font-size: 14px;
+    color: #fff;
   }
+}
 </style>

src/xt_pages/home/modify_user_info_dialog.vue

@@ -1,254 +1,305 @@
 <template>
-    <div>
-        <el-dialog title="修改个人信息" :modal-append-to-body="false" :append-to-body="true" width="50%" :visible.sync="visible" :before-close="_close">
-            <el-form ref="form" :model="form"  :rules="rules" label-width="80px" 
-                    v-loading="uploading">
-                <el-form-item label="账号:">
-                    <span>{{ this.$store.getters.xt_user.user.mobile }}</span>
-                </el-form-item>
-                <el-form-item label="姓名:" prop="user_name">
-                    <el-input v-model="form.user_name" style="width: 300px;"></el-input>
-                </el-form-item>
-                <el-form-item label="头像:">
-                    <el-upload  
-                    style="width:100%;"
-                    :data="qn_upload_data"
-                    :multiple="false"
-                    action="https://upload.qiniup.com"
-                    :show-file-list="false"
-                    :on-error="handleAvatarError"
-                    :on-success="handleAvatarSuccess"
-                    :before-upload="beforeAvatarUpload"
-                    list-type="picture-card">
-                        <!-- <img :src="avatar" style="width: 100px; height: 100px;" />
+  <div>
+    <el-dialog
+      title="修改个人信息"
+      :modal-append-to-body="false"
+      :append-to-body="true"
+      width="50%"
+      :visible.sync="visible"
+      :before-close="_close"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        v-loading="uploading"
+      >
+        <el-form-item label="账号:">
+          <span>{{ this.$store.getters.xt_user.user.mobile }}</span>
+        </el-form-item>
+        <el-form-item label="姓名:" prop="user_name">
+          <el-input v-model="form.user_name" style="width: 300px;"></el-input>
+        </el-form-item>
+        <el-form-item label="头像:">
+          <el-upload
+            style="width:100%;"
+            :data="qn_upload_data"
+            :multiple="false"
+            action="https://upload.qiniup.com"
+            :show-file-list="false"
+            :on-error="handleAvatarError"
+            :on-success="handleAvatarSuccess"
+            :before-upload="beforeAvatarUpload"
+            list-type="picture-card"
+          >
+            <!-- <img :src="avatar" style="width: 100px; height: 100px;" />
                         <span style="display: block; font-size: 11px; color: gray">108*108像素，仅支持JPG/PNG/JPEG， 大小在300K以内</span> -->
-                        <img v-if="form.avatar" :src="form.avatar" class="avatar">
-                        <i v-else class="el-icon-plus"></i>
-                    </el-upload>
-                    <span style="display: block; font-size: 11px; color: gray">仅支持JPG/PNG/JPEG， 大小在300K以内</span>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                    <el-button type="primary" @click="submitAction">保存</el-button>
-                    <el-button type="primary" @click="modifyPwdAction">修改密码</el-button>
-            </div>
-        </el-dialog>
+            <img v-if="form.avatar" :src="form.avatar" class="avatar" />
+            <i v-else class="el-icon-plus"></i>
+          </el-upload>
+          <span style="display: block; font-size: 11px; color: gray"
+            >仅支持JPG/PNG/JPEG， 大小在300K以内</span
+          >
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitAction">保存</el-button>
+        <el-button type="primary" @click="modifyPwdAction">修改密码</el-button>
+      </div>
+    </el-dialog>
 
-        <el-dialog title="修改密码" :modal-append-to-body="false" :append-to-body="true" :visible.sync="pwd_dialog_visible">
-            <el-form ref="pwd_form" :model="pwd_form" label-width="80px">
-                <el-form-item label="账号:">
-                    <span>{{ this.$store.getters.xt_user.user.mobile }}</span>
-                </el-form-item>
-                <el-form-item label="新密码:" prop="new_password">
-                    <el-input v-model="pwd_form.new_password" style="width: 260px;"></el-input>
-                </el-form-item>
-                <el-form-item label="验证码:" prop="code">
-                    <el-input v-model="pwd_form.code" style="width: 135px;"></el-input>
-                    <el-button :type="count_downing ? 'info' : 'primary'" :disabled="count_downing" @click="getCodeAction" style="width: 122px; padding-left: 5px; padding-right: 5px;">{{ code_btn_title }}</el-button>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                    <el-button :loading="modify_pwd_loading" type="primary" @click="submitModifyPwdAction">保存</el-button>
-            </div>
-        </el-dialog>
-    </div>
+    <el-dialog
+      title="修改密码"
+      :modal-append-to-body="false"
+      :append-to-body="true"
+      :visible.sync="pwd_dialog_visible"
+    >
+      <el-form ref="pwd_form" :model="pwd_form" label-width="80px">
+        <el-form-item label="账号:">
+          <span>{{ this.$store.getters.xt_user.user.mobile }}</span>
+        </el-form-item>
+        <el-form-item label="新密码:" prop="new_password">
+          <el-input
+            v-model="pwd_form.new_password"
+            style="width: 260px;"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="验证码:" prop="code">
+          <el-input v-model="pwd_form.code" style="width: 135px;"></el-input>
+          <el-button
+            :type="count_downing ? 'info' : 'primary'"
+            :disabled="count_downing"
+            @click="getCodeAction"
+            style="width: 122px; padding-left: 5px; padding-right: 5px;"
+            >{{ code_btn_title }}</el-button
+          >
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button
+          :loading="modify_pwd_loading"
+          type="primary"
+          @click="submitModifyPwdAction"
+          >保存</el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import { getToken } from "@/api/qiniu";
 import { getFileExtension } from "@/utils/tools";
-import { modifyAdminInfo, getModifyPwdCode, modifyPassword } from "@/api/login/login"
-import { hex_md5 } from "@/utils/md5"
+import {
+  modifyAdminInfo,
+  getModifyPwdCode,
+  modifyPassword
+} from "@/api/login/login";
+import { hex_md5 } from "@/utils/md5";
 
 export default {
-    name: "ModifyUserInfoDialog",
-    data() {
-        return {
-            visible: false,
-            pwd_dialog_visible: false,
-            form: {
-                user_name: this.$store.getters.xt_user.user.user_name,
-                avatar: this.$store.getters.xt_user.user.avatar,
-            },
-            qn_upload_data: { 
-                token: "", 
-                key: "",
-            },
-            qiniuDomain: "https://images.shengws.com/",
-            uploading: false,
-            rules: {
-                user_name: [
-                    { required: true, message: "请填写姓名", trigger: "blur" }
-                ]
-            },
+  name: "ModifyUserInfoDialog",
+  data() {
+    return {
+      visible: false,
+      pwd_dialog_visible: false,
+      form: {
+        user_name: this.$store.getters.xt_user.user.user_name,
+        avatar: this.$store.getters.xt_user.user.avatar
+      },
+      qn_upload_data: {
+        token: "",
+        key: ""
+      },
+      qiniuDomain: "https://images.shengws.com/",
+      uploading: false,
+      rules: {
+        user_name: [{ required: true, message: "请填写姓名", trigger: "blur" }]
+      },
 
-            pwd_form: {
-                new_password: "",
-                code: "",
-            },
-            count_downing: false,
-            count_down: 0,
-            modify_pwd_loading: false,
-        }
+      pwd_form: {
+        new_password: "",
+        code: ""
+      },
+      count_downing: false,
+      count_down: 0,
+      modify_pwd_loading: false
+    };
+  },
+  computed: {
+    avatar: function() {
+      return this.form.avatar.length == 0
+        ? "/src/assets/home/user.png"
+        : this.form.avatar;
+    },
+    code_btn_title: function() {
+      if (this.count_down == 0) {
+        return "获取验证码";
+      } else {
+        return this.count_down + "秒后重新获取";
+      }
+    }
+  },
+  methods: {
+    _close: function(done) {
+      this.clear();
+      done();
+    },
+    clear: function() {
+      this.form.user_name = this.$store.getters.xt_user.user.user_name;
+      this.form.avatar = this.$store.getters.xt_user.user.avatar;
     },
-    computed: {
-        avatar: function() {
-            return this.form.avatar.length == 0 ? "/src/assets/home/user.png" : this.form.avatar
-        },
-        code_btn_title: function() {
-            if (this.count_down == 0) {
-                return "获取验证码"
+    show() {
+      this.clear();
+      this.visible = true;
+    },
+    hide() {
+      this.clear();
+      this.visible = false;
+    },
+    submitAction() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.uploading = true;
+          var params = {
+            name: this.form.user_name,
+            avatar: this.form.avatar
+          };
+          modifyAdminInfo(params).then(rs => {
+            this.uploading = false;
+            var resp = rs.data;
+            if (resp.state === 1) {
+              this.$store.dispatch("ModifyAdminUserInfo", {
+                user_name: this.form.user_name,
+                avatar: this.form.avatar
+              });
+              this.hide();
             } else {
-                return this.count_down + "秒后重新获取"
+              this.$message.error(resp.msg);
             }
+          });
+        } else {
+          return false;
         }
+      });
     },
-    methods: {
-        _close: function(done) {
-            this.clear()
-            done()
-        },
-        clear: function() {
-            this.form.user_name = this.$store.getters.xt_user.user.user_name
-            this.form.avatar = this.$store.getters.xt_user.user.avatar
-        },
-        show() {
-            this.clear()
-            this.visible = true
-        },
-        hide() {
-            this.clear()
-            this.visible = false
-        },
-        submitAction() {
-            this.$refs.form.validate(valid => {
-                if (valid) {
-                    this.uploading = true
-                    var params = {
-                        name: this.form.user_name,
-                        avatar: this.form.avatar,
-                    }
-                    modifyAdminInfo(params).then(rs => {
-                        this.uploading = false
-                        var resp = rs.data
-                        if (resp.state === 1) {
-                            this.$store.dispatch("ModifyAdminUserInfo", { user_name: this.form.user_name, avatar: this.form.avatar })
-                            this.hide()
-
-                        } else {
-                            this.$message.error(resp.msg)
-                        }
-                    })
-                    
-                } else {
-                    return false
-                }
-            })
-        },
-        handleAvatarError(err, file, fileList) {
-            this.$message.error(err);
-            this.uploading = false
-            return false;
-        },
-        handleAvatarSuccess(res, file) {
-            this.form.avatar = this.qiniuDomain + res.url;
-            this.uploading = false
-        },
-        beforeAvatarUpload(file) {
-            var fileType = file.type
-            const isJPG = fileType.indexOf("image") > -1
-            const isLt300K = file.size < 300 * 1024
+    handleAvatarError(err, file, fileList) {
+      this.$message.error(err);
+      this.uploading = false;
+      return false;
+    },
+    handleAvatarSuccess(res, file) {
+      this.form.avatar = this.qiniuDomain + res.url;
+      this.uploading = false;
+    },
+    beforeAvatarUpload(file) {
+      var fileType = file.type;
+      const isJPG = fileType.indexOf("image") > -1;
+      const isLt300K = file.size < 300 * 1024;
 
-            if (!isJPG) {
-                this.$message.error("只能上传图片")
-                return false
-            }
-            if (!isLt300K) {
-                this.$message.error("上传头像图片大小不能超过 300KB!")
-                return false
-            }
+      if (!isJPG) {
+        this.$message.error("只能上传图片");
+        return false;
+      }
+      if (!isLt300K) {
+        this.$message.error("上传头像图片大小不能超过 300KB!");
+        return false;
+      }
 
-            var date = new Date()
-            var ext = getFileExtension(file.name)
-            var key = date.getFullYear() + "/" + (date.getMonth() + 1) + "/" + date.getDate() + "/" + "admin_avatar_" + file.uid + "." + ext
-            this.uploading = true
+      var date = new Date();
+      var ext = getFileExtension(file.name);
+      var key =
+        date.getFullYear() +
+        "/" +
+        (date.getMonth() + 1) +
+        "/" +
+        date.getDate() +
+        "/" +
+        "admin_avatar_" +
+        file.uid +
+        "." +
+        ext;
+      this.uploading = true;
 
-            return new Promise((resolve, reject) => {
-                getToken().then(response => {
-                    const token = response.data.data.uptoken
-                    this.qn_upload_data.token = token
-                    this.qn_upload_data.key = key
-                    resolve(true)
-                })
-            })
-        },
-        modifyPwdAction: function() {
-            this.pwd_dialog_visible = true
-        },
-        getCodeAction: function() {
-            this.count_downing = true
-            this.count_down = 11
-            this.countDown()
-            getModifyPwdCode()
-        },
-        countDown: function() {
-            this.count_down = this.count_down - 1
-            if (this.count_down == 0) {
-                this.count_downing = false
-                return
-            }
-            var t = this
-            setTimeout(() => {
-                this.countDown()
-            }, 1000);
-        },
-        submitModifyPwdAction: function() {
-            if (this.pwd_form.new_password.length == 0) {
-                this.$message.error("未填写新密码")
-                return
-            }
-            if (this.pwd_form.code.length == 0) {
-                this.$message.error("未填写验证码")
-                return
-            }
-            this.modify_pwd_loading = true
-            modifyPassword(hex_md5(this.pwd_form.new_password), this.pwd_form.code).then(rs => {
-                this.modify_pwd_loading = false
-                var resp = rs.data
-                if (resp.state == 1) {
-                    this.$message.success(resp.data.msg)
-                } else {
-                    this.$message.error(resp.msg)
-                }
-            })
+      return new Promise((resolve, reject) => {
+        getToken().then(response => {
+          const token = response.data.data.uptoken;
+          this.qn_upload_data.token = token;
+          this.qn_upload_data.key = key;
+          resolve(true);
+        });
+      });
+    },
+    modifyPwdAction: function() {
+      this.pwd_dialog_visible = true;
+    },
+    getCodeAction: function() {
+      this.count_downing = true;
+      this.count_down = 11;
+      this.countDown();
+      getModifyPwdCode();
+    },
+    countDown: function() {
+      this.count_down = this.count_down - 1;
+      if (this.count_down == 0) {
+        this.count_downing = false;
+        return;
+      }
+      var t = this;
+      setTimeout(() => {
+        this.countDown();
+      }, 1000);
+    },
+    submitModifyPwdAction: function() {
+      if (this.pwd_form.new_password.length == 0) {
+        this.$message.error("未填写新密码");
+        return;
+      }
+      if (this.pwd_form.code.length == 0) {
+        this.$message.error("未填写验证码");
+        return;
+      }
+      this.modify_pwd_loading = true;
+      modifyPassword(
+        hex_md5(this.pwd_form.new_password),
+        this.pwd_form.code
+      ).then(rs => {
+        this.modify_pwd_loading = false;
+        var resp = rs.data;
+        if (resp.state == 1) {
+          this.$message.success(resp.data.msg);
+        } else {
+          this.$message.error(resp.msg);
         }
+      });
     }
-}
+  }
+};
 </script>
 
 <style scoped>
 .avatar-uploader .el-upload {
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-  }
-  .avatar-uploader .el-upload:hover {
-    border-color: #409EFF;
-  }
-  .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 148px;
-    height: 148px;
-    line-height: 148px;
-    text-align: center;
-  }
-  .avatar {
-    width: 146px;
-    height: 146px;
-    display: block;
-  }
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 148px;
+  height: 148px;
+  line-height: 148px;
+  text-align: center;
+}
+.avatar {
+  width: 146px;
+  height: 146px;
+  display: block;
+}
 </style>
-

src/xt_pages/role/admin.vue

@@ -104,7 +104,11 @@
                 type="danger"
                 size="small"
                 icon="el-icon-delete"
-                v-if="scope.row.status == 1 && org.creator != scope.row.user_id && (scope.row.user_id != local_user_id )"
+                v-if="
+                  scope.row.status == 1 &&
+                    org.creator != scope.row.user_id &&
+                    scope.row.user_id != local_user_id
+                "
                 @click="disableAdminAction(scope.row)"
               ></el-button>
             </el-tooltip>
@@ -118,7 +122,11 @@
                 size="small"
                 type="info"
                 icon="el-icon-refresh"
-                v-if="scope.row.status == 0 && org.creator != scope.row.user_id  && (scope.row.user_id != local_user_id )"
+                v-if="
+                  scope.row.status == 0 &&
+                    org.creator != scope.row.user_id &&
+                    scope.row.user_id != local_user_id
+                "
                 @click="recoverAdminAction(scope.row)"
               ></el-button>
             </el-tooltip>
@@ -156,18 +164,18 @@ export default {
     return {
       crumbs: [
         { path: false, name: "权限管理" },
-        { path: false, name: "用户管理" }
+        { path: false, name: "员工管理" }
       ],
       is_loading_admins: true,
       admins: [], // [{user_id, user_name, role_name, title_name, ip, last_login_time, status}]
       admin_total_count: 0,
       current_page: 1,
-      roles:[],
+      roles: [],
       is_exist_role: false,
       org: null,
-      isSubSuperAdmin:false,
+      isSubSuperAdmin: false,
 
-      local_user_id: 0,
+      local_user_id: 0
     };
   },
   components: {
@@ -175,42 +183,44 @@ export default {
     AdminInfoForm
   },
   created: function() {
-    this.local_user_id = this.$store.getters.xt_user.user.id
-    let page = 1
-    this.getRoles(page)
+    this.local_user_id = this.$store.getters.xt_user.user.id;
+    let page = 1;
+    this.getRoles(page);
     adminMainView()
       .then(rs => {
         this.is_loading_admins = false;
         var resp = rs.data;
         if (resp.state === 1) {
-
           this.admins.push(...resp.data.admins);
           this.admin_total_count = resp.data.total_count;
           this.is_exist_role = resp.data.is_exist_role;
           this.current_page = 1;
-          this.org = resp.data.org
-          this.isSubSuperAdmin = resp.data.isSubSuperAdmin
+          this.org = resp.data.org;
+          this.isSubSuperAdmin = resp.data.isSubSuperAdmin;
 
           //能进入当前页面的角色只有超级管理员和子管理员，如果当前角色是子管理员，需要把超级管理员和其他子管理员的信息去除，子管理员不能编辑超级管理员和其他子管理员信息，
-          if(this.isSubSuperAdmin) {
+          if (this.isSubSuperAdmin) {
             //去除管理员信息
-            for (let i = 0; i < this.admins.length; i++){
+            for (let i = 0; i < this.admins.length; i++) {
               if (this.admins[i].user_id == this.org.creator) {
-                this.admins.splice(i, 1)
-                i--
+                this.admins.splice(i, 1);
+                i--;
               }
             }
 
             //去除其他子管理员信息
-            for (let i = 0; i < this.admins.length; i++){
-              if (this.admins[i].user_id  != this.local_user_id && this.admins[i].is_sub_super_admin) { //将自己排除在外
-                console.log(this.admins[i])
+            for (let i = 0; i < this.admins.length; i++) {
+              if (
+                this.admins[i].user_id != this.local_user_id &&
+                this.admins[i].is_sub_super_admin
+              ) {
+                //将自己排除在外
+                console.log(this.admins[i]);
 
-                this.admins.splice(i, 1)
-                i--
+                this.admins.splice(i, 1);
+                i--;
               }
             }
-
           }
         } else {
           this.$message.error(resp.msg);
@@ -227,7 +237,7 @@ export default {
     }
   },
   methods: {
-    getRoles(page){
+    getRoles(page) {
       getRoles(page)
         .then(rs => {
           this.loading_roles = false;
@@ -244,7 +254,7 @@ export default {
         });
     },
     openForm(adminId) {
-      this.$refs["admininfoform"].open(adminId,this.roles);
+      this.$refs["admininfoform"].open(adminId, this.roles);
     },
     _parseTime(time, format) {
       return parseTime(time, format);

src/xt_pages/role/components/AddRole.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="新增用户"
+    title="新增角色"
     width="660px"
     :visible.sync="visible"
     :before-close="_close"
@@ -9,8 +9,14 @@
       <el-form-item label="角色名称 : " prop="name">
         <el-input v-model="form.name" placeholder="" maxlength="30"></el-input>
       </el-form-item>
-      <el-form-item label="角色描述 : " >
-        <el-input type="textarea" v-model="form.intro" placeholder="" resize="none" rows="4"></el-input>
+      <el-form-item label="角色描述 : ">
+        <el-input
+          type="textarea"
+          v-model="form.intro"
+          placeholder=""
+          resize="none"
+          rows="4"
+        ></el-input>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -21,232 +27,223 @@
 </template>
 
 <script>
-  import { addRole, modifyRole } from '@/api/role/role'
-
-  export default {
-    name: 'AddRole',
-    data() {
-      return {
-        form: {
-          id: 0,
-          name: '',
-          intro: ''
-        },
-        visible: false,
-        rules: {
-          name: [
-            { required: true, message: '请输入角色名称', trigger: 'blur' },
-            { max: 10, message: '10个字以内', trigger: 'blur' }
-          ],
-          // intro: [{ required: true, message: '请输入角色说明', trigger: 'blur' }]
-        },
-
-        //
-        checked: '1',
-        checkAll: false,
-        checkedCities: [],
-        cities: ['上海', '北京', '广州', '深圳'],
-        isIndeterminate: true,
-        ruleForm: {
-          name: '',
-          phone: '',
-          position: ''
-        },
-        newrules: {
-          name: [
-            { required: true, message: '请输入角色名称', trigger: 'blur' },
-            { max: 10, message: '10个字以内', trigger: 'blur' }
-          ],
-          phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }]
-        }
-      }
-    },
-    methods: {
-      _close: function(done) {
-        this.clear()
-        done()
+import { addRole, modifyRole } from "@/api/role/role";
+
+export default {
+  name: "AddRole",
+  data() {
+    return {
+      form: {
+        id: 0,
+        name: "",
+        intro: ""
       },
-      clear: function() {
-        this.form.id = 0
-        this.form.name = ''
-        this.form.intro = ''
+      visible: false,
+      rules: {
+        name: [
+          { required: true, message: "请输入角色名称", trigger: "blur" },
+          { max: 10, message: "10个字以内", trigger: "blur" }
+        ]
+        // intro: [{ required: true, message: '请输入角色说明', trigger: 'blur' }]
       },
-      show() {
-        this.clear()
-        this.visible = true
-      },
-      hide() {
-        this.clear()
-        this.visible = false
-      },
-      modify(id, name, intro) {
-        this.form.id = id
-        this.form.name = name
-        this.form.intro = intro
-        this.visible = true
-      },
-      submitAction() {
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            // 验证通过
-            if (this.form.id === 0) {
-              // 新增 role
-              addRole(this.form.name, this.form.intro)
-                .then(rs => {
-                  var resp = rs.data
-                  if (resp.state === 1) {
-                    var new_id = resp.data.id
-                    var new_name = resp.data.name
-                    var new_intro = resp.data.intro
-                    var new_status = resp.data.status
-                    var staff_number = 0
-                    this.$emit(
-                      'did-add-role',
-                      new_id,
-                      new_name,
-                      new_intro,
-                      new_status,
-                      staff_number
-                    )
 
-                    this.hide()
-                  } else {
-                    this.$message.error(resp.msg)
-                  }
-                })
-                .catch(err => {
-                  this.$message.error(err)
-                })
-            } else {
-              // 修改 role
-              modifyRole(this.form.id, this.form.name, this.form.intro)
-                .then(rs => {
-                  var resp = rs.data
-                  if (resp.state === 1) {
-                    this.$emit(
-                      'did-edit-role',
-                      this.form.id,
-                      this.form.name,
-                      this.form.intro
-                    )
-                    this.hide()
-                  } else {
-                    this.$message.error(resp.msg)
-                  }
-                })
-                .catch(err => {
-                  this.$message.error(err)
-                })
-            }
-          } else {
-            // 验证失败
-            return false
-          }
-        })
-      },
-      handleCheckAllChange(val) {
-        this.checkedCities = val ? this.cities : []
-        this.isIndeterminate = false
+      //
+      checked: "1",
+      checkAll: false,
+      checkedCities: [],
+      cities: ["上海", "北京", "广州", "深圳"],
+      isIndeterminate: true,
+      ruleForm: {
+        name: "",
+        phone: "",
+        position: ""
       },
-      handleCheckedCitiesChange(value) {
-        let checkedCount = value.length
-        this.checkAll = checkedCount === this.cities.length
-        this.isIndeterminate =
-          checkedCount > 0 && checkedCount < this.cities.length
+      newrules: {
+        name: [
+          { required: true, message: "请输入角色名称", trigger: "blur" },
+          { max: 10, message: "10个字以内", trigger: "blur" }
+        ],
+        phone: [{ required: true, message: "请输入手机号", trigger: "blur" }]
       }
+    };
+  },
+  methods: {
+    _close: function(done) {
+      this.clear();
+      done();
+    },
+    clear: function() {
+      this.form.id = 0;
+      this.form.name = "";
+      this.form.intro = "";
+    },
+    show() {
+      this.clear();
+      this.visible = true;
+    },
+    hide() {
+      this.clear();
+      this.visible = false;
+    },
+    modify(id, name, intro) {
+      this.form.id = id;
+      this.form.name = name;
+      this.form.intro = intro;
+      this.visible = true;
+    },
+    submitAction() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          // 验证通过
+          if (this.form.id === 0) {
+            // 新增 role
+            addRole(this.form.name, this.form.intro)
+              .then(rs => {
+                var resp = rs.data;
+                if (resp.state === 1) {
+                  var new_id = resp.data.id;
+                  var new_name = resp.data.name;
+                  var new_intro = resp.data.intro;
+                  var new_status = resp.data.status;
+                  var staff_number = 0;
+                  this.$emit(
+                    "did-add-role",
+                    new_id,
+                    new_name,
+                    new_intro,
+                    new_status,
+                    staff_number
+                  );
+
+                  this.hide();
+                } else {
+                  this.$message.error(resp.msg);
+                }
+              })
+              .catch(err => {
+                this.$message.error(err);
+              });
+          } else {
+            // 修改 role
+            modifyRole(this.form.id, this.form.name, this.form.intro)
+              .then(rs => {
+                var resp = rs.data;
+                if (resp.state === 1) {
+                  this.$emit(
+                    "did-edit-role",
+                    this.form.id,
+                    this.form.name,
+                    this.form.intro
+                  );
+                  this.hide();
+                } else {
+                  this.$message.error(resp.msg);
+                }
+              })
+              .catch(err => {
+                this.$message.error(err);
+              });
+          }
+        } else {
+          // 验证失败
+          return false;
+        }
+      });
+    },
+    handleCheckAllChange(val) {
+      this.checkedCities = val ? this.cities : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedCitiesChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.cities.length;
+      this.isIndeterminate =
+        checkedCount > 0 && checkedCount < this.cities.length;
     }
   }
+};
 </script>
 
 <style lang="scss" scoped>
-  .roleContent {
-    margin-top: 20px;
-    display: flex;
-    justify-content: space-between;
+.roleContent {
+  margin-top: 20px;
+  display: flex;
+  justify-content: space-between;
 
   .roleContentLeft {
+    .chooseBox {
+      width: 280px;
+      height: 320px;
+      overflow-y: auto;
+      border: 1px solid rgba(235, 238, 240, 1);
+      margin-top: 26px;
+      padding: 20px;
+
+      .checkone {
+        display: flex;
+        align-items: center;
+        height: 50px;
+      }
 
-  .chooseBox {
-    width: 280px;
-    height: 320px;
-    overflow-y: auto;
-    border: 1px solid rgba(235, 238, 240, 1);
-    margin-top: 26px;
-    padding: 20px;
-
-  .checkone {
-    display: flex;
-    align-items: center;
-    height: 50px;
-  }
-
-  .el-checkbox__label {
-    display: flex;
-    align-items: center;
-
-  img {
-    width: 30px;
-    height: 30px;
-    margin-right: 10px;
-  }
+      .el-checkbox__label {
+        display: flex;
+        align-items: center;
 
-  }
-  }
+        img {
+          width: 30px;
+          height: 30px;
+          margin-right: 10px;
+        }
+      }
+    }
   }
   .roleContentRight {
-
-  .chooseBox {
-    width: 280px;
-    height: 320px;
-    overflow-y: auto;
-    border: 1px solid rgba(235, 238, 240, 1);
-    margin-top: 26px;
-    padding: 20px;
-
-  .hasChoosedOne {
-    display: flex;
-    align-items: center;
-    height: 50px;
-
-  img {
-    width: 30px;
-    height: 30px;
-    margin-right: 10px;
-  }
-
-  }
-  }
-  }
+    .chooseBox {
+      width: 280px;
+      height: 320px;
+      overflow-y: auto;
+      border: 1px solid rgba(235, 238, 240, 1);
+      margin-top: 26px;
+      padding: 20px;
+
+      .hasChoosedOne {
+        display: flex;
+        align-items: center;
+        height: 50px;
+
+        img {
+          width: 30px;
+          height: 30px;
+          margin-right: 10px;
+        }
+      }
+    }
   }
-  .newStaff {
-    margin-top: 26px;
+}
+.newStaff {
+  margin-top: 26px;
 
   .newItem {
     display: flex;
     align-items: center;
   }
-
-  }
+}
 </style>
 
 <style lang="scss">
-  .roleContent {
-
+.roleContent {
   .roleContentLeft {
+    .chooseBox {
+      .el-checkbox {
+        display: flex;
+        align-items: center;
+      }
 
-  .chooseBox {
-
-  .el-checkbox {
-    display: flex;
-    align-items: center;
-  }
-
-  .el-checkbox__label {
-    display: flex;
-    align-items: center;
-  }
-
-  }
-  }
+      .el-checkbox__label {
+        display: flex;
+        align-items: center;
+      }
+    }
   }
+}
 </style>

src/xt_pages/role/components/EditRole.vue

@@ -110,7 +110,7 @@
             style="font-size:20px;color:#338AFB"
           ></i>
         </p>
-        <p style="color:#409FFF" @click="continueAddStaff()">继续新增员工</p>
+        <p style="color:#409FFF" @click="continueAddStaff()">保存并继续新增员工</p>
       </div>
     </div>
     <div slot="footer" class="dialog-footer">