From 5c4423f936cd0164c888698b6d0947c6e63e3dae Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Wed, 28 Feb 2024 12:07:41 +0800
Subject: [PATCH] priv

---
 src/assets/css/global_button.css              | 27 +++++-
 src/assets/css/global_table.css               |  5 +
 src/components/customerOrg/ContactPerson.vue  | 26 +++--
 .../customerOrg/customerOrgEdit.vue           | 22 +++--
 .../customerOrg/customerOrgGroupAsbitem.vue   | 48 ++++++----
 .../customerOrg/customerOrgRegister.vue       | 24 +++--
 src/components/menuPage/MenuPageEdit.vue      | 47 +++++----
 src/components/menuPage/MenuPageSet.vue       | 19 ++--
 .../patientRegister/PatientRegisterList.vue   | 95 +++++++++++--------
 .../patientRegister/patientRegisterQuery.vue  | 16 +++-
 src/main.js                                   |  4 +-
 src/utlis/proFunc.js                          | 24 +++++
 src/views/customerOrg/customerOrgGroup.vue    | 28 ++++--
 src/views/customerOrg/customerOrgGroupBak.vue | 81 ----------------
 .../customerOrg/patientRegisterImport.vue     |  6 +-
 src/views/login/Login.vue                     |  6 +-
 16 files changed, 269 insertions(+), 209 deletions(-)
 delete mode 100644 src/views/customerOrg/customerOrgGroupBak.vue

diff --git a/src/assets/css/global_button.css b/src/assets/css/global_button.css
index b239519..a5cc799 100644
--- a/src/assets/css/global_button.css
+++ b/src/assets/css/global_button.css
@@ -1,3 +1,27 @@
+.el-button {
+    background: #FFF;
+    border: 1px solid #0B663D;  /*原始 默认值 1px solid #DCDFE6; */
+    color: #0B663D !important;  /*原始 默认值 #606266 */
+    font-weight: 700; /*原始 默认值 500 */
+    font-family: 'Microsoft YaHei';  /*原始 默认值 Arial */
+    padding: 10px 5px; /*原始 默认值 12px 20px */
+    min-width: 60px;
+    /*
+    display: inline-block;
+    line-height: 1;
+    white-space: nowrap;
+    cursor: pointer;  
+    -webkit-appearance: none;
+    text-align: center;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    transition: .1s;  
+    font-size: 14px;
+    border-radius: 4px;
+    */
+}
+
 .commonbutton {
     width: 100px;
     height: 32px;
@@ -41,4 +65,5 @@
     color: #396FFA;
     background-color: #f4f4f4;
     border-color: #396FFA;
-}
\ No newline at end of file
+}
+
diff --git a/src/assets/css/global_table.css b/src/assets/css/global_table.css
index 23a2747..59a9ea1 100644
--- a/src/assets/css/global_table.css
+++ b/src/assets/css/global_table.css
@@ -76,4 +76,9 @@
     font-size: 14px;
     font-weight: 400;
     font-family: "NotoSansSC-Regular";
+}
+
+/* 表格列排序 */
+.el-table .caret-wrapper {
+    width: 16px; /* 默认值 24px */
 }
\ No newline at end of file
diff --git a/src/components/customerOrg/ContactPerson.vue b/src/components/customerOrg/ContactPerson.vue
index 3db9201..ce5a3f4 100644
--- a/src/components/customerOrg/ContactPerson.vue
+++ b/src/components/customerOrg/ContactPerson.vue
@@ -54,14 +54,14 @@
         </el-table>
       </div>
       <div style="margin-left: 10px; margin-top: 20px">
-        <div style="margin-top: 10px">
-          <el-button type="primary" @click="add" class="commonbutton">新增</el-button>
+        <div v-show="checkPagePriv(pagePriv.privs,'新增联系人')" style="margin-top: 10px">
+          <el-button type="primary" @click="add" class="commonbutton">新增联系人</el-button>
         </div>
-        <div style="margin-top: 10px">
-          <el-button type="success" @click="edit" class="commonbutton">编辑</el-button>
+        <div v-show="checkPagePriv(pagePriv.privs,'编辑联系人')" style="margin-top: 10px">
+          <el-button type="success" @click="edit" class="commonbutton">编辑联系人</el-button>
         </div>
-        <div style="margin-top: 10px">
-          <el-button type="danger" @click="del" class="commonbutton">删除</el-button>
+        <div v-show="checkPagePriv(pagePriv.privs,'删除联系人')" style="margin-top: 10px">
+          <el-button type="danger" @click="del" class="commonbutton">删除联系人</el-button>
         </div>
       </div>
     </div>
@@ -142,12 +142,16 @@
 import moment from "moment";
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { objCopy, deepCopy, arrayExistObj } from "../../utlis/proFunc";
+import {  getPagePriv,checkPagePriv,objCopy, deepCopy, arrayExistObj } from "../../utlis/proFunc";
 export default {
   components: {},
   props:["customerOrgId"],
   data() {
     return {
+      pagePriv:{
+        routeUrlorPageName:'customerOrg', //当前页面归属路由或归属页面权限名称
+        privs:[] // 页面权限
+      },     
       personId: "",
       form: {}, //联系人表单信息
       contactMethodListEdit:[],  //联系方式（可修改）
@@ -168,7 +172,11 @@ export default {
     };
   },
 
-  created() { },
+  created() { 
+    //获取用户当前页面的权限
+    let userPriv = window.sessionStorage.getItem('userPriv')
+    if(userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
+  },
 
   //挂载完成
   mounted() { },
@@ -178,7 +186,7 @@ export default {
   },
 
   methods: {
-    moment,
+    moment,checkPagePriv,
     //获取联系人列表
     getContactPersonList(customerOrgId) {
       getapi(
diff --git a/src/components/customerOrg/customerOrgEdit.vue b/src/components/customerOrg/customerOrgEdit.vue
index 1f199bd..89d1b29 100644
--- a/src/components/customerOrg/customerOrgEdit.vue
+++ b/src/components/customerOrg/customerOrgEdit.vue
@@ -182,22 +182,22 @@
     </div>
     <!-- 按钮区域 -->
     <div style="width: 110px; margin-left: 10px; margin-top: 3%">
-      <div class="btnList">
+      <div v-show="checkPagePriv(pagePriv.privs,'新增单位')" class="btnList">
         <el-button type="primary" @click="add('form', '')" class="commonbutton"
           >新增单位</el-button
         >
       </div>
-      <div class="btnList">
+      <div v-show="checkPagePriv(pagePriv.privs,'新增子单位')" class="btnList">
         <el-button type="primary" @click="add('form', 'child')" class="commonbutton"
           >新增子单位</el-button
         >
       </div>
-      <div class="btnList">
+      <div v-show="checkPagePriv(pagePriv.privs,'保存')" class="btnList">
         <el-button type="success" @click="btnSubmit('form')" class="commonbutton"
           ><i class="el-icon-check"></i>保存</el-button
         >
       </div>
-      <div class="btnList">
+      <div v-show="checkPagePriv(pagePriv.privs,'删除')" class="btnList">
         <el-button type="danger" @click="del('form')" class="commonbutton">
           <i class="el-icon-delete"></i>删除
         </el-button>
@@ -208,7 +208,7 @@
 <script>
 import { mapState, mapMutations } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { tcdate, objCopy, deepCopy, arrayExistObj } from "../../utlis/proFunc";
+import { getPagePriv,checkPagePriv,tcdate, objCopy, deepCopy, arrayExistObj } from "../../utlis/proFunc";
 import { getTreeNode, getTreePids } from "../../utlis/tree";
 
 export default {
@@ -216,6 +216,10 @@ export default {
   props: ["id"],
   data() {
     return {
+      pagePriv:{
+        routeUrlorPageName:'customerOrg', //当前页面归属路由或归属页面权限名称
+        privs:[] // 页面权限
+      }, 
       isActiveBox: false,
       customerOrgEditStyle: "height:400px;",
       data: {
@@ -261,7 +265,11 @@ export default {
     };
   },
 
-  created() {    
+  created() {   
+    //获取用户当前页面的权限
+    let userPriv = window.sessionStorage.getItem('userPriv')
+    if(userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
+    
     this.peisid = window.sessionStorage.getItem("peisid");
     if (!this.form.id) {
       this.form.organizationUnitId = this.peisid;
@@ -288,7 +296,7 @@ export default {
     ...mapState(["customerOrg", "window"]),
   },
   methods: {
-    ...mapMutations(["setData"]),
+    ...mapMutations(["setData"]),checkPagePriv,
 
     changeBox(type) {
       //赋值
diff --git a/src/components/customerOrg/customerOrgGroupAsbitem.vue b/src/components/customerOrg/customerOrgGroupAsbitem.vue
index a30d6ed..72bade9 100644
--- a/src/components/customerOrg/customerOrgGroupAsbitem.vue
+++ b/src/components/customerOrg/customerOrgGroupAsbitem.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="display: flex; margin-top:5px;">
-    <div :style="'display: flex;width:' + (window.pageWidth - 45 - 110) + 'px;'">
+    <div :style="'display: flex;width:' + (window.pageWidth - 45 - 110) + 'px;font-size:14px;'">
       <!--未选组合项目-->
       <div style="display: block; width:230px;">
         <div>
@@ -29,19 +29,19 @@
       </div>
 
       <!--中间操作按钮-->
-      <div style="display: block;margin: 40px 10px 0 10px;">
-        <div style="padding: 5px 0;">
+      <div style="display: block;margin: 40px 10px 0 10px;width:110px;">
+        <div v-show="checkPagePriv(pagePriv.privs,'添加')" style="padding: 5px 0;">
           <el-button class="commonbutton" @click="addAbs(asbItemChoosed,'choosed')" >添加 <i class="el-icon-arrow-right"></i></el-button>
         </div>
-        <div style="padding: 5px 0;">
+        <div v-show="checkPagePriv(pagePriv.privs,'全部添加')" style="padding: 5px 0;">
           <el-button class="difference" @click="addAbs(asbItemChoosed,'all')">全部添加</el-button>
         </div>
-        <div style="padding: 5px 0;">
+        <div v-show="checkPagePriv(pagePriv.privs,'移除')" style="padding: 5px 0;">
           <el-button class="commonbutton"
             @click="delAbs(customerOrgGroupAsbitemsChoosed,'choosed')">移除 <i class="el-icon-arrow-left"></i
           ></el-button>
         </div>
-        <div style="padding: 5px 0;">
+        <div v-show="checkPagePriv(pagePriv.privs,'全部移除')" style="padding: 5px 0;">
           <el-button class="difference" @click="delAbs(customerOrgGroupAsbitemsChoosed,'all')">全部移除</el-button>
         </div>        
       </div>
@@ -49,14 +49,16 @@
       <!--已选组合项目-->
       <div :style="'display: block; width:' + (window.pageWidth - 230 - 120 - 45 - 110) + 'px;'">
         <div style="height:32px;">
-          <span>快速选择</span>
-          <el-select v-model="asbItemId" placeholder="快速选择组合项目" size="small" 
-            filterable  default-first-option :filter-method="filterMethod"
-            clearable @clear="quickAsb = deepCopy(dict.asbItemQuick)"
-            @change="quickChoosedAsb" ref="quickAsbOCX"
-            style="margin-left: 3px;width:160px;">
-            <el-option v-for="item in quickAsb" :key="item.id" :value="item.id" :label="item.displayName" />
-          </el-select>
+          <div v-show="checkPagePriv(pagePriv.privs,'快速选择')">
+            <span>快速选择</span>
+            <el-select v-model="asbItemId" placeholder="快速选择组合项目" size="small" 
+              filterable  default-first-option :filter-method="filterMethod"
+              clearable @clear="quickAsb = deepCopy(dict.asbItemQuick)"
+              @change="quickChoosedAsb" ref="quickAsbOCX"
+              style="margin-left: 3px;width:160px;">
+              <el-option v-for="item in quickAsb" :key="item.id" :value="item.id" :label="item.displayName" />
+            </el-select>
+          </div>
         </div>
         <div class="box">
           <el-table :data="customerOrgGroupAsbitems" border size="small"
@@ -112,13 +114,13 @@
     </div>
     <!--批量操作按钮（复制套餐与分组）-->
     <div style="display: block;margin-left: 10px;">
-      <div style="margin-top: 50px;">
+      <div v-show="checkPagePriv(pagePriv.privs,'复制分组')" style="margin-top: 50px;">
         <el-button class="commonbutton" @click="btnCopyGroup">复制分组</el-button>
       </div>
-      <div style="margin-top: 10px;">
+      <div v-show="checkPagePriv(pagePriv.privs,'复制套餐')" style="margin-top: 10px;">
         <el-button class="commonbutton"  @click="btnCopyMedicalPackage">复制套餐</el-button>
       </div>
-      <div style="margin-top: 10px;">
+      <div v-show="checkPagePriv(pagePriv.privs,'保存')" style="margin-top: 10px;">
         <el-button class="commonbutton"  @click="btnSave">保存</el-button>
       </div>
     </div>
@@ -268,13 +270,17 @@
 import moment from 'moment';
 import { mapState } from "vuex";
 import { getapi, postapi, putapi } from "@/api/api";
-import { arrayExistObj, tcdate, arrayFilter, arrayReduce, deepCopy,dddw } from "../../utlis/proFunc";
+import { getPagePriv,checkPagePriv, arrayExistObj, tcdate, arrayFilter, arrayReduce, deepCopy,dddw } from "../../utlis/proFunc";
 
 
 export default {
   props:['customerOrgGroup','refreshMoney'],
   data() {
     return {
+      pagePriv:{
+        routeUrlorPageName:'customerOrgGroup', //当前页面归属路由或归属页面权限名称
+        privs:[] // 页面权限
+      }, 
       groupPrice:0,               //分组总价
       customerOrgGroupAsbitems:[], //分组包含组合项目(显示)
       customerOrgGroupAsbitemsChoosed:[], //分组包含组合项目(显示) 被选中
@@ -312,6 +318,10 @@ export default {
   },
 
   created() {
+    //获取用户当前页面的权限
+    let userPriv = window.sessionStorage.getItem('userPriv')
+    if(userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
+
     this.dictInit()
   },
   
@@ -319,7 +329,7 @@ export default {
     this.refreshTable('tableCustomerOrgGroupAsbitems')
   },
   methods: {
-    moment,dddw,deepCopy,
+    moment,dddw,deepCopy,checkPagePriv,
     //表格强制刷新
     refreshTable(tableRef){
       this.$nextTick(() => {
diff --git a/src/components/customerOrg/customerOrgRegister.vue b/src/components/customerOrg/customerOrgRegister.vue
index 9d5a270..5ac3af2 100644
--- a/src/components/customerOrg/customerOrgRegister.vue
+++ b/src/components/customerOrg/customerOrgRegister.vue
@@ -38,16 +38,16 @@
       </el-table>
     </div>
     <div style="margin-left: 10px; margin-top: 20px">
-      <div style="margin-top: 10px">
-        <el-button type="primary" @click="add" class="commonbutton">增加次数</el-button>
+      <div v-show="checkPagePriv(pagePriv.privs,'新增次数')" style="margin-top: 10px">
+        <el-button type="primary" @click="add" class="commonbutton">新增次数</el-button>
       </div>
-      <div style="margin-top: 10px">
+      <div v-show="checkPagePriv(pagePriv.privs,'体检完成')" style="margin-top: 10px">
         <el-button type="success" @click="edit" class="commonbutton">体检完成</el-button>
       </div>
-      <div style="margin-top: 10px">
+      <div v-show="checkPagePriv(pagePriv.privs,'取消完成')" style="margin-top: 10px">
         <el-button type="warning" @click="cansel" class="commonbutton">取消完成</el-button>
       </div>
-      <div style="margin-top: 10px">
+      <div v-show="checkPagePriv(pagePriv.privs,'删除次数')" style="margin-top: 10px">
         <el-button type="danger" @click="btnDel" class="commonbutton">删除次数</el-button>
       </div>
     </div>
@@ -57,17 +57,25 @@
 import moment from "moment";
 import { mapState, mapMutations } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { tcdate, objCopy, deepCopy,arrayExistObj } from "../../utlis/proFunc";
+import { getPagePriv,checkPagePriv,tcdate, objCopy, deepCopy,arrayExistObj } from "../../utlis/proFunc";
 
 export default {
   components: {},
   data() {
     return {
+      pagePriv:{
+        routeUrlorPageName:'customerOrg', //当前页面归属路由或归属页面权限名称
+        privs:[] // 页面权限
+      },  
       customerOrgRegisterId: "", //体检次数ID
     };
   },
 
-  created() { },
+  created() { 
+    //获取用户当前页面的权限
+    let userPriv = window.sessionStorage.getItem('userPriv')
+    if(userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
+  },
 
   //挂载完成
   mounted() { },
@@ -77,7 +85,7 @@ export default {
   },
 
   methods: {
-    moment,
+    moment,checkPagePriv,
     //点击体检次数行
     rowClick(row) {
       this.customerOrgRegisterId = row.id;
diff --git a/src/components/menuPage/MenuPageEdit.vue b/src/components/menuPage/MenuPageEdit.vue
index 7551e4a..e156a2c 100644
--- a/src/components/menuPage/MenuPageEdit.vue
+++ b/src/components/menuPage/MenuPageEdit.vue
@@ -148,12 +148,12 @@
     </div>
     <!-- 按钮区域 -->
     <div style="width: 110px; margin-left: 10px; margin-top: 3%">
-      <div class="btnList">
+      <div class="btnList" v-show="checkPagePriv(pagePriv.privs,'新增节点')">
         <el-button type="primary" @click="btnAdd('form', '')" class="btnClass"
           >新增节点</el-button
         >
       </div>
-      <div class="btnList">
+      <div class="btnList" v-show="checkPagePriv(pagePriv.privs,'新增子节点')">
         <el-button
           type="primary"
           @click="btnAdd('form', 'child')"
@@ -161,12 +161,12 @@
           >新增子节点</el-button
         >
       </div>
-      <div class="btnList">
+      <div class="btnList" v-show="checkPagePriv(pagePriv.privs,'保存')">
         <el-button type="success" @click="btnSubmit('form')" class="btnClass"
           >保存</el-button
         >
       </div>
-      <div class="btnList">
+      <div class="btnList" v-show="checkPagePriv(pagePriv.privs,'删除')">
         <el-button type="danger" @click="btnDel('form')" class="btnClass"
           >删除</el-button
         >
@@ -177,7 +177,7 @@
 <script>
 import { mapState, mapMutations } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { tcdate, objCopy, deepCopy, arrayExistObj } from "../../utlis/proFunc";
+import { getPagePriv,checkPagePriv, tcdate, objCopy, deepCopy, arrayExistObj } from "../../utlis/proFunc";
 import { getTreeNode, getTreePids } from "../../utlis/tree";
 
 export default {
@@ -185,21 +185,25 @@ export default {
   props: ["id"],
   data() {
     return {
+      pagePriv:{
+        routeUrlorPageName:'menuPage', //当前页面归属路由或归属页面权限名称
+        privs:[] // 页面权限
+      },      
       isActiveBox: false,
       customerOrgEditStyle: "height:400px;",
 
       form: {
         displayName: "",
-        displayOrder:null,
-        routeUrl: null,
-        iconName: null,
-        simpleCode: "QXGL",
+        displayOrder:"",
+        routeUrl: "",
+        iconName: "",
+        simpleCode: "",
         parentId: null,
         isActive: "Y",
         isActiveBox: true,
         menuType: "0",
-        creatorName: null,
-        lastModifierName: null,
+        creatorName: "",
+        lastModifierName: "",
         lastModificationTime: "",
         lastModifierId: "",
         creationTime: "",
@@ -220,8 +224,13 @@ export default {
   },
 
   created() {
+    //获取用户当前页面的权限
+    let userPriv = window.sessionStorage.getItem('userPriv')
+    if(userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
+
     // 保留初始化数据
     this.formInit = deepCopy(this.form);
+    console.log('this.formInit',this.formInit)
   },
 
   //挂载完成
@@ -235,6 +244,7 @@ export default {
   },
   methods: {
     ...mapMutations(["setData"]),
+    checkPagePriv,
 
     changeBox(type) {
       //赋值
@@ -254,8 +264,9 @@ export default {
       getapi(`/api/app/menuinfo/getmenuinfoasync?MenuInfoId=${id}`).then(
         (res) => {
           if (res.code != -1) {
-            this.form = res.data;
-            // objCopy(res.data, this.form);
+            // this.form = res.data;
+            console.log('deepCopy(this.form)',deepCopy(this.form))
+            objCopy(res.data, this.form);
 
             if (res.data.isActive == "Y") {
               this.form.isActiveBox = true;
@@ -417,17 +428,19 @@ export default {
 
     //新增节点
     async btnAdd(formName, isChild) {
-      await this.$refs[formName].resetFields();
-
       if (isChild) {
         if (!this.form.id) {
           this.$message.warning("请先选择上级节点");
           return;
         }
-        this.form = Object.assign({}, this.formInit, { parentId: this.form.id, });
+        let parentForm = deepCopy(this.form)
+        console.log('parentForm',parentForm)
+        this.form = Object.assign({}, this.formInit, { parentId: parentForm.id,routeUrl: parentForm.routeUrl});
+        console.log('this.form',this.form)
       } else {
         this.form = Object.assign({}, this.formInit);
       }
+      await this.$refs[formName].resetFields();
     },
 
     //删除
@@ -500,7 +513,7 @@ export default {
   watch: {
     //人员ID未切换换时 也可以强制刷新数据
     "dataTransOpts.refresh.menu_info.S": {
-      immediate: true,
+      // immediate: true,  // 立即执行在 组件的 created 前面，如有用到 本组件的参数时，不推荐使用
       handler(newVal, oldVal) {
         console.log(
           `watch 菜单与页面 newVal:${newVal} oldVal:${oldVal} menuInfoId: ${this.dataTransOpts.tableS.menu_info.id}`
diff --git a/src/components/menuPage/MenuPageSet.vue b/src/components/menuPage/MenuPageSet.vue
index 286f419..a63c33f 100644
--- a/src/components/menuPage/MenuPageSet.vue
+++ b/src/components/menuPage/MenuPageSet.vue
@@ -4,7 +4,7 @@
       <div>
         <el-input  placeholder="输入关键字进行过滤" v-model="filterText" size="small" />
       </div>
-      <div v-show="isRole">
+      <div v-show="isRole && checkPagePriv(pagePriv.privs,'提交')">
         <el-button @click="btnSubmit" size="small">提交</el-button>
       </div>
     </div>
@@ -20,7 +20,7 @@
 <script>
 import { mapState, mapMutations } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { tcdate,arrayExistObj } from "../../utlis/proFunc";
+import { getPagePriv,checkPagePriv, deepCopy,tcdate,arrayExistObj } from "../../utlis/proFunc";
 import { getTreeNode, getTreeAllChildIdsByNode, getTreeAllChildIdsById, getTreePids } from "../../utlis/tree";
 
 
@@ -29,6 +29,10 @@ export default {
   props:["params"], // params = { opra: role/user 用户/角色, idVal: roleId/userId}
   data() {
     return {
+      pagePriv:{
+        routeUrlorPageName:'MenuInfoSet', //当前页面归属路由或归属页面权限名称
+        privs:[] // 页面权限
+      },   
       menuInfoView:[], //显示菜单
       menuInfoSet:[],  //设置菜单
       checkedKeys:[],  //勾选的菜单节点ID
@@ -37,7 +41,7 @@ export default {
   },
  
   computed: {
-    ...mapState(["window", "dataTransOpts", "customerOrg" ]),
+    ...mapState(["window", "dialogWin", "dataTransOpts", "customerOrg" ]),
 
     // 是否角色
     isRole(){      
@@ -51,7 +55,10 @@ export default {
   },
 
   //创建组件后
-  created() {    
+  created() { 
+    //获取用户当前页面的权限
+    let userPriv = window.sessionStorage.getItem('userPriv')
+    if(userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))   
   },
 
   //挂载组件完成
@@ -60,7 +67,7 @@ export default {
   },
 
   methods: {
-    ...mapMutations(["setData"]),
+    ...mapMutations(["setData"]),checkPagePriv,
 
     // 初始化数据，获取菜单列表树信息 及角色的授权菜单
     initData(roleOrUser_Id) {        
@@ -139,9 +146,9 @@ export default {
       postapi('/api/app/rolemenuinfo/setrolemenuinfo',body).then(res =>{
         if(res.code != -1){
           console.log('操作成功！')
+          this.dialogWin.MenuPageSet = false 
         }
       })
-
     },
 
     //勾选节点
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 00329c9..3deee0f 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -129,20 +129,20 @@
       </el-tabs>
     </div>
     <div style="margin-left: 10px;">
-      <div class="listBtn">
+      <div v-show="checkPagePriv(pagePriv.privs,'人员登记')" class="listBtn">
         <el-button type="success" class="btnClass" @click="btnAdd">人员登记</el-button
         >
       </div>
-      <div class="listBtn">
+      <div v-show="checkPagePriv(pagePriv.privs,'批量正式登记')" class="listBtn">
         <el-button type="success" class="btnClass" @click="btnAddBatch">批量正式登记</el-button
         >
       </div>
-      <div class="listBtn">
+      <div v-show="checkPagePriv(pagePriv.privs,'编辑')" class="listBtn">
         <el-button type="primary" class="btnClass" @click="btnEdit"
           >编辑</el-button
         >
       </div>
-      <div class="listBtn">
+      <div v-show="checkPagePriv(pagePriv.privs,'删除')" class="listBtn">
         <el-button type="danger" class="btnClass" @click="btnDel"
           >删除</el-button
         >
@@ -161,17 +161,17 @@
         <el-button type="" class="btnClass commonbutton">健康档案</el-button>
       </div>
       -->
-      <div class="listBtn">
+      <div v-show="checkPagePriv(pagePriv.privs,'批量调整分组')" class="listBtn">
         <el-button type="" class="btnClass" @click="btnGroupBatch"
           >批量调整分组</el-button
         >
       </div>
-      <div class="listBtn">
+      <div v-show="checkPagePriv(pagePriv.privs,'批量调整项目')" class="listBtn">
         <el-button type="" class="btnClass" @click="btnAsbBatch"
           >批量调整项目</el-button
         >
       </div>
-      <div class="listBtn">
+      <div v-show="checkPagePriv(pagePriv.privs,'指引单打印')" class="listBtn">
         <el-button
           type=""
           class="btnClass"
@@ -179,7 +179,7 @@
           >指引单打印</el-button
         >
       </div>
-      <div class="listBtn">
+      <div v-show="checkPagePriv(pagePriv.privs,'指引单预览')" class="listBtn">
         <el-button
           type=""
           class="btnClass"
@@ -187,7 +187,7 @@
           >指引单预览</el-button
         >
       </div>
-      <div class="listBtn">
+      <div v-show="checkPagePriv(pagePriv.privs,'人员信息导出')" class="listBtn">
         <el-button
           type=""
           class="btnClass"
@@ -290,6 +290,7 @@ import FileSaver from 'file-saver';
 import html2canvas from 'html2canvas';
 
 import {
+  getPagePriv,checkPagePriv, 
   dddw,
   objCopy,
   arrayReduce,
@@ -316,6 +317,10 @@ export default {
   },
   data() {
     return {
+      pagePriv:{
+        routeUrlorPageName:'patientRegister', //当前页面归属路由或归属页面权限名称
+        privs:[] // 页面权限
+      },
       peisid:null,
       startPoint: -1, // 多选起点 -1 表示选择
       endPoint: -1, // 多选终点 -1 表示未选择
@@ -383,6 +388,10 @@ export default {
   },
 
   created() {
+    //获取用户当前页面的权限
+    let userPriv = window.sessionStorage.getItem('userPriv')
+    if(userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
+
     this.headerCols = deepCopy(this.dropCol)
     this.loadOptsInit = Object.assign({},this.loadOpts)
   },
@@ -413,7 +422,7 @@ export default {
   },
   methods: {
     ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
-    moment,dddw,deepCopy,
+    moment,dddw,deepCopy,checkPagePriv,
 
     // 扩展定义表格行样式
     handleRowClassName({ row, rowIndex }) {
@@ -966,42 +975,46 @@ export default {
       //console.log('onContextmenu',event);
       if (!this.rClickRow) return false;
       let row = { ...this.rClickRow };
-      this.$contextmenu({
-        items: [
-          {
-            label: "发送检验申请",
-            onClick: () => {
-              this.lisRequest(row.id);
-            },
-          },
-          {
-            label: "预览检验条码",
-            onClick: () => {
-              this.lisPrint(row.id, "0002", true);
-            },
+      let items = [] //菜单项
+
+      if(checkPagePriv(this.pagePriv.privs,'发送检验申请')) 
+        items.push({
+          label: "发送检验申请",
+          onClick: () => {
+            this.lisRequest(row.id);
           },
-          {
-            label: "打印检验条码",
-            onClick: () => {
-              this.lisPrint(row.id, "0002", false);
-            },
+        })
+      if(checkPagePriv(this.pagePriv.privs,'预览检验条码')) 
+        items.push({
+          label: "预览检验条码",
+          onClick: () => {
+            this.lisPrint(row.id, "0002", true);
           },
-          {
-            label: "预览Pacs条码",
-            onClick: () => {
-              this.pacsPrint(row.id, "0004", true);
-            },
+        })
+      if(checkPagePriv(this.pagePriv.privs,'打印检验条码')) 
+        items.push({
+          label: "打印检验条码",
+          onClick: () => {
+            this.lisPrint(row.id, "0002", false);
           },
-          {
-            label: "打印Pacs条码",
-            onClick: () => {
-              this.pacsPrint(row.id, "0004", false);
-            },
+        })
+      if(checkPagePriv(this.pagePriv.privs,'预览Pacs条码')) 
+        items.push({
+          label: "预览Pacs条码",
+          onClick: () => {
+            this.pacsPrint(row.id, "0004", true);
           },
-          {
-            label: "----------------",
+        })
+      if(checkPagePriv(this.pagePriv.privs,'打印Pacs条码')) 
+        items.push({
+          label: "打印Pacs条码",
+          onClick: () => {
+            this.pacsPrint(row.id, "0004", false);
           },
-        ],
+        })
+      items.push({ label: "----------------", })
+      this.$contextmenu({
+        items,
         event,
         //x: event.clientX,
         //y: event.clientY,
diff --git a/src/components/patientRegister/patientRegisterQuery.vue b/src/components/patientRegister/patientRegisterQuery.vue
index fb81c2e..c7cf994 100644
--- a/src/components/patientRegister/patientRegisterQuery.vue
+++ b/src/components/patientRegister/patientRegisterQuery.vue
@@ -77,10 +77,10 @@
 
     <!-- 按钮区域 -->
     <div style="margin-left: 10px;">
-      <div class="listBtn">
+      <div v-show="checkPagePriv(pagePriv.privs,'查询')" class="listBtn">
         <el-button class="btnClass" @click="btnQuery">查询</el-button>
       </div>
-      <div class="listBtn">
+      <div v-show="checkPagePriv(pagePriv.privs,'读身份证')" class="listBtn">
         <el-button type="danger" class="btnClass" @click="readIdCard">读身份证</el-button>
       </div>
     </div>
@@ -89,19 +89,27 @@
 <script>
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import {parsIcCardtoLocal} from '../../utlis/proFunc'
+import { getPagePriv,checkPagePriv, parsIcCardtoLocal, deepCopy} from '../../utlis/proFunc'
 
 export default {
   components: {},
   props: ["orgEnable"],
   data() {
     return {
+      pagePriv:{
+        routeUrlorPageName:'patientRegister', //当前页面归属路由或归属页面权限名称
+        privs:[] // 页面权限
+      },
       dialogVisible: false,
       customerOrgRegisterList:[],
     };
   },
 
   created() { 
+    //获取用户当前页面的权限
+    let userPriv = window.sessionStorage.getItem('userPriv')
+    if(userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
+
     let ldate = new Date();
     this.patientRegister.query.startDate = ldate;
     this.patientRegister.query.endDate = ldate;
@@ -114,7 +122,7 @@ export default {
     ...mapState(["window", "dict", "patientRegister", "customerOrg"]),
   },
   methods: {
-
+    checkPagePriv,
     //查询
     btnQuery() {
       this.patientRegister.query.times++;
diff --git a/src/main.js b/src/main.js
index 033162f..5ecf9d1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -108,7 +108,7 @@ onResize();
 
 // 监听keydown：获取键盘按住事件,code返回按住的键信息 (为了省事放在全局，后续优化应考虑放至具体用到界面上)
 window.addEventListener('keydown', code => {
-    console.log('keydown', code)
+    // console.log('keydown', code)
     if (code.key == "Shift" && code.shiftKey) {
         store.commit('setData', { key: 'window.shift', value: true }); // 标记按住了shift键            
     }
@@ -120,7 +120,7 @@ window.addEventListener('keydown', code => {
 
 // // 监听keyup：获取键盘松开事件,code返回按住的键信息
 window.addEventListener('keyup', code => {
-    console.log('keyup', code)
+    // console.log('keyup', code)
     if (code.key == "Shift") {
         store.commit('setData', { key: 'window.shift', value: false }); // 标记松开了shift键    
     }
diff --git a/src/utlis/proFunc.js b/src/utlis/proFunc.js
index 45f10e4..c344ca5 100644
--- a/src/utlis/proFunc.js
+++ b/src/utlis/proFunc.js
@@ -292,6 +292,30 @@ async function savePeoplePhoto(peopleId, photoBase64) {
 };
 exports.savePeoplePhoto = savePeoplePhoto;
 
+// 获取当前用户，当前界面的权限
+// roteUrlorPageName 路由或需要控制权限的组件界面名称
+function getPagePriv(routeUrlorPageName){
+  let priv = []
+  let userPriv = window.sessionStorage.getItem('userPriv')
+  if(userPriv) priv = JSON.parse(userPriv)
+  priv = priv.filter(e => {
+    return e.routeUrl == routeUrlorPageName 
+  })
+  return priv
+};
+exports.getPagePriv = getPagePriv;
+
+// 检查权限是否具有某个权限
+// privs 权限集合； displayName 待验证的权限节点名称，有权限返回 true ,否则返回 false
+function checkPagePriv(privs,displayName){
+  let ret = false
+  if(!(Array.isArray(privs) && privs.length > 0)) return ret
+  let lfind = arrayExistObj(privs,'displayName',displayName)
+  if(lfind > -1) ret = true
+  return ret  
+};
+exports.checkPagePriv = checkPagePriv;
+
 
 
 
diff --git a/src/views/customerOrg/customerOrgGroup.vue b/src/views/customerOrg/customerOrgGroup.vue
index 54ab05d..5c9a7fd 100644
--- a/src/views/customerOrg/customerOrgGroup.vue
+++ b/src/views/customerOrg/customerOrgGroup.vue
@@ -3,7 +3,7 @@
     <el-card>
       <div slot="header">单位分组</div>
       <!--分组信息-->
-      <div style="display: flex;">
+      <div style="display: flex;font-size:14px;">
         <div :style="'display: block;width:' + (window.pageWidth - 45 - 110) + 'px;'">
           <div style="display: flex">
             <div>
@@ -128,22 +128,22 @@
         </div>
         <!--按钮-->
         <div style="display: block;margin-left: 10px;">
-          <div style="margin-top: 35px;">      
+          <div v-show="checkPagePriv(pagePriv.privs,'新增')" style="margin-top: 35px;">      
             <el-button class="commonbutton"  @click="btnAdd">新增</el-button>
           </div>
-          <div style="margin-top: 8px;">
+          <div v-show="checkPagePriv(pagePriv.privs,'编辑')" style="margin-top: 8px;">
             <el-button class="commonbutton" @click="btnEdit" >编辑</el-button> 
           </div>
-          <div style="margin-top: 8px;">
+          <div v-show="checkPagePriv(pagePriv.privs,'删除')" style="margin-top: 8px;">
             <el-button class="commonbutton" @click="btnDel" >删除</el-button> 
           </div>
-          <div style="margin-top: 8px;">
+          <div v-show="checkPagePriv(pagePriv.privs,'置顶')" style="margin-top: 8px;">
             <el-button class="commonbutton" @click="btnSetTop" >置顶</el-button> 
           </div>
-          <div style="margin-top: 8px;">
-            <el-button class="commonbutton" @click="btnSetBottom">置低</el-button>
+          <div v-show="checkPagePriv(pagePriv.privs,'置底')" style="margin-top: 8px;">
+            <el-button class="commonbutton" @click="btnSetBottom">置底</el-button>
           </div>
-          <div style="margin-top: 8px;">
+          <div v-show="checkPagePriv(pagePriv.privs,'保存排序')" style="margin-top: 8px;">
             <el-button class="commonbutton" @click="btnSort" :disabled="!isDrag" >保存排序</el-button>
           </div>
         </div>
@@ -247,7 +247,7 @@ import moment from "moment";
 import Sortable from "sortablejs";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { mapState } from "vuex";
-import { dddw, deepCopy, objCopy, arrayExistObj } from "../../utlis/proFunc";
+import { getPagePriv,checkPagePriv, dddw, deepCopy, objCopy, arrayExistObj } from "../../utlis/proFunc";
 
 import CustomerOrgGroupAsbitem from "../../components/customerOrg/customerOrgGroupAsbitem.vue";
 
@@ -257,6 +257,10 @@ export default {
   },
   data() {
     return {
+      pagePriv:{
+        routeUrlorPageName:'customerOrgGroup', //当前页面归属路由或归属页面权限名称
+        privs:[] // 页面权限
+      }, 
       customerOrg: [], //体检单位
       customerOrgGroups: [], //体检单位分组
       customerOrgId: "", //当前选中的体检单位id
@@ -297,6 +301,10 @@ export default {
     ...mapState(["personnelUnit", "window", "dict", "dataTransOpts"]),
   },
   created() {
+    //获取用户当前页面的权限
+    let userPriv = window.sessionStorage.getItem('userPriv')
+    if(userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
+
     this.rowDrop();
     this.formInit = deepCopy(this.form);
   },
@@ -306,7 +314,7 @@ export default {
   },
   methods: {
     moment,
-    dddw,deepCopy,
+    checkPagePriv,dddw,deepCopy,
 
     //刷新分组价格（供子组件调用）
     refreshMoney(formData){
diff --git a/src/views/customerOrg/customerOrgGroupBak.vue b/src/views/customerOrg/customerOrgGroupBak.vue
deleted file mode 100644
index ab9dfc9..0000000
--- a/src/views/customerOrg/customerOrgGroupBak.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-  <div style="display: flex">
-    <div class="box">
-      <el-card>
-        <div class="publiccss">单位分组</div>
-        <span>单位</span>
-        <el-select
-          v-model="value"
-          placeholder="请选择"
-          style="margin-left: 20px; margin-top: 20px"
-          @change="secltchang"
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.id"
-            :label="item.displayName"
-            :value="item.id"
-          >
-          </el-option>
-        </el-select>
-        <div>
-          <CustomerOrgTree></CustomerOrgTree>
-          <UnitGroupCategory></UnitGroupCategory>
-        </div>
-      </el-card>
-    </div>
-  </div>
-</template>
-<script>
-import CustomerOrgTree from "../../components/unitGrouping/unitGroupingTable.vue";
-import UnitGroupCategory from "../../components/unitGrouping/unitGroupCategory.vue";
-import { mapState } from "vuex";
-import { getapi } from "@/api/api";
-export default {
-  components: {
-    CustomerOrgTree,
-    UnitGroupCategory,
-  },
-  data() {
-    return {
-      options: [],
-      value: "",
-    };
-  },
-  computed: {
-    ...mapState(["personnelUnit"]),
-  },
-  created() {
-    this.getitemtype();
-  },
-  methods: {
-    secltchang(v) {
-      this.personnelUnit.id = v;
-      //let that=this
-      console.log(this.customerOrg);
-      getapi(`/api/app/customer-org-group/in-customer-org-id/${v}`).then(
-        (res) => {
-          this.personnelUnit.personnelgrouping = res.data;
-          // console.log(res.data);
-          // console.log(that.customerOrg.personnelgrouping);
-        }
-      );
-      console.log(v);
-    },
-    //获取单位列表
-    getitemtype() {
-      getapi("/api/app/customer-org/parent-all").then((res) => {
-        this.options = res.data;
-      });
-    },
-  },
-};
-</script>
-<style scoped>
-::v-deep .el-card__body {
-  height: 800px;
-}
-.box {
-  width: 100%;
-}
-</style>
diff --git a/src/views/customerOrg/patientRegisterImport.vue b/src/views/customerOrg/patientRegisterImport.vue
index fec1182..02f8e23 100644
--- a/src/views/customerOrg/patientRegisterImport.vue
+++ b/src/views/customerOrg/patientRegisterImport.vue
@@ -6,13 +6,13 @@
         <div></div>
         <div style="display: flex;">
           <div>
-            <a :underline="false" href="/files/单位体检人员名单导入模板.xlsx"><el-button class="btnClass">下载导入模版</el-button></a>
+            <a :underline="false" href="/files/单位体检人员名单导入模板.xlsx"><el-button class="btnClass" size="small">下载导入模版</el-button></a>
           </div>
           <div>
-            <el-button class="btnClass" @click="seq = 0">导入</el-button>
+            <el-button class="btnClass" @click="seq = 0" size="small">导入</el-button>
           </div>
           <div>
-            <el-button class="btnClass" @click="btnExport('tableData')">导入后结果状态导出</el-button>
+            <el-button class="btnClass" @click="btnExport('tableData')" size="small">导入后结果状态导出</el-button>
           </div>
         </div>
       </div>
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index a071345..a7f08a6 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -112,10 +112,14 @@ export default {
 
               this.$router.push({ path: "/home" });
               this.$store.state.changepassword = this.form.Password;
-
+              return getapi('/api/app/menuinfo/getmymenuinfolist')
             } else {
               this.$message.warning(res.message);
             }
+          }).then(res => {
+            if(res && res.code != -1){
+              window.sessionStorage.setItem("userPriv", JSON.stringify(res.data));
+            }
           }).catch(err =>{
             this.$message.error(err);
           })