Merge branch 'ap' into dev

src/views/promotion/components/SearchList/index.vue

@@ -50,7 +50,8 @@ const props = defineProps({
   }
 })
 const queryParams = reactive({
-  salesMonth: '',
+  // 当月
+  salesMonth: new Date(),
   deptName: '',
   dealerCN: '',
   lineNameLike: '',

src/views/promotion/components/Table/index.vue

@@ -40,7 +40,10 @@
         <template #header="{ column }">
           <!-- 只为特定公式列添加问号图标 -->
           <span class="formula-column">
-            {{ column.label }}
+            <div class="column">
+              <p>{{ column.label }}</p>
+              <p v-if="col.subLabel">{{ col.subLabel }}</p>
+            </div>
             <el-tooltip v-if="col.type === 'formula'"
               :content="col.formulaStr"
               placement="top">
@@ -128,6 +131,7 @@ const emit = defineEmits(['updateColumns', 'getTableList', 'updateShowSearch'])
 /*************** 工具栏 ***************/
 // 切换平铺/填报模式
 const operation = ref('展示模式');
+// const operation = ref('填报模式');
 const tableRef = ref(null)
 const checkTableColumns = async () => {
   // 通知外面传入 tableColumns / chooseColumns 数据源
@@ -184,6 +188,19 @@ const getTableList = () => {
         justify-content: center;
         align-items: center;
 
+        .column {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          flex-direction: column;
+
+          p {
+            margin: 0;
+            font-size: 12px;
+            color: #606266;
+          }
+        }
+
         .el-icon {
           margin-left: 2px;
         }
@@ -197,7 +214,7 @@ const getTableList = () => {
         white-space: nowrap;
       }
 
-      
+
 
       .cell-style {
         >div {
@@ -220,19 +237,27 @@ const getTableList = () => {
           width: 100% !important;
           padding: 10px;
 
-          /* 非 disabled 状态下的背景颜色 */
-          &.no-disabled {
-            background-color: var(--el-background-editor-cell);
+          ::v-deep(.el-select__wrapper) {
+            border: 4px solid var(--el-background-editor-cell) !important;
           }
 
+          /* 非 disabled 状态下的背景颜色 */
+          /* &.no-disabled {
+            background-color: ;
+          } */
+
         }
 
         .el-input {
           padding: 10px;
 
-          &.no-disabled {
-            background-color: var(--el-background-editor-cell);
+          ::v-deep(.el-input__wrapper) {
+            border: 4px solid var(--el-background-editor-cell) !important;
           }
+
+          /* &.no-disabled {
+            background-color: var(--el-background-editor-cell);
+          } */
         }
 
         .date-picker {
@@ -253,11 +278,13 @@ const getTableList = () => {
 
     /* 填报模式-单元格 */
     &.cell-no-padding {
+
       /* 无上下内边距 */
       ::v-deep(.el-table__row) {
         .el-table__cell {
           padding: 0;
-          .cell{
+
+          .cell {
             padding: 0 !important;
           }
         }