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

src/api/distribution/distributionStockup.js

@@ -149,4 +149,12 @@ export const billStockList = (current, size, params) => {
     }
   })
 }
-
+// 商,市,自提配备货列表导出
+export const $_CommercialMarket = params => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockup/export-StockUp',
+    method: 'get',
+    params,
+    responseType: 'blob',
+  });
+};

src/api/warehouse/warehouseUpdownGoodsLog.js

@@ -93,7 +93,7 @@ export const $_Inventory = params => {
 // 零担订单导出 
 export const $_LessThanTruckload = params => {
   return request({
-    url: '/api/logpm-distribution/distributionStockArticle/export-distributionStockArticle',
+    url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/export-temporary',
     method: 'get',
     params,
     responseType: 'blob',

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -2949,17 +2949,17 @@ export default {
       row.clerkSignRemarks = this.TcForm.clerkSignRemarks; //备注
       row.deliveryId = this.deliveryId;
       // 本身图片处理开始
-      if (
-        this.DoorstepPhoto.length < 3 &&
-        this.StackingPhoto.length < 3 &&
-        this.SignForPhotos.length < 3
-      ) {
-        ElMessage({
-          message: '图片参数不全',
-          type: 'warning',
-        });
-        return;
-      }
+      // if (
+      //   this.DoorstepPhoto.length < 3 &&
+      //   this.StackingPhoto.length < 3 &&
+      //   this.SignForPhotos.length < 3
+      // ) {
+      //   ElMessage({
+      //     message: '图片参数不全',
+      //     type: 'warning',
+      //   });
+      //   return;
+      // }
 
       const pushPhotoToRow = (photoArray, photoType) => {
         photoArray.forEach(item => {

src/views/distribution/signdetail/distributionSigndetail.vue

@@ -36,7 +36,7 @@
           </template>
         </tablecmt>
       </el-row>
-      <el-row>
+      <el-row class='el-fy'>
         <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
           <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
           <!-- 分页模块 -->
@@ -713,4 +713,22 @@ export default {
   display: flex;
   align-items: flex-end;
 }
+:deep(.avue-crud) {
+  display: flex;
+  height: 100%;
+  flex-direction: column;
+}
+:deep(.el-card__body) {
+  height: 100%;
+}
+:deep(.el-card) {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+.el-fy {
+  flex: 1;
+  display: flex;
+  align-items: center;
+}
 </style>

src/views/distribution/signfor/distributionSignfor.vue

@@ -105,7 +105,7 @@
           </template>
         </tablecmt>
       </el-row>
-      <el-row>
+      <el-row  class='el-fy'>
         <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
           <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
           <!-- 分页模块 -->
@@ -897,4 +897,22 @@ export default {
   display: flex;
   align-items: flex-end;
 }
+:deep(.avue-crud) {
+  display: flex;
+  height: 100%;
+  flex-direction: column;
+}
+:deep(.el-card__body) {
+  height: 100%;
+}
+:deep(.el-card) {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+.el-fy {
+  flex: 1;
+  display: flex;
+  align-items: center;
+}
 </style>

src/views/distribution/signfor/distributionSignforedt.vue

@@ -1588,27 +1588,12 @@ const valueAddedServices = val => {
   }).then(res => {
     editLoading.value = false; //关闭加载效果
     console.log(res, '增值服务上楼的返回值');
-    // if (!res.data.data) {
-    //   dataAdded.value = [];
-    //   TabTitle.value[0].value = '暂无数据'; //距离
-    //   TabTitle.value[1].value = '暂无数据'; //费用
-    //   TabTitle.value[2].value = '暂无数据'; //楼层
-    //   TabTitle.value[3].value = '暂无数据'; //件数
-    // } else {
-    //   dataAdded.value = res.data.data.packageEntityList;
-    //   TabTitle.value[0].value = res.data.data.distance ? res.data.data.distance : '暂无数据'; //距离
-    //   TabTitle.value[1].value = res.data.data.fee ? res.data.data.fee : '暂无数据'; //费用
-    //   TabTitle.value[2].value = res.data.data.floolNum ? res.data.data.floolNum : '暂无数据'; //楼层
-    //   TabTitle.value[3].value = res.data.data.packageEntityList ? res.data.data.packageEntityList.length : '暂无数据'; //件数
-
-    // }
-
-    const packageList = res.data.data ? res.data.data.packageEntityList : [];
+  const packageList = res.data.data ? res.data.data.packageEntityList : [];
     dataAdded.value = packageList;
-    TabTitle.value[0].value = res.data.data?.distance ?? '暂无数据';
-    TabTitle.value[1].value = res.data.data?.fee ?? '暂无数据';
-    TabTitle.value[2].value = res.data.data?.floolNum ?? '暂无数据';
-    TabTitle.value[3].value = packageList.length ? packageList.length : '暂无数据';
+    TabTitle.value[0].value = res.data.data?.distance ?? '暂无数据';//距离
+    TabTitle.value[1].value = res.data.data?.fee ?? '暂无数据';//费用
+    TabTitle.value[2].value = res.data.data?.floolNum ?? '暂无数据'; //楼层
+    TabTitle.value[3].value = packageList.length ? packageList.length : '暂无数据';//件数
   });
 };
 const ServiceChange = val => {
@@ -1734,6 +1719,11 @@ const ImgSuccessE = (response, uploadFile) => {
     /* 样式 */
     // margin-top: 0;
   }
+      .title-name {
+      min-width: 120px;
+      font-weight: 500;
+      font-size:16px;
+    }
   .el-txt {
     min-width: 280px;
     margin-right: 1%;
@@ -1742,10 +1732,7 @@ const ImgSuccessE = (response, uploadFile) => {
     i {
       margin-right: 5px;
     }
-    .title-name {
-      min-width: 120px;
-      font-weight: 500;
-    }
+
     .el-cont {
       font-weight: 400;
       padding: 0 10px;

src/views/distribution/signfor/distributionSignfortreat.vue

@@ -141,6 +141,7 @@
                 slotProps.scope.row.sijiSigningStatus == '司机已签收' &&
                 slotProps.scope.row.wenyuanSigningStatus == '文员待审核'
               " -->
+
             <el-text
               v-if="
                 slotProps.scope.row.sijiSigningStatus == '司机已签收' &&
@@ -180,7 +181,7 @@
                   </el-table-column>
                 </el-table> -->
       </el-row>
-      <el-row>
+      <el-row class="el-fy">
         <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
           <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
           <!-- 分页模块 -->
@@ -1427,34 +1428,16 @@ export default {
         this.name[this.name.length - 1].url = data.data.link;
       }
     },
-
-    // 通用的图片上传成功处理函数
-    handleImageUploadSuccess(response, uploadFile, photoArray) {
-      if (response.success === true) {
-        console.log(response, '图片上传成功');
-        this.$set(photoArray, photoArray.length - 1, { url: response.data.link });
-      }
-    },
     // 上门照图片上传成功
-    ImgSuccessA(response, uploadFile) {
-      this.handleImageUploadSuccess(response, uploadFile, this.DoorstepPhoto);
-    },
+    ImgSuccessA(response, uploadFile) {},
     // 堆门图片上传成功
-    ImgSuccessB(response, uploadFile) {
-      this.handleImageUploadSuccess(response, uploadFile, this.StackingPhoto);
-    },
+    ImgSuccessB(response, uploadFile) {},
     // 易碎图片上传成功
-    ImgSuccessC(response, uploadFile) {
-      this.handleImageUploadSuccess(response, uploadFile, this.FragilePhotos);
-    },
+    ImgSuccessC(response, uploadFile) {},
     // 家配图片上传成功
-    ImgSuccessD(response, uploadFile) {
-      this.handleImageUploadSuccess(response, uploadFile, this.HomePhotos);
-    },
+    ImgSuccessD(response, uploadFile) {},
     // 签收图片上传成功
-    ImgSuccessE(response, uploadFile) {
-      this.handleImageUploadSuccess(response, uploadFile, this.SignForPhotos);
-    },
+    ImgSuccessE(response, uploadFile) {},
 
     /**
      * 弹窗的勾选回调，用于更改头部数组
@@ -2053,4 +2036,23 @@ export default {
     width: 100%;
   }
 }
+
+:deep(.avue-crud) {
+  display: flex;
+  height: 100%;
+  flex-direction: column;
+}
+:deep(.el-card__body) {
+  height: 100%;
+}
+:deep(.el-card) {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+.el-fy {
+  flex: 1;
+  display: flex;
+  align-items: center;
+}
 </style>

src/views/distribution/stockup/distributionStockupDiscuss.vue

@@ -55,9 +55,13 @@
           <div class="avue-crud__left">
             <!--   <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
                <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
+                       <el-button type="danger" icon="el-icon-bottom" @click="handleExportInfo" plain
+              >导出
+          </el-button>
             <el-button type="primary" text icon="el-icon-edit" @click="handleForklift"
               >指派备货信息</el-button
             >
+
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -100,7 +104,7 @@
           </template>
         </tablecmt>
       </el-row>
-      <el-row>
+      <el-row class='el-fy'>
         <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
           <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
           <!-- 分页模块 -->
@@ -320,6 +324,7 @@ import {
   remove,
   getListUser,
   addAssign,
+  $_CommercialMarket,
 } from '@/api/distribution/distributionStockup';
 import { getPostList } from '@/api/system/post';
 import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
@@ -329,7 +334,7 @@ import { mapGetters } from 'vuex';
 import { getListTeam } from '@/api/basicdata/basicdataTeamGroup';
 import dayjs from 'dayjs';
 import { getDictionaryBiz } from '@/api/system/dict';
-
+import { downloadXls } from '@/utils/util';
 export default {
   data() {
     return {
@@ -1037,6 +1042,27 @@ export default {
         },
       });
     },
+    // 导出功能
+      handleExportInfo() {
+      let row = {};
+      // 查询信息
+      // query: {},
+      if (this.query) {
+        for (let prop in this.query) {
+          row[prop] = this.query[prop];
+        }
+      }
+      if (!!this.ids) {
+        row.ids = this.ids;
+      } else {
+        row.ids = '';
+      }
+       row.typeService='1',//固定参数代表当前页面
+      $_CommercialMarket(row).then(res => {
+        console.log(res.data);
+        downloadXls(res.data, '商配备货列表.xlsx');
+      });
+    },
     handleDelete() {
       if (this.selectionList.length === 0) {
         this.$message.warning('请选择至少一条数据');
@@ -1165,4 +1191,22 @@ export default {
   width:auto !important;
   padding:0;
 }
+:deep(.avue-crud) {
+  display: flex;
+  height: 100%;
+  flex-direction: column;
+}
+:deep(.el-card__body) {
+  height: 100%;
+}
+:deep(.el-card) {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+.el-fy {
+  flex: 1;
+  display: flex;
+  align-items: center;
+}
 </style>

src/views/warehouse/warehousesignedorder/distributionStockArticle.vue

@@ -50,7 +50,7 @@
           <!--          </template>-->
         </tablecmt>
       </el-row>
-      <el-row>
+      <el-row class='el-fy '>
         <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
           <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
           <!-- 分页模块 -->
@@ -1300,4 +1300,22 @@ export default {
 .dialog-footer button:first-child {
   margin-right: 10px;
 }
+:deep(.avue-crud) {
+  display: flex;
+  height: 100%;
+  flex-direction: column;
+}
+:deep(.el-card__body) {
+  height: 100%;
+}
+:deep(.el-card) {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+.el-fy {
+  flex: 1;
+  display: flex;
+  align-items: center;
+}
 </style>

vite.config.js

@@ -22,9 +22,9 @@ export default ({ mode, command }) => {
           // cyz
           // target: 'http://192.168.10.94:8888',
           // tjj
-          // target: 'http://192.168.10.29:13000',
+          target: 'http://192.168.10.29:13000',
           // sst
-          target: 'http://192.168.10.94:8888',
+          // target: 'http://192.168.10.94:8888',
           // target: 'http://192.168.10.29:13000',
           // target: 'http://test.api.huitongys.com',
           // target: 'http://h5uapi.huitongys.com',