From d9862ca29fde0046995b22e66e44839b1ad546c3 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Fri, 17 Jan 2025 18:22:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=83=A8=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/exportData.js | 2 +- src/views/basic/coderule/basicTenantCode.vue | 7 + src/views/basic/forklift/basicForklift.vue | 6 + src/views/basic/material/basicMaterial.vue | 15 +- .../basicdata/TripartiteMaterial/list.vue | 7 + .../basicdata/carrier/basicdataCarrier.vue | 7 + .../driverArtery/basicdataDriverArtery.vue | 5 + .../basicdata/platform/PaymentPlatform.vue | 7 + .../basicdata/team/basicdataTeamGroup.vue | 5 + .../basicdata/vehicle/basicdataVehicle.vue | 25 ++- .../vehicle/basicdataVehicleInfo.vue | 7 + .../BasicdataGoodsAllocation.vue | 66 +++--- .../goodsArea/basicdataGoodsArea.vue | 5 + .../goodsShelf/basicdataGoodsShelf.vue | 6 + .../warehouse/tray/basicdataTray.vue | 7 + .../warehouse/basicdataWarehouse.vue | 174 +++++++++------- .../prewarehousing/PreStorageTrainNumber.vue | 7 + .../prewarehousing/Prewarehouseorder.vue | 7 + src/views/waybill/ChangeOrder.vue | 2 +- src/views/waybill/FreezeOrder.vue | 13 ++ src/views/waybill/TemporaryStorageList.vue | 190 +++++++++--------- .../orderPackageListDetailsByMarket.vue | 11 + 22 files changed, 377 insertions(+), 204 deletions(-) diff --git a/src/utils/exportData.js b/src/utils/exportData.js index f9f1fd30..2ef66adb 100644 --- a/src/utils/exportData.js +++ b/src/utils/exportData.js @@ -21,7 +21,7 @@ export function exportExcel(columnList = [], listData = [], name = 'excel') { if (blackArr.includes(val.label) || val.head) continue; if (j === 0) headers.push(val.label); - arr.push(item[val.prop] || ''); + arr.push(item[val.prop] || item[val.prop] === 0 ? item[val.prop] : ''); } console.log('arr :>> ', arr); data.push(arr); diff --git a/src/views/basic/coderule/basicTenantCode.vue b/src/views/basic/coderule/basicTenantCode.vue index 64fd444b..f6b5ff61 100644 --- a/src/views/basic/coderule/basicTenantCode.vue +++ b/src/views/basic/coderule/basicTenantCode.vue @@ -48,6 +48,7 @@