From f69adde2c8de2cb0c5f194780520ea3a0aa20d89 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Tue, 9 Apr 2024 10:27:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/financialsector/FinanceHome.vue                | 7 ++++++-
 .../financialsector/Financialse/FinancialWarehousing.vue | 9 +++++++--
 .../warehousesignedorder/distributionStockArticle.vue    | 9 +++++----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/views/financialsector/FinanceHome.vue b/src/views/financialsector/FinanceHome.vue
index e73d88c5..a7a5c87f 100644
--- a/src/views/financialsector/FinanceHome.vue
+++ b/src/views/financialsector/FinanceHome.vue
@@ -41,7 +41,7 @@
             <span v-if="item.label == '提货'"><FinancialBill /></span>
             <span v-if="item.label == '干线'"><FinancialTrunkLine /></span>
             <span v-if="item.label == '仓储'"
-              ><FinancialWarehousing :templateData="templateInfo"
+              ><FinancialWarehousing @request-data="provideData" :templateData="templateInfo"
             /></span>
             <span v-if="item.label == '配送'"><FinancialDelivery /></span>
             <span v-if="item.label == '安装'">安装</span>
@@ -124,6 +124,11 @@ const removeTag = value => {
     Tabmenu.value = ServiceList.value.find(res => res.state).label;
   }
 };
+
+// 提供数据的函数
+const provideData = () => {
+  console.log(`父组件的数据是：${11111}`);
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/financialsector/Financialse/FinancialWarehousing.vue b/src/views/financialsector/Financialse/FinancialWarehousing.vue
index 4cbed1f3..5ce0e511 100644
--- a/src/views/financialsector/Financialse/FinancialWarehousing.vue
+++ b/src/views/financialsector/Financialse/FinancialWarehousing.vue
@@ -241,10 +241,14 @@
 
 <script setup>
 import { ref } from 'vue';
-import { defineProps } from 'vue';
+import { defineProps , defineEmits} from 'vue';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import {$_priceTemplate} from '@/api/financialsector/index'; //价格模板
-
+import { defineComponent } from 'vue';
+const emit = defineEmits(['request-data']);
+defineComponent({
+  emits: ['request-data']
+});
 // 接收参数
 const props = defineProps({
   templateData: Object,
@@ -437,6 +441,7 @@ onLoad()
 // 新增
 const Submit=()=>{
   console.log(form.value,'表单');
+  emit('request-data');
 }
 </script>
 
diff --git a/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue b/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue
index 780f2e3b..80474230 100644
--- a/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue
+++ b/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue
@@ -293,10 +293,10 @@ const selectionChange = list => {
 const searchChange = () => {
   // 日期处理
   if (TopQuery.value.warehouseEntryTime) {
-    queryCarn.value.startTaskTime = dayjs(TopQuery.value.warehouseEntryTime[0]).format(
+    queryCarn.value.warehouseEntryTimestartTaskTime = dayjs(TopQuery.value.warehouseEntryTime[0]).format(
       'YYYY-MM-DD HH:mm:ss'
     ); //开始日期
-    queryCarn.value.endTaskTime = dayjs(TopQuery.value.warehouseEntryTime[1]).format(
+    queryCarn.value.warehouseEntryTimeendTaskTime = dayjs(TopQuery.value.warehouseEntryTime[1]).format(
       'YYYY-MM-DD HH:mm:ss'
     ); //结束日期
   } else {
@@ -305,10 +305,10 @@ const searchChange = () => {
   }
 
   if (TopQuery.value.signinTime) {
-    queryCarn.value.startTaskTime = dayjs(TopQuery.value.signinTime[0]).format(
+    queryCarn.value.signinTimestartTaskTime = dayjs(TopQuery.value.signinTime[0]).format(
       'YYYY-MM-DD HH:mm:ss'
     ); //开始日期
-    queryCarn.value.endTaskTime = dayjs(TopQuery.value.signinTime[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
+    queryCarn.value.signinTimeendTaskTime = dayjs(TopQuery.value.signinTime[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
   } else {
     delete queryCarn.value.signinTimestartTaskTime;
     delete queryCarn.value.signinTimeendTaskTime;
@@ -340,6 +340,7 @@ const searchHide = () => {
 };
 // 清空
 const searchReset = () => {
+  queryCarn.query={}
   details.query = {};
   details.columnList.forEach(item => {
     item.values = '';