diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue index a4e500a..a03434b 100644 --- a/src/views/moneyManage/executor/executor.vue +++ b/src/views/moneyManage/executor/executor.vue @@ -11,8 +11,8 @@
所属地区 - +
产品名称 @@ -70,11 +70,14 @@ - - @@ -260,8 +263,8 @@ const getRefund = async function () { // 40：执行人待处理；41：执行人已处理，退款完成； paymentCurrency: searchForm.value.paymentCurrency, payType: searchForm.value.payType, - startTime: dateRange.value && dateRange.value[0] ? moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "", - endtime: dateRange.value && dateRange.value[1] ? moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "", + startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "", + endtime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "", adminId: adminData.value.id, account: adminData.value.account } @@ -309,33 +312,33 @@ const submitRefund = async function () { } } const getMarket = async function () { - try { - const result = await API({ + try { + const result = await API({ - url: '/market/selectMarket', - }) - console.log('看看地区树', result) + url: '/market/selectMarket', + }) + console.log('看看地区树', result) - const transformTree = (nodes) => { - const allChildren = nodes.flatMap(node => node.children || []); + const transformTree = (nodes) => { + const allChildren = nodes.flatMap(node => node.children || []); - return allChildren.map(child => { - const grandchildren = child.children && child.children.length - ? transformTree([child]) - : null; + return allChildren.map(child => { + const grandchildren = child.children && child.children.length + ? transformTree([child]) + : null; - return { - value: child.name, - label: child.name, - children: grandchildren + return { + value: child.name, + label: child.name, + children: grandchildren + }; + }); }; - }); - }; - market.value = transformTree(result.data) - console.log('转换后的地区树==============', market.value) - } catch (error) { - console.log('请求失败', error) - } + market.value = transformTree(result.data) + console.log('转换后的地区树==============', market.value) + } catch (error) { + console.log('请求失败', error) + } } const showEditDialog = (row) => { editRow.value = row @@ -633,6 +636,15 @@ onMounted(() => { background-color: #F3FAFE !important; } +:deep(.el-image-viewer) { + z-index: 3000 !important; /* 确保高于固定列和对话框的层级 */ +} + +/* 若固定列仍遮挡，强制提高固定列容器的层级（可选） */ +:deep(.el-table__fixed), +:deep(.el-table__fixed-right) { + z-index: 10 !important; /* 低于预览层的 3000 即可 */ +} .condition1 { width: 82vw; diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue index 16807e9..f0b747d 100644 --- a/src/views/moneyManage/refundDetail/refundCharge.vue +++ b/src/views/moneyManage/refundDetail/refundCharge.vue @@ -62,7 +62,7 @@ - + - +