Merge branch 'release' into dev

src/api/index.js

@@ -25,7 +25,7 @@ export * from './monitor/job'
 export * from './monitor/jobLog'
 export * from './monitor/online'
 export * from './monitor/server'
-export * from './promotion/display'
+export * from './promotion/display_schedule'
 export * from './promotion/plan'
 export * from './promotion/task'
 export * from './scm/logistics_receipt'

src/api/promotion/display.js

-import request from '@/utils/request';
-// 获取-陈列计划列表
-export function getDisplayList(params) {
-  return request({
-    url: '/operation/sales/ap_display/query/page',
-    params
-  });
-}

src/api/promotion/display_schedule.js

+import request from '@/utils/request';
+// 获取-陈列计划列表
+export function getDisplayList(params) {
+  return request({
+    url: '/operation/sales/ap_display/query/page',
+    params
+  })
+}
+
+// 填报-陈列计划
+export function submitDisplayPlan(data) {
+  return request({
+    url: `/operation/sales/ap_display/core/${data.id}`,
+    method: 'PUT',
+    data: {
+      display: data
+    }
+  });
+}
+
+// 获取档期计划列表
+export function getDisplayScheduleList(params) {
+  return request({
+    url: '/operation/sales/ap_promotion/query/page',
+    params
+  })
+}
+
+// 填报-档期计划
+export function submitDisplaySchedulePlan(data) {
+  return request({
+    url: `/operation/sales/ap_promotion/core/${data.id}`,
+    method: 'PUT',
+    data: {
+      promotion: data
+    }
+  });
+}

src/assets/styles/index.scss

@@ -126,7 +126,7 @@ aside {
 // 全局样式
 // 容器
 .app-container {
-  padding: 30px;
+  padding: 10px;
   height: 100%;
 
   // 内容区域
@@ -134,7 +134,7 @@ aside {
     width: 100%;
     height: 100%;
     background-color: var(--el-bg-color-overlay);
-    padding: 20px;
+    padding: 10px;
     display: flex;
     flex-direction: column;
   }

src/components/RightToolbar/index.vue

@@ -19,7 +19,7 @@
           icon="Refresh"
           @click="refresh()" />
       </el-tooltip>
-      <el-tooltip class="item"
+      <el-tooltip class="item "
         effect="dark"
         content="显隐列"
         placement="top"
@@ -31,7 +31,8 @@
         <el-dropdown trigger="click"
           :hide-on-click="false"
           style="padding-left: 12px"
-          v-if="showColumnsType == 'checkbox'">
+          v-if="showColumnsType == 'checkbox'"
+          class="columns-dropdown">
           <el-button circle
             icon="Menu" />
           <template #dropdown>
@@ -50,7 +51,8 @@
         <el-dropdown trigger="click"
           :hide-on-click="false"
           style="padding-left: 12px"
-          v-if="showColumnsType == 'tree'">
+          v-if="showColumnsType == 'tree'"
+          >
           <el-button circle
             icon="Menu" />
           <template #dropdown>

src/views/promotion/display_schedule/index.vue

+<template>
+  <div class="app-container">
+    <div class="container">
+      <el-tabs v-model="activeName"
+        type="card"
+        class="demo-tabs"
+        @tab-click="handleClickTabs">
+        <el-tab-pane label="陈列计划"
+          name="陈列计划">
+          <Display />
+        </el-tab-pane>
+        <el-tab-pane label="档期计划"
+          name="档期计划">
+          <Schedule />
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import Display from './tabs/display.vue'
+import Schedule from './tabs/schedule.vue'
+const activeName = ref('陈列计划');
+const handleClickTabs = (tab) => {
+  activeName.value = tab.name;
+}
+</script>
+
+<style scoped
+  lang="scss">
+  .app-container {
+    padding: 10px;
+
+    .container {
+      padding: 10px;
+
+      .el-tabs {
+        height: 100%;
+        display: flex;
+        flex-direction: column-reverse;
+
+        .el-tabs__content {
+          display: flex;
+          flex-direction: column;
+          height: 100%;
+
+          .el-tab-pane {
+            height: 100%;
+            display: flex;
+            flex-direction: column;
+          }
+
+          .formula-column {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+
+            .el-icon {
+              margin-left: 2px;
+            }
+          }
+        }
+      }
+
+      .el-form-item {
+        align-items: center;
+      }
+
+    }
+  }
+
+</style>
\ No newline at end of file