修复部分bug

src/api/warehouse/warehouseWarehousingEntry.js

@@ -8,55 +8,55 @@ export const getList = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 
-export const getDetail = (id) => {
+export const getDetail = id => {
   return request({
     url: '/api/logpm-warehouse/warehouseWarehousingEntry/detail',
     method: 'get',
     params: {
-      id
-    }
-  })
-}
+      id,
+    },
+  });
+};
 
-export const getWarehouseDetail = (id) => {
+export const getWarehouseDetail = id => {
   return request({
     url: '/api/logpm-warehouse/warehouseWarehousingEntry/detailOwn',
     method: 'get',
     params: {
-      id
-    }
-  })
-}
+      id,
+    },
+  });
+};
 
-export const remove = (ids) => {
+export const remove = ids => {
   return request({
     url: '/api/logpm-warehouse/warehouseWarehousingEntry/remove',
     method: 'post',
     params: {
       ids,
-    }
-  })
-}
+    },
+  });
+};
 
-export const add = (row) => {
+export const add = row => {
   return request({
     url: '/api/logpm-warehouse/warehouseWarehousingEntry/submit',
     method: 'post',
-    data: row
-  })
-}
+    data: row,
+  });
+};
 
-export const update = (row) => {
+export const update = row => {
   return request({
     url: '/api/logpm-warehouse/warehouseWarehousingEntry/submit',
     method: 'post',
-    data: row
-  })
-}
+    data: row,
+  });
+};
 
 //导出
 export const $_getBillLadingExport = params => {
@@ -68,4 +68,16 @@ export const $_getBillLadingExport = params => {
     },
     responseType: 'blob',
   });
-};
+};
+
+/**
+ * 批量打印
+ * @returns
+ */
+export const postWarehouseWarehousingEntryPrintBatch = params => {
+  return request({
+    url: '/api/logpm-warehouse/warehouseWarehousingEntry/printBatch',
+    method: 'post',
+    params,
+  });
+};

src/views/distribution/artery/TripartiteTransferDetails.vue

@@ -815,7 +815,7 @@ const arraySpanMethod = (row: any) => {
 
 /** 跳转到运单详情 */
 const handleGoWayBillDetail = ({ row }) => {
-  if (row.waybillNo === '--') return ElMessage.warning('暂无运单号');
+  if (row.waybillNo === '————' || !row.waybillId) return ElMessage.warning('暂无运单号');
 
   $router.push({
     path: '/distribution/inventory/BookingNote',

src/views/distribution/artery/VehicleStowageDetails.vue

@@ -1004,7 +1004,7 @@ const handleCheckTab = e => {
 };
 /** 跳转到运单详情 */
 const handleGoWayBillDetail = ({ row }) => {
-  if (row.waybillNo === '--') return ElMessage.warning('暂无运单号');
+  if (row.waybillNo === '————' || !row.waybillId) return ElMessage.warning('暂无运单号');
 
   $router.push({
     path: '/distribution/inventory/BookingNote',

src/views/distribution/inventory/CreateOrder.vue

@@ -2679,11 +2679,13 @@ const handlePickUpPrice = (pickup, template) => {
     if (
       (pickup || template) &&
       template.pickupIsMinCost &&
-      Number(template.pickupCompleteOrNot) === 0
+      Number(details.query.pickupCompleteOrNot) === 0
     ) {
+      console.log('Number(template.pickupMinCostType) :>> ', Number(template.pickupMinCostType));
       switch (Number(template.pickupMinCostType)) {
         // 价格
         case 1:
+          console.log('1231 :>> ', 1231);
           details.query.pickupFee = pickup.minCost > _total ? pickup.minCost : _total;
           break;
 

src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue

@@ -754,7 +754,7 @@ export default {
 
     /** 跳转到运单详情 */
     handleGoWayBillDetail({ row }) {
-      if (row.waybillNo === '--') return ElMessage.warning('暂无运单号');
+      if (row.waybillNo === '————' || !row.waybillId) return ElMessage.warning('暂无运单号');
 
       this.$router.push({
         path: '/distribution/inventory/BookingNote',

src/views/warehouse/prewarehousing/PreStoragePackage.vue

@@ -143,11 +143,15 @@ import {
   handleInputQuery,
   handleSelectQuery,
   handleTranslationDataSeclect,
+  getObjType
 } from '@/utils/util';
 import { columnList } from '@/option/warehouse/PreStoragePackage';
 import { useRouter, useRoute } from 'vue-router';
 import { deepClone } from '@/utils/util';
-import { showOrderPackgeCode,$_showOrderPackgeCodeByCode } from '@/api/distribution/distributionStockArticle';
+import {
+  showOrderPackgeCode,
+  $_showOrderPackgeCodeByCode,
+} from '@/api/distribution/distributionStockArticle';
 import { getList, getInOrder } from '@/api/warehouse/PreStoragePackage';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { getShowAdvancePackgeCode } from '@/api/waybill/orderPackageListDetails';
@@ -372,9 +376,11 @@ const handleShowQrCode = async ({ row }) => {
     const res = await getShowAdvancePackgeCode(qr);
 
     const { code, data } = res.data;
+    if (code !== 200 || getObjType(data.moldList) !== 'array') return;
 
-    if (code !== 200) return;
-    details.html = getHtmls(data.dataList, data.templateHtml);
+    for (let i = 0; i < data.moldList.length; i++) {
+      details.html += data.moldList[i];
+    }
 
     details.popUpShow.dialogVisible = true;
   } catch (error) {
@@ -401,11 +407,11 @@ const handleBatchShowQrCode = async () => {
     details.html = '';
     const res = await getShowAdvancePackgeCode(qr);
 
-    console.log(details,'details');
+    console.log(details, 'details');
     const { code, data } = res.data;
 
     if (code !== 200) return;
-    
+
     details.html = getHtmls(data.dataList, data.templateHtml);
 
     details.popUpShow.dialogVisible = true;
@@ -447,22 +453,23 @@ const handleIncoming = ({ row }) => {
 };
 
 function ProhibitSelection(val, index) {
-  console.log(val,'vvv');
-  if(val.inWarehouse == 1){
-    return false
-  }else{
-    return true
+  console.log(val, 'vvv');
+  if (val.inWarehouse == 1) {
+    return false;
+  } else {
+    return true;
   }
 }
 
-
 /** 批量入库 */
 const handleBatchImcoming = () => {
   if (details.selectionList.length === 0) return ElMessage.warning('请选择要批量入库的数据');
-  const isParamSame = details.selectionList.every(({ distrCarNumber }) => distrCarNumber === details.selectionList[0].distrCarNumber);
-  if(!isParamSame){
+  const isParamSame = details.selectionList.every(
+    ({ distrCarNumber }) => distrCarNumber === details.selectionList[0].distrCarNumber
+  );
+  if (!isParamSame) {
     ElMessage.warning('请选择同一配送车次号的数据');
-    return
+    return;
   }
   for (let i = 0; i < details.selectionList.length; i++) {
     const item = details.selectionList[i];

src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue

@@ -1,6 +1,6 @@
 <template>
   <basic-container>
-    <div class="avue-crud">
+    <div class="avue-crud" v-loading="loadingObj.pageLoading">
       <div v-h5uShow="!search">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query" class="header_search">
@@ -25,12 +25,18 @@
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
             <!--            <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>-->
-            <el-button type="danger" icon="el-icon-plus" @click="handleImport" plain
-              >导 入</el-button
-            >
-            <el-button type="danger" icon="el-icon-bottom" @click="handleExportInfo" plain
-              >导出
+            <!-- 导入 -->
+            <el-button type="danger" icon="el-icon-plus" @click="handleImport" plain>
+              导 入
+            </el-button>
+
+            <!-- 导出 -->
+            <el-button type="danger" icon="el-icon-bottom" @click="handleExportInfo" plain>
+              导出
             </el-button>
+
+            <!-- 打印 -->
+            <el-button type="primary" icon="Printer" @click="handlePrint"> 打 印 </el-button>
             <!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
           </div>
           <!-- 头部右侧按钮模块 -->
@@ -197,6 +203,10 @@
       </el-drawer>
     </div>
   </basic-container>
+
+  <!-- 打印 -->
+  <MyPrint :html="html" v-model="PrintVisted" width="80%" :isShowExport="false" />
+
   <edittablehead
     @closce="showdrawer"
     :drawerShow="drawerShow"
@@ -213,13 +223,14 @@ import {
   update,
   remove,
   $_getBillLadingExport,
+  postWarehouseWarehousingEntryPrintBatch,
 } from '@/api/warehouse/warehouseWarehousingEntry';
 import option from '@/option/warehouse/warehouseWarehousingEntry';
 import { mapGetters, mapMutations } from 'vuex';
 import WarehouseWarehousingDetailSub from '@/views/warehouse/warehousingentry/warehouseWarehousingDetailSub.vue';
 import { exportBlob } from '@/api/common';
 import { getToken } from '@/utils/auth';
-import { downloadXls, handleClearTableQuery, setNodeHeight } from '@/utils/util';
+import { downloadXls, handleClearTableQuery, setNodeHeight, getObjType } from '@/utils/util';
 import dayjs from 'dayjs';
 import { getDictionaryBiz } from '@/api/system/dict';
 
@@ -484,6 +495,14 @@ export default {
           },
         ],
       },
+      /** loading */
+      loadingObj: {
+        /** 页面loading */
+        pageLoading: false,
+      },
+      /** 打印 */
+      html: '',
+      PrintVisted: false,
     };
   },
   watch: {
@@ -515,33 +534,72 @@ export default {
   },
   methods: {
     // 导出功能
-    handleExportInfo() {
-      let row = {};
-      // console.log(this.stockupDate);
-      // if (this.query.startDate) {
-      //   row.startDate = this.query.startDate[0]; //开始时间
-      //   row.endDate = this.query.startDate[1]; //结束时间
-      // }
-      // if (this.query.serviceNumber) {
-      //   row.serviceNumber = this.query.serviceNumber; //服务号
-      // }
-      // 日库批次
-      if (this.query.receiptBatch) {
-        row.receiptBatch = this.query.receiptBatch;
-      }
-      // 日期
-      if (this.query.receiptDate) {
-        row.receiptDate = this.query.receiptDate;
+    async handleExportInfo() {
+      try {
+        this.loadingObj.pageLoading = true;
+
+        let row = {};
+        // console.log(this.stockupDate);
+        // if (this.query.startDate) {
+        //   row.startDate = this.query.startDate[0]; //开始时间
+        //   row.endDate = this.query.startDate[1]; //结束时间
+        // }
+        // if (this.query.serviceNumber) {
+        //   row.serviceNumber = this.query.serviceNumber; //服务号
+        // }
+        // 日库批次
+        if (this.query.receiptBatch) {
+          row.receiptBatch = this.query.receiptBatch;
+        }
+        // 日期
+        if (this.query.receiptDate) {
+          row.receiptDate = this.query.receiptDate;
+        }
+        if (!!this.ids) {
+          row.ids = this.ids; //根据DI来查询
+        } else {
+          row.ids = ''; //查询全部
+        }
+        const res = await $_getBillLadingExport(row);
+
+        if (res.status !== 200) return;
+
+        downloadXls(res.data, '入库数据.xlsx');
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loadingObj.pageLoading = false;
       }
-      if (!!this.ids) {
-        row.ids = this.ids; //根据DI来查询
-      } else {
-        row.ids = ''; //查询全部
+    },
+
+    /** 打印 */
+    async handlePrint() {
+      if (this.selectionList.length === 0) return this.$message.warning('请选择需要打印的数据');
+      try {
+        this.loadingObj.pageLoading = true;
+
+        this.html = '';
+
+        const res = await postWarehouseWarehousingEntryPrintBatch({
+          ids: this.selectionList.map(val => val.id).join(','),
+          type: 1,
+        });
+
+        const { code, data } = res.data;
+        if (code !== 200 || getObjType(data) !== 'array' || data.length === 0) return;
+
+        for (let i = 0; i < data.length; i++) {
+          const value = data[i];
+          this.html += value.templateHtml;
+        }
+        console.log('data :>> ', data);
+        this.PrintVisted = true;
+        console.log('this.html :>> ', this.html);
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loadingObj.pageLoading = false;
       }
-      $_getBillLadingExport(row).then(res => {
-        console.log(res.data);
-        downloadXls(res.data, '入库数据.xlsx');
-      });
     },
 
     showdrawer(value) {

src/views/waybill/ChangeOrder.vue

@@ -468,7 +468,7 @@ const handleFullScrean = (_type: 'open' | 'close', _name: string) => {
 
 /** 查看运单 */
 const handleGoWaybillDetails = ({ row }) => {
-  if (row.waybillNo === '--') return ElMessage.warning('暂无运单号');
+  if (row.waybillNo === '————' || !row.waybillId) return ElMessage.warning('暂无运单号');
 
   console.log('row :>> ', row);
   $router.push({

src/views/waybill/WaybillOrderList.vue

@@ -840,7 +840,7 @@ const handleBatchRecover = () => {
 
 /** 查看运单 */
 const handleGoWaybillDetails = ({ row }) => {
-  if (row.waybillNo === '--') return ElMessage.warning('暂无运单号');
+  if (row.waybillNo === '————' || !row.waybillId) return ElMessage.warning('暂无运单号');
 
   console.log('row :>> ', row);
   $router.push({

src/views/waybill/orderPackageList.vue

@@ -780,14 +780,22 @@ const handleBatchBarcode = async () => {
     let qr = {
       orderPackageCodes: details.selectionList.map(val => val.orderPackageCode).join(','),
     };
+    details.html = '';
 
     const res = await getShowAdvancePackgeCode(qr);
 
     if (res.data.code !== 200) return;
+
+    const { code, data } = res.data;
+    if (code !== 200 || getObjType(data.moldList) !== 'array') return;
+
+    for (let i = 0; i < data.moldList.length; i++) {
+      details.html += data.moldList[i];
+    }
+
     details.popUpShow.QRCodeVisible = true;
     console.log(res.data);
-    details.html = '';
-    details.html = getHtmls(res.data.data.dataList, res.data.data.templateHtml);
+    // details.html = getHtmls(res.data.data.dataList, res.data.data.templateHtml);
   } catch (error) {
     console.log('error :>> ', error);
   } finally {
@@ -805,10 +813,12 @@ const printOrder = async ({ row }) => {
     };
     const res = await getShowAdvancePackgeCode(qr);
     const { code, data } = res.data;
-    if (code !== 200) return;
+    if (code !== 200 || getObjType(data.moldList) !== 'array') return;
 
+    for (let i = 0; i < data.moldList.length; i++) {
+      details.html += data.moldList[i];
+    }
     details.popUpShow.QRCodeVisible = true;
-    details.html = getHtmls(data.dataList, data.templateHtml);
   } catch (error) {
     console.log('error :>> ', error);
   } finally {