From 5d9b299357c718a3b9d6cb73ad27977ffc292ae0 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Tue, 9 Apr 2024 10:15:45 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/financialsector/index.js                |  9 +++++++++
 .../distributionDeliveryListedt.vue             | 17 ++++++++++-------
 .../distributionDeliveryListmar.vue             |  3 ++-
 .../Financialse/FinancialWarehousing.vue        | 15 +++++++++++++--
 4 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100644 src/api/financialsector/index.js

diff --git a/src/api/financialsector/index.js b/src/api/financialsector/index.js
new file mode 100644
index 00000000..63dbadc9
--- /dev/null
+++ b/src/api/financialsector/index.js
@@ -0,0 +1,9 @@
+import request from '@/axios';
+//基础价格模板新增
+export const $_priceTemplate = data => {
+  return request({
+    url: '/api/logpm-basicdata/priceTemplate',
+    method: 'post',
+    data,
+  });
+};
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 8927af23..721c5911 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -4701,13 +4701,16 @@ export default {
     // 复核签收确认弹窗
     submitForm() {
       // 取消上门照片规则
-      // if (!this.DoorstepPhoto.length) {
-      //   ElMessage({
-      //     message: '至少上传一张上门照片',
-      //     type: 'warning',
-      //   });
-      //   return;
-      // }
+      if(this.$route.query.state){
+        if (!this.DoorstepPhoto.length) {
+        ElMessage({
+          message: '至少上传一张上门照片',
+          type: 'warning',
+        });
+        return;
+      }
+      }
+
       if (!this.StackingPhoto.length) {
         ElMessage({
           message: '至少上传一张堆码照片',
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
index c2422f1c..0086f557 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
@@ -1090,7 +1090,8 @@ export default {
         path: '/distribution/deliverylist/distributionDeliveryListedt',
         query: {
           data: encodeURIComponent(JSON.stringify(row)),
-          name: row.trainNumber + '-查看配送',
+          state:'imgType',
+        name: row.trainNumber + '-查看配送',
         },
       });
     },
diff --git a/src/views/financialsector/Financialse/FinancialWarehousing.vue b/src/views/financialsector/Financialse/FinancialWarehousing.vue
index 2a5f343b..4cbed1f3 100644
--- a/src/views/financialsector/Financialse/FinancialWarehousing.vue
+++ b/src/views/financialsector/Financialse/FinancialWarehousing.vue
@@ -233,7 +233,9 @@
         </div>
       </div>
     </div>
-    <div>保存</div>
+    <div class="el_submit">
+      <el-button type="primary" @click="Submit">保存</el-button>
+    </div>
   </div>
 </template>
 
@@ -241,7 +243,7 @@
 import { ref } from 'vue';
 import { defineProps } from 'vue';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
-
+import {$_priceTemplate} from '@/api/financialsector/index'; //价格模板
 
 // 接收参数
 const props = defineProps({
@@ -432,6 +434,10 @@ const onLoad=()=>{
   
 }
 onLoad()
+// 新增
+const Submit=()=>{
+  console.log(form.value,'表单');
+}
 </script>
 
 <style scoped lang="scss">
@@ -545,4 +551,9 @@ onLoad()
 }
 .el_Surcharge {
 }
+.el_submit{
+  width: 100%;
+    display: flex;
+    justify-content: flex-end;
+}
 </style>

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 2/4] =?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 = '';

From 6dbc98722b96c925c433c5dbfb18ee78f50b3359 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Tue, 9 Apr 2024 10:39:11 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/financialsector/FinanceHome.vue     |  1 +
 .../distributionStockArticle.vue              | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

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 };
 };
 </script>
 
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 = '';

From 680955d6792013b53679c7c9ffebebf330fd9397 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Tue, 9 Apr 2024 10:51:37 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/financialsector/FinanceHome.vue                    | 5 ++---
 .../financialsector/Financialse/FinancialWarehousing.vue     | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/financialsector/FinanceHome.vue b/src/views/financialsector/FinanceHome.vue
index d1b255b3..35e0b12a 100644
--- a/src/views/financialsector/FinanceHome.vue
+++ b/src/views/financialsector/FinanceHome.vue
@@ -125,10 +125,9 @@ const removeTag = value => {
   }
 };
 
-// 提供数据的函数
+//   给子页面传递数据
 const provideData = () => {
-  console.log(`父组件的数据是：${11111}`);
-  templateInfo.value = { name: '参数', data: 11111 };
+  templateInfo.value = form.value;
 };
 </script>
 
diff --git a/src/views/financialsector/Financialse/FinancialWarehousing.vue b/src/views/financialsector/Financialse/FinancialWarehousing.vue
index 5ce0e511..f7f08fd5 100644
--- a/src/views/financialsector/Financialse/FinancialWarehousing.vue
+++ b/src/views/financialsector/Financialse/FinancialWarehousing.vue
@@ -441,7 +441,8 @@ onLoad()
 // 新增
 const Submit=()=>{
   console.log(form.value,'表单');
-  emit('request-data');
+  emit('request-data');//通知父页面传递数据
+  console.log(props);//读取父页面传递的参数
 }
 </script>