Browse Source

代码上传

zhangqi 2 years ago
parent
commit
ed3c59f089

+ 2 - 2
src/HManagement/accountManage/modules/account_detail.vue

@@ -19,11 +19,11 @@
         <unuseTemp v-if="tool.checkAuth($route.name,'use')" :data="mainData" @onSuccess="queryMainData"></unuseTemp>
       </div>
       <div class="container normal-panel" slot="slot0" >
-        <el-descriptions :column="6">
+        <el-descriptions :column="4">
           <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="编号">{{mainData.hrmsg.hrcode?mainData.hrmsg.hrcode:'--'}}</el-descriptions-item>
           <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="身份证号">{{mainData.hrmsg.idcard?mainData.hrmsg.idcard:'--'}}</el-descriptions-item>
           <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="部门">{{mainData.hrmsg.depname?mainData.hrmsg.depname:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="是否部门负责人">{{mainData.hrmsg.isleader === 1?'是':'否'}}</el-descriptions-item>
+          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="部门负责人">{{mainData.hrmsg.isleader === 1?'是':'否'}}</el-descriptions-item>
           <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="职位">{{mainData.hrmsg.position?mainData.hrmsg.position:'--'}}</el-descriptions-item>
           <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="办公电话">{{mainData.hrmsg.officetelephone?mainData.hrmsg.officetelephone:'--'}}</el-descriptions-item>
           <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="姓名">{{mainData.hrmsg.name?mainData.hrmsg.name:'--'}}</el-descriptions-item>

+ 1 - 1
src/HManagement/accountManage/modules/add.vue

@@ -4,7 +4,7 @@
     <el-drawer
       title="创建用户"
       :visible.sync="drawer"
-      size="800px"
+      size="400px"
       direction="rtl"
       append-to-body
       @close="onClose">

+ 3 - 14
src/HManagement/roleManage/modules/edit.vue

@@ -1,18 +1,7 @@
 <template>
-  <div>
-    <el-button size="mini" type="default" @click="drawer = true">编 辑</el-button>
-    <el-drawer
-      title="创建角色"
-      :visible.sync="drawer"
-      append-to-body
-      size="80%"
-      direction="rtl">
-      <div class="drawer__panel">
-        <roleContentTemp :data="{roleid:$route.query.id}" @onSuccess="onSuccess">
-          <el-button slot="cancel" size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
-        </roleContentTemp>
-      </div>
-    </el-drawer>
+  <div class="container normal-panel drawer__panel">
+    <roleContentTemp :data="{roleid:$route.query.id}" @onSuccess="onSuccess">
+    </roleContentTemp>
   </div>
 </template>
 

+ 1 - 1
src/components/normal-basic-layout/details/modules/tags/tag.vue

@@ -2,7 +2,7 @@
   <div>
     <!-- <p class="detail__head__label">标签展示:</p> -->
     <div v-if="showTag">
-      <el-tag style="margin-right:10px" v-for="item in datatag" :key="item.rowindex" size="small" type="primary" effect="dark">{{item}}</el-tag>
+      <el-tag style="margin-right:10px" v-for="item in datatag" :key="item.rowindex" size="small" type="warning" effect="dark">{{item}}</el-tag>
       <el-button type="text" @click="showTag = false">+</el-button>
     </div>
     <el-select

+ 1 - 1
src/components/normal-basic-layout/index.vue

@@ -4,7 +4,7 @@
       <div class="layout-header-panel container normal-panel">
         <div class="flex-align-center flex-between">
           <div class="normal-margin flex-align-center">
-            <p style="font-size:26px;font-weight:300">{{routerName}}&nbsp;<i @click="addToAsideBar" style="color:#999" class="el-icon-star-off"></i></p>
+            <p style="font-size:26px;font-weight:300">{{acitveApp.meta.title}}&nbsp;<i @click="addToAsideBar" style="color:#999" class="el-icon-star-off"></i></p>
             <el-divider direction="vertical"></el-divider>
             <div class="flex-align-center">
               <cpAdd v-if="tool.checkAuth($route.name,'insert')" :formPath="formPath" :oldFormPath="oldFormPath" @onAddSuccess="listData(param.content.pageNumber = 1)"></cpAdd>

+ 2 - 1
src/router/HManagement.js

@@ -64,7 +64,8 @@ const HManagement = [
           ast_nav: true,
           keeproute: true
         },
-        component: () => import(/* webpackChunkName: "about" */ '@/HManagement/roleManage/modules/role_details.vue')
+        // component: () => import(/* webpackChunkName: "about" */ '@/HManagement/roleManage/modules/role_details.vue')
+        component: () => import(/* webpackChunkName: "about" */ '@/HManagement/roleManage/modules/edit.vue')
       },
     ]
   },