Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

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,
+  });
+};

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: '至少上传一张堆码照片',

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 + '-查看配送',
         },
       });
     },

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 = () => {
+  templateInfo.value = form.value;
+};
 </script>
 
 <style scoped lang="scss">

src/views/financialsector/Financialse/FinancialWarehousing.vue

@@ -233,16 +233,22 @@
         </div>
       </div>
     </div>
-    <div>保存</div>
+    <div class="el_submit">
+      <el-button type="primary" @click="Submit">保存</el-button>
+    </div>
   </div>
 </template>
 
 <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,
@@ -432,6 +438,12 @@ const onLoad=()=>{
   
 }
 onLoad()
+// 新增
+const Submit=()=>{
+  console.log(form.value,'表单');
+  emit('request-data');//通知父页面传递数据
+  console.log(props);//读取父页面传递的参数
+}
 </script>
 
 <style scoped lang="scss">
@@ -545,4 +557,9 @@ onLoad()
 }
 .el_Surcharge {
 }
+.el_submit{
+  width: 100%;
+    display: flex;
+    justify-content: flex-end;
+}
 </style>

src/views/warehouse/warehousesignedorder/distributionStockArticle.vue

@@ -293,25 +293,25 @@ const selectionChange = list => {
 const searchChange = () => {
   // 日期处理
   if (TopQuery.value.warehouseEntryTime) {
-    queryCarn.value.startTaskTime = dayjs(TopQuery.value.warehouseEntryTime[0]).format(
+    queryCarn.value.warehouseEntryTimeStart = dayjs(TopQuery.value.warehouseEntryTime[0]).format(
       'YYYY-MM-DD HH:mm:ss'
     ); //开始日期
-    queryCarn.value.endTaskTime = 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.startTaskTime = dayjs(TopQuery.value.signinTime[0]).format(
+    queryCarn.value.signingTimeStart = 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.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,6 +340,8 @@ const searchHide = () => {
 };
 // 清空
 const searchReset = () => {
+  
+  TopQuery.value={}
   details.query = {};
   details.columnList.forEach(item => {
     item.values = '';