bug修改

src/components/PageMain/index.vue

@@ -37,7 +37,7 @@ function unCollaspe() {
         {{ title }}
       </slot>
     </div>
-    <div class="main-container p-5">
+    <div class="main-container p-5" style="height: 100%;">
       <slot />
     </div>
     <div v-if="isCollaspe" class="collaspe absolute bottom-0 w-full cursor-pointer from-transparent to-[var(--g-container-bg)] bg-gradient-to-b pb-2 pt-10 text-center" @click="unCollaspe">

src/views/operationManagement/operation.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="operation pad-24">
+  <PageMain class="vh100">
     <el-form class="operationForm" ref="OperationRef" :model="form" label-width="70">
       <el-row :gutter="20">
         <el-col :span="8">
@@ -103,7 +103,7 @@
         </el-dropdown>
       </span>
     </el-row>
-    <el-table :data="tableData" ref="operationListRef" height="536" @selection-change="handleSelectionChange">
+    <el-table :data="tableData" ref="operationListRef" height="calc(100% - 270px)" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column label="姓名" prop="name" width="80"></el-table-column>
       <el-table-column label="手机号" prop="mobile" width="150"></el-table-column>
@@ -166,7 +166,7 @@
     <el-dialog v-model="allocationShow" title="分配管理人" width="800">
       <allocation ref="AllocationRef" @closeDialog="closeAllocation"></allocation>
     </el-dialog>
-  </div>
+  </PageMain>
 </template>
 
 <script setup lang="ts">
@@ -519,7 +519,7 @@ const handleCurrentChange = (page) => {
 // 详情
 const showDetail = (scope) => {
   myRouter.push({
-    path: '/operationDetail',
+    path: '/operationManagement/operation/operationDetail',
     query: {
       id: scope.row.userId,
       ids: scope.row.id
@@ -636,6 +636,9 @@ const tableDataCommand = (scope, e) => {
 }
 // 添加业务员
 const addNumber = () => {
+  // myRouter.push({
+  //   path: '/operationManagement/operation/addOperation',
+  // })
   dialogShow.value = true
   title.value = '添加'
   nextTick(() => {
@@ -675,9 +678,7 @@ onMounted(() => {
 @use "@/assets/styles/common/style.scss";
 
 .operation {
-  margin: 0 20px;
-  background: white;
-
+  height: 100%;
   .operationForm {
     margin: 20px 0;
 

src/views/personnel/roleManagement.vue

@@ -76,7 +76,7 @@
                 <el-radio value="3" size="large">指定机构</el-radio>
               </el-radio-group>
               <ElTree style="max-height: 440px; overflow-y: auto;" :data="deptTreeData" :props="deptProps" show-checkbox
-                node-key="id" :check-strictly="false" :default-expand-all="true"
+                node-key="id" check-strictly :default-expand-all="true"
                 :default-checked-keys="roleInfo.deptIds" @check="handleDeptCheckChange" ref="deptTree" />
             </el-tab-pane>
           </el-tabs>
@@ -251,6 +251,7 @@ function chooseRole(item: any) {
       } else {
         roleInfo.dataMark = '1';
       }
+      dataMarkChange()
 
       roleInfo.deptIds = res.data.dataScope?.deptIds;
     });