Xiao_123 3 місяців тому
батько
коміт
bd4100f231

+ 1 - 0
components.d.ts

@@ -31,6 +31,7 @@ declare module 'vue' {
     CtTextField: typeof import('./src/components/CtVuetify/CtTextField/index.vue')['default']
     DatePicker: typeof import('./src/components/DatePicker/index.vue')['default']
     Echarts: typeof import('./src/components/Echarts/index.vue')['default']
+    ElCascader: typeof import('element-plus/es')['ElCascader']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElTree: typeof import('element-plus/es')['ElTree']
     Empty: typeof import('./src/components/Empty/index.vue')['default']

+ 1 - 1
src/layout/enterprise.vue

@@ -2,7 +2,7 @@
   <div class="parent d-flex flex-column">
     <Headers class="headers"></Headers>
     <div class="content d-flex">
-      <side class="content-sticky" v-if="!router.currentRoute.value?.meta?.hideSide"></side>
+      <side class="content-sticky" v-if="!isInWhiteList(route.path)"></side>
       <div class="content-box d-flex flex-column" :style="`width: ${ !isInWhiteList(route.path) ? 'calc(100vw - 230px)' : '100%'}`">
         <div v-if="!isInWhiteList(route.path)" class="breadcrumbs_sticky">
           <div class=" d-flex align-center justify-space-between">

+ 1 - 0
src/styles/index.scss

@@ -170,6 +170,7 @@
 }
 
 .card-box {
+  // width: calc(100vw - 272px);
   width: 100%;
   height: 100%;
   min-height: 70vh;

+ 1 - 1
src/views/recruit/enterprise/newlyAppointed/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<div>
+	<div style="width: calc(100vw - 271px)">
 		<CtFilter :items="formItems" @reset="handleReset" @search="handleSearch" />
 
 		<v-card elevation="5" class="mt-3">

+ 1 - 1
src/views/recruit/enterprise/statistics/overallAnalysis.vue

@@ -1,6 +1,6 @@
 <template>
   <v-card class="card-box pa-5">
-    <div class="d-flex color-666 font-size-14">
+    <div class="d-flex color-666 font-size-14 align-center">
       <div class="d-flex align-center" style="min-width: 358px;">
         <span>选择时间</span>
         <div class="ml-5 after">

+ 31 - 36
src/views/recruit/enterprise/systemManagement/groupAccount/index.vue

@@ -1,38 +1,34 @@
 <template>
   <v-card class="card-box d-flex pa-3">
-    <v-row no-gutters justify="space-between">
-      <v-col cols="2">
-        <div class="d-flex justify-start pr-3">
-          <v-btn prepend-icon="mdi-plus" variant="text" density="compact" color="primary" @click="handleAdd(1)">{{ $t('enterprise.userManagement.addBranchOffice') }}</v-btn>
-        </div>
-        <v-treeview
-          :items="treeData"
-          activatable
-          color="primary"
-          item-value="id"
-          open-all
-          open-strategy="single"
-          density="compact"
-          @update:activated="handleClick"
-          @update:opened="handleClick"
-        >
-          <template v-slot:title="{ item }">
-            <div class="treeTitle font-size-15">
-              {{ formatName(item.anotherName || item.name) }}
-              <v-tooltip activator="parent" location="end">{{ formatName(item.anotherName || item.name) }}</v-tooltip>
-            </div>
-          </template>
-        </v-treeview>
-      </v-col>
-
-      <v-divider vertical></v-divider>
-
-      <v-col class="pl-3" cols="10">
-        <div class="d-flex justify-space-between px-3">
-          <TextInput v-model="query.name" :item="textItem" @change="getUserList"></TextInput>
-          <v-btn prepend-icon="mdi-plus" class="elevation-5" color="primary" @click="handleAdd(0)">{{ $t('enterprise.userManagement.inviteNewColleagues') }}</v-btn>
-        </div>
-        <CtTable
+    <div style="width: 20%; border-right: 1px solid #ccc;">
+      <div class="d-flex justify-start pr-3">
+        <v-btn prepend-icon="mdi-plus" variant="text" density="compact" color="primary" @click="handleAdd(1)">{{ $t('enterprise.userManagement.addBranchOffice') }}</v-btn>
+      </div>
+      <v-treeview
+        :items="treeData"
+        activatable
+        color="primary"
+        item-value="id"
+        open-all
+        open-strategy="single"
+        density="compact"
+        @update:activated="handleClick"
+        @update:opened="handleClick"
+      >
+        <template v-slot:title="{ item }">
+          <div class="treeTitle font-size-15">
+            {{ formatName(item.anotherName || item.name) }}
+            <v-tooltip activator="parent" location="end">{{ formatName(item.anotherName || item.name) }}</v-tooltip>
+          </div>
+        </template>
+      </v-treeview>
+    </div>
+    <div style="width: 80%" class="ml-3">
+      <div class="d-flex justify-space-between px-3">
+        <TextInput v-model="query.name" :item="textItem" @change="getUserList"></TextInput>
+        <v-btn prepend-icon="mdi-plus" class="elevation-5" color="primary" @click="handleAdd(0)">{{ $t('enterprise.userManagement.inviteNewColleagues') }}</v-btn>
+      </div>
+      <CtTable
           :items="tableData"
           :headers="headers"
           :loading="loading"
@@ -56,9 +52,8 @@
             <v-btn v-if="item.status === '0' && item.userType !== '1'" color="primary" variant="text" @click="handleAction('', 1, item)">{{ $t('enterprise.userManagement.disable') }}</v-btn>
             <v-btn v-if="item.status === '0' && item.userType !== '1' && item.enterpriseId.toString() === enterpriseInfo?.enterpriseId.toString()" color="primary" variant="text" @click="handleRole(item)">分配角色</v-btn>
           </template>
-        </CtTable>
-      </v-col>
-    </v-row>
+      </CtTable>
+    </div>
   </v-card>
 
   <CtDialog :visible="showEdit" :widthType="2" titleClass="text-h6" title="编辑员工基本信息" @close="showEdit = false; editId = null" @submit="handleSubmit">