diff --git a/src/App.vue b/src/App.vue index 6368c2f..819249d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -58,7 +58,7 @@ import { audioManager } from '@/utils/audioManager' .textCenter { width: 100%; text-align: center; - font-size: 15px; + font-size: 16px; color: #808080; margin-top: 88rpx; } @@ -105,7 +105,7 @@ import { audioManager } from '@/utils/audioManager' display: flex; align-items: center; justify-content: space-between; - font-size: 15px; + font-size: 16px; } .flex-white-plr26-column { @@ -114,7 +114,7 @@ import { audioManager } from '@/utils/audioManager' padding-right: 26rpx; display: flex; flex-direction: column; - font-size: 15px; + font-size: 16px; } .bdb_f5 { @@ -155,12 +155,12 @@ import { audioManager } from '@/utils/audioManager' .redXingh { color: #FF0000; - font-size: 14px; + font-size: 15px; } .bluecolor { color: #0000FF; - font-size: 16px; + font-size: 17px; } .udropdown { @@ -174,7 +174,7 @@ import { audioManager } from '@/utils/audioManager' .width276 { width: 546rpx; color: #c5c5c5; - font-size: 14px; + font-size: 15px; } .cBlack { @@ -185,7 +185,7 @@ import { audioManager } from '@/utils/audioManager' margin-bottom: -10rpx; margin-top: 16rpx; padding-left: 26rpx; - font-size: 30rpx; + font-size: 32rpx; color: #555555; font-weight: bold; } @@ -193,7 +193,7 @@ import { audioManager } from '@/utils/audioManager' .width242 { width: 484rpx; color: #c5c5c5; - font-size: 14px; + font-size: 15px; } .myCard { @@ -211,7 +211,7 @@ import { audioManager } from '@/utils/audioManager' .cardRow { display: flex; align-items: center; - font-size: 14px; + font-size: 15px; margin-bottom: 8rpx; } @@ -231,7 +231,7 @@ import { audioManager } from '@/utils/audioManager' } .cardTopName { - font-size: 16px; + font-size: 17px; margin-bottom: 8rpx; color: #000000; overflow: hidden; @@ -265,7 +265,7 @@ import { audioManager } from '@/utils/audioManager' display: flex; align-items: center; justify-content: flex-end; - font-size: 15px; + font-size: 16px; color: #007AFF; margin-top: 12rpx; margin-bottom: 16rpx; @@ -279,7 +279,7 @@ import { audioManager } from '@/utils/audioManager' position: absolute; right: 26rpx; bottom: 80rpx; - font-size: 15px; + font-size: 16px; } .fzrLeft { @@ -359,4 +359,19 @@ import { audioManager } from '@/utils/audioManager' height: 32rpx; background-color: #EEEEEE; } + + /* PDA:放大 u-select 确认/取消按钮点击区域 */ + .u-select__header { + height: 110rpx !important; + padding: 0 16rpx !important; + } + + .u-select__header__btn { + font-size: 36rpx !important; + line-height: 110rpx !important; + padding: 0 40rpx !important; + min-width: 140rpx; + text-align: center; + box-sizing: border-box; + } diff --git a/src/common/storeFabricBusinessOut.js b/src/common/storeFabricBusinessOut.js index e551b5d..f47d2df 100644 --- a/src/common/storeFabricBusinessOut.js +++ b/src/common/storeFabricBusinessOut.js @@ -46,12 +46,12 @@ export const FABRIC_INFO_FIELDS = [ /** 细码表格列(不含操作列) */ export const FINE_CODE_TABLE_COLUMNS = [ - { label: '序号', key: 'seq', width: 70 }, - { label: '卷号', key: 'roll_no', width: 90 }, - { label: '匹数', key: 'roll', width: 90 }, - { label: '数量(重量)', key: 'weight', width: 120 }, - { label: '条码', key: 'bar_code', width: 260 }, - { label: '仓位', key: 'position', width: 110 }, + { label: '序号', key: 'seq', width: 80 }, + { label: '卷号', key: 'roll_no', width: 110 }, + { label: '匹数', key: 'roll', width: 100 }, + { label: '数量(重量)', key: 'weight', width: 140 }, + { label: '条码', key: 'bar_code', width: 280 }, + { label: '仓位', key: 'position', width: 130 }, ]; /** 审核状态变更操作配置(apiKey 对应 gfmOtherDeliveryOrder 下的方法名) */ @@ -149,12 +149,12 @@ export function normalizeOrder(order) { /** 扫码详情区表格列 */ export const SCAN_DETAIL_TABLE_COLUMNS = [ - { label: '坯布编号', key: 'grey_fabric_code', width: 140 }, - { label: '坯布名称', key: 'grey_fabric_name', width: 140 }, - { label: '纱批', key: 'yarn_batch', width: 120 }, - { label: '机号', key: 'machine_number', width: 100 }, - { label: '条数', key: 'roll', width: 80 }, - { label: '重量', key: 'weight', width: 100 }, + { label: '坯布编号', key: 'grey_fabric_code', width: 160 }, + { label: '坯布名称', key: 'grey_fabric_name', width: 160 }, + { label: '纱批', key: 'yarn_batch', width: 130 }, + { label: '机号', key: 'machine_number', width: 110 }, + { label: '条数', key: 'roll', width: 90 }, + { label: '重量', key: 'weight', width: 110 }, ]; /** 扫码详情区可勾选锁定维度(对应 PDAScanGfmOtherDeliveryOrderParam 的 *_lock;勾选后参与表格分组并随扫码请求传给后端) */ @@ -525,7 +525,7 @@ export function orderToFormFields(order) { export function getFineCodeTableColumns(readonly) { const cols = [...FINE_CODE_TABLE_COLUMNS]; - if (!readonly) cols.push({ label: '操作', key: 'action', width: 90 }); + if (!readonly) cols.push({ label: '操作', key: 'action', width: 100 }); return cols; } diff --git a/src/common/storeFabricWarehouse.js b/src/common/storeFabricWarehouse.js index 08f5f7d..0ac264c 100644 --- a/src/common/storeFabricWarehouse.js +++ b/src/common/storeFabricWarehouse.js @@ -53,16 +53,16 @@ export const STOCK_TABLE_COLUMNS = [ /** 细码明细表格列 */ export const WAREHOUSE_DETAIL_COLUMNS = [ - { label: '序号', key: 'seq', width: 70 }, - { label: '卷号', key: 'volume_number', width: 90 }, - { label: '匹数', key: 'roll', width: 90 }, - { label: '数量(KG)', key: 'weight', width: 110 }, - { label: '条码', key: 'bar_code', width: 240 }, - { label: '仓位', key: 'position', width: 100 }, - { label: '颜色', key: 'gray_fabric_color_name', width: 100 }, - { label: '织厂', key: 'supplier_name', width: 120 }, - { label: '机台', key: 'machine_number', width: 90 }, - { label: '库龄(天)', key: 'days_of_age', width: 90 }, + { label: '序号', key: 'seq', width: 80 }, + { label: '卷号', key: 'volume_number', width: 110 }, + { label: '匹数', key: 'roll', width: 100 }, + { label: '数量(KG)', key: 'weight', width: 130 }, + { label: '条码', key: 'bar_code', width: 280 }, + { label: '仓位', key: 'position', width: 120 }, + { label: '颜色', key: 'gray_fabric_color_name', width: 120 }, + { label: '织厂', key: 'supplier_name', width: 140 }, + { label: '机台', key: 'machine_number', width: 100 }, + { label: '库龄(天)', key: 'days_of_age', width: 110 }, ]; export function formatStockWeightWithUnit(weight, unitName) { diff --git a/src/components/storefabric/FabricInfoPopup.vue b/src/components/storefabric/FabricInfoPopup.vue index 8aeb92b..eeec480 100644 --- a/src/components/storefabric/FabricInfoPopup.vue +++ b/src/components/storefabric/FabricInfoPopup.vue @@ -42,7 +42,7 @@ export default { overflow: hidden; } .popupTitle { - font-size: 32rpx; + font-size: 34rpx; font-weight: bold; text-align: center; margin-bottom: 20rpx; @@ -58,7 +58,7 @@ export default { display: flex; padding: 16rpx 0; border-bottom: 1rpx solid #f0f0f0; - font-size: 28rpx; + font-size: 30rpx; } .label { width: 180rpx; diff --git a/src/components/storefabric/FineCodePopup.vue b/src/components/storefabric/FineCodePopup.vue index 754e21f..9a9c603 100644 --- a/src/components/storefabric/FineCodePopup.vue +++ b/src/components/storefabric/FineCodePopup.vue @@ -58,10 +58,10 @@ export default { return getFineCodeTableWidth(this.columns); }, tableScrollHeight() { - const rowHeight = 56; - const headerHeight = 56; + const rowHeight = 68; + const headerHeight = 68; const total = headerHeight + this.list.length * rowHeight; - return `${Math.min(Math.max(total, 112), 480)}rpx`; + return `${Math.min(Math.max(total, 136), 520)}rpx`; }, }, methods: { @@ -91,7 +91,7 @@ export default { overflow: hidden; } .popupTitle { - font-size: 32rpx; + font-size: 34rpx; font-weight: bold; text-align: center; margin-bottom: 20rpx; @@ -102,7 +102,7 @@ export default { text-align: center; color: #999; padding: 40rpx 0; - font-size: 28rpx; + font-size: 30rpx; } .tableScroll { width: 100%; @@ -131,8 +131,8 @@ export default { } .tableCell { flex-shrink: 0; - padding: 12rpx 8rpx; - font-size: 22rpx; + padding: 16rpx 10rpx; + font-size: 28rpx; color: #333; text-align: center; border-right: 1rpx solid #e1e1e1; @@ -152,7 +152,7 @@ export default { } .tableTip { margin-top: 16rpx; - font-size: 22rpx; + font-size: 26rpx; color: #999; text-align: center; flex-shrink: 0; diff --git a/src/components/storegoods/ProcessInBinBar.vue b/src/components/storegoods/ProcessInBinBar.vue index 4c96a8c..3ff52ac 100644 --- a/src/components/storegoods/ProcessInBinBar.vue +++ b/src/components/storegoods/ProcessInBinBar.vue @@ -55,7 +55,7 @@ export default { } .process-in-binName { margin-left: 12rpx; - font-size: 26rpx; + font-size: 28rpx; color: #333; max-width: 200rpx; overflow: hidden; @@ -64,7 +64,7 @@ export default { } .process-in-binClear { margin-left: 16rpx; - font-size: 26rpx; + font-size: 28rpx; color: #2979ff; flex-shrink: 0; } diff --git a/src/components/storegoods/ProcessInDetailList.vue b/src/components/storegoods/ProcessInDetailList.vue index 6873253..5a2d22c 100644 --- a/src/components/storegoods/ProcessInDetailList.vue +++ b/src/components/storegoods/ProcessInDetailList.vue @@ -82,16 +82,16 @@ import { buildItemGroups } from '@/common/storeGoodsProcessIn'; const FINE_COLUMNS = [ - { label: '卷号', key: 'volume_number', width: 90 }, - { label: '匹数', key: 'roll', width: 90 }, - { label: '数量', key: 'weight', width: 110 }, - { label: '仓位', key: 'warehouse_bin_name', width: 120 }, - { label: '缸号', key: 'dye_factory_dyelot_number', width: 140 }, + { label: '卷号', key: 'volume_number', width: 110 }, + { label: '匹数', key: 'roll', width: 100 }, + { label: '数量', key: 'weight', width: 130 }, + { label: '仓位', key: 'warehouse_bin_name', width: 140 }, + { label: '缸号', key: 'dye_factory_dyelot_number', width: 160 }, ]; const TARE_COLUMNS = [ - { label: '纸筒重量', key: 'paper_tube_weight', width: 120 }, - { label: '包装重量', key: 'package_weight', width: 120 }, + { label: '纸筒重量', key: 'paper_tube_weight', width: 140 }, + { label: '包装重量', key: 'package_weight', width: 140 }, ]; export default { @@ -113,7 +113,7 @@ export default { cols.splice(idx + 1, 0, ...TARE_COLUMNS); } if (this.deletable) { - cols.push({ label: '操作', key: 'action', width: 90 }); + cols.push({ label: '操作', key: 'action', width: 100 }); } return cols; }, @@ -160,7 +160,7 @@ export default { border-bottom: 1rpx solid #e6f0ff; } .process-in-productTitle { - font-size: 28rpx; + font-size: 32rpx; font-weight: bold; color: #1a1a1a; flex: 1; @@ -168,14 +168,14 @@ export default { } .process-in-productSum, .process-in-colorSum { - font-size: 24rpx; + font-size: 28rpx; color: #666; flex-shrink: 0; } .process-in-subText { font-weight: normal; color: #666; - font-size: 24rpx; + font-size: 28rpx; } .process-in-colorBlock { padding: 16rpx 20rpx 20rpx; @@ -191,7 +191,7 @@ export default { margin-bottom: 8rpx; } .process-in-colorTitle { - font-size: 26rpx; + font-size: 30rpx; font-weight: bold; color: #333; flex: 1; @@ -201,17 +201,17 @@ export default { display: flex; flex-wrap: wrap; gap: 16rpx 24rpx; - font-size: 24rpx; + font-size: 28rpx; color: #888; margin-bottom: 12rpx; } .process-in-fcTitle { - font-size: 24rpx; + font-size: 28rpx; color: #2979ff; margin-bottom: 8rpx; } .process-in-fcEmpty { - font-size: 24rpx; + font-size: 28rpx; color: #bbb; padding: 8rpx 0; } @@ -236,8 +236,8 @@ export default { } .process-in-fcCell { box-sizing: border-box; - padding: 10rpx 8rpx; - font-size: 22rpx; + padding: 14rpx 10rpx; + font-size: 28rpx; color: #333; border-right: 1rpx solid #f0f0f0; word-break: break-all; @@ -254,7 +254,7 @@ export default { } .process-in-fcTip { margin-top: 8rpx; - font-size: 22rpx; + font-size: 26rpx; color: #999; } diff --git a/src/components/storegoods/ProcessOutDetailList.vue b/src/components/storegoods/ProcessOutDetailList.vue index 524c0c2..06113e8 100644 --- a/src/components/storegoods/ProcessOutDetailList.vue +++ b/src/components/storegoods/ProcessOutDetailList.vue @@ -82,12 +82,12 @@ import { buildItemGroups } from '@/common/storeGoodsProcessOut'; const FINE_COLUMNS = [ - { label: '卷号', key: 'volume_number', width: 90 }, - { label: '匹数', key: 'roll', width: 90 }, - { label: '数量', key: 'weight', width: 110 }, - { label: '条码', key: 'bar_code', width: 220 }, - { label: '仓位', key: 'warehouse_bin_name', width: 120 }, - { label: '缸号', key: 'dye_factory_dyelot_number', width: 140 }, + { label: '卷号', key: 'volume_number', width: 110 }, + { label: '匹数', key: 'roll', width: 100 }, + { label: '数量', key: 'weight', width: 130 }, + { label: '条码', key: 'bar_code', width: 260 }, + { label: '仓位', key: 'warehouse_bin_name', width: 140 }, + { label: '缸号', key: 'dye_factory_dyelot_number', width: 160 }, ]; export default { @@ -102,7 +102,7 @@ export default { }, fineColumns() { if (!this.deletable) return FINE_COLUMNS; - return [...FINE_COLUMNS, { label: '操作', key: 'action', width: 90 }]; + return [...FINE_COLUMNS, { label: '操作', key: 'action', width: 100 }]; }, fineTableWidth() { const total = this.fineColumns.reduce((sum, col) => sum + (col.width || 100), 0); @@ -147,7 +147,7 @@ export default { border-bottom: 1rpx solid #e6f0ff; } .process-in-productTitle { - font-size: 28rpx; + font-size: 32rpx; font-weight: bold; color: #1a1a1a; flex: 1; @@ -155,14 +155,14 @@ export default { } .process-in-productSum, .process-in-colorSum { - font-size: 24rpx; + font-size: 28rpx; color: #666; flex-shrink: 0; } .process-in-subText { font-weight: normal; color: #666; - font-size: 24rpx; + font-size: 28rpx; } .process-in-colorBlock { padding: 16rpx 20rpx 20rpx; @@ -178,7 +178,7 @@ export default { margin-bottom: 8rpx; } .process-in-colorTitle { - font-size: 26rpx; + font-size: 30rpx; font-weight: bold; color: #333; flex: 1; @@ -188,17 +188,17 @@ export default { display: flex; flex-wrap: wrap; gap: 16rpx 24rpx; - font-size: 24rpx; + font-size: 28rpx; color: #888; margin-bottom: 12rpx; } .process-in-fcTitle { - font-size: 24rpx; + font-size: 28rpx; color: #2979ff; margin-bottom: 8rpx; } .process-in-fcEmpty { - font-size: 24rpx; + font-size: 28rpx; color: #bbb; padding: 8rpx 0; } @@ -223,8 +223,8 @@ export default { } .process-in-fcCell { box-sizing: border-box; - padding: 10rpx 8rpx; - font-size: 22rpx; + padding: 14rpx 10rpx; + font-size: 28rpx; color: #333; border-right: 1rpx solid #f0f0f0; word-break: break-all; @@ -241,7 +241,7 @@ export default { } .process-in-fcTip { margin-top: 8rpx; - font-size: 22rpx; + font-size: 26rpx; color: #999; } diff --git a/src/components/wyb-table/wyb-table.vue b/src/components/wyb-table/wyb-table.vue index dc8badf..cd83874 100644 --- a/src/components/wyb-table/wyb-table.vue +++ b/src/components/wyb-table/wyb-table.vue @@ -534,7 +534,7 @@ fontSize: { type: Array, default() { - return [20] + return [28] } }, defaultColWidth: { @@ -548,7 +548,7 @@ minHeight: { type: Array, default() { - return [70] + return [84] } }, headerBgColor: { diff --git a/src/pages/storefabric/storeFabricBusinessOutPage.scss b/src/pages/storefabric/storeFabricBusinessOutPage.scss index 9c35fe7..b7024b4 100644 --- a/src/pages/storefabric/storeFabricBusinessOutPage.scss +++ b/src/pages/storefabric/storeFabricBusinessOutPage.scss @@ -7,7 +7,7 @@ margin-top: 32rpx; } .fabric-out-sectionTitle { - font-size: 30rpx; + font-size: 32rpx; font-weight: bold; padding: 24rpx 26rpx 12rpx; border-left: 6rpx solid #007AFF; @@ -16,7 +16,7 @@ .fabric-out-scanTip { padding: 20rpx 26rpx; color: #fa8c16; - font-size: 26rpx; + font-size: 28rpx; background: #fff7e6; margin: 16rpx 26rpx; border-radius: 8rpx; @@ -24,7 +24,7 @@ .fabric-out-msgTip { padding: 12rpx 26rpx; color: #52c41a; - font-size: 26rpx; + font-size: 28rpx; } .fabric-out-detailList { padding: 0 26rpx; @@ -39,7 +39,7 @@ display: flex; justify-content: space-between; align-items: center; - font-size: 28rpx; + font-size: 30rpx; font-weight: bold; padding-bottom: 12rpx; border-bottom: 1rpx solid #f0f0f0; @@ -49,7 +49,7 @@ align-items: center; gap: 20rpx; padding-top: 12rpx; - font-size: 26rpx; + font-size: 28rpx; color: #666; } .fabric-out-scanRow { @@ -66,7 +66,7 @@ .fabric-out-delCheck { display: flex; align-items: center; - font-size: 26rpx; + font-size: 28rpx; color: #666; white-space: nowrap; } @@ -82,7 +82,7 @@ flex-wrap: wrap; padding: 16rpx 20rpx; border-bottom: 1rpx solid #f0f0f0; - font-size: 26rpx; + font-size: 28rpx; color: #333; } .fabric-out-scanDetailRow--2col { @@ -123,8 +123,8 @@ font-weight: bold; } .fabric-out-scanDetailTableCell { - padding: 14rpx 8rpx; - font-size: 24rpx; + padding: 16rpx 10rpx; + font-size: 28rpx; color: #333; text-align: center; box-sizing: border-box; @@ -133,7 +133,7 @@ .fabric-out-scanDetailEmpty { padding: 24rpx; text-align: center; - font-size: 26rpx; + font-size: 28rpx; color: #999; } .fabric-out-submitView { diff --git a/src/pages/storefabric/storeFabricWarehouseDetail.vue b/src/pages/storefabric/storeFabricWarehouseDetail.vue index 93e711b..1dda50e 100644 --- a/src/pages/storefabric/storeFabricWarehouseDetail.vue +++ b/src/pages/storefabric/storeFabricWarehouseDetail.vue @@ -186,15 +186,15 @@ page { background-color: #F8F8F8; } border-radius: 12rpx; } .infoTitle { - font-size: 30rpx; + font-size: 32rpx; font-weight: bold; margin-bottom: 16rpx; color: #333; } .infoRow { display: flex; - font-size: 26rpx; - padding: 8rpx 0; + font-size: 28rpx; + padding: 10rpx 0; } .infoLabel { width: 160rpx; @@ -208,8 +208,8 @@ page { background-color: #F8F8F8; } } .summaryBar { margin: 16rpx 24rpx 0; - padding: 12rpx 16rpx; - font-size: 26rpx; + padding: 14rpx 16rpx; + font-size: 28rpx; color: #666; background: #fff; border-radius: 8rpx; @@ -241,8 +241,8 @@ page { background-color: #F8F8F8; } } .tableCell { flex-shrink: 0; - padding: 12rpx 8rpx; - font-size: 22rpx; + padding: 16rpx 10rpx; + font-size: 28rpx; color: #333; text-align: center; border-right: 1rpx solid #e1e1e1;