Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/App.vue

@@ -24,8 +24,7 @@ export default {
   beforeCreate() {
     Vue.prototype.$app = this;
   },
-  created() {
-  },
+  created() {},
 
   methods: {},
 };
@@ -58,4 +57,23 @@ export default {
     }
   }
 }
+/deep/.el-menu--horizontal > .el-menu-item.is-active,
+/deep/.el-tabs__item.is-active {
+  border-bottom: 2px solid #409eff;
+  color: #303133;
+}
+/deep/.el-tabs__item.is-active {
+  border-bottom: 3px solid #409eff;
+}
+/deep/.el-tabs__item:hover {
+  color: #303133;
+}
+/deep/.el-tabs__active-bar {
+  color: unset;
+  background-color: unset;
+}
+/deep/.el-tabs__item {
+  width: 120px;
+  color: #909399;
+}
 </style>

attendance-performance-manager-ui/admin/src/components/Header.vue

@@ -214,12 +214,15 @@ export default {
     color: #eee;
     background: linear-gradient(90deg, #1845c6, #2999ff) !important;
     .layout-logo {
-      height: 50px;
+      height: 100%;
       .el-icon-menu {
         display: none;
       }
       a {
         margin: auto;
+        display: block;
+        width: 300px;
+        height: 100%;
       }
       img {
         vertical-align: middle;

attendance-performance-manager-ui/admin/src/views/attendance/group/groupTemplate.vue

 <template>
   <div class="container" v-if="open">
-    <el-card style="min-height:80vh;padding: 0 10px">
+    <el-card style="min-height:80vh;">
       <div class="head">
         <el-button type="primary" size="mini" @click="backTo"
           >返回上一级</el-button
@@ -1401,9 +1401,19 @@ export default {
   margin-left: 5px;
   margin-right: 5px;
   color: #606266;
-  background-color: #fff;
+  background-color: transparent;
 }
 
+/deep/.el-card.is-always-shadow {
+  box-shadow: unset;
+  -webkit-box-shadow: unset;
+}
+/deep/.el-card {
+  border: unset;
+}
+/deep/.el-card__body {
+  padding: 0;
+}
 .contentClass {
   width: 600px;
 }
@@ -1429,6 +1439,5 @@ export default {
   position: absolute;
   right: 45px;
   z-index: 99;
-
 }
 </style>

attendance-performance-manager-ui/admin/src/views/dept/list.vue

 <template>
   <div className="page">
-    <el-card style="height:80vh;overflow:scroll-y">
+    <el-card style="height:80vh;overflow:scroll-y;padding: 10px;">
       <LayoutTable
         notPagination
         :data="tableData"
@@ -92,3 +92,8 @@ export default {
   },
 };
 </script>
+<style lang="less" scoped>
+/deep/.el-card__body {
+  padding: 0 !important;
+}
+</style>

attendance-performance-manager-ui/admin/src/views/staff/drawershow.vue

@@ -57,19 +57,57 @@
           </div>
           <div class="history">
             <span>考勤授权：</span>
-            <el-switch v-model="form.kaoqin"> </el-switch>
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="form.attendCheck"
+            >
+            </el-switch>
           </div>
           <div class="history">
             <span>评价授权：</span>
-            <el-switch v-model="form.kaoqin"> </el-switch>
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="form.complainCheck"
+            >
+            </el-switch>
           </div>
           <div class="history">
             <span>投诉授权：</span>
-            <el-switch v-model="form.kaoqin"> </el-switch>
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="form.reviewCheck"
+            >
+            </el-switch>
           </div>
           <div class="history">
             <span>办件授权：</span>
-            <el-switch v-model="form.kaoqin"> </el-switch>
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="form.goworkCheck"
+            >
+            </el-switch>
+          </div>
+          <div class="history">
+            <span>效能授权：</span>
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="form.effectCheck"
+            >
+            </el-switch>
+          </div>
+          <div class="history">
+            <span>其他授权：</span>
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="form.otherCheck"
+            >
+            </el-switch>
           </div>
         </div>
 

attendance-performance-manager-ui/admin/src/views/staff/list.vue

 <template>
   <div class="page">
-    <div style="margin:10px 0">
+    <div>
       <tab-pane
         :thirdList="thirdList"
         :activeName="activeName"
@@ -378,23 +378,23 @@ export default {
             width: 240,
             formatter: (row) => {
               return (
-                <table-buttons
-                  noAdd
-                  noDel
-                  noEdit
-                  row={row}
-                  onView={this.toView}
-                  onEdit={this.toEdit}
-                />
                 // <table-buttons
                 //   noAdd
-                //   noAuth
                 //   noDel
                 //   noEdit
                 //   row={row}
                 //   onView={this.toView}
                 //   onEdit={this.toEdit}
                 // />
+                <table-buttons
+                  noAdd
+                  noAuth
+                  noDel
+                  noEdit
+                  row={row}
+                  onView={this.toView}
+                  onEdit={this.toEdit}
+                />
               );
             },
           },
@@ -445,6 +445,7 @@ export default {
 <style lang="scss" scoped>
 .page {
   min-width: 1400px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 }
 .hisList {
   padding: 15px;