lm 1 месяц назад
Родитель
Сommit
0436db471b

+ 1 - 2
src/layout/components/AppMain.vue

@@ -33,8 +33,7 @@ export default {
     justify-content: flex-start;
     justify-content: flex-start;
 
 
   .main_container {
   .main_container {
-    /* border:solid blue 2px; */
-
+    // border:solid blue 2px; 
     position: relative;
     position: relative;
     flex: 1 1;
     flex: 1 1;
     padding: 20px;
     padding: 20px;

+ 6 - 7
src/views/myCustomer/index.vue

@@ -39,14 +39,13 @@
             </Table>
             </Table>
 
 
         </div>
         </div>
-    </div>
-
-    <SchoolFormDialog 
-        v-if="schoolVisible"
-        v-model:visible="schoolVisible"
-        :defaultFormData="schoolDefaultFormData"
-    ></SchoolFormDialog>
 
 
+        <SchoolFormDialog 
+            v-if="schoolVisible"
+            v-model:visible="schoolVisible"
+            :defaultFormData="schoolDefaultFormData"
+        ></SchoolFormDialog>
+    </div>
 </template>
 </template>
 
 
 
 

+ 52 - 60
src/views/myCustomer/myCustomerDetail/index.vue

@@ -27,7 +27,6 @@
                 </div>
                 </div>
             </template>
             </template>
         </TopBackNav>
         </TopBackNav>
-
         <div class="page_item bottom_detail end_item">
         <div class="page_item bottom_detail end_item">
             <TabSearch :defaultTabKey="defaultShowTab" 
             <TabSearch :defaultTabKey="defaultShowTab" 
                 tabType="line" :tabList="tabList" 
                 tabType="line" :tabList="tabList" 
@@ -40,63 +39,60 @@
             <ContactDetail v-if="defaultShowTab === 'contactDetails'"/>
             <ContactDetail v-if="defaultShowTab === 'contactDetails'"/>
             <CustomerStatusOverview v-if="defaultShowTab === 'messageOverview'"/>
             <CustomerStatusOverview v-if="defaultShowTab === 'messageOverview'"/>
         </div>
         </div>
-    </div>
 
 
-    <!-- 转让 弹窗 -->
-    <FormDialog title="转让" :visible="transferFormDialogVisible" 
-        :submit-loading="transferFormDialogSubmitLoading" 
-        :default-form-data="transferDefaultFormData" 
-        :formItemList="formItemList"
-        @close="CloseTransferFormDialog"
-        @confirm="HandleTransferFormDialogConfirm">
-    </FormDialog>
-
-    <!-- 操作记录 弹窗 -->
-    <PreviewDialog 
-        v-if="operationRecordDialogVisible"
-        class="operation_dialog"
-        title="操作记录"
-        :previewVisible="operationRecordDialogVisible"
-        :customFooter="true"
-        @close="CloseOperationRecordDialog">
-
-        <SearchBlock :searchList="operationRecordSearchList"></SearchBlock>
-
-        <FollowCard :card-list="finalOperationLogRenderData">
-            <template #operation><i></i></template>
-        </FollowCard>
-
-        <Pagination :currentPage="currentPage" :pageSize="pageSize" :totalNum="totalNum"></Pagination>
-
-
-        <template #close>
-            <el-button @click="CloseOperationRecordDialog" class="button_background" >关闭</el-button>
-        </template>
-        <template #confirm><i></i></template>
-    </PreviewDialog>
-
-    <!-- 编辑学校弹窗 -->
-     <SchoolFormDialog 
-        v-if="schoolVisible"
-        v-model:visible="schoolVisible"  
-        :defaultFormData="schoolDefaultFormData">
-    </SchoolFormDialog>
-
-    <!-- 新增联系人弹窗 -->
-     <ConcactPeopleFormDialog 
-        v-if="concactPeopleVisible"
-        v-model:visible="concactPeopleVisible" 
-        title="新增联系人"
-        :default-form-data="concactPeopleDefaultFormData">
-    </ConcactPeopleFormDialog>
-
-    <!-- 写跟进弹窗 -->
-    <FollowFormDialog 
-        v-if="followVisible"
-        v-model:visible="followVisible"
-        :defaultFormData="followDefaultFormData">
-    </FollowFormDialog>
 
 
+            <!-- 转让 弹窗 -->
+        <FormDialog 
+            v-if="transferFormDialogVisible"    
+            title="转让" :visible="transferFormDialogVisible" 
+            :submit-loading="transferFormDialogSubmitLoading" 
+            :default-form-data="transferDefaultFormData" 
+            :formItemList="formItemList"
+            @close="CloseTransferFormDialog"
+            @confirm="HandleTransferFormDialogConfirm">
+        </FormDialog>
+
+        <!-- 操作记录 弹窗 -->
+        <PreviewDialog 
+            v-if="operationRecordDialogVisible"
+            class="operation_dialog"
+            title="操作记录"
+            :previewVisible="operationRecordDialogVisible"
+            :customFooter="true"
+            @close="CloseOperationRecordDialog">
+            <SearchBlock :searchList="operationRecordSearchList"></SearchBlock>
+            <FollowCard :card-list="finalOperationLogRenderData">
+                <template #operation><i></i></template>
+            </FollowCard>
+            <Pagination :currentPage="currentPage" :pageSize="pageSize" :totalNum="totalNum"></Pagination>
+            <template #close>
+                <el-button @click="CloseOperationRecordDialog" class="button_background" >关闭</el-button>
+            </template>
+            <template #confirm><i></i></template>
+        </PreviewDialog>
+
+        <!-- 编辑学校弹窗 -->
+        <SchoolFormDialog 
+            v-if="schoolVisible"
+            v-model:visible="schoolVisible"  
+            :defaultFormData="schoolDefaultFormData">
+        </SchoolFormDialog>
+
+        <!-- 新增联系人弹窗 -->
+        <ConcactPeopleFormDialog 
+            v-if="concactPeopleVisible"
+            v-model:visible="concactPeopleVisible" 
+            title="新增联系人"
+            :default-form-data="concactPeopleDefaultFormData">
+        </ConcactPeopleFormDialog>
+
+        <!-- 写跟进弹窗 -->
+        <FollowFormDialog 
+            v-if="followVisible"
+            v-model:visible="followVisible"
+            :defaultFormData="followDefaultFormData">
+        </FollowFormDialog>
+    </div>
 
 
 </template>
 </template>
 
 
@@ -319,11 +315,7 @@ const OpenFollowlFormDialog = ()=>{
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 .main_container{
 .main_container{
-    // 公共样式不生效了
     gap:16px;
     gap:16px;
-    padding: 20px;
-    flex: 1 1;
-    overflow: auto;
 
 
     :deep(.top_right){
     :deep(.top_right){
         flex: 1 1;
         flex: 1 1;