营销费用管理新增营销费用统计

src/HDrpManagement/marketingExpenseMag/index.vue

@@ -12,6 +12,12 @@
         fileName="营销费用管理"
         :detailPath="{path:'/marketingExpenseMagDetail'}"
     >
+      <template #titleRight>
+        <div>
+          <el-button type="primary" size="small" @click="portraitShowFun">营销费用统计</el-button>
+        </div>
+
+      </template>
       <template #custom >
         <div class="mt-10 inline-16" >
           <label  class="search__label" >部门:</label>
@@ -42,18 +48,30 @@
         </div>
       </template>
     </basicLayout>
+    <el-drawer
+        title="我是标题"
+        :visible.sync="drawer"
+        size="80%"
+        direction="rtl"
+        append-to-body
+        :with-header="false">
+      <salerpriceData isPortraitShow="true"></salerpriceData>
+    </el-drawer>
   </div>
 </template>
 
 <script>
+import salerpriceData from '@/HDrpManagement/salerpriceData/index'
 export default {
   name: "index",
+  components:{salerpriceData},
   data(){
     return {
       columns:[],
       deplist:[],
       depment:'',
-      dateSelect:[]
+      dateSelect:[],
+      drawer:false
     }
   },
   methods:{
@@ -134,6 +152,9 @@ export default {
       }
       this.$refs.basicLayout.listData()
     },
+    portraitShowFun(){
+      this.drawer = true
+    }
   },
   mounted() {
     this.departmentrtment()

src/HDrpManagement/salerpriceData/index.vue

@@ -1,6 +1,6 @@
 
 <template>
-  <normalLayout style="background: #f8f8f8">
+  <normalLayout style="background: #f8f8f8" :isPortraitShow="isPortraitShow">
     <template #refresh>
       <div style="margin-right: 15px">
         <el-button
@@ -15,7 +15,7 @@
     </template>
     <template #content>
       <div style="padding: 16px">
-          <div  style="overflow: auto;height: calc(100vh - 220px);" ref="rollRef" @scroll="handleScroll">
+          <div  :style="{'overflow': 'auto','height': isPortraitShow?'calc(100vh - 90px)':'calc(100vh - 220px)'}" ref="rollRef" @scroll="handleScroll">
             <div class="inline-16">
               <label class="search__label">部门:</label>
               <el-cascader
@@ -176,7 +176,7 @@
               :windowWidth="windowWidth"
               @backFull="backFull"
             ></ProjectType>
-            
+
           </div>
       </div>
     </template>
@@ -196,6 +196,7 @@ import ProjectType from "./modules/projectType.vue";
 import PhoneType from "./modules/phoneType.vue";
 export default {
   name: "customerData",
+  props:['isPortraitShow'],
   components: {
     borderTemp,
     pageTable,

src/components/marketingExpenses/index.vue

@@ -73,7 +73,7 @@
         </el-pagination>
       </div>
       <div slot="footer" class="dialog-footer" style="margin-top: 0;!important;">
-        <el-button @click="onClose" size="small">关闭</el-button>
+        <el-button @click="onClose" size="small" style="width: 200px">关闭</el-button>
       </div>
     </el-dialog>
     <el-dialog :title="formTitle" :visible.sync="dialogFormVisible" append-to-body :show-close="false">

src/components/normal-basic-layout/normal.vue

@@ -3,9 +3,9 @@
     <div style="padding:16px 16px 0 16px;" class="flex-align-center flex-between" >
       <div class="flex-align-center ">
         <div class="inline-16" v-if="activeApp" style="font-size:26px;font-weight:300">{{customTitle ? customTitle : activeApp.meta.title}}&nbsp;
-          <div v-if="!customTitle" style="display:inline">
-            <img width="20" v-if="showAppCollection()" src="@/assets/icons/incoll.svg" alt="">
-            <img width="20" v-else src="@/assets/icons/uncoll.svg" @click="addToAsideBar" alt="">
+          <div v-if="!customTitle && isPortraitShow !== 'true'" style="display:inline">
+              <img width="20" v-if="showAppCollection()" src="@/assets/icons/incoll.svg" alt="">
+              <img width="20" v-else src="@/assets/icons/uncoll.svg" @click="addToAsideBar" alt="">
           </div>
         </div>
         <slot name="titleRight"></slot>
@@ -23,7 +23,7 @@
 
 import {mapGetters} from 'vuex'
 export default {
-  props:['tableName','idName','tableData','apiId','formPath','oldFormPath','options','autoQuery','detailPath','customTitle','hidePagination'],
+  props:['tableName','idName','tableData','apiId','formPath','oldFormPath','options','autoQuery','detailPath','customTitle','hidePagination','isPortraitShow'],
   components:{
     drawer:() =>  import('./drawerDetail/drawer'),