From 74a1895fb26929038daa99c31dc66a8bfd2f3429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Thu, 7 Sep 2023 17:23:32 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8E=A5=E5=8F=A3=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E3=80=911=E3=80=81=E7=99=BB=E5=BD=95=E5=8F=8A=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E4=BC=98=E5=8C=96=EF=BC=8C2=E3=80=81=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91=EF=BC=8C3=E3=80=81?=
 =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E6=A0=BC=E7=BB=84=E4=BB=B6=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=88=B0=E6=93=8D=E4=BD=9C=E5=88=97=E6=8C=89=E9=92=AE=E5=B0=81?=
 =?UTF-8?q?=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PC/InterFace.Dash/public/config.js            |   3 -
 PC/InterFace.Dash/src/api/wms-auth.js         |   9 +-
 .../src/components/tablePagination/index.vue  |   3 +-
 .../src/components/umyTable/index.vue         |   3 +
 .../src/mixins/TableHeaderMixins.js           |   4 +-
 PC/InterFace.Dash/src/mixins/TableMixins.js   |  10 +-
 PC/InterFace.Dash/src/permission.js           |  19 +-
 .../src/store/modules/permission.js           |   2 +-
 PC/InterFace.Dash/src/utils/defaultButtons.js |   3 +-
 PC/InterFace.Dash/src/views/login/index.vue   |   7 +-
 .../views/menuList/AbpIdentityMarkRoles.vue   |   4 +-
 .../views/menuList/AbpIdentityMarkUsers.vue   | 624 +++++++++++++++++-
 .../menuList/ExportCustomUserSetting.vue      |  52 +-
 13 files changed, 692 insertions(+), 51 deletions(-)

diff --git a/PC/InterFace.Dash/public/config.js b/PC/InterFace.Dash/public/config.js
index 5398f1d..8cf43ae 100644
--- a/PC/InterFace.Dash/public/config.js
+++ b/PC/InterFace.Dash/public/config.js
@@ -1,10 +1,7 @@
 // dev_win
 window.SITE_CONFIG['baseApi'] = 'http://dev.ccwin-in.com:60068'
-// window.SITE_CONFIG['baseApi'] = 'http://192.168.0.190:60068'
 window.SITE_CONFIG['authApi'] = 'http://dev.ccwin-in.com:60068'
-// window.SITE_CONFIG['authApi'] = 'http://192.168.0.190:60068'
 window.SITE_CONFIG['loginApi'] = 'http://dev.ccwin-in.com:60065'
-// window.SITE_CONFIG['loginApi'] = 'http://192.168.0.190:60065'
 window.SITE_CONFIG['businessApi'] = 'http://dev.ccwin-in.com:10097'
 //是否登录配置信息【loginName】
 window.SITE_CONFIG['isConfigLogin'] = false
diff --git a/PC/InterFace.Dash/src/api/wms-auth.js b/PC/InterFace.Dash/src/api/wms-auth.js
index 0fb286b..4b74e0b 100644
--- a/PC/InterFace.Dash/src/api/wms-auth.js
+++ b/PC/InterFace.Dash/src/api/wms-auth.js
@@ -195,10 +195,11 @@ export function getusersID(data) {
   })
 }
 
-//重置密码
-export function resetPassword(id) {
+//修改登录用户的密码-强密码规则
+export function postLoginUserInfo(data, id) {
   return request({
-    url: authApi + '/identity/users/reset-password/' + id,
-    method: 'post'
+    url: authApi + '/identity/users/change-password/' + id,
+    method: 'post',
+    data
   })
 }
\ No newline at end of file
diff --git a/PC/InterFace.Dash/src/components/tablePagination/index.vue b/PC/InterFace.Dash/src/components/tablePagination/index.vue
index 9e16895..a081346 100644
--- a/PC/InterFace.Dash/src/components/tablePagination/index.vue
+++ b/PC/InterFace.Dash/src/components/tablePagination/index.vue
@@ -307,7 +307,8 @@ export default {
           _list.push(item)
         }else{
           if(this.noUsePermissionBtn.indexOf(item.name) < 0){
-            item.permission =  [this.$route.name+'.'+item.name]
+            let _scope = item.clientScope || localStorage.getItem('appClientScope')
+            item.permission =  [_scope + '.' +this.$route.name+'.'+item.name]
           }else{
             item.permission = []
           }
diff --git a/PC/InterFace.Dash/src/components/umyTable/index.vue b/PC/InterFace.Dash/src/components/umyTable/index.vue
index aaad8fc..ab57c35 100644
--- a/PC/InterFace.Dash/src/components/umyTable/index.vue
+++ b/PC/InterFace.Dash/src/components/umyTable/index.vue
@@ -167,6 +167,7 @@
           :key="indexButton"
           type="text"
           size="mini"
+          v-permission="itemButton.permission"
           :style="{color:itemButton.color || '#409EFF'}"
           @click="buttonOperationClick_right(scope.row, itemButton, indexButton)"
         >{{itemButton.label}}</el-button>
@@ -212,8 +213,10 @@ import { formatTimeStrToStr } from "@/utils/formatTime";
 import _ from "lodash";
 import { getMatchRegConformValue } from "@/utils/index"
 import showCopyJsonPop from "@/components/showCopyJsonPop"
+import permission from "@/directive/permission/index"
 export default {
   name: "currenTable",
+  directives: { permission },
   components:{ showCopyJsonPop },
   filters: {
     formatDate(time) {
diff --git a/PC/InterFace.Dash/src/mixins/TableHeaderMixins.js b/PC/InterFace.Dash/src/mixins/TableHeaderMixins.js
index 85b2224..f468695 100644
--- a/PC/InterFace.Dash/src/mixins/TableHeaderMixins.js
+++ b/PC/InterFace.Dash/src/mixins/TableHeaderMixins.js
@@ -68,10 +68,10 @@ export const TableHeaderMixins = {
         // this.$store.dispatch("app/appMainLoading", true)
       } 
       // 新增(原始前端写死配置)
-      else if (val == 'newly') {
+      else if (val == 'Create') {
         this.formTitle = "新增" + this.$route.meta.title;
         this.formReveal = true
-        this.theEvent = "newly"
+        this.theEvent = "Create"
         this.displayDialog.newDialog = true;
       } 
       // Api新增(参数配置从api获取)
diff --git a/PC/InterFace.Dash/src/mixins/TableMixins.js b/PC/InterFace.Dash/src/mixins/TableMixins.js
index 32dbdd5..1fab8af 100644
--- a/PC/InterFace.Dash/src/mixins/TableMixins.js
+++ b/PC/InterFace.Dash/src/mixins/TableMixins.js
@@ -51,15 +51,19 @@ export const tableMixins = {
   },
   methods: {
     // 主表-右侧操作列基础按钮
-    buttonOperationList_rightBase(){
+    buttonOperationList_rightBase(op_e,op_d){
       return [{
         label:'编辑',
         name:'edit',
-        color:'#ff9000'
+        color:'#ff9000',
+        hide:op_e && op_e.hide ? op_e.hide : false,
+        permission:op_e && op_e.permission ? op_e.permission : []
       },{
         label:'删除',
         name:'delete',
-        color:'red'
+        color:'red',
+        hide:op_d && op_d.hide ? op_d.hide : false,
+        permission:op_d && op_d.permission ? op_d.permission : []
       }]
     },
     // 主表-右侧操作列基础按钮
diff --git a/PC/InterFace.Dash/src/permission.js b/PC/InterFace.Dash/src/permission.js
index ed2865d..6b26604 100644
--- a/PC/InterFace.Dash/src/permission.js
+++ b/PC/InterFace.Dash/src/permission.js
@@ -12,7 +12,7 @@ NProgress.configure({
 }) // NProgress Configuration
 
 const whiteList = ['/login','/callback'] // no redirect whitelist
-const noUserMsg = '获取用户信息失败，请重新登录 !'
+const loginErr = '登录失败，请重新登录 !'
 const getErrMsg = '数据获取失败 !'
 
 
@@ -45,10 +45,9 @@ const toPageInit = async (to, from, next) => {
   //     toNextHandle(to, from, next)
   //   })
   //   .catch(()=>{
-  //     // todo-fast:接口恢复后更改
-  //     toNextHandle(to, from, next)
-  //     // Message.error(noUserMsg)
-  //     // pageToLogin(to, from, next)
+  //     // toNextHandle(to, from, next)
+  //     Message.error(loginErr)
+  //     pageToLogin(to, from, next)
   //   })
   //   return
   // }
@@ -80,7 +79,7 @@ const toNextHandle = async (to, from, next) => {
       .then(res=>{
         // 没有权限（token失效处理）
         if(!res || res.length <=0){
-          Message.error('用户无权限或者token失效，请重新登录')
+          Message.error('用户无权限或者token失效，请配置权限或重新登录')
           store.dispatch("user/logout")
         }
       })
@@ -142,6 +141,7 @@ router.beforeEach(async (to, from, next) => {
     } else {
       // 如果有单点登录方式使用下方配置
       // mgr.signinRedirect(); //执行重定向
+
       if(isAutoLogin){
         let _username = localStorage.getItem("isConfigLogin") && localStorage.getItem("isConfigLogin") != 'false' ? localStorage.getItem("configLoginName") : to.query.loginName
         await store.dispatch('user/login', {
@@ -152,10 +152,9 @@ router.beforeEach(async (to, from, next) => {
             toPageInit(to, from, next)
           })
           .catch(()=>{
-            // todo-fast:接口恢复后更改
-            toNextHandle(to, from, next)
-            // Message.error(noUserMsg)
-            // pageToLogin(to, from, next)
+            // toNextHandle(to, from, next)
+            Message.error(loginErr)
+            pageToLogin(to, from, next)
           })
       }else{
         console.log('没有token，不是登录页，不是自动登录，pageToLogin')
diff --git a/PC/InterFace.Dash/src/store/modules/permission.js b/PC/InterFace.Dash/src/store/modules/permission.js
index f800273..33c94e0 100644
--- a/PC/InterFace.Dash/src/store/modules/permission.js
+++ b/PC/InterFace.Dash/src/store/modules/permission.js
@@ -169,7 +169,7 @@ const actions = {
         }
         // 存储所有的表名
         commit('SET_TABLESNAME', _menuList)
-        // 数据模拟，todo-new:接口获取
+        // 数据模拟，todo-faster:接口获取
         let _treeMenusAll = null//树形菜单
         // _treeMenusAll = [
         //   {name:"aaaaaaa"},
diff --git a/PC/InterFace.Dash/src/utils/defaultButtons.js b/PC/InterFace.Dash/src/utils/defaultButtons.js
index bbe5032..8dcf1c8 100644
--- a/PC/InterFace.Dash/src/utils/defaultButtons.js
+++ b/PC/InterFace.Dash/src/utils/defaultButtons.js
@@ -13,7 +13,7 @@ export function defaultAddBtn(option) {
         type: "primary",
         icon: "el-icon-plus",
         label: i18n.t('btns.add'),
-        name: "newly",
+        name: "Create",
         size: "mini",
         background:"#31bb99"
     })
@@ -123,5 +123,6 @@ function __defaultBtnOption(option,specific){
         isDetailExport:option && option.isDetailExport ? option.isDetailExport : false,
         isRedundance:option && option.isRedundance ? option.isRedundance : false,
         permission:option && option.permission ? option.permission : null,
+        clientScope:option && option.clientScope ? option.clientScope : null,
     }
 }
\ No newline at end of file
diff --git a/PC/InterFace.Dash/src/views/login/index.vue b/PC/InterFace.Dash/src/views/login/index.vue
index dbd4b97..d306364 100644
--- a/PC/InterFace.Dash/src/views/login/index.vue
+++ b/PC/InterFace.Dash/src/views/login/index.vue
@@ -38,10 +38,9 @@
               <svg-icon icon-class="svg_password" />
             </span>
             <el-input
-              :key="passwordType"
               ref="password"
               v-model="loginForm.password"
-              :type="passwordType"
+              :type="passwordType == 'svg_password' ? 'password' : 'text'"
               placeholder="密码"
               name="password"
               tabindex="2"
@@ -171,8 +170,10 @@ export default {
               })
             })
             .catch((error) => {
-              this.$message.error('用户名或密码错误！')
               this.loading = false
+              if(!error){
+                this.$message.error('用户名或密码错误！')
+              }
             })
         } else {
           console.log('error submit!!')
diff --git a/PC/InterFace.Dash/src/views/menuList/AbpIdentityMarkRoles.vue b/PC/InterFace.Dash/src/views/menuList/AbpIdentityMarkRoles.vue
index 9518f06..1cabd61 100644
--- a/PC/InterFace.Dash/src/views/menuList/AbpIdentityMarkRoles.vue
+++ b/PC/InterFace.Dash/src/views/menuList/AbpIdentityMarkRoles.vue
@@ -130,7 +130,7 @@
     <el-dialog
       :title="formTitle"
       :visible.sync="dialogVisible"
-      width="600px"
+      width="800px"
       :close-on-click-modal="false"
     >
       <el-form
@@ -138,8 +138,6 @@
         :model="form"
         label-width="70px"
         :rules="rules"
-        size="small"
-        :inline="true"
       >
         <el-form-item label="名称" prop="name">
           <el-input v-model="form.name" style="width: 380px" maxlength="23" />
diff --git a/PC/InterFace.Dash/src/views/menuList/AbpIdentityMarkUsers.vue b/PC/InterFace.Dash/src/views/menuList/AbpIdentityMarkUsers.vue
index 3281d1b..13869c6 100644
--- a/PC/InterFace.Dash/src/views/menuList/AbpIdentityMarkUsers.vue
+++ b/PC/InterFace.Dash/src/views/menuList/AbpIdentityMarkUsers.vue
@@ -1,19 +1,637 @@
 <template>
-  <div>AbpIdentityMarkUsers</div>
+  <div class="appMainPage" v-loading="loading">
+    <div class="main">
+      <div class="table-active">
+        <div class="bttton-box">
+          <el-button
+            type="primary"
+            icon="el-icon-plus"
+            @click="handleCreate"
+            size="mini"
+            v-permission="['AbpIdentity.Users.Create']"
+            >创建用户</el-button
+          >
+          <el-button
+            type="success"
+            icon="el-icon-refresh"
+            @click.native.prevent="Createview"
+            size="mini"
+            >刷新</el-button
+          >
+        </div>
+        <div class="query-box">
+          <!-- 搜索 -->
+          <searchNormal 
+            ref="normalSearch_UserManage"
+            @searchNormalClick="filtrate"
+            @searchNormalClear="filtrate"
+          ></searchNormal>
+        </div>
+      </div>
+      <el-table
+        ref="multipleTable"
+        :data="tableData"
+        height="calc(100vh - 260px)"
+        style="width: 100%"
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
+        :border="true"
+      >
+        <el-table-column :align="'center'" type="selection" width="55" />
+        <el-table-column
+          prop="userName"
+          label="用户名"
+          width="180"
+          :align="'left'"
+          sortable="custom"
+        />
+        <el-table-column
+          prop="name"
+          label="姓名"
+          width="180"
+          :align="'left'"
+          sortable="custom"
+        />
+        <el-table-column
+          prop="isActive"
+          label="是否启用"
+          sortable="custom"
+          :align="'center'"
+          width="180"
+        >
+         <template slot-scope="scope">
+           <span>{{ scope.row['isActive'] | trigger('whetherOrNot', "label") }}</span>
+         </template>
+        </el-table-column>
+        <el-table-column label="操作" :align="'center'" width="230">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              @click="Update(scope.row)"
+              v-permission="['AbpIdentity.Users.Update']"
+              v-if="scope.row.name == 'admin' ? false : true"
+            >编辑</el-button>
+            <el-button 
+              type="text" 
+              @click="deleteUser(scope.row)"
+              v-if="scope.row.name == 'admin' ? false : true"
+              v-permission="['AbpIdentity.Users.Delete']"
+              style="color:red"
+            >删除用户</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="Footer">
+      <el-pagination
+        background
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="queryInfo.currentPage"
+        :page-sizes="[10, 15, 20]"
+        :page-size="queryInfo.pagesize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+      <el-button
+        type="primary"
+        size="mini"
+        style="margin-left: 10px; background-color: #409eff"
+        >确定</el-button
+      >
+    </div>
+    <el-dialog
+      :title="formTitle"
+      :visible.sync="dialogVisible"
+      width="800px"
+      :close-on-click-modal="false"
+      :modal-append-to-body="false"
+      :append-to-body="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        label-width="70px"
+        :rules="rules"
+      >
+        <el-form-item label="用户名" prop="userName">
+          <el-input
+            v-model="form.userName"
+            maxlength="20"
+          />
+        </el-form-item>
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="form.name" maxlength="20" />
+        </el-form-item>
+        <el-form-item label="角色" prop="roleNames">
+          <el-select
+            :disabled="!checkPermission(['AbpIdentity.Users.ManagePermissions']) && isEdit"
+            v-model="form.roleNames"
+            multiple
+            style="width: 100%"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.name"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否启用" prop="IsActive">
+          <el-select
+            v-model="form.IsActive"
+            style="width: 100%"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in userOptions('whetherOrNot')"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="密码" prop="password" v-if="!isEdit">
+          <el-input
+            ref="password"
+            v-model="form.password"
+            maxlength="16"
+            minlength="6"
+            :type="passwordType"
+          />
+          <span class="show-pwd" @click="showPwd">
+            <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
+          </span>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="resetform">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 <script>
+import { isvalidPhone } from "@/utils/validate";
+import checkPermission from '@/utils/permission'
+import {
+  getPageListUsers,
+  usersroles,
+  postCreateUser,
+  postUpdateUser,
+  postDeleteUser,
+  getusersID,
+} from "@/api/wms-auth";
+import permission from "@/utils/permission/index";
+import searchNormal from "@/components/searchNormal/index.vue"
 export default {
+  directives: { permission },
+  components:{
+    searchNormal
+  },
   name:"AbpIdentityMarkUsers",
   data() {
     // 自定义验证
+    const validPhone = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error("请输入电话号码"));
+      } else if (!isvalidPhone(value)) {
+        callback(new Error("请输入正确的11位手机号码"));
+      } else {
+        callback();
+      }
+    };
+    const validName = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error("请输入登录名称"));
+      } else if (/[\u4E00-\u9FA5]/g.test(value)) {
+        callback(new Error("登录名不能输入汉字"));
+      } else {
+        callback();
+      }
+    };
+    // 简单
+    // const validpassword = (rule, value, callback) => {
+    //   if (!value) {
+    //     callback(new Error("请输入密码"));
+    //   } else {
+    //     if (
+    //       /^(?=.*\d)(?=.*[a-z]).{6,16}$/.test(
+    //         value
+    //       )
+    //     ) {
+    //       callback();
+    //     } else {
+    //       callback(new Error("密码必须包含字母,数字混合,最小长度为6位"));
+    //     }
+    //   }
+    // };
+    // 中等
+    // const validpassword = (rule, value, callback) => {
+    //   if (!value) {
+    //     callback(new Error("请输入密码"));
+    //   } else {
+    //     if (
+    //       /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{6,16}$/.test(
+    //         value
+    //       )
+    //     ) {
+    //       callback();
+    //     } else {
+    //       callback(new Error("密码必须包含大小写,数字混合,最小长度为6位"));
+    //     }
+    //   }
+    // };
+    // 复杂
+    const validpassword = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error("请输入密码"));
+      } else {
+        if (
+          /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[~@#$%\*-\+=:,\\?\[\]\{}]).{6,16}$/.test(
+            value
+          )
+        ) {
+          callback();
+        } else {
+          callback(new Error("密码必须包含大小写,数字与特殊字符混合,最小长度为6位"));
+        }
+      }
+    };
+    const checkEmail = (rule, value, callback) => {
+      const mailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/;
+      if (!value) {
+        return callback(new Error("邮箱不能为空"));
+      }
+      setTimeout(() => {
+        if (mailReg.test(value)) {
+          callback();
+        } else {
+          callback(new Error("请输入正确的邮箱格式"));
+        }
+      }, 100);
+    };
     return {
-      
+      loading:false,
+      //编辑弹出
+      dialogVisible: false,
+      //密码显示
+      isEdit: false,
+      //弹出title
+      formTitle: "",
+      //总条数
+      total: 0,
+      //分页器
+      queryInfo: {
+        //当前页数
+        currentPage: 1,
+        //每页条数
+        pagesize: 20,
+        Sorting: "",
+      },
+      //角色组
+      options: [],
+      //当前用户ID
+      usersId: "",
+      //编辑参数
+      concurrencyStamp: "",
+      //新增参数
+      form: {
+        userName: "",
+        phoneNumber: "",
+        name: "",
+        email: "",
+        roleNames: [],
+        password: "",
+        surname: "",
+        lockoutEnabled: true,
+        IsActive: true,
+      },
+      //密码明文
+      passwordType: "password",
+      //
+      multipleSelection: [],
+      //table渲染
+      tableData: [],
+      rules: {
+        userName: [
+          { required: true, trigger: "blur", validator: validName },
+          {
+            min: 2,
+            max: 20,
+            message: "长度在 2 到 20 个字符",
+            trigger: "blur",
+          },
+        ],
+        name: [
+          { required: true, trigger: "blur", message: "请输入姓名" },
+          {
+            min: 2,
+            max: 20,
+            message: "长度在 2 到 20 个字符",
+            trigger: "blur",
+          },
+        ],
+        email: [{ required: true, validator: checkEmail, trigger: "blur" }],
+        phoneNumber: [
+          { required: true, trigger: "blur", validator: validPhone },
+        ],
+        password: [
+          { required: true, trigger: "blur", message: "请输入密码" },
+          {
+            min: 6,
+            max: 16,
+            message: "长度在 6 到 16 个字符",
+            trigger: "blur",
+          },
+        ],
+        roleNames: [
+          { required: true, message: "请选择角色", trigger: "change" },
+        ],
+      },
     };
   },
+  created() {
+    //获取所有角色
+    usersroles().then((res) => {
+      this.options = res.items;
+    });
+  },
   mounted() {
+    this.pageList();
   },
   methods: {
-    
+    checkPermission,
+    // 是否下拉
+    userOptions(val){
+      let options = this.$staticOptions[val]
+      return options()
+    },
+    //请求数据渲染table
+    pageList(val) {
+      this.loading = true
+      const data = {
+        Filter: val || '',
+        Sorting: this.queryInfo.Sorting,
+        SkipCount: (this.queryInfo.currentPage - 1) * this.queryInfo.pagesize,
+        MaxResultCount: this.queryInfo.pagesize,
+      };
+      getPageListUsers(data).then((res) => {
+        this.loading = false
+        const data = res;
+        this.total = data.totalCount;
+        this.tableData = data.items;
+      }).catch(()=>{
+        this.loading = false
+      });
+    },
+    //密码明文显示
+    showPwd() {
+      if (this.passwordType === "password") {
+        this.passwordType = "";
+      } else {
+        this.passwordType = "password";
+      }
+      this.$nextTick(() => {
+        this.$refs.password.focus();
+      });
+    },
+    //排序
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.queryInfo.Sorting = "";
+        this.handleFilter();
+        return;
+      }
+      this.queryInfo.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    //排序触发页面更新
+    handleFilter() {
+      this.queryInfo.currentPage = 1;
+      this.pageList();
+    },
+    //筛选
+    filtrate(val) {
+      this.queryInfo.currentPage = 1;
+      this.pageList(val);
+    },
+    //选择每页条数分页
+    handleSizeChange(val) {
+      this.queryInfo.pagesize = val;
+      this.pageList();
+    },
+    //选择当前页分页
+    handleCurrentChange(val) {
+      this.queryInfo.currentPage = val;
+      this.pageList();
+    },
+    //重置新建与编辑后的参数
+    resetform() {
+      this.$refs.form.resetFields();
+      this.dialogVisible = false;
+      this.form.userName = "";
+      this.form.phoneNumber = "";
+      this.form.name = "";
+      this.form.email = "";
+      this.form.roleNames = [];
+      this.form.password = "";
+      this.form.surname = "";
+      this.form.IsActive = "";
+      this.$refs.multipleTable.clearSelection();
+    },
+    handleCreate() {
+      this.formTitle = "创建用户";
+      this.dialogVisible = true;
+      this.isEdit = false;
+      this.form.phoneNumber = this.getRandomPhoneNumber()
+      this.form.email = this.getRandomEmail()
+      usersroles().then((res) => {
+        this.options = res.items
+      })
+      
+    },
+    //刷新
+    Createview() {
+      this.queryInfo.currentPage = 1;
+      this.queryInfo.Sorting = "";
+      this.$refs.normalSearch_UserManage.searchNormalClear()//清空搜索
+      usersroles().then((res) => {
+        this.options = res.items;
+      });
+      this.$refs.multipleTable.clearSort();
+    },
+    //获取当前角色
+    usersID(data) {
+      getusersID(data).then((res) => {
+        const data = res.items;
+        this.form.roleNames = data.map((item) => {
+          return item.name;
+        });
+      });
+    },
+    //编辑默认参数
+    Update(row) {
+      if (row) {
+        this.formTitle = "编辑用户";
+        this.usersId = row.id;
+        this.usersID(row.id);
+        this.form.userName = row.userName;
+        this.form.phoneNumber = row.phoneNumber;
+        this.form.name = row.name;
+        this.form.email = row.email;
+        this.form.surname = row.name;
+        this.form.lockoutEnabled = row.lockoutEnabled
+        this.concurrencyStamp = row.concurrencyStamp;
+        this.form.IsActive = row.isActive;
+        usersroles().then((res) => {
+          this.options = res.items;
+        });
+        this.isEdit = true;
+        this.dialogVisible = true;
+      }
+    },
+    //新建与编辑
+    submitForm() {
+      this.$refs.form.validate((valid) => {
+        //新建报表组
+        if (valid && !this.isEdit) {
+          this.form.surname = this.form.name;
+          postCreateUser(this.form)
+            .then((res) => {
+              this.resetform();
+              this.$successMsg("创建成功！");
+              this.pageList();
+            })
+            .catch((err) => {
+              this.resetform();
+            });
+        } else if (valid && this.isEdit) {
+          //编辑报表
+          const data = JSON.parse(JSON.stringify(this.form));
+          delete data.password;
+          data.concurrencyStamp = this.concurrencyStamp;
+          postUpdateUser(data, this.usersId)
+            .then((res) => {
+              this.$successMsg("编辑成功！");
+              this.pageList();
+              this.resetform();
+            })
+            .catch((err) => {
+              this.resetform();
+            });
+        } else {
+          this.$errorMsg("请按照提示继续输入！");
+          return false;
+        }
+      });
+    },
+    // 删除用户
+    deleteUser(row){
+      this.$confirm("您确认删除 " + row.userName + " 用户吗？", "提示", {
+        confirmButtonText: "确认删除用户",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+      .then(() => {
+        this.loading = true
+        postDeleteUser(row.id)
+        .then((res) => {
+          this.loading = false
+          this.$successMsg("删除成功！");
+          this.pageList();
+        })
+        .catch((err) => {
+          this.loading = false
+        })
+      })
+      .catch((err) => {
+        console.log(err)
+      })
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    //点击table行选择
+    handleRowClick(row, column, event) {
+      if (
+        this.multipleSelection.length == 1 &&
+        this.multipleSelection[0].id == row.id
+      ) {
+        this.$refs.multipleTable.clearSelection();
+        return;
+      }
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+    // 创建用户，随机生成11位电话号，去掉电话校验
+    getRandomPhoneNumber () {
+      return '1' + Math.floor(Math.random()*9+1) + Math.floor(Math.random()*9+1) + Math.floor(Math.random()*9+1) + Math.floor(Math.random()*9+1) + Math.floor(Math.random()*9+1) + Math.floor(Math.random()*9+1) + Math.floor(Math.random()*9+1) + Math.floor(Math.random()*9+1) + Math.floor(Math.random()*9+1) + Math.floor(Math.random()*9+1)
+    },
+    getRandomEmail () {
+      return '' + Math.floor(Math.random()*9+1) + Math.floor(Math.random()*9+1) + Math.floor(Math.random()*9+1) + Math.floor(Math.random()*9+1) + '@' + Math.floor(Math.random()*9+1) + Math.floor(Math.random()*9+1) + Math.floor(Math.random()*9+1) + '.com'
+    },
   },
 };
 </script>
+<style lang="scss" scoped>
+.appMainPage {
+  .main {
+    .table-active {
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: space-between;
+      align-items: center;
+      padding: 20px 0;
+
+      .bttton-box {
+        display: flex;
+      }
+    }
+  }
+
+  .el-table__body-wrapper {
+    tbody {
+      span {
+        cursor: pointer;
+
+        &:hover {
+          color: #409eff;
+        }
+      }
+    }
+  }
+
+  .Footer {
+    padding: 25px;
+    // background-color: #f2f2f2;
+    display: flex;
+    justify-content: flex-end;
+
+    ::v-deep button {
+      background-color: #fff;
+    }
+  }
+
+  ::v-deep .el-dialog {
+    .el-dialog__header {
+      button {
+        display: none;
+      }
+    }
+  }
+  .el-form-item{
+    margin-bottom: 30px;
+  }
+  .show-pwd {
+    position: absolute;
+    right: 10px;
+  }
+}
+</style>
+
diff --git a/PC/InterFace.Dash/src/views/menuList/ExportCustomUserSetting.vue b/PC/InterFace.Dash/src/views/menuList/ExportCustomUserSetting.vue
index 70b378c..119e5be 100644
--- a/PC/InterFace.Dash/src/views/menuList/ExportCustomUserSetting.vue
+++ b/PC/InterFace.Dash/src/views/menuList/ExportCustomUserSetting.vue
@@ -24,7 +24,10 @@
       :primarySearchOption="primarySearchOption"
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
-      :buttonOperationList_right="buttonOperationList_rightBase"
+      :buttonOperationList_right="(row)=>{return buttonOperationList_rightBase(
+        {permission:['Z.ExportCustomUserSetting.Update'],hide:OperaButtonHide(row)},
+        {permission:['Z.ExportCustomUserSetting.Delete'],hide:OperaButtonHide(row)}
+      )}"
       @buttonOperationClick_right="buttonOperationClick_right"
     >
     <!-- :buttonOperationList_left="buttonOperationClick_leftBase"
@@ -261,24 +264,36 @@ export default {
     },
     getColumList(){
       let val = this.formReveal ? this.CreateFormData.exportTableName_old : this.editFormData.exportTableName_old
-      getPageList(this.PageListParams, val+'/base').then(res=>{
-        let _column = res.items[0]
-        this.columsList = []
-        for(let item in _column){
-          if(item != 'detail' || item != 'details'){
-            let _item = {
-              label:zhApiColumnsLable(val+firstWordSizeChange(item,'Upper')),
-              value:item
+      getPageList(this.PageListParams, val+'/base')
+        .then(res=>{
+          let _column = res.items[0]
+          this.columsList = []
+          for(let item in _column){
+            if(item != 'detail' || item != 'details'){
+              let _item = {
+                label:zhApiColumnsLable(val+firstWordSizeChange(item,'Upper')),
+                value:item
+              }
+              this.columsList.push(_item)
             }
-            this.columsList.push(_item)
           }
-        }
-        if(this.formReveal){
-          this.CreateForm[2].userOptions = this.columsList
-        }else{
-          this.editForm[2].userOptions = this.columsList
-        }
-      })
+          if(this.formReveal){
+            this.CreateForm[2].userOptions = this.columsList
+          }else{
+            this.editForm[2].userOptions = this.columsList
+          }
+        })
+        .catch(err=>{
+          let _name = ''
+          if(this.formReveal){
+            this.CreateForm[2].userOptions = []
+            _name = this.CreateFormData.exportTableName
+          }else{
+            this.editForm[2].userOptions = []
+            _name = this.editFormData.exportTableName
+          }
+          this.$message.error(`暂无【${_name}】模块权限`)
+        })
     },
     //提交表单
     FormSubmit(val) {
@@ -316,6 +331,9 @@ export default {
           })
       }
     },
+    OperaButtonHide(data){
+      return data.creatorId != this.$store.getters.currentUserInfo.id
+    }
   }
 };
 </script>