From d42ff443beeeff47c01cd3c989c170d063c9039a Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Thu, 28 Nov 2024 17:40:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tablecmt/tablecmt.vue | 37 +++- .../finance/ReconciliationDepositSlip.js | 16 +- .../distribution/artery/AddVehicleStowage.vue | 25 +-- .../artery/addTripartiteTransfer.vue | 25 +-- .../distribution/inventory/CreateOrder.vue | 1 - .../inventory/delivery/OrderInTransit.vue | 25 +-- .../distributionStockArticleDiscuss.vue | 18 ++ .../delivery/distributionStockArticleSelf.vue | 25 +-- .../signfor/distributionSignfortreat.vue | 196 ++++++++++-------- src/views/waybill/CreateZeroOrder.vue | 1 - src/views/waybill/TemporaryStorageList.vue | 21 -- 11 files changed, 178 insertions(+), 212 deletions(-) diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue index 5c44edf7..e3d07b3e 100644 --- a/src/components/tablecmt/tablecmt.vue +++ b/src/components/tablecmt/tablecmt.vue @@ -381,7 +381,7 @@ const isHaveSelection = ref(false); let selectarr = ref([]); /** 设置每行颜色 */ const tableRowClassName = ({ row, rowIndex }: { row: TableDataType; rowIndex: number }) => { - if (props.tableData.length === selectarr.value.length) return 'table-SelectedRow-bgcolor'; + // if (props.tableData.length === selectarr.value.length) return 'table-SelectedRow-bgcolor'; for (let i = 0; i < selectarr.value.length; i++) { if (selectarr.value[i] === row) return 'table-SelectedRow-bgcolor'; @@ -931,4 +931,39 @@ defineExpose({ handleCheckSelect, handleClearSelect }); font-weight: initial; font-size: 12px; } + +// 表格行样式 +.el-table { + tr { + // 预警 + &.WarningTime { + color: #e6a23c !important; + background-color: #fff3e8; + + .el-text { + color: #e6a23c !important; + // background-color: #fff3e8; + } + + td { + border-color: #fff !important; + } + } + + // 超时 + &.timeOut { + color: #f56c6c !important; + background-color: #feeded; + + .el-text { + color: #f56c6c !important; + // background-color: #feeded; + } + + td { + border-color: #fff !important; + } + } + } +} diff --git a/src/option/finance/ReconciliationDepositSlip.js b/src/option/finance/ReconciliationDepositSlip.js index 73e111b4..0ed2b128 100644 --- a/src/option/finance/ReconciliationDepositSlip.js +++ b/src/option/finance/ReconciliationDepositSlip.js @@ -245,7 +245,7 @@ export const columnList = [ }, { prop: 'sysTotalFee', - label: '订单开单价', + label: '订单预估总价', type: 1, values: '', width: '130', @@ -268,7 +268,7 @@ export const columnList = [ }, { prop: 'systemFreightPrice', - label: '开单运费', + label: '预估运费', type: 1, values: '', width: '130', @@ -292,7 +292,7 @@ export const columnList = [ }, { prop: 'systemPickupPrice', - label: '开单提货费', + label: '预估提货费', type: 1, values: '', width: '130', @@ -388,7 +388,7 @@ export const columnList = [ }, { prop: 'systemDeliveryFee', - label: '开单配送费', + label: '预估配送费', type: 1, values: '', width: '150', @@ -1017,7 +1017,7 @@ export const columnListB = [ }, { prop: 'sysTotalFee', - label: '订单开单价', + label: '订单预估总价', type: 1, values: '', width: '130', @@ -1041,7 +1041,7 @@ export const columnListB = [ }, { prop: 'systemFreightPrice', - label: '开单运费', + label: '预估运费', type: 1, values: '', width: '130', @@ -1065,7 +1065,7 @@ export const columnListB = [ }, { prop: 'systemPickupPrice', - label: '开单提货费', + label: '预估提货费', type: 1, values: '', width: '130', @@ -1161,7 +1161,7 @@ export const columnListB = [ }, { prop: 'systemDeliveryFee', - label: '开单配送费', + label: '预估配送费', type: 1, values: '', width: '130', diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue index 789c14ba..6f84bb3e 100644 --- a/src/views/distribution/artery/AddVehicleStowage.vue +++ b/src/views/distribution/artery/AddVehicleStowage.vue @@ -2131,9 +2131,9 @@ const handleSubmitProblemData = () => { const handleSetRowClassName = (row, rowIndex) => { if (!row.warehouseEntryTimeStart) return 'timeOut'; - // 设置预警 -- 以创建时间为基准, 24小时后为超期, 临近2小时为临期 + // 设置预警 -- 以入库时间为基准, 24小时后为超期, 临近2小时为临期 - // 当前时间 - 创建时间 + // 当前时间 - 入库时间 const time = Date.now() - new Date(row.warehouseEntryTimeStart).getTime(); // 预警时间 @@ -2842,25 +2842,4 @@ onActivated(() => { :deep(.el-form-item__content) { width: 250px !important; } - -// 表格行样式 -:deep(.el-table) { - tr { - &.WarningTime { - color: #e6a23c !important; - - .el-text { - color: #e6a23c !important; - } - } - - &.timeOut { - color: #f56c6c !important; - - .el-text { - color: #f56c6c !important; - } - } - } -} diff --git a/src/views/distribution/artery/addTripartiteTransfer.vue b/src/views/distribution/artery/addTripartiteTransfer.vue index afcff915..2d0ba683 100644 --- a/src/views/distribution/artery/addTripartiteTransfer.vue +++ b/src/views/distribution/artery/addTripartiteTransfer.vue @@ -1302,9 +1302,9 @@ const handleSubmit = (formEl: FormInstance | undefined) => { const handleSetRowClassName = (row, rowIndex) => { if (!row.warehouseEntryTimeStart) return 'timeOut'; - // 设置预警 -- 以创建时间为基准, 24小时后为超期, 临近2小时为临期 + // 设置预警 -- 以入库时间为基准, 24小时后为超期, 临近2小时为临期 - // 当前时间 - 创建时间 + // 当前时间 - 入库时间 const time = Date.now() - new Date(row.warehouseEntryTimeStart).getTime(); // 预警时间 @@ -1489,25 +1489,4 @@ const handleSetRowClassName = (row, rowIndex) => { background: #f5f7fa; } } - -// 表格行样式 -:deep(.el-table) { - tr { - &.WarningTime { - color: #e6a23c !important; - - .el-text { - color: #e6a23c !important; - } - } - - &.timeOut { - color: #f56c6c !important; - - .el-text { - color: #f56c6c !important; - } - } - } -} diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue index 6fdcf795..19a587a7 100644 --- a/src/views/distribution/inventory/CreateOrder.vue +++ b/src/views/distribution/inventory/CreateOrder.vue @@ -565,7 +565,6 @@ v-model="item.chargeType" @change="() => handleAssignmentItemPrice(item, false, item.chargeType)" style="display: flex" - :disabled="isDisabled" > 件 方 diff --git a/src/views/distribution/inventory/delivery/OrderInTransit.vue b/src/views/distribution/inventory/delivery/OrderInTransit.vue index c13d4e64..26dbc7ba 100644 --- a/src/views/distribution/inventory/delivery/OrderInTransit.vue +++ b/src/views/distribution/inventory/delivery/OrderInTransit.vue @@ -428,9 +428,9 @@ const handleView = ({ row }) => { const handleSetRowClassName = (row, rowIndex) => { if (!row.warehouseEntryTime) return 'timeOut'; - // 设置预警 -- 以创建时间为基准, 24小时后为超期, 临近2小时为临期 + // 设置预警 -- 以入库时间为基准, 24小时后为超期, 临近2小时为临期 - // 当前时间 - 创建时间 + // 当前时间 - 入库时间 const time = Date.now() - new Date(row.warehouseEntryTime).getTime(); // 预警时间 @@ -471,25 +471,4 @@ const handleSetRowClassName = (row, rowIndex) => { :deep(.el-overlay-dialog) { position: absolute; } - -// 表格行样式 -:deep(.el-table) { - tr { - &.WarningTime { - color: #e6a23c !important; - - .el-text { - color: #e6a23c !important; - } - } - - &.timeOut { - color: #f56c6c !important; - - .el-text { - color: #f56c6c !important; - } - } - } -} diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue index 43af09ad..15326142 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue @@ -102,6 +102,7 @@ :columnList="columnList" :tableData="data" :loading="loading" + :tableRowClassName="handleSetRowClassName" @inputTxt="inputsc" @timeCheck="timesc" @btnCheck="btnsc" @@ -1415,6 +1416,23 @@ export default { console.log('error :>> ', error); } }, + handleSetRowClassName(row, rowIndex) { + console.log('row.warehouseEntryTime :>> ', row.warehouseEntryTime); + if (!row.warehouseEntryTime) return 'timeOut'; + + // 设置预警 -- 以入库时间为基准, 24小时后为超期, 临近2小时为临期 + + // 当前时间 - 入库时间 + const time = Date.now() - new Date(row.warehouseEntryTime).getTime(); + // 预警时间 + const WarningTime = 1000 * 60 * 60 * (24 * 2 - 2); + + // 超时 + const timeOut = 1000 * 60 * 60 * 24 * 2; + + if (time > timeOut) return 'timeOut'; + else if (time > WarningTime && time < timeOut) return 'WarningTime'; + }, }, }; diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue index 3edbe002..1c38e364 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue @@ -788,9 +788,9 @@ export default { console.log('row.warehouseEntryTime :>> ', row.warehouseEntryTime); if (!row.warehouseEntryTime) return 'timeOut'; - // 设置预警 -- 以创建时间为基准, 24小时后为超期, 临近2小时为临期 + // 设置预警 -- 以入库时间为基准, 24小时后为超期, 临近2小时为临期 - // 当前时间 - 创建时间 + // 当前时间 - 入库时间 const time = Date.now() - new Date(row.warehouseEntryTime).getTime(); // 预警时间 const WarningTime = 1000 * 60 * 60 * (24 * 2 - 2); @@ -1844,25 +1844,4 @@ export default { .el_textBtn { font-weight: bold; } - -// 表格行样式 -:deep(.el-table) { - tr { - &.WarningTime { - color: #e6a23c !important; - - .el-text { - color: #e6a23c !important; - } - } - - &.timeOut { - color: #f56c6c !important; - - .el-text { - color: #f56c6c !important; - } - } - } -} diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue index 8b4602f0..4bfa5943 100644 --- a/src/views/distribution/signfor/distributionSignfortreat.vue +++ b/src/views/distribution/signfor/distributionSignfortreat.vue @@ -108,101 +108,99 @@ -
- - -