diff --git a/src/views/financialsector/FinanceHome.vue b/src/views/financialsector/FinanceHome.vue index a7a5c87f..d1b255b3 100644 --- a/src/views/financialsector/FinanceHome.vue +++ b/src/views/financialsector/FinanceHome.vue @@ -128,6 +128,7 @@ const removeTag = value => { // 提供数据的函数 const provideData = () => { console.log(`父组件的数据是:${11111}`); + templateInfo.value = { name: '参数', data: 11111 }; }; diff --git a/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue b/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue index 80474230..23ff5db1 100644 --- a/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue +++ b/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue @@ -293,25 +293,25 @@ const selectionChange = list => { const searchChange = () => { // 日期处理 if (TopQuery.value.warehouseEntryTime) { - queryCarn.value.warehouseEntryTimestartTaskTime = dayjs(TopQuery.value.warehouseEntryTime[0]).format( + queryCarn.value.warehouseEntryTimeStart = dayjs(TopQuery.value.warehouseEntryTime[0]).format( 'YYYY-MM-DD HH:mm:ss' ); //开始日期 - queryCarn.value.warehouseEntryTimeendTaskTime = dayjs(TopQuery.value.warehouseEntryTime[1]).format( + queryCarn.value.warehouseEntryTimeEnd = dayjs(TopQuery.value.warehouseEntryTime[1]).format( 'YYYY-MM-DD HH:mm:ss' ); //结束日期 } else { - delete queryCarn.value.warehouseEntryTimestartTaskTime; - delete queryCarn.value.warehouseEntryTimeendTaskTime; + delete queryCarn.value.warehouseEntryTimeStart; + delete queryCarn.value.warehouseEntryTimeEnd; } if (TopQuery.value.signinTime) { - queryCarn.value.signinTimestartTaskTime = dayjs(TopQuery.value.signinTime[0]).format( + queryCarn.value.signingTimeStart = dayjs(TopQuery.value.signinTime[0]).format( 'YYYY-MM-DD HH:mm:ss' ); //开始日期 - queryCarn.value.signinTimeendTaskTime = dayjs(TopQuery.value.signinTime[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期 + queryCarn.value.signingTimeEnd = dayjs(TopQuery.value.signinTime[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期 } else { - delete queryCarn.value.signinTimestartTaskTime; - delete queryCarn.value.signinTimeendTaskTime; + delete queryCarn.value.signingTimeStart; + delete queryCarn.value.signingTimeEnd; } getrain(); @@ -340,7 +340,8 @@ const searchHide = () => { }; // 清空 const searchReset = () => { - queryCarn.query={} + + TopQuery.value={} details.query = {}; details.columnList.forEach(item => { item.values = '';