Merge branch 'master' of http://218.108.80.158:8081/zhangjy/TXbackstage

合并二维码代码

public/config.js

@@ -1,5 +1,5 @@
 window.g = {
   ApiUrl: 'https://tx.hz-hanghui.com:8088/yx-fyzd', //塘栖
-  // ApiUrl: 'http://192.168.11.3:9100/yx-fyzd', //塘栖本地
+  // ApiUrl: 'http://192.168.11.17:9100/yx-fyzd', //塘栖本地
 
 }

src/api/user_manage.js

@@ -1,457 +1,474 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 // (新)获取管理员列表(id 和 username)
 export function getAdminListNew(data) {
   return request({
-    url: '/admin/auth/getAdminListNew',
-    method: 'post',
-    data
-  })
+    url: "/admin/auth/getAdminListNew",
+    method: "post",
+    data,
+  });
 }
 
 // 获得管理员列表
 export function getUserList(data) {
   return request({
-    url: '/admin/auth/doGetAdmins',
-    method: 'post',
-    data
-  })
+    url: "/admin/auth/doGetAdmins",
+    method: "post",
+    data,
+  });
 }
 
 // 获得管理员列表
 export function getUserListSearch() {
   return request({
-    url: '/admin/auth/getAdminlist',
-    method: 'post'
-  })
+    url: "/admin/auth/getAdminlist",
+    method: "post",
+  });
 }
 
 // 获得省份列表
 export function getProvince() {
   return request({
-    url: '/admin/areaCode/getProvince',
-    method: 'get',
-    params: {}
-  })
+    url: "/admin/areaCode/getProvince",
+    method: "get",
+    params: {},
+  });
 }
 
 // 获得城市列表
 export function getCity(areaCodeId) {
   return request({
-    url: '/admin/areaCode/getCity',
-    method: 'get',
+    url: "/admin/areaCode/getCity",
+    method: "get",
     params: {
-      areaCodeId: areaCodeId
-    }
-  })
+      areaCodeId: areaCodeId,
+    },
+  });
 }
 
 // 获得区县列表
 export function getArea(areaCodeId) {
   return request({
-    url: '/admin/areaCode/getArea',
-    method: 'get',
+    url: "/admin/areaCode/getArea",
+    method: "get",
     params: {
-      areaCodeId: areaCodeId
-    }
-  })
+      areaCodeId: areaCodeId,
+    },
+  });
 }
 
 // 获得街道列表
 export function getStreet(areaCodeId) {
   return request({
-    url: '/admin/areaCode/getStreet',
-    method: 'get',
+    url: "/admin/areaCode/getStreet",
+    method: "get",
     params: {
-      areaCodeId: areaCodeId
-    }
-  })
+      areaCodeId: areaCodeId,
+    },
+  });
 }
 
 // 获得派出所列表
 export function getPolice(areaCodeId) {
   return request({
-    url: '/admin/policeStationCode/getList',
-    method: 'get',
+    url: "/admin/policeStationCode/getList",
+    method: "get",
     params: {
-      areaCodeId: areaCodeId
-    }
-  })
+      areaCodeId: areaCodeId,
+    },
+  });
 }
 
 // 添加&编辑管理员
 export function doEditAdmin(data) {
   return request({
-    url: '/admin/auth/doEditAdmin',
-    method: 'post',
-    data
-  })
+    url: "/admin/auth/doEditAdmin",
+    method: "post",
+    data,
+  });
 }
 
 // 删除管理员
 export function doDeleteAdmin(id) {
   return request({
-    url: '/admin/auth/doDeleteAdmin',
-    method: 'delete',
+    url: "/admin/auth/doDeleteAdmin",
+    method: "delete",
     params: {
-      id: id
-    }
-  })
+      id: id,
+    },
+  });
 }
 
 /**********************************************标签管理****************************/
 // 获得标签列表
 export function getTagList(provinceId) {
   return request({
-    url: '/admin/tag/getList',
-    method: 'get',
+    url: "/admin/tag/getList",
+    method: "get",
     params: {
-      provinceId: provinceId || null
-    }
-  })
+      provinceId: provinceId || null,
+    },
+  });
 }
 
 // 添加标签
 export function insert(data) {
   return request({
-    url: '/admin/tag/insert',
-    method: 'post',
-    data
-  })
+    url: "/admin/tag/insert",
+    method: "post",
+    data,
+  });
 }
 
 // 编辑标签
 export function update(data) {
   return request({
-    url: '/admin/tag/update',
-    method: 'post',
-    data
-  })
+    url: "/admin/tag/update",
+    method: "post",
+    data,
+  });
 }
 
 // 删除标签
 export function deleteTag(tagId) {
   return request({
-    url: '/admin/tag/delete',
-    method: 'get',
+    url: "/admin/tag/delete",
+    method: "get",
     params: {
-      tagId: tagId
-    }
-  })
+      tagId: tagId,
+    },
+  });
 }
 
 /**********************************************查询详情****************************/
 // 查询详情
 export function searchContent(data) {
   return request({
-    url: '/admin/tag/insert',
-    method: 'post',
-    data
-  })
+    url: "/admin/tag/insert",
+    method: "post",
+    data,
+  });
 }
 
 // 自定义字段(访客，进出记录)
 export function getContext(id) {
   return request({
-    url: '/admin/face/getContext',
-    method: 'get',
-    params: { id }
-  })
+    url: "/admin/face/getContext",
+    method: "get",
+    params: { id },
+  });
 }
 // 自定义字段(常客)
 export function getContextById(adminId) {
   return request({
-    url: '/admin/face/getContextById',
-    method: 'get',
-    params: { adminId }
-  })
+    url: "/admin/face/getContextById",
+    method: "get",
+    params: { adminId },
+  });
 }
 export function getContextByWhiteId(id) {
   return request({
-    url: '/admin/face/getContextByWhiteId',
-    method: 'get',
-    params: { id }
-  })
+    url: "/admin/face/getContextByWhiteId",
+    method: "get",
+    params: { id },
+  });
 }
 export function getContextByFaceLog(params) {
   return request({
-    url: '/admin/face/getContextByFaceLog',
-    method: 'get',
-    params
-  })
+    url: "/admin/face/getContextByFaceLog",
+    method: "get",
+    params,
+  });
 }
 // -------------------访客机接口----------------------------
 // 根据进出记录获取访客机字段
 export function getUserListFrom(params) {
   return request({
-    url: '/admin/face/getUserListFrom',
-    method: 'get',
-    params
-  })
+    url: "/admin/face/getUserListFrom",
+    method: "get",
+    params,
+  });
 }
 
 // 根据访客id获取访客机字段
 export function getVisitorListFrom(id) {
   return request({
-    url: '/admin/face/getVisitorListFrom',
-    method: 'get',
-    params: { id }
-  })
+    url: "/admin/face/getVisitorListFrom",
+    method: "get",
+    params: { id },
+  });
 }
 // 根据常客id获取访客机字段
 export function getWhiteListFrom(id) {
   return request({
-    url: '/admin/face/getWhiteListFrom',
-    method: 'get',
-    params: { id }
-  })
+    url: "/admin/face/getWhiteListFrom",
+    method: "get",
+    params: { id },
+  });
 }
 // 常客列表-下载模板
 export function doGetWhiteExcel() {
   return request({
-    url: '/admin/userWhitelis/doGetWhiteExcel',
-    method: 'get',
-    responseType: 'blob',
-    params: {}
-  })
+    url: "/admin/userWhitelis/doGetWhiteExcel",
+    method: "get",
+    responseType: "blob",
+    params: {},
+  });
 }
 // -----------访客-------------------
 // 访客删除
 export function deleteVisitor(id) {
   return request({
-    url: '/admin/userVisitorList/deleteVisitor',
-    method: 'get',
-    params: { id }
-  })
+    url: "/admin/userVisitorList/deleteVisitor",
+    method: "get",
+    params: { id },
+  });
 }
 // 访客下发
 export function addSingle(id) {
   return request({
-    url: '/admin/userVisitorList/addSingle',
-    method: 'get',
-    params: { id }
-  })
+    url: "/admin/userVisitorList/addSingle",
+    method: "get",
+    params: { id },
+  });
 }
 // 访客记录分页
 export function getDetailPageList(data) {
   return request({
-    url: '/admin/userVisitorList/getDetailPageList',
-    method: 'post',
-    data
-  })
+    url: "/admin/userVisitorList/getDetailPageList",
+    method: "post",
+    data,
+  });
 }
 // 访客记录详情
 export function getDetailInfo(detailId) {
   return request({
     url: `/admin/userVisitorList/getDetailInfo/${detailId}`,
-    method: 'get',
-  })
+    method: "get",
+  });
 }
 
 // ----------------------常访客导出------------------------
 // 导出常客列表Excel
 export function userWhitelistExcelOut(data) {
   return request({
-    url: '/admin/userWhitelis/userWhitelistExcelOut',
-    method: 'post',
-    data
-  })
+    url: "/admin/userWhitelis/userWhitelistExcelOut",
+    method: "post",
+    data,
+  });
 }
 
 // 导出访客列表Excel
 export function userVisitorlistExcelOut(data) {
   return request({
-    url: '/admin/userVisitorList/userVisitorlistExcelOut',
-    method: 'post',
-    data
-  })
+    url: "/admin/userVisitorList/userVisitorlistExcelOut",
+    method: "post",
+    data,
+  });
 }
 // -------------------楼宇场景-------------------
 // 添加-编辑企业
 export function saveEnterpriseAccount(data) {
   return request({
-    url: '/admin/auth/saveEnterpriseAccount',
-    method: 'post',
-    data
-  })
+    url: "/admin/auth/saveEnterpriseAccount",
+    method: "post",
+    data,
+  });
 }
 // 通过账号id查询详情
 export function queryAdminById(id) {
   return request({
     url: `/admin/auth/queryAdminById/${id}`,
-    method: 'get',
-  })
+    method: "get",
+  });
 }
 // 企业审核
 export function audit(id, reviewStatus) {
   return request({
     url: `/admin/auth/audit/${id}/${reviewStatus}`,
-    method: 'post',
-  })
+    method: "post",
+  });
 }
 // 查询企业账号信息
 export function queryEnterpriseAccount(id) {
   return request({
     url: `/admin/auth/queryEnterpriseAccount`,
-    method: 'get',
-  })
+    method: "get",
+  });
 }
 // -----------场所码---------
 // 场所记录分页查询
 export function placeRecordList(data) {
   return request({
-    url: '/admin/placeRecord/getPageList',
-    method: 'post',
+    url: "/admin/placeRecord/getPageList",
+    method: "post",
     data,
-  })
+  });
 }
 // 查询账号场所码信息
 export function queryPlaceInfos(adminId) {
   return request({
     url: `/admin/auth/queryPlaceInfos/${adminId}`,
-    method: 'get',
-  })
+    method: "get",
+  });
 }
 
 // ---------私有区域-----------
 // 获取私有区域列表
 export function getPrivateAreaList(adminId) {
   return request({
-    url: '/admin/privateArea/getPrivateAreaList',
-    method: 'get',
-    params: { adminId }
-  })
+    url: "/admin/privateArea/getPrivateAreaList",
+    method: "get",
+    params: { adminId },
+  });
 }
 
 // 私有区域列表分页
 export function privateAreaPageList(data) {
   return request({
-    url: '/admin/privateArea/privateAreaPageList',
-    method: 'post',
+    url: "/admin/privateArea/privateAreaPageList",
+    method: "post",
     data,
-  })
+  });
 }
 // 添加-修改私有区域
 export function addOrUpdatePrivateArea(data) {
   return request({
-    url: '/admin/privateArea/addOrUpdatePrivateArea',
-    method: 'post',
+    url: "/admin/privateArea/addOrUpdatePrivateArea",
+    method: "post",
     data,
-  })
+  });
 }
 // 删除私有区域
 export function deletePrivateArea(privateAreaId) {
   return request({
-    url: 'admin/privateArea/deletePrivateArea',
-    method: 'get',
-    params: { privateAreaId }
-  })
+    url: "admin/privateArea/deletePrivateArea",
+    method: "get",
+    params: { privateAreaId },
+  });
 }
 // 私有区域设备列表分页
 export function privateAreaDevicePageList(data) {
   return request({
-    url: '/admin/privateArea/privateAreaDevicePageList',
-    method: 'post',
+    url: "/admin/privateArea/privateAreaDevicePageList",
+    method: "post",
     data,
-  })
+  });
 }
 // 获取私有区域设备列表
 export function getPrivateAreaDeviceList(privateAreaId) {
   return request({
-    url: 'admin/privateArea/getPrivateAreaDeviceList',
-    method: 'get',
-    params: { privateAreaId }
-  })
+    url: "admin/privateArea/getPrivateAreaDeviceList",
+    method: "get",
+    params: { privateAreaId },
+  });
+}
+// 获取人员类型列表
+export function getUserWhitePersonnelTypeEnum() {
+  return request({
+    url: "admin/userWhitelis/getUserWhitePersonnelTypeEnum",
+    method: "get",
+    params: {},
+  });
 }
 // 私有区域人员列表分页
 export function privateAreaWhitelistPageList(data) {
   return request({
-    url: '/admin/privateArea/privateAreaWhitelistPageList',
-    method: 'post',
+    url: "/admin/privateArea/privateAreaWhitelistPageList",
+    method: "post",
     data,
-  })
+  });
 }
 // ---------------下发任务列表----------------
 // 分页
 export function issuedList(data) {
   return request({
-    url: '/admin/issuedTaskInfo/getPageList',
-    method: 'post',
+    url: "/admin/issuedTaskInfo/getPageList",
+    method: "post",
     data,
-  })
+  });
 }
 export function issuedCancel(id) {
   return request({
     url: `/admin/issuedTaskInfo/cancel/${id}`,
-    method: 'post',
-  })
+    method: "post",
+  });
 }
 // ---------------行程码-行政区域列表列表----------------
 export function riskAreaList(data) {
   return request({
-    url: '/admin/auth/riskAreaList',
-    method: 'post',
-    data
-  })
+    url: "/admin/auth/riskAreaList",
+    method: "post",
+    data,
+  });
 }
 // 推送字段
 export function fieldOptions(data) {
   return request({
-    url: '/admin/auth/punch/field-options',
-    method: 'get',
-    params:{}
-  })
+    url: "/admin/auth/punch/field-options",
+    method: "get",
+    params: {},
+  });
 }
 // ---------------下发删除自动化任务----------------
 // 任务列表
 export function getByPage(data) {
   return request({
-    url: '/autoTaskInfo/getByPage',
-    method: 'post',
-    data
-  })
+    url: "/autoTaskInfo/getByPage",
+    method: "post",
+    data,
+  });
 }
 // 取消任务
 export function cancelTask(taskId) {
   return request({
-    url: '/autoTaskInfo/cancelTask',
+    url: "/autoTaskInfo/cancelTask",
     headers: {
-      'Content-Type': 'application/x-www-form-urlencoded'
+      "Content-Type": "application/x-www-form-urlencoded",
     },
-    method: 'post',
-    params:{taskId}
-  })
+    method: "post",
+    params: { taskId },
+  });
 }
 // ---------------系统公告----------------
 // 编辑公告
 export function systemNoticeEdit(data) {
   return request({
-    url: '/systemNotice/edit',
-    method: 'post',
-    data
-  })
+    url: "/systemNotice/edit",
+    method: "post",
+    data,
+  });
 }
 // 获取公告信息
 export function systemNoticeGetNotice(data) {
   return request({
-    url: '/systemNotice/getNotice',
-    method: 'post',
-    data
-  })
+    url: "/systemNotice/getNotice",
+    method: "post",
+    data,
+  });
 }
 
 // -------------场所码所属区域-------------
 export function getPlaceAreas(data) {
   return request({
-    url: '/admin/auth/getPlaceAreas',
-    method: 'get',
-    params: {}
-  })
+    url: "/admin/auth/getPlaceAreas",
+    method: "get",
+    params: {},
+  });
 }
 // -------------获取商户平台列表-------------
 export function doGetTenants(data) {
   return request({
-    url: '/admin/face/doGetTenants',
-    method: 'post',
-    data
-  })
+    url: "/admin/face/doGetTenants",
+    method: "post",
+    data,
+  });
+}
+
+// 获取操作人（家长）信息
+export function getParentInfo(UserWhitelistId) {
+  return request({
+    url: "/admin/userWhitelis/getParentInfo",
+    method: "get",
+    params: {UserWhitelistId},
+  });
 }

src/layout/components/Sidebar/SidebarItem.vue

@@ -88,6 +88,7 @@ export default {
       disinfectFlag: this.$store.getters.disinfectFlag,
       isOpenExam: this.$store.getters.isOpenExam,
       buildingCheckType: this.$store.getters.buildingCheckType,
+      enterpriseName: this.$store.getters.enterpriseName,
     };
   },
   created() {},
@@ -124,13 +125,19 @@ export default {
       return path.resolve(this.basePath, routePath);
     },
     hasPower(item) {
+      if (item.path === "/enterprise" && this.enterpriseName) {
+        item.children[0].meta.title =this.enterpriseName+ "管理";
+      }
       if (item.path === "/exception_model" && this.role == 99) {
         return false;
       }
-      if (this.placeType != 2 && item.path.indexOf("enterprise") > -1) {
+      if (
+        this.placeType != 2 &&
+        this.placeType != 3 &&
+        item.path.indexOf("enterprise") > -1
+      ) {
         return false;
       }
-
       if (
         item.path === "/exception_model" &&
         this.tagName != "车管所" &&
@@ -138,11 +145,12 @@ export default {
       ) {
         return false;
       } else if (
-        this.buildingCheckType ==1 &&
+        this.buildingCheckType == 1 &&
         item.path.indexOf("audit_authority") > -1
       ) {
         return false;
-      } else if (
+      }
+      else if (
         this.isControlEarlyWarning == 2 &&
         item.path === "/monitor_management"
       ) {

src/router/index.js

@@ -152,6 +152,18 @@ export const constantRoutes = [
       }
     ]
   },
+  // {
+  //   path: '/white_school_list',
+  //   component: Layout,
+  //   children: [
+  //     {
+  //       path: 'index',
+  //       name: 'white_school_list',
+  //       component: () => import('@/views/white_school_list/index'),
+  //       meta: { title: '学生/教职工列表', role: [1, 2, 3, 4,5], visitorType: ['1'], icon: 'el-icon-s-custom' }
+  //     }
+  //   ]
+  // },
   {
     path: '/audit_authority',
     component: Layout,

src/store/getters.js

@@ -35,6 +35,8 @@ const getters = {
   bg:state=>state.user.bg,
   isOpenExam:state=>state.user.isOpenExam,
   buildingCheckType:state=>state.user.buildingCheckType,
+  enterpriseName:state=>state.user.enterpriseName,
+  tenantEnterpriseName:state=>state.user.tenantEnterpriseName,
 
 }
 export default getters

src/store/modules/user.js

@@ -39,6 +39,9 @@ const getDefaultState = () => {
     // logo:'',
     // favicon:'',
     // bg:'',
+    tenantEnterpriseName:null,//上级名称-显示使用
+    enterpriseName:null,//下级名称-显示使用
+
   }
 }
 
@@ -138,6 +141,12 @@ const mutations = {
   SET_BUILDINGCHECKTYPE: (state, buildingCheckType) => {
     state.buildingCheckType = buildingCheckType
   },
+  SET_TENANTENTERPRISENAME: (state, tenantEnterpriseName) => {
+    state.tenantEnterpriseName = tenantEnterpriseName
+  },
+  SET_ENTERPRISENAME: (state, enterpriseName) => {
+    state.enterpriseName = enterpriseName
+  },
   // SET_TITLE: (state, title) => {
   //   state.title = title
   // },
@@ -237,6 +246,8 @@ const actions = {
         commit('SET_ISOPENEXAM', data.isOpenExam)
         commit('SET_OPENINOUTSTATISTICS', data.openInOutStatistics)
         commit('SET_BUILDINGCHECKTYPE', data.buildingCheckType)
+        commit('SET_ENTERPRISENAME', data.enterpriseName)
+        commit('SET_TENANTENTERPRISENAME', data.tenantEnterpriseName)
         resolve(data)
       }).catch(error => {
         reject(error)

src/views/enterprise_manage/compoment/addEnterprise.vue

@@ -32,7 +32,7 @@
           <el-form-item label="账号名称" prop="username" style="flex: 0.5">
             <el-input
               v-model.trim="form.username"
-              placeholder="请输入账号名称（企业简称）"
+              placeholder="请输入账号名称"
             />
           </el-form-item>
           <el-form-item label="密码" prop="password" style="flex: 0.5">
@@ -53,7 +53,7 @@
         </div>
         <div class="flex">
           <el-form-item
-            label="企业全称"
+            :label="`${enterpriseName}全称`"
             prop="enterpriseFullName"
             style="flex: 0.5"
           >
@@ -291,6 +291,8 @@ export default {
   data() {
     return {
       isOpenPrivateArea: this.$store.getters.isOpenPrivateArea,
+      enterpriseName: this.$store.getters.enterpriseName,
+      tenantEnterpriseName: this.$store.getters.tenantEnterpriseName,
       active: "0",
       // password1: null,
       adminId: null,
@@ -349,10 +351,10 @@ export default {
           },
         ],
         enterpriseFullName: [
-          { required: true, message: "请输入企业全称", trigger: "blur" },
+          { required: true, message: "请输入", trigger: "blur" },
         ],
         enterpriseSimpleName: [
-          { required: true, message: "请输入企业简称", trigger: "blur" },
+          { required: true, message: "请输入", trigger: "blur" },
         ],
       },
       // 员工人数

src/views/enterprise_manage/compoment/detail.vue

@@ -23,7 +23,7 @@
         <el-descriptions-item label="管理员手机号">{{
           list.phone
         }}</el-descriptions-item>
-         <el-descriptions-item label="企业全称">{{
+         <el-descriptions-item :label="`${enterpriseName}全称`">{{
           list.enterpriseFullName
         }}</el-descriptions-item>
          <el-descriptions-item label="详细地址">{{
@@ -90,6 +90,8 @@ export default {
   },
   data() {
     return {
+      enterpriseName: this.$store.getters.enterpriseName,
+      tenantEnterpriseName: this.$store.getters.tenantEnterpriseName,
       CS: {
         // "text-align": "center", //文本居中
         "min-width": "250px", //最小宽度

src/views/enterprise_manage/index.vue

@@ -5,7 +5,7 @@
       icon="el-icon-plus"
       @click="create"
       class="margin-left"
-      >添加企业</el-button
+      >添加{{ enterpriseName }}</el-button
     >
     <el-input
       v-model="page.data.username"
@@ -100,7 +100,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="微信企业通用码"
+        :label="`微信${enterpriseName}通用码`"
         align="center"
         v-if="codeType.indexOf('0') > -1"
       >
@@ -117,9 +117,9 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="支付宝企业通用码"
+        :label="`支付宝${enterpriseName}通用码`"
         align="center"
-       v-if="codeType.indexOf('0') > -1"
+        v-if="codeType.indexOf('0') > -1"
       >
         <template slot-scope="scope">
           <el-image
@@ -136,7 +136,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="微信企业员工码"
+        :label="`微信${enterpriseName}员工码`"
         align="center"
         v-if="codeType.indexOf('1') > -1"
       >
@@ -157,7 +157,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="支付宝企业员工码"
+        :label="`支付宝${enterpriseName}员工码`"
         align="center"
         v-if="codeType.indexOf('1') > -1"
       >
@@ -177,7 +177,21 @@
           </el-image>
         </template>
       </el-table-column>
-
+      <el-table-column
+        label="支付宝入库码"
+        align="center"
+        v-if="placeType == 3"
+      >
+        <el-image
+          style="width: 70px; height: 70px"
+          :src="schoolCode"
+          :preview-src-list="[schoolCode]"
+        >
+          <div slot="error" class="image-slot">
+            {{ schoolCode ? "加载失败" : "暂无照片" }}
+          </div>
+        </el-image>
+      </el-table-column>
       <el-table-column align="center" prop="" label="操作区" width="300">
         <template slot-scope="scope">
           <el-button
@@ -245,6 +259,9 @@ export default {
   data() {
     return {
       codeType: this.$store.getters.codeType,
+      enterpriseName: this.$store.getters.enterpriseName,
+      tenantEnterpriseName: this.$store.getters.tenantEnterpriseName,
+      placeType: this.$store.getters.placeType, //是否是学校场景
       // 主表格&主表格加载状态
       list: [],
       listLoading: false,
@@ -264,6 +281,8 @@ export default {
         pageSize: 10,
       },
       total: 0,
+      schoolCode:
+        "https://tx.hz-hanghui.com:8088/yx-fyzd/file/upload/imagesnew/20230912/417855998988910592.jpg",
     };
   },
   methods: {
@@ -276,7 +295,7 @@ export default {
       });
     },
     deleteUser(id) {
-      this.$confirm("确定要删除此企业账号吗?", "提示", {
+      this.$confirm("确定要删除此账号吗?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",

src/views/machine_list/components/thirdPart_machine_list.vue

@@ -266,13 +266,13 @@
       >
         <template slot-scope="scope">
           <el-tag type="success" v-if="scope.row.adminAreaType === 1"
-            >楼宇公有</el-tag
+            >{{tenantEnterpriseName}}公有</el-tag
           >
           <el-tag type="primary" v-if="scope.row.adminAreaType === 2"
-            >企业公有</el-tag
+            >{{enterpriseName}}公有</el-tag
           >
           <el-tag type="warning" v-if="scope.row.adminAreaType === 3"
-            >企业私有</el-tag
+            >{{enterpriseName}}私有</el-tag
           >
         </template>
       </el-table-column>
@@ -432,8 +432,8 @@
             >
               <el-radio-group v-model="form.adminAreaType">
                 <!-- <el-radio :label="1" v-if="!checkRole([99])">楼宇公有</el-radio> -->
-                <el-radio :label="2">企业公有</el-radio>
-                <el-radio :label="3">企业私有</el-radio>
+                <el-radio :label="2">{{enterpriseName}}公有</el-radio>
+                <el-radio :label="3">{{enterpriseName}}私有</el-radio>
               </el-radio-group>
             </el-form-item>
             <el-form-item
@@ -690,6 +690,8 @@ export default {
       role: this.$store.getters.role,// 角色
       placeType: this.$store.getters.placeType,
       isOpenPrivateArea: this.$store.getters.isOpenPrivateArea, //是否开启私有区域
+      enterpriseName: this.$store.getters.enterpriseName,
+      tenantEnterpriseName: this.$store.getters.tenantEnterpriseName,
       // 主表格&主表格加载状态
       list: null,
       listLoading: true,

src/views/machine_list/components/ysgz_machine_list.vue

@@ -289,13 +289,13 @@
       >
         <template slot-scope="scope">
           <el-tag type="success" v-if="scope.row.adminAreaType === 1"
-            >楼宇公有</el-tag
+            >{{tenantEnterpriseName}}公有</el-tag
           >
           <el-tag type="primary" v-if="scope.row.adminAreaType === 2"
-            >企业公有</el-tag
+            >{{enterpriseName}}公有</el-tag
           >
           <el-tag type="warning" v-if="scope.row.adminAreaType === 3"
-            >企业私有</el-tag
+            >{{enterpriseName}}私有</el-tag
           >
         </template>
       </el-table-column>
@@ -459,8 +459,8 @@
             >
               <el-radio-group v-model="form.adminAreaType">
                 <!-- <el-radio :label="1" v-if="!checkRole([99])">楼宇公有</el-radio> -->
-                <el-radio :label="2">企业公有</el-radio>
-                <el-radio :label="3">企业私有</el-radio>
+                <el-radio :label="2">{{enterpriseName}}公有</el-radio>
+                <el-radio :label="3">{{enterpriseName}}私有</el-radio>
               </el-radio-group>
             </el-form-item>
             <el-form-item
@@ -716,6 +716,8 @@ export default {
       role: this.$store.getters.role, // 角色
       placeType: this.$store.getters.placeType,
       isOpenPrivateArea: this.$store.getters.isOpenPrivateArea, //是否开启私有区域
+      enterpriseName: this.$store.getters.enterpriseName,
+      tenantEnterpriseName: this.$store.getters.tenantEnterpriseName,
       // 主表格&主表格加载状态
       list: null,
       listLoading: true,

src/views/private_area/index.vue

@@ -235,7 +235,6 @@ export default {
         ],
       },
       form_copy: {},
-
       showPrivateArea: true, //true显示私有区域false设备/人员
       activeName: "2",
       checkList: [],
@@ -261,8 +260,7 @@ export default {
     },
     // 打开添加设备对话框
     create() {
-      this.form = JSON.parse(JSON.stringify(this.form_copy));
-      this.dialogType = "add";
+      this.form = {};      this.dialogType = "add";
       this.dialogVisible = true;
       this.$nextTick(() => {
         this.$refs["form"].clearValidate();

src/views/user_manage/index.vue

@@ -278,6 +278,12 @@
             effect="plain"
             >楼宇场景</el-tag
           >
+          <el-tag
+            v-else-if="scope.row.placeType === 3"
+            type="info"
+            effect="plain"
+            >学校场景</el-tag
+          >
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" show-overflow-tooltip>
@@ -350,7 +356,7 @@
     <el-dialog
       :title="dialogTitle[dialogType]"
       :visible.sync="dialogVisible"
-      width="1200px"
+      width="1100px"
       :close-on-click-modal="false"
     >
       <el-form
@@ -568,18 +574,44 @@
               </el-select>
             </el-form-item>
           </div>
-          <div class="flex">
+          <div>
             <el-form-item
-              v-if="user_form.type === 5 && dialogType == 'add'"
               label="场景选择"
               prop="placeType"
               class="form-item-style"
             >
               <el-radio-group v-model="user_form.placeType">
-                <el-radio :label="0">通用场景</el-radio>
-                <el-radio :label="1">预约场景</el-radio>
-                <el-radio :label="2">楼宇场景</el-radio>
+                <el-radio :disabled="dialogType != 'add'" :label="0">通用场景</el-radio>
+                <el-radio :disabled="dialogType != 'add'" :label="1">预约场景</el-radio>
+                <el-radio :disabled="dialogType != 'add'" :label="2">楼宇场景</el-radio>
+                <el-radio :disabled="dialogType != 'add'" :label="3">学校场景</el-radio>
               </el-radio-group>
+              <el-input
+              class="titName"
+                v-model="user_form.tenantEnterpriseName"
+              />
+              <el-input
+              class="titName"
+                v-model="user_form.enterpriseName"
+              />
+            </el-form-item>
+          </div>
+        </div>
+        <!-- 支付宝信息配置 -->
+        <div v-if="user_form.placeType==3">
+          <div class="title">
+            <div class="line"></div>
+            <span>支付宝信息配置</span>
+          </div>
+          <div class="flex">
+             <el-form-item
+              label="机构代码"
+              class="form-item-style item-margin-bottom special"
+              prop="orgOutId"
+            >
+              <el-input
+                v-model.trim="user_form.orgOutId"
+              />
             </el-form-item>
           </div>
         </div>
@@ -2071,7 +2103,10 @@ export default {
         // 支付宝小程序单机二维码标题
         zfbMiniEthTitle: null,
         // 支付宝小程序联机二维码标题
-        zfbMiniVguangTitle: null
+        zfbMiniVguangTitle: null,
+        orgOutId:null,
+        tenantEnterpriseName:'楼宇',//上级名称-显示使用
+        enterpriseName:'企业',//下级名称-显示使用
       },
       user_form_copy: {},
       scene_list: [
@@ -2087,6 +2122,10 @@ export default {
           name: "预约场景",
           id: 1,
         },
+        {
+          name: "学校场景",
+          id: 3,
+        },
       ],
       // 账号级别
       type_list: [
@@ -2353,6 +2392,9 @@ export default {
         ],
         zfbMiniVguangTitle: [
           { required: true, message: "请选择", trigger: "blur" },
+        ],
+        orgOutId: [
+          { required: true, message: "请输入", trigger: "blur" },
         ]
       },
       // 批量导入结果返回
@@ -3382,6 +3424,11 @@ export default {
   margin-top: 16px;
   margin-bottom: 10px;
 }
+.titName{
+  border:1px solid #fff;
+  width: 80px;
+  margin-left: 15px;
+}
 </style>
 <style lang="scss">
 //修改element原生样式

src/views/white_list/index.vue

@@ -190,7 +190,21 @@
       >
       </el-option>
     </el-select>
-
+<el-select
+      filterable
+      clearable
+      v-model="page.data.warehousingStatus"
+      placeholder="请选择入库状态"
+      class="margin-left input"
+    >
+      <el-option
+        v-for="item in putStorage"
+        :key="item.id"
+        :label="item.name"
+        :value="item.id"
+      >
+      </el-option>
+    </el-select>
     <!-- <el-date-picker
       v-model="page.data.startTime"
       type="datetime"
@@ -341,13 +355,7 @@
           {{ scope.row.cardIdEx | matchNull }}
         </template>
       </el-table-column>
-      <!-- <el-table-column label="公司名称" align="center" v-if="checkRole([5])&& ">
-        <template slot-scope="scope">
-          {{ scope.row.enterpriseFullName | matchNull }}
-        </template>
-      </el-table-column> -->
-
-      <el-table-column
+      <!-- <el-table-column
         label="省-市-区-街道"
         align="center"
         v-if="checkRole([1, 2, 3, 4])"
@@ -372,25 +380,26 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="账号名称"
+        label="所属组织名称"
         align="center"
-        v-if="showUserName"
+        v-if="checkRole([1, 2, 3, 4])"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          {{ scope.row.username | matchNull }}
+          {{ scope.row.policeStationName | matchNull }}
         </template>
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column
-        label="所属组织名称"
+        label="所属账号"
         align="center"
-        v-if="checkRole([1, 2, 3, 4])"
+        v-if="showUserName"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          {{ scope.row.policeStationName | matchNull }}
+          {{ scope.row.username | matchNull }}
         </template>
       </el-table-column>
+
       <el-table-column label="认证状态" align="center">
         <template slot-scope="scope">
           <el-tag effect="plain" type="success" v-if="scope.row.status === 1"
@@ -437,6 +446,13 @@
           <el-tag effect="plain" type="info" v-else>其他</el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="人员类型" align="center" v-if="placeType == 3">
+        <template slot-scope="scope">
+          <span>{{
+            scope.row.personnelType | getPersonnelTypeName(that)
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="通行区域权限"
         align="center"
@@ -444,13 +460,36 @@
       >
         <template slot-scope="scope">
           <el-tag type="success" v-if="scope.row.adminAreaType === 1"
-            >楼宇公有</el-tag
+            >{{ tenantEnterpriseName }}公有</el-tag
           >
           <el-tag type="primary" v-if="scope.row.adminAreaType === 2"
-            >企业公有</el-tag
+            >{{ enterpriseName }}公有</el-tag
           >
           <el-tag type="warning" v-if="scope.row.adminAreaType === 3"
-            >企业私有</el-tag
+            >{{ enterpriseName }}私有</el-tag
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="通行区域"
+        align="center"
+        v-if="isOpenPrivateArea === 1"
+      >
+        <template slot-scope="scope">
+          <span
+            v-for="(item, index) in scope.row.privateAreaNameList"
+            :key="index"
+            >{{ item }}，</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="入库状态" align="center" v-if="placeType == 3">
+        <template slot-scope="scope">
+          <el-tag type="success" v-if="scope.row.warehousingStatus == 1"
+            >开通</el-tag
+          >
+          <el-tag type="info" v-if="scope.row.warehousingStatus == 0"
+            >关闭</el-tag
           >
         </template>
       </el-table-column>
@@ -489,7 +528,7 @@
           {{ scope.row.createTime | matchNull }}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="" label="操作区" width="320">
+      <el-table-column align="center" prop="" label="操作区" width="380">
         <template slot-scope="scope">
           <el-button
             type="danger"
@@ -519,6 +558,13 @@
             @click="searchContent(scope.row)"
             >详情</el-button
           >
+          <el-button
+            v-if="placeType == 3"
+            type="primary"
+            size="small"
+            @click="detailFun(scope.row)"
+            >操作人</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -549,9 +595,11 @@
           v-if="isOpenPrivateArea === 1"
         >
           <el-radio-group v-model="user_form.adminAreaType">
-            <el-radio :label="1" v-if="!checkRole([99])">楼宇公有</el-radio>
-            <el-radio :label="2">企业公有</el-radio>
-            <el-radio :label="3">企业私有</el-radio>
+            <el-radio :label="1" v-if="!checkRole([99])"
+              >{{ tenantEnterpriseName }}公有</el-radio
+            >
+            <el-radio :label="2">{{ enterpriseName }}公有</el-radio>
+            <el-radio :label="3">{{ enterpriseName }}私有</el-radio>
           </el-radio-group>
         </el-form-item>
         <div class="flex">
@@ -559,7 +607,7 @@
             style="flex: 0.5"
             label="选择账号"
             prop="adminId"
-            v-if="placeType == 2 && !checkRole([99])"
+            v-if="(placeType == 2 || placeType == 3) && !checkRole([99])"
           >
             <el-select
               style="width: 100%"
@@ -682,6 +730,25 @@
             </el-tooltip>
           </el-form-item>
         </div>
+        <div v-if="placeType == 3">
+          <el-form-item style="flex: 0.5" label="人员类型" prop="personnelType">
+            <el-select
+              style="width: 100%"
+              filterable
+              clearable
+              v-model="user_form.personnelType"
+              placeholder="请选择人员类型"
+            >
+              <el-option
+                v-for="item in userTypeList"
+                :key="item.code"
+                :label="item.desc"
+                :value="item.code"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </div>
         <el-form-item label="上传照片" prop="avatar" v-if="showImg">
           <el-upload
             ref="upload"
@@ -1090,6 +1157,25 @@
         ></BatchUpload>
       </div>
     </el-dialog>
+    <!--操作人-->
+    <el-dialog
+      title="操作人"
+      width="400px"
+      :visible.sync="operatorVisible"
+      destroy-on-close
+    >
+      <div class="content-operator" v-if="operatorData">
+        <div>UID：{{operatorData.zfbUserId}}</div>
+        <div>姓名：{{operatorData.username}}</div>
+        <div>手机号：{{operatorData.phone | desensitization( 3, 7)}}</div>
+        <div>证件号：{{operatorData.idNumber| desensitization( 6,14)}}</div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="operatorVisible = false">
+          确定
+        </el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -1123,6 +1209,8 @@ import {
   getContextByWhiteId,
   doGetWhiteExcel,
   queryEnterpriseAccount,
+  getUserWhitePersonnelTypeEnum,
+  getParentInfo,
 } from "@/api/user_manage";
 import { reIssue } from "@/api/old_api_pengwenbing";
 import { downloadPhotosWhiteList } from "@/utils/steakPhoto";
@@ -1157,6 +1245,37 @@ export default {
       }
       return str2;
     },
+    getPersonnelTypeName(id, that) {
+      if (id) {
+        let index = that.userTypeList.findIndex((item) => {
+          return item.code == id;
+        });
+        if (index > -1) {
+          return that.userTypeList[index].desc;
+        } else {
+          return id;
+        }
+      }
+    },
+    // 脱敏
+    desensitization(string = "", start, end) {
+      if (string) {
+        var star = "";
+        function makeStar(number) {
+          if (number > 0) {
+            star += "*";
+            return makeStar(--number);
+          } else {
+            return star;
+          }
+        }
+        return (
+          string.substring(0, start) +
+          makeStar(end - start) +
+          string.substring(end)
+        );
+      }
+    },
   },
   watch: {
     "user_form.adminAreaType"(n, o) {
@@ -1179,6 +1298,7 @@ export default {
   },
   data() {
     return {
+      that: this,
       // 主表格&主表格加载状态
       list: null,
       listLoading: true,
@@ -1186,6 +1306,8 @@ export default {
       isOut: this.$store.getters.isOut, // 是否可以导出
       placeType: this.$store.getters.placeType, //是否是楼宇场景
       isOpenPrivateArea: this.$store.getters.isOpenPrivateArea, //是否开启私有区域
+      enterpriseName: this.$store.getters.enterpriseName,
+      tenantEnterpriseName: this.$store.getters.tenantEnterpriseName,
       // 分页参数
       page: {
         data: {
@@ -1202,6 +1324,7 @@ export default {
           pushType: null, //推送类型
           endTime: null,
           startTime: null,
+          warehousingStatus:null,
         },
         pageNum: 1,
         pageSize: 10,
@@ -1229,6 +1352,7 @@ export default {
       ],
       // 是否显示对话框
       dialogVisible: false,
+      operatorVisible: false,
       // 对话框标题
       dialogTitle: {
         add: "添加白名单",
@@ -1252,6 +1376,7 @@ export default {
         startTime: null,
         endTime: null,
         cardIdEx: "", //卡号
+        personnelType: null, //人员类型
       },
       user_form_copy: {},
       // 初始化的省市区(街道)参数
@@ -1272,7 +1397,9 @@ export default {
         ],
         startTime: [{ required: true, message: "请选择", trigger: "blur" }],
         endTime: [{ required: true, message: "请选择", trigger: "blur" }],
+        personnelType: [{ required: true, message: "请选择", trigger: "blur" }],
       },
+      userTypeList: [],
       // 是否显示提示
       showTooltip: false,
       // 批量导入结果返回
@@ -1332,6 +1459,11 @@ export default {
       bgcolor: "-1", //鼠标移入命名参数
       uploadFileName: "", //文件夹名称
       temporaryAreaList: [], //私有区域临时数据
+      operatorData: null, //操作人
+      putStorage:[
+        {id:0,name:'关闭'},
+        {id:1,name:'开通'},
+      ],
     };
   },
   created() {
@@ -1361,6 +1493,7 @@ export default {
       this.queryEnterpriseAccount();
     }
     this.getContextById(this.$store.getters.adminId);
+    this.getUserWhitePersonnelTypeEnum();
   },
   methods: {
     // 查询权限
@@ -1396,6 +1529,19 @@ export default {
         }
       });
     },
+    // 获取人员类型列表
+    async getUserWhitePersonnelTypeEnum() {
+      await getUserWhitePersonnelTypeEnum().then((res) => {
+        this.userTypeList = res.data;
+      });
+    },
+    // 操作人
+    detailFun(row) {
+      getParentInfo(row.userWhitelistId).then((res) => {
+        this.operatorData = res.data;
+        this.operatorVisible = true;
+      });
+    },
     // 打开添加对话框
     create(type) {
       this.initAddress(this.user_form.contents);
@@ -2408,5 +2554,8 @@ export default {
 .file1 {
   margin: 0 0 0 5px;
 }
+.content-operator {
+  line-height: 40px;
+}
 </style>