2022-11-8 16:00

src/HManagement/department/staff/detail/index.vue

@@ -6,10 +6,10 @@
       </div>
     </template>
      <template v-slot:createuser="scope">
-        <createUser  v-if="tool.checkAuth($route.name,'editStaff') && !scope.data.userid" :data="scope.data"  @onSuccess="query_hrMain"></createUser>
+        <!-- <createUser  :data="scope.data"  @onSuccess="query_hrMain"></createUser> -->
      </template>
     <template v-slot:linkact="scope">
-      <linkAccount v-if="tool.checkAuth($route.name,'editStaff')"  :data="scope.data"  @onSuccess="query_hrMain"></linkAccount>
+      <!-- <linkAccount v-if="tool.checkAuth($route.name,'editStaff')"  :data="scope.data"  @onSuccess="query_hrMain"></linkAccount> -->
     </template>
     <restPas slot="restpas" v-if="tool.checkAuth($route.name,'restpas')"></restPas>
   </mianStaff>

src/HManagement/department/staff/detail/modules/main.vue

@@ -37,6 +37,7 @@
           </div>
           <!-- <el-descriptions-item label="头像"><img width="40" style="margin-top:-8px" src="../../../../../assets/avatar.png" alt=""></el-descriptions-item> -->
           <el-descriptions-item label="账号名称">{{mainInfo.username?mainInfo.username:'--'}}</el-descriptions-item>
+          <el-descriptions-item label="手机号">{{mainInfo.phonenumber?mainInfo.phonenumber:'--'}}</el-descriptions-item>
           <el-descriptions-item label="账号类型">{{mainInfo.usertypename?mainInfo.usertypename:'--'}}</el-descriptions-item>
           <el-descriptions-item label="角色">{{mainInfo.userrole?(mainInfo.userrole).toString():''}}</el-descriptions-item>
           <el-descriptions-item label="账号密码">

src/HManagement/department/staff/list/list.vue

@@ -34,6 +34,7 @@
 </template>
 
 <script>
+import { log } from '@antv/g2plot/lib/utils'
 export default {
   data () {
     return {
@@ -74,12 +75,14 @@ export default {
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.param.content.pageSize = val
-      this.listData()
+      this.listData(this.depid)
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.param.content.pageNumber = val
-      this.listData()
+      console.log(this.param.content.pageNumber);
+      
+      this.listData(this.depid)
     }
   },
   mounted () {

src/HManagement/department/staff/list/modules/add.vue

@@ -4,11 +4,11 @@
   <el-dialog title="新建员工" :visible.sync="dialogFormVisible" @close="$refs.form.clearValidate()">
     <el-row :gutter="20">
       <el-form :model="form" size="small" :rules="rules" ref="form" label-position="left" label-width="100px">
-        <el-col class="mb-30" :span="12">
+        <!-- <el-col class="mb-30" :span="12">
           <el-form-item label="编号:" prop="hrcode">
             <el-input v-model="form.hrcode" placeholder="输入人员编号" autocomplete="off"></el-input>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col class="mb-30" :span="12">
           <el-form-item label="性别">
             <el-select v-model="form.sex" style="width:100%" placeholder="请选择">
@@ -83,7 +83,7 @@
         </el-col>
         <el-col class="mb-30" :span="24">
           <el-form-item>
-            <el-checkbox v-model="form.isleader" :false-label="0" :true-label="1">是否部门负责人</el-checkbox>
+            <el-checkbox v-model="form.isleader" :false-label="0" :true-label="1">授权系统账号</el-checkbox>
           </el-form-item>
         </el-col>
       </el-form>
@@ -115,9 +115,9 @@ export default {
       dialogFormVisible:false,
       showTree:false,
       rules:{
-        hrcode: [
-          { required: true, message: '请输入员工编码', trigger: 'blur' },
-        ],
+        // hrcode: [
+        //   { required: true, message: '请输入员工编码', trigger: 'blur' },
+        // ],
         name: [
           { required: true, message: '请输入员工姓名', trigger: 'blur' },
         ],
@@ -131,7 +131,7 @@ export default {
       },
       form:{
         "hrid":0,
-        "hrcode":"",
+        // "hrcode":"",
         "name":"",
         "sex":'男',
         "phonenumber":"",
@@ -141,7 +141,7 @@ export default {
         "birthday":"",
         "remarks":"",
         "departmentid":"",
-        "isleader":"",
+        "isleader":1,
         "position":"",
         "reporthrid":"",
         "userid":"0"
@@ -183,7 +183,16 @@ export default {
             message: '添加成功',
             type: 'success'
           });
-
+          if (res.data.isleader) {
+            const res2 = await this.$api.requested({
+              "classname": "webmanage.hr.hr",
+              "method": "createUser",
+              "content": {
+                "hrid":res.data.hrid,
+                "roleids":[311]
+              }
+            })
+          }
           this.dialogFormVisible = false
           this.refreshData()
           this.$emit('onSuccess')
@@ -202,7 +211,7 @@ export default {
         "birthday":"",
         "remarks":"",
         "departmentid":"",
-        "isleader":"",
+        "isleader":1,
         "position":"",
         "reporthrid":"",
         "userid":"0"

src/HManagement/department/staff/list/modules/edit.vue

@@ -5,11 +5,11 @@
   <el-dialog title="编辑员工" :visible.sync="dialogFormVisible">
     <el-row :gutter="20">
       <el-form :model="form" size="small" :rules="rules" ref="form" label-position="left" label-width="100px">
-        <el-col class="mb-30" :span="12">
+        <!-- <el-col class="mb-30" :span="12">
           <el-form-item label="编号:" prop="hrcode">
             <el-input v-model="form.hrcode" placeholder="输入人员编号" autocomplete="off"></el-input>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col class="mb-30" :span="12">
           <el-form-item label="性别">
             <el-select v-model="form.sex" style="width:100%" placeholder="请选择">
@@ -84,7 +84,7 @@
         </el-col>
         <el-col class="mb-30" :span="24">
           <el-form-item>
-            <el-checkbox v-model="form.isleader" :false-label="0" :true-label="1">是否部门负责人</el-checkbox>
+            <el-checkbox v-model="form.isleader" :false-label="0" :true-label="1">授权系统账号</el-checkbox>
           </el-form-item>
         </el-col>
       </el-form>
@@ -115,9 +115,9 @@ export default {
       dialogFormVisible:false,
       showTree:false,
       rules:{
-        hrcode: [
-          { required: true, message: '请输入员工编码', trigger: 'blur' },
-        ],
+        // hrcode: [
+        //   { required: true, message: '请输入员工编码', trigger: 'blur' },
+        // ],
         name: [
           { required: true, message: '请输入员工姓名', trigger: 'blur' },
         ],
@@ -131,7 +131,7 @@ export default {
       },
       form:{
         "hrid":0,
-        "hrcode":"",
+        // "hrcode":"",
         "name":"",
         "sex":0,
         "phonenumber":"",

src/HManagement/marketing/agent/modules/edit_agent.vue

@@ -93,13 +93,13 @@
     </div>
     <div class="container normal-panel">
       <template v-if="activeName=='first'">
-        <el-button class="normal-margin" type="primary" size="small" @click="createAgentMainUser">创建经销商主账号</el-button>
+        <el-button class="normal-margin" v-if="tool.checkAuth($route.name,'createAgentAccount')" type="primary" size="small" @click="createAgentMainUser">创建经销商主账号</el-button>
         <tableLayout :layout="tablecols" :data="form.hrs" :custom="false" height="300px"></tableLayout>
       </template>
       <template v-if="activeName=='area'">
         <div class="area-header">
           <!-- <Search /> -->
-          <add-agent-btn :arealist="arealist" @areaAddSuccess="areaAddSuccess"></add-agent-btn>
+          <add-agent-btn  v-if="tool.checkAuth($route.name,'create_area')" :arealist="arealist" @areaAddSuccess="areaAddSuccess"></add-agent-btn>
         </div>
         <tableLayout :layout="tablecols2" :data="agentAreaList" :custom="true" height="300px">
           <template v-slot:customcol="scope">

src/SManagement/user/user-info/components/PassEdit.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="password">
-    <span @click="dialogVisible=true">编辑</span>
+    <!-- <span @click="dialogVisible=true">编辑</span> -->
     <el-dialog title="修改密码" :visible.sync="dialogVisible" :before-close="handleClose">
       <el-form ref="form" :rules="rules" :model="form" label-width="80px">
         <el-form-item label="原密码" prop="pass">

src/SManagement/user/user-info/components/PhoneEdit.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="phone">
-  <span @click="dialogVisible=true">编辑</span>
+  <!-- <span @click="dialogVisible=true">编辑</span> -->
   <el-dialog
     title="修改手机号"
     :visible.sync="dialogVisible"

src/SManagement/user/user-info/components/baseInfo.vue

@@ -10,8 +10,8 @@
       <el-form-item label="姓名:" prop="name" v-focus>
         <el-input v-model="ruleForm.name" size="small" :placeholder="ruleForm.name" :disabled="editStatus" ref="nameEdit"></el-input>
         <div class="handle">
-          <span v-if="editStatus" @click="editStatus = false">编辑</span>
-          <span v-else @click="save('name')">保存</span>
+          <!-- <span v-if="editStatus" @click="editStatus = false">编辑</span> -->
+          <!-- <span v-else @click="save('name')">保存</span> -->
         </div>
       </el-form-item>
       <el-form-item label="手机号:" prop="phonenumber">
@@ -25,8 +25,8 @@
       <el-form-item label="邮箱" prop="email" v-emailfocus>
         <el-input v-model="ruleForm.email" size="small" :placeholder="ruleForm.email" :disabled="EmailStatus" ref="email"></el-input>
         <div class="handle">
-          <span v-if="EmailStatus" @click="EmailStatus = false">编辑</span>
-          <span v-else @click="save('email')">保存</span>
+          <!-- <span v-if="EmailStatus" @click="EmailStatus = false">编辑</span> -->
+          <!-- <span v-else @click="save('email')">保存</span> -->
         </div>
       </el-form-item>
     </el-form>

src/views/login/login.vue

@@ -90,8 +90,23 @@ export default {
       this.checked = true
     }
     console.log(this.HTTP_DEFALUT_ERROR)
+    /* 绑定回车登录事件 */
+    // window.addEventListener('keydown',this.keyDown)
+  },
+  destroyed () {
+    /* 销毁事件 */
+    // window.removeEventListener('keydown',this.keyDown)
   },
   methods: {
+    keyDown (e) {
+      if (e.keyCode == 13 || e.keyCode == 100) {
+        if (typeof this.$route.query.admin != 'object') {
+          this.login()
+        } else {
+          this.loginbyaccount()
+        }
+      }
+    },
     //验证码请求
     loginCode () {
       this.$api.loginCode({

yos/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>美大营销管理平台</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.0f41233e.js"></script><link href="css/app.e05006d8.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.25c4112b.js" nomodule></script><script defer="defer" src="js/app-legacy.fcee4508.js" nomodule></script></head><body><noscript><strong>We're sorry but 美大营销管理平台 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>美大营销管理平台</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.28ca1dcb.js"></script><link href="css/app.e05006d8.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.25c4112b.js" nomodule></script><script defer="defer" src="js/app-legacy.f9a8b62b.js" nomodule></script></head><body><noscript><strong>We're sorry but 美大营销管理平台 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>