Merge remote-tracking branch 'origin/hella_online_20240904' into hella_online_20240904

src/api/wms/demandforecastingDetail/index.ts

@@ -35,11 +35,12 @@ const getPageParams = (params)=>{
       params.endDate = params.dueDate[1].format('YYYY-MM-DD')
     }
   }
+  console.log(params.dueDate)
   if (!params.dueDate || params.dueDate.length == 0) {
     params.startDate = ''
     params.endDate = ''
   }
-  params.dueDate = ''
+  // params.dueDate = ''
 
   //计划员
   if(params.planerId&&params.planerId.length>0){
@@ -83,7 +84,6 @@ export const getDemandforecastingDetailPage = async (params) => {
     return await request.post({ url: '/wms/demandforecasting-detail/senior', data })
   } else {
     params = getPageParams(params)
-    console.log('params',params)
     return await request.get({ url: `/wms/demandforecasting-detail/page`, params })
   }
 }

src/api/wms/demandforecastingMain/index.ts

@@ -89,7 +89,7 @@ const getPageParams = (params)=>{
     params.startDate = ''
     params.endDate = ''
   }
-  params.dueDate = ''
+  // params.dueDate = ''
 
   //计划员
   if(params.planerId&&params.planerId.length>0){

src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts

@@ -63,6 +63,10 @@ export const BalanceSummary = useCrudSchemas(
       label: ' ',
       field: 'name',
       sort: 'custom',
+      align: 'left',
+      table:{
+        width: 350
+      }
     },
     {
       label: '总数',

src/views/wms/inventoryManage/balanceSummary/index.vue

@@ -26,6 +26,7 @@
     </el-table>
 </template>
 <script setup lang="ts">
+// 库存汇总
 import * as BalanceApi from '@/api/wms/balance'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts

@@ -265,7 +265,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     search: {
       component: 'DatePicker',
-      // value: [dayjs(),  dayjs().subtract(-3,'month')],
+      value: [dayjs(),  dayjs().subtract(-3,'month')],
       componentProps: {
         valueFormat: 'YYYY-MM-DD',
         type: 'daterange',

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue

@@ -171,7 +171,6 @@ const onSearchChange = (field, value)=>{
   }
 }
 const searchClick = async (data)=>{
-  console.log('3444',tableObject.params)
   await setSearchParamsHead(data)
   // updateDateTableColumns()
   setSearchParams(data)