snow 1 year ago
parent
commit
f4fbda4e46

+ 3 - 0
src/components/PageContent/src/page-content.tsx

@@ -173,6 +173,9 @@ const PageContent = defineComponent({
         <div style={{ width: '100%', marginBottom: '5px' }}>
           {/* excel导出 */}
           {slots.table_header && slots.table_header()}
+          <div v-if="props.contentConfig.title" class="float-left text-black font-bold">
+            <h2>{props.contentConfig.title}</h2>
+          </div>
           <div class="float-right">
             {slots.header && slots.header()}
             {renderCreateButton()}

+ 1 - 1
src/components/ReTable/src/bar.tsx

@@ -134,7 +134,7 @@ export default defineComponent({
             {slots?.buttons()}
           </div>
           {props.showTitle && props.title && (
-            <div class="flex justify-between w-full h-60px p-3">
+            <div class="float-left text-black">
               <p class="font-bold truncate" style="line-height: 40px;">
                 {props.title}
               </p>

+ 1 - 2
src/views/time/receivable/components/all.vue

@@ -75,8 +75,7 @@ async function handleExportAllReport() {
           size="small"
           :icon="useRenderIcon('arrow-up-line')"
           type="primary"
-          >导出</el-button
-        >
+          >导出</el-button>
       </template>
     </page-container>
   </page-auth>

+ 1 - 1
src/views/time/receivable/components/config/content.config.ts

@@ -51,7 +51,7 @@ const columns = [
 
 const contentConfig: ContentConfig = {
   columns,
-  showTitle: false,
+  title: "订单只取toB订单统计",
   responseCode: 0,
   notPagination: true,
   superUserNoAction: false,

+ 1 - 1
src/views/time/receivableDetail/components/all.vue

@@ -43,7 +43,7 @@ const hooks: PageHooks = {
       result: {
         start: start + " 00:00:00",
         end: end + " 23:59:59",
-        plat_type:"1",
+        plat_type: "1"
       },
       deleteProps:['date']
     }

+ 2 - 1
src/views/time/receivableDetail/components/config/content.config.ts

@@ -4,7 +4,7 @@ import apis from "./apis";
 import { isBeyondTime } from "/@/views/reportCollection/_utils";
 import { addition } from "/@/utils/calc";
 import { h } from "vue";
-import { ElTag } from "element-plus";
+import { ElMessage, ElTag } from "element-plus";
 
 const send_status_list = [
   { value: "1", label: "未发货", type: "warning" },
@@ -162,6 +162,7 @@ const columns = [
 const contentConfig: ContentConfig = {
   columns,
   showTitle: false,
+  title: "订单只取toB订单统计",
   superUserNoAction: false,
   responseCode: 0,
   beforeRequestList(params) {

+ 1 - 14
src/views/time/receivableDetail/components/config/search.config.ts

@@ -23,20 +23,7 @@ const searchFormConfig: FormConfig = {
       field: "depart_id",
       type: "depart-query",
       trigger: "change"
-    },
-    // {
-    //   field: 'plat_type',
-    //   type: 'select',
-    //   trigger: 'change',
-    //   defaultValue: '1',
-    //   options: [
-    //     { value: '1', label: 'toB' },
-    //     { value: '2', label: 'toC' }
-    //   ],
-    //   otherOptions: {
-    //     clearable: false
-    //   }
-    // }
+    }
   ]
 };
 

+ 2 - 2
src/views/time/receivableManager/components/all.vue

@@ -17,8 +17,8 @@ const pageContentRef = ref<PageContentInstance | null>(null);
 const hooks: PageHooks = {
   pageSearchHook: () => {
     return usePageSearch(
-      (params) => ({ result: { ...params, plat_type: "1" }}),
-      (params) => ({ result: { ...params, plat_type: "1" }}),
+      (params) => ({ result: { ...params}}),
+      (params) => ({ result: { ...params}}),
       searchConfig);
   }
 };

+ 0 - 1
src/views/time/receivableManager/components/config/content.config.ts

@@ -40,7 +40,6 @@ const columns = [
 
 const contentConfig: ContentConfig = {
   columns,
-  showTitle: false,
   responseCode: 0,
   notPagination: true,
   superUserNoAction: false,

+ 4 - 16
src/views/time/receivableManager/components/config/search.config.ts

@@ -2,8 +2,7 @@ import { FormConfig } from "/@/components/PageSearch";
 import dayjs from "dayjs";
 import { useUserStore } from "/@/store/modules/user";
 
-const now = new Date();
-const start = dayjs(now).format("YYYY-MM-DD");
+const start = dayjs(new Date()).format("YYYY-MM-DD");
 
 const searchFormConfig: FormConfig = {
   formItems: [
@@ -25,20 +24,9 @@ const searchFormConfig: FormConfig = {
       field: "depart_id",
       type: "depart-query",
       trigger: "change"
-    },
-    // {
-    //   field: 'plat_type',
-    //   type: 'select',
-    //   trigger: 'change',
-    //   defaultValue: '1',
-    //   options: [
-    //     { value: '1', label: 'toB' },
-    //     { value: '2', label: 'toC' }
-    //   ],
-    //   otherOptions: {
-    //     clearable: false
-    //   }
-    // }
+      // disabled: Number(level) === 1,
+      // defaultValue: info.item || ""
+    }
   ]
 };