1
This commit is contained in:
van
@@ -19,99 +19,121 @@
|
|||||||
label-width="76px"
|
label-width="76px"
|
||||||
label-position="left"
|
label-position="left"
|
||||||
>
|
>
|
||||||
<el-form-item label="备注">
|
<div class="jd-filter-group jd-filter-group--basic">
|
||||||
<el-input v-model="queryParams.remark" placeholder="单据备注" clearable size="small" @keyup.enter.native="handleQuery" />
|
<div class="jd-filter-group-head">
|
||||||
</el-form-item>
|
<span class="jd-filter-group-title">基础条件</span>
|
||||||
<el-form-item label="订单号">
|
</div>
|
||||||
<el-input v-model="queryParams.orderSearch" placeholder="订单号/第三方单号/分销标识" clearable size="small" @keyup.enter.native="handleQuery" />
|
<div class="jd-filter-group-body">
|
||||||
</el-form-item>
|
<el-form-item label="备注">
|
||||||
<el-form-item label="分销标记">
|
<el-input v-model="queryParams.remark" placeholder="单据备注" clearable size="small" @keyup.enter.native="handleQuery" />
|
||||||
<el-input v-model="queryParams.distributionMark" placeholder="分销标记" clearable size="small" @keyup.enter.native="handleQuery" />
|
</el-form-item>
|
||||||
</el-form-item>
|
<el-form-item label="订单号">
|
||||||
<el-form-item label="型号">
|
<el-input v-model="queryParams.orderSearch" placeholder="订单号/第三方单号/分销标识" clearable size="small" @keyup.enter.native="handleQuery" />
|
||||||
<el-input v-model="queryParams.modelNumber" placeholder="型号" clearable size="small" @keyup.enter.native="handleQuery" />
|
</el-form-item>
|
||||||
</el-form-item>
|
<el-form-item label="分销标记">
|
||||||
<el-form-item label="下单人">
|
<el-input v-model="queryParams.distributionMark" placeholder="分销标记" clearable size="small" @keyup.enter.native="handleQuery" />
|
||||||
<el-input v-model="queryParams.buyer" placeholder="下单人" clearable size="small" @keyup.enter.native="handleQuery" />
|
</el-form-item>
|
||||||
</el-form-item>
|
<el-form-item label="型号">
|
||||||
<el-form-item label="地址">
|
<el-input v-model="queryParams.modelNumber" placeholder="型号" clearable size="small" @keyup.enter.native="handleQuery" />
|
||||||
<el-input v-model="queryParams.address" placeholder="收货地址" clearable size="small" @keyup.enter.native="handleQuery" />
|
</el-form-item>
|
||||||
</el-form-item>
|
<el-form-item label="下单人">
|
||||||
<el-form-item label="状态">
|
<el-input v-model="queryParams.buyer" placeholder="下单人" clearable size="small" @keyup.enter.native="handleQuery" />
|
||||||
<el-input v-model="queryParams.status" placeholder="备注/状态" clearable size="small" @keyup.enter.native="handleQuery" />
|
</el-form-item>
|
||||||
</el-form-item>
|
<el-form-item label="地址">
|
||||||
<el-form-item label="下单时间">
|
<el-input v-model="queryParams.address" placeholder="收货地址" clearable size="small" @keyup.enter.native="handleQuery" />
|
||||||
<el-date-picker
|
</el-form-item>
|
||||||
v-model="dateRange"
|
<el-form-item label="状态">
|
||||||
type="daterange"
|
<el-input v-model="queryParams.status" placeholder="备注/状态" clearable size="small" @keyup.enter.native="handleQuery" />
|
||||||
start-placeholder="开始日期"
|
</el-form-item>
|
||||||
end-placeholder="结束日期"
|
<el-form-item label="下单时间">
|
||||||
value-format="yyyy-MM-dd"
|
<el-date-picker
|
||||||
size="small"
|
v-model="dateRange"
|
||||||
range-separator="至"
|
type="daterange"
|
||||||
@change="handleDateRangeChange"
|
start-placeholder="开始日期"
|
||||||
/>
|
end-placeholder="结束日期"
|
||||||
</el-form-item>
|
value-format="yyyy-MM-dd"
|
||||||
<el-form-item label="完成日期">
|
size="small"
|
||||||
<el-checkbox v-model="queryParams.hasFinishTime" @change="handleQuery">仅显示已完成订单</el-checkbox>
|
range-separator="至"
|
||||||
</el-form-item>
|
@change="handleDateRangeChange"
|
||||||
<el-form-item label="退款状态">
|
/>
|
||||||
<el-select v-model="queryParams.isRefunded" placeholder="全部" clearable size="small" style="width: 120px;">
|
</el-form-item>
|
||||||
<el-option label="已退款" :value="1" />
|
<el-form-item label="完成日期">
|
||||||
<el-option label="未退款" :value="0" />
|
<el-checkbox v-model="queryParams.hasFinishTime" @change="handleQuery">仅显示已完成订单</el-checkbox>
|
||||||
</el-select>
|
</el-form-item>
|
||||||
</el-form-item>
|
</div>
|
||||||
<el-form-item label="退款到账">
|
</div>
|
||||||
<el-select v-model="queryParams.isRefundReceived" placeholder="全部" clearable size="small" style="width: 120px;">
|
|
||||||
<el-option label="已到账" :value="1" />
|
<div class="jd-filter-group jd-filter-group--status">
|
||||||
<el-option label="未到账" :value="0" />
|
<div class="jd-filter-group-head">
|
||||||
</el-select>
|
<span class="jd-filter-group-title">跟进状态</span>
|
||||||
</el-form-item>
|
</div>
|
||||||
<el-form-item label="后返到账">
|
<div class="jd-filter-group-body jd-filter-group-body--status">
|
||||||
<el-select v-model="queryParams.isRebateReceived" placeholder="全部" clearable size="small" style="width: 120px;">
|
<el-form-item label="退款状态">
|
||||||
<el-option label="已到账" :value="1" />
|
<el-select v-model="queryParams.isRefunded" placeholder="全部" clearable size="small" class="jd-filter-status-select">
|
||||||
<el-option label="未到账" :value="0" />
|
<el-option label="已退款" :value="1" />
|
||||||
</el-select>
|
<el-option label="未退款" :value="0" />
|
||||||
</el-form-item>
|
</el-select>
|
||||||
<el-form-item label="点过价保">
|
</el-form-item>
|
||||||
<el-select v-model="queryParams.isPriceProtected" placeholder="全部" clearable size="small" style="width: 120px;">
|
<el-form-item label="退款到账">
|
||||||
<el-option label="已点价保" :value="1" />
|
<el-select v-model="queryParams.isRefundReceived" placeholder="全部" clearable size="small" class="jd-filter-status-select">
|
||||||
<el-option label="未点价保" :value="0" />
|
<el-option label="已到账" :value="1" />
|
||||||
</el-select>
|
<el-option label="未到账" :value="0" />
|
||||||
</el-form-item>
|
</el-select>
|
||||||
<el-form-item label="开过专票">
|
</el-form-item>
|
||||||
<el-select v-model="queryParams.isInvoiceOpened" placeholder="全部" clearable size="small" style="width: 120px;">
|
<el-form-item label="后返到账">
|
||||||
<el-option label="已开专票" :value="1" />
|
<el-select v-model="queryParams.isRebateReceived" placeholder="全部" clearable size="small" class="jd-filter-status-select">
|
||||||
<el-option label="未开专票" :value="0" />
|
<el-option label="已到账" :value="1" />
|
||||||
</el-select>
|
<el-option label="未到账" :value="0" />
|
||||||
</el-form-item>
|
</el-select>
|
||||||
<el-form-item label="晒过评价">
|
</el-form-item>
|
||||||
<el-select v-model="queryParams.isReviewPosted" placeholder="全部" clearable size="small" style="width: 120px;">
|
<el-form-item label="点过价保">
|
||||||
<el-option label="已晒评价" :value="1" />
|
<el-select v-model="queryParams.isPriceProtected" placeholder="全部" clearable size="small" class="jd-filter-status-select">
|
||||||
<el-option label="未晒评价" :value="0" />
|
<el-option label="已点价保" :value="1" />
|
||||||
</el-select>
|
<el-option label="未点价保" :value="0" />
|
||||||
</el-form-item>
|
</el-select>
|
||||||
<el-form-item label="后返备注">
|
</el-form-item>
|
||||||
<el-select
|
<el-form-item label="开过专票">
|
||||||
v-model="rebateRemarkScreen"
|
<el-select v-model="queryParams.isInvoiceOpened" placeholder="全部" clearable size="small" class="jd-filter-status-select">
|
||||||
placeholder="全部"
|
<el-option label="已开专票" :value="1" />
|
||||||
clearable
|
<el-option label="未开专票" :value="0" />
|
||||||
size="small"
|
</el-select>
|
||||||
style="width: 160px;"
|
</el-form-item>
|
||||||
@change="onRebateRemarkScreenChange"
|
<el-form-item label="晒过评价">
|
||||||
>
|
<el-select v-model="queryParams.isReviewPosted" placeholder="全部" clearable size="small" class="jd-filter-status-select">
|
||||||
<el-option label="有导入记录" value="any" />
|
<el-option label="已晒评价" :value="1" />
|
||||||
<el-option label="含异常项" value="abnormal" />
|
<el-option label="未晒评价" :value="0" />
|
||||||
<el-option label="无异常项" value="ok" />
|
</el-select>
|
||||||
<el-option label="未关联后返表" value="noUploadLink" />
|
</el-form-item>
|
||||||
</el-select>
|
<el-form-item label="后返表">
|
||||||
</el-form-item>
|
<el-select
|
||||||
<!-- 搜索按钮：桌面端显示，移动端展开时在底部显示 -->
|
v-model="rebateRemarkScreen"
|
||||||
<el-form-item>
|
placeholder="全部"
|
||||||
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">搜索</el-button>
|
clearable
|
||||||
<el-button size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
|
size="small"
|
||||||
<el-button type="warning" size="small" icon="el-icon-download" @click="handleExport" v-hasPermi="['system:jdorder:export']">导出</el-button>
|
class="jd-filter-rebate-select"
|
||||||
</el-form-item>
|
@change="onRebateRemarkScreenChange"
|
||||||
|
>
|
||||||
|
<el-option label="有导入记录" value="any" />
|
||||||
|
<el-option label="含异常项" value="abnormal" />
|
||||||
|
<el-option label="无异常项" value="ok" />
|
||||||
|
<el-option label="未关联后返表" value="noUploadLink" />
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="jd-filter-group jd-filter-group--extra">
|
||||||
|
<div class="jd-filter-group-head">
|
||||||
|
<span class="jd-filter-group-title">查询</span>
|
||||||
|
</div>
|
||||||
|
<div class="jd-filter-group-body">
|
||||||
|
<el-form-item class="jd-filter-actions">
|
||||||
|
<el-button type="primary" plain size="small" icon="el-icon-search" class="jd-filter-act-btn jd-filter-act-btn--primary" @click="handleQuery">搜索</el-button>
|
||||||
|
<el-button class="jd-tb-muted jd-filter-act-btn" plain size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
|
||||||
|
<el-button class="jd-tb-muted jd-filter-act-btn" plain size="small" icon="el-icon-download" @click="handleExport" v-hasPermi="['system:jdorder:export']">导出</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</el-form>
|
</el-form>
|
||||||
</template>
|
</template>
|
||||||
</mobile-search-form>
|
</mobile-search-form>
|
||||||
@@ -126,6 +148,7 @@
|
|||||||
|
|
||||||
<!-- 桌面端：克制的工具栏（低饱和 + plain） -->
|
<!-- 桌面端：克制的工具栏（低饱和 + plain） -->
|
||||||
<div class="desktop-action-buttons desktop-only jd-order-toolbar">
|
<div class="desktop-action-buttons desktop-only jd-order-toolbar">
|
||||||
|
<div class="jd-toolbar-buttons">
|
||||||
<el-button class="jd-tb-muted" plain size="small" icon="el-icon-setting" @click="showAutoWriteConfig = true" title="配置H-TF订单自动写入腾讯文档">腾峰文档配置</el-button>
|
<el-button class="jd-tb-muted" plain size="small" icon="el-icon-setting" @click="showAutoWriteConfig = true" title="配置H-TF订单自动写入腾讯文档">腾峰文档配置</el-button>
|
||||||
<el-button class="jd-tb-muted" plain size="small" icon="el-icon-monitor" @click="showPushMonitor = true" title="查看推送监控和历史记录">推送监控</el-button>
|
<el-button class="jd-tb-muted" plain size="small" icon="el-icon-monitor" @click="showPushMonitor = true" title="查看推送监控和历史记录">推送监控</el-button>
|
||||||
<el-button class="jd-tb-muted" plain size="small" icon="el-icon-user" @click="showTouserConfig = true" title="配置分销标识对应的企业微信接收人">接收人配置</el-button>
|
<el-button class="jd-tb-muted" plain size="small" icon="el-icon-user" @click="showTouserConfig = true" title="配置分销标识对应的企业微信接收人">接收人配置</el-button>
|
||||||
@@ -138,6 +161,7 @@
|
|||||||
<el-button v-if="!isMobile" class="jd-tb-muted" plain size="small" icon="el-icon-document-copy" @click="handleBatchCopyRebateText" :disabled="selectedRows.length === 0" title="批量复制选中订单的后返录表格式（Excel可粘贴）">批量复制后返录表</el-button>
|
<el-button v-if="!isMobile" class="jd-tb-muted" plain size="small" icon="el-icon-document-copy" @click="handleBatchCopyRebateText" :disabled="selectedRows.length === 0" title="批量复制选中订单的后返录表格式（Excel可粘贴）">批量复制后返录表</el-button>
|
||||||
<el-button v-if="!isMobile" class="jd-tb-muted" plain size="small" icon="el-icon-document-copy" @click="handleBatchCopySichuanCommerceText" :disabled="selectedRows.length === 0" title="批量复制选中订单的四川商贸录表格式（日期 型号 数量 地址 价格 备注 是否安排 物流）">四川商贸录表</el-button>
|
<el-button v-if="!isMobile" class="jd-tb-muted" plain size="small" icon="el-icon-document-copy" @click="handleBatchCopySichuanCommerceText" :disabled="selectedRows.length === 0" title="批量复制选中订单的四川商贸录表格式（日期 型号 数量 地址 价格 备注 是否安排 物流）">四川商贸录表</el-button>
|
||||||
<el-button v-if="!isMobile" class="jd-tb-muted" plain size="small" icon="el-icon-refresh" @click="handleBatchRecalcProfit" :disabled="selectedRows.length === 0" title="清除售价/利润手动锁定并按规则重算（依赖型号配置与当前付款、后返）">批量重算利润</el-button>
|
<el-button v-if="!isMobile" class="jd-tb-muted" plain size="small" icon="el-icon-refresh" @click="handleBatchRecalcProfit" :disabled="selectedRows.length === 0" title="清除售价/利润手动锁定并按规则重算（依赖型号配置与当前付款、后返）">批量重算利润</el-button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -293,14 +317,14 @@
|
|||||||
<div class="field-row" v-if="row.distributionMark === 'F'">
|
<div class="field-row" v-if="row.distributionMark === 'F'">
|
||||||
<span class="field-label">售价</span>
|
<span class="field-label">售价</span>
|
||||||
<span class="field-value">
|
<span class="field-value">
|
||||||
<el-input-number v-model="row.sellingPrice" :min="0" :step="1" :precision="2" size="mini" controls-position="right" style="width: 130px;" @change="onOrderSellingPriceChange(row)" />
|
<el-input-number v-model="row.sellingPrice" :min="0" :step="1" :precision="2" size="mini" controls-position="right" style="width: 152px;" @change="onOrderSellingPriceChange(row)" />
|
||||||
<el-tag v-if="row.sellingPriceManual === 1" type="info" size="mini" style="margin-left: 6px;">手填</el-tag>
|
<el-tag v-if="row.sellingPriceManual === 1" type="info" size="mini" style="margin-left: 6px;">手填</el-tag>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="field-row" v-if="row.distributionMark === 'F' || row.distributionMark === 'H-TF'">
|
<div class="field-row" v-if="row.distributionMark === 'F' || row.distributionMark === 'H-TF'">
|
||||||
<span class="field-label">利润</span>
|
<span class="field-label">利润</span>
|
||||||
<span class="field-value">
|
<span class="field-value">
|
||||||
<el-input-number v-model="row.profit" :step="1" :precision="2" size="mini" controls-position="right" style="width: 130px;" @change="onOrderProfitChange(row)" />
|
<el-input-number v-model="row.profit" :step="0.01" :precision="2" size="mini" controls-position="right" style="width: 120px;" @change="onOrderProfitChange(row)" />
|
||||||
<el-tag v-if="row.profitManual === 1" type="warning" size="mini" style="margin-left: 6px;">手填</el-tag>
|
<el-tag v-if="row.profitManual === 1" type="warning" size="mini" style="margin-left: 6px;">手填</el-tag>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -315,22 +339,14 @@
|
|||||||
<el-button type="text" size="mini" @click="recalcOrderProfitOnly(row)">重算利润</el-button>
|
<el-button type="text" size="mini" @click="recalcOrderProfitOnly(row)">重算利润</el-button>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="field-row" v-if="row.rebateRemarkJson">
|
|
||||||
<span class="field-label">后返备注</span>
|
|
||||||
<span class="field-value">
|
|
||||||
<el-tag v-if="row.rebateRemarkHasAbnormal === 1" type="danger" size="mini">异常</el-tag>
|
|
||||||
<el-tag v-else-if="row.rebateRemarkHasAbnormal === 0" type="success" size="mini">正常</el-tag>
|
|
||||||
<span style="margin-left: 6px;">{{ rebateRemarkCount(row) }} 条记录</span>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div class="field-row">
|
<div class="field-row">
|
||||||
<span class="field-label">下单人</span>
|
<span class="field-label">下单人</span>
|
||||||
<span class="field-value">{{ row.buyer || '-' }}</span>
|
<span class="field-value">{{ row.buyer || '-' }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 退款状态 -->
|
<!-- 跟进状态（含后返表关联） -->
|
||||||
<div class="field-row refund-status">
|
<div class="field-row refund-status">
|
||||||
<span class="field-label">退款状态</span>
|
<span class="field-label">跟进状态</span>
|
||||||
<div class="field-value status-tags">
|
<div class="field-value status-tags">
|
||||||
<el-tag
|
<el-tag
|
||||||
:type="row.isRefunded === 1 ? 'warning' : 'info'"
|
:type="row.isRefunded === 1 ? 'warning' : 'info'"
|
||||||
@@ -371,9 +387,20 @@
|
|||||||
:type="row.isReviewPosted === 1 ? 'success' : 'info'"
|
:type="row.isReviewPosted === 1 ? 'success' : 'info'"
|
||||||
size="mini"
|
size="mini"
|
||||||
@click.native="toggleReviewPosted(row)"
|
@click.native="toggleReviewPosted(row)"
|
||||||
style="cursor: pointer;">
|
style="cursor: pointer; margin-right: 8px;">
|
||||||
{{ row.isReviewPosted === 1 ? '晒过评价' : '未晒评价' }}
|
{{ row.isReviewPosted === 1 ? '晒过评价' : '未晒评价' }}
|
||||||
</el-tag>
|
</el-tag>
|
||||||
|
<span class="mobile-rebate-remark-inline">
|
||||||
|
<span class="mobile-rebate-remark-hint">后返表</span>
|
||||||
|
<template v-if="!row.rebateRemarkJson">
|
||||||
|
<span style="color: #c0c4cc;">—</span>
|
||||||
|
</template>
|
||||||
|
<template v-else>
|
||||||
|
<el-tag v-if="row.rebateRemarkHasAbnormal === 1" type="danger" size="mini">异常</el-tag>
|
||||||
|
<el-tag v-else-if="row.rebateRemarkHasAbnormal === 0" type="success" size="mini">正常</el-tag>
|
||||||
|
<span style="margin-left: 6px; color: #64748b; font-size: 12px;">{{ rebateRemarkCount(row) }} 条</span>
|
||||||
|
</template>
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -441,29 +468,35 @@
|
|||||||
<el-table-column label="后返金额" prop="rebateAmount" width="90" align="right">
|
<el-table-column label="后返金额" prop="rebateAmount" width="90" align="right">
|
||||||
<template slot-scope="scope">{{ toYuan(scope.row.rebateAmount) }}</template>
|
<template slot-scope="scope">{{ toYuan(scope.row.rebateAmount) }}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="售价渠道" prop="sellingPriceType" width="96" align="center">
|
<el-table-column label="售价渠道" prop="sellingPriceType" min-width="120" align="center" class-name="jd-col-channel">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<template v-if="scope.row.distributionMark === 'F'">
|
<template v-if="scope.row.distributionMark === 'F'">
|
||||||
<el-select v-model="scope.row.sellingPriceType" placeholder="—" size="mini" clearable style="width: 88px;" @change="onOrderSellingPriceTypeChange(scope.row)">
|
<div class="jd-cell-stretch">
|
||||||
<el-option label="直款" value="direct" />
|
<el-select v-model="scope.row.sellingPriceType" placeholder="—" size="mini" clearable class="jd-cell-select-full" @change="onOrderSellingPriceTypeChange(scope.row)">
|
||||||
<el-option label="闲鱼" value="xianyu" />
|
<el-option label="直款" value="direct" />
|
||||||
</el-select>
|
<el-option label="闲鱼" value="xianyu" />
|
||||||
|
</el-select>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<span v-else style="color: #c0c4cc;">—</span>
|
<span v-else style="color: #c0c4cc;">—</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="售价" prop="sellingPrice" width="128" align="right">
|
<el-table-column label="售价" prop="sellingPrice" min-width="150" align="right" class-name="jd-col-money jd-col-money--selling">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<template v-if="scope.row.distributionMark === 'F'">
|
<template v-if="scope.row.distributionMark === 'F'">
|
||||||
<el-input-number v-model="scope.row.sellingPrice" :min="0" :step="1" :precision="2" size="mini" controls-position="right" class="jd-order-input-money" @change="onOrderSellingPriceChange(scope.row)" />
|
<div class="jd-cell-stretch jd-cell-stretch--num">
|
||||||
|
<el-input-number v-model="scope.row.sellingPrice" :min="0" :step="1" :precision="2" size="mini" controls-position="right" class="jd-order-input-money jd-order-input-money--selling" @change="onOrderSellingPriceChange(scope.row)" />
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<span v-else>{{ scope.row.sellingPrice != null ? toYuan(scope.row.sellingPrice) : '—' }}</span>
|
<span v-else>{{ scope.row.sellingPrice != null ? toYuan(scope.row.sellingPrice) : '—' }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="利润" prop="profit" width="128" align="right">
|
<el-table-column label="利润" prop="profit" min-width="118" align="right" class-name="jd-col-money jd-col-money--profit">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<template v-if="scope.row.distributionMark === 'F' || scope.row.distributionMark === 'H-TF'">
|
<template v-if="scope.row.distributionMark === 'F' || scope.row.distributionMark === 'H-TF'">
|
||||||
<el-input-number v-model="scope.row.profit" :step="1" :precision="2" size="mini" controls-position="right" class="jd-order-input-money" @change="onOrderProfitChange(scope.row)" />
|
<div class="jd-cell-stretch jd-cell-stretch--num">
|
||||||
|
<el-input-number v-model="scope.row.profit" :step="0.01" :precision="2" size="mini" controls-position="right" class="jd-order-input-money jd-order-input-money--profit" @change="onOrderProfitChange(scope.row)" />
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<span v-else>{{ scope.row.profit != null ? toYuan(scope.row.profit) : '—' }}</span>
|
<span v-else>{{ scope.row.profit != null ? toYuan(scope.row.profit) : '—' }}</span>
|
||||||
</template>
|
</template>
|
||||||
@@ -480,42 +513,11 @@
|
|||||||
<span v-else style="color: #c0c4cc;">—</span>
|
<span v-else style="color: #c0c4cc;">—</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="后返备注" prop="rebateRemarkJson" min-width="160" show-overflow-tooltip>
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<template v-if="!scope.row.rebateRemarkJson">
|
|
||||||
<span style="color: #c0c4cc;">-</span>
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
<el-tag v-if="scope.row.rebateRemarkHasAbnormal === 1" type="danger" size="mini">异常</el-tag>
|
|
||||||
<el-tag v-else-if="scope.row.rebateRemarkHasAbnormal === 0" type="success" size="mini">正常</el-tag>
|
|
||||||
<el-popover trigger="click" placement="left" width="420">
|
|
||||||
<div class="rebate-remark-popover">
|
|
||||||
<div
|
|
||||||
v-for="(it, idx) in parseRebateRemarks(scope.row)"
|
|
||||||
:key="idx"
|
|
||||||
class="rebate-remark-item"
|
|
||||||
>
|
|
||||||
<div class="rebate-remark-title">
|
|
||||||
<b>{{ it.documentTitle || '（未命名）' }}</b>
|
|
||||||
<span class="rebate-remark-time">{{ formatRebateRemarkTime(it.uploadTime) }}</span>
|
|
||||||
</div>
|
|
||||||
<div>是否返现：{{ it.whetherRebate !== undefined && it.whetherRebate !== '' ? it.whetherRebate : '（空）' }}
|
|
||||||
<el-tag v-if="it.abnormal" type="danger" size="mini">异常</el-tag>
|
|
||||||
<el-tag v-else type="success" size="mini">正常</el-tag>
|
|
||||||
</div>
|
|
||||||
<div>返现金额：{{ it.rebateAmount !== undefined && it.rebateAmount !== '' ? it.rebateAmount : '-' }}</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<el-button slot="reference" type="text" size="small">明细（{{ rebateRemarkCount(scope.row) }}）</el-button>
|
|
||||||
</el-popover>
|
|
||||||
</template>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="备注/状态" prop="status" min-width="100" show-overflow-tooltip/>
|
<el-table-column label="备注/状态" prop="status" min-width="100" show-overflow-tooltip/>
|
||||||
<el-table-column label="下单人" prop="buyer" width="80"/>
|
<el-table-column label="下单人" prop="buyer" width="80"/>
|
||||||
|
|
||||||
<!-- 退款状态：更早版本为单列纵向（标签列表），非六列拆分 -->
|
<!-- 跟进状态：退款/价保/票/评价 + 后返到账 + 后返表导入明细 -->
|
||||||
<el-table-column label="退款状态" min-width="248" align="left" class-name="refund-status-column">
|
<el-table-column label="跟进状态" min-width="268" align="left" class-name="refund-status-column">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<div class="refund-status-stack">
|
<div class="refund-status-stack">
|
||||||
<div class="refund-status-col">
|
<div class="refund-status-col">
|
||||||
@@ -595,6 +597,38 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="jd-rebate-remark-strip">
|
||||||
|
<span class="jd-rebate-remark-strip-label">后返表</span>
|
||||||
|
<div class="jd-rebate-remark-strip-body">
|
||||||
|
<template v-if="!scope.row.rebateRemarkJson">
|
||||||
|
<span class="jd-rebate-remark-empty">—</span>
|
||||||
|
</template>
|
||||||
|
<template v-else>
|
||||||
|
<el-tag v-if="scope.row.rebateRemarkHasAbnormal === 1" type="danger" size="mini">异常</el-tag>
|
||||||
|
<el-tag v-else-if="scope.row.rebateRemarkHasAbnormal === 0" type="success" size="mini">正常</el-tag>
|
||||||
|
<el-popover trigger="click" placement="left" width="420">
|
||||||
|
<div class="rebate-remark-popover">
|
||||||
|
<div
|
||||||
|
v-for="(it, idx) in parseRebateRemarks(scope.row)"
|
||||||
|
:key="idx"
|
||||||
|
class="rebate-remark-item"
|
||||||
|
>
|
||||||
|
<div class="rebate-remark-title">
|
||||||
|
<b>{{ it.documentTitle || '（未命名）' }}</b>
|
||||||
|
<span class="rebate-remark-time">{{ formatRebateRemarkTime(it.uploadTime) }}</span>
|
||||||
|
</div>
|
||||||
|
<div>是否返现：{{ it.whetherRebate !== undefined && it.whetherRebate !== '' ? it.whetherRebate : '（空）' }}
|
||||||
|
<el-tag v-if="it.abnormal" type="danger" size="mini">异常</el-tag>
|
||||||
|
<el-tag v-else type="success" size="mini">正常</el-tag>
|
||||||
|
</div>
|
||||||
|
<div>返现金额：{{ it.rebateAmount !== undefined && it.rebateAmount !== '' ? it.rebateAmount : '-' }}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<el-button slot="reference" type="text" size="small">明细（{{ rebateRemarkCount(scope.row) }}）</el-button>
|
||||||
|
</el-popover>
|
||||||
|
</template>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
@@ -720,15 +754,17 @@
|
|||||||
<el-button type="text" size="mini" class="jd-act-link jd-act-link--success" @click="handleFetchLogistics(scope.row)" title="获取物流">物流拉取</el-button>
|
<el-button type="text" size="mini" class="jd-act-link jd-act-link--success" @click="handleFetchLogistics(scope.row)" title="获取物流">物流拉取</el-button>
|
||||||
</div>
|
</div>
|
||||||
<div class="jd-action-row jd-action-row--meta">
|
<div class="jd-action-row jd-action-row--meta">
|
||||||
<el-switch
|
<div class="jd-count-pill" title="是否参与利润等汇总统计">
|
||||||
v-model="scope.row.isCountEnabled"
|
<span class="jd-count-pill-label">统计</span>
|
||||||
:active-value="1"
|
<el-switch
|
||||||
:inactive-value="0"
|
v-model="scope.row.isCountEnabled"
|
||||||
@change="handleCountEnabledChange(scope.row)"
|
:active-value="1"
|
||||||
active-text="统计"
|
:inactive-value="0"
|
||||||
inactive-text=""
|
@change="handleCountEnabledChange(scope.row)"
|
||||||
size="mini" />
|
class="jd-count-el-switch"
|
||||||
<el-button type="text" size="mini" class="jd-act-link jd-act-link--danger" @click="handleDelete(scope.row)" title="删除订单">删除</el-button>
|
size="mini" />
|
||||||
|
</div>
|
||||||
|
<el-button type="text" size="mini" class="jd-act-link jd-act-link--danger" icon="el-icon-delete" @click="handleDelete(scope.row)" title="删除订单">删除</el-button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -2853,18 +2889,25 @@ export default {
|
|||||||
.jd-order-list-root {
|
.jd-order-list-root {
|
||||||
--jd-accent: #2563eb;
|
--jd-accent: #2563eb;
|
||||||
--jd-accent-hover: #1d4ed8;
|
--jd-accent-hover: #1d4ed8;
|
||||||
|
--jd-warm-title: #c2410c;
|
||||||
--jd-border: #e5e7eb;
|
--jd-border: #e5e7eb;
|
||||||
--jd-text: #111827;
|
--jd-text: #111827;
|
||||||
--jd-muted: #6b7280;
|
--jd-muted: #6b7280;
|
||||||
--jd-surface: #ffffff;
|
--jd-surface: #ffffff;
|
||||||
--jd-header: #f8fafc;
|
--jd-header: #f8fafc;
|
||||||
--jd-row-hover: #f8fafc;
|
--jd-row-hover: #fffbf5;
|
||||||
--jd-row-stripe: #fafbfc;
|
--jd-row-stripe: #fafbfc;
|
||||||
|
/* 表格「统计」胶囊：高度与边框对齐 plain 小按钮 */
|
||||||
|
--jd-fn-chip-h: 32px;
|
||||||
|
--jd-fn-chip-radius: 6px;
|
||||||
|
--jd-fn-chip-border: var(--jd-border);
|
||||||
|
--jd-fn-chip-bg: var(--jd-surface);
|
||||||
|
--jd-fn-chip-text: var(--jd-muted);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 搜索区：更疏、更干净 */
|
/* 搜索区：略暖、分层底色 */
|
||||||
.jd-order-list-root ::v-deep .search-section {
|
.jd-order-list-root ::v-deep .search-section {
|
||||||
background: linear-gradient(180deg, #fafbfc 0%, #ffffff 100%);
|
background: linear-gradient(165deg, #f4f8ff 0%, #fffaf5 42%, #ffffff 100%);
|
||||||
border-bottom: 1px solid var(--jd-border);
|
border-bottom: 1px solid var(--jd-border);
|
||||||
box-shadow: 0 1px 2px rgba(15, 23, 42, 0.04);
|
box-shadow: 0 1px 2px rgba(15, 23, 42, 0.04);
|
||||||
padding: 18px 20px 14px;
|
padding: 18px 20px 14px;
|
||||||
@@ -2888,14 +2931,130 @@ export default {
|
|||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* 筛选分组卡片 */
|
||||||
|
.jd-filter-group {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
align-items: flex-start;
|
||||||
|
width: 100%;
|
||||||
|
box-sizing: border-box;
|
||||||
|
margin-bottom: 8px;
|
||||||
|
padding: 10px 12px;
|
||||||
|
border-radius: 8px;
|
||||||
|
border: 1px solid var(--jd-border);
|
||||||
|
gap: 4px 0;
|
||||||
|
}
|
||||||
|
.jd-filter-group:last-of-type {
|
||||||
|
margin-bottom: 2px;
|
||||||
|
}
|
||||||
|
.jd-filter-group--basic {
|
||||||
|
background: linear-gradient(135deg, #f5f9ff 0%, #ffffff 70%);
|
||||||
|
border-color: #bfdbfe;
|
||||||
|
}
|
||||||
|
.jd-filter-group--status {
|
||||||
|
background: linear-gradient(135deg, #fff8f0 0%, #fff4e6 45%, #ffffff 100%);
|
||||||
|
border-color: #fdba74;
|
||||||
|
}
|
||||||
|
.jd-filter-group--extra {
|
||||||
|
background: linear-gradient(135deg, #fafaf9 0%, #ffffff 90%);
|
||||||
|
border-color: #d6d3d1;
|
||||||
|
}
|
||||||
|
.jd-filter-group-head {
|
||||||
|
flex: 0 0 auto;
|
||||||
|
min-width: 4.5em;
|
||||||
|
padding-top: 0;
|
||||||
|
margin-right: 8px;
|
||||||
|
align-self: center;
|
||||||
|
}
|
||||||
|
.jd-filter-group-title {
|
||||||
|
display: block;
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--jd-text);
|
||||||
|
line-height: 1.2;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
.jd-filter-group--status .jd-filter-group-title {
|
||||||
|
color: var(--jd-warm-title);
|
||||||
|
}
|
||||||
|
.jd-filter-group-body {
|
||||||
|
flex: 1;
|
||||||
|
min-width: 240px;
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
align-items: flex-start;
|
||||||
|
}
|
||||||
|
.jd-order-filter-form ::v-deep .jd-filter-status-select {
|
||||||
|
width: 118px;
|
||||||
|
}
|
||||||
|
.jd-order-filter-form ::v-deep .jd-filter-rebate-select {
|
||||||
|
width: 188px;
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
.jd-order-filter-form ::v-deep .jd-filter-actions {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
.jd-order-filter-form ::v-deep .jd-filter-actions .el-form-item__content {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
line-height: 1;
|
||||||
|
}
|
||||||
|
/* 与顶部工具栏一致的筛选区按钮（plain + 圆角） */
|
||||||
|
.jd-order-filter-form ::v-deep .jd-filter-act-btn {
|
||||||
|
border-radius: 6px;
|
||||||
|
font-weight: 500;
|
||||||
|
letter-spacing: 0.01em;
|
||||||
|
}
|
||||||
|
.jd-order-filter-form ::v-deep .jd-filter-act-btn--primary.el-button--primary.is-plain {
|
||||||
|
color: var(--jd-accent);
|
||||||
|
border-color: #bfdbfe;
|
||||||
|
background: #eff6ff;
|
||||||
|
}
|
||||||
|
.jd-order-filter-form ::v-deep .jd-filter-act-btn--primary.el-button--primary.is-plain:hover {
|
||||||
|
color: #fff;
|
||||||
|
background: var(--jd-accent);
|
||||||
|
border-color: var(--jd-accent);
|
||||||
|
}
|
||||||
|
.jd-order-filter-form ::v-deep .jd-filter-actions .jd-tb-muted.is-plain {
|
||||||
|
color: var(--jd-muted);
|
||||||
|
border-color: var(--jd-border);
|
||||||
|
background: var(--jd-surface);
|
||||||
|
}
|
||||||
|
.jd-order-filter-form ::v-deep .jd-filter-actions .jd-tb-muted.is-plain:hover {
|
||||||
|
color: var(--jd-text);
|
||||||
|
border-color: #cbd5e1;
|
||||||
|
background: var(--jd-row-hover);
|
||||||
|
}
|
||||||
|
@media (max-width: 768px) {
|
||||||
|
.jd-filter-group-head {
|
||||||
|
flex: 1 1 100%;
|
||||||
|
padding-top: 0;
|
||||||
|
margin-bottom: 4px;
|
||||||
|
}
|
||||||
|
.jd-filter-group-body {
|
||||||
|
min-width: 100%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* 桌面工具栏：低饱和、统一圆角 */
|
/* 桌面工具栏：低饱和、统一圆角 */
|
||||||
.jd-order-toolbar {
|
.jd-order-toolbar {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
|
align-items: center;
|
||||||
gap: 8px;
|
gap: 8px;
|
||||||
padding: 12px 0 4px;
|
padding: 8px 0 4px;
|
||||||
border-top: 1px solid var(--jd-border);
|
border-top: 1px solid var(--jd-border);
|
||||||
margin-top: 8px;
|
margin-top: 6px;
|
||||||
|
}
|
||||||
|
.jd-toolbar-buttons {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 8px;
|
||||||
|
flex: 1 1 220px;
|
||||||
|
min-width: 0;
|
||||||
|
align-items: center;
|
||||||
}
|
}
|
||||||
.jd-order-toolbar ::v-deep .el-button {
|
.jd-order-toolbar ::v-deep .el-button {
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
@@ -3022,7 +3181,7 @@ export default {
|
|||||||
box-shadow: 4px 0 16px rgba(15, 23, 42, 0.06);
|
box-shadow: 4px 0 16px rgba(15, 23, 42, 0.06);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 退款状态：双列压缩行高 */
|
/* 跟进状态：双列标签 + 下方后返表条 */
|
||||||
.refund-status-stack {
|
.refund-status-stack {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
@@ -3065,6 +3224,37 @@ export default {
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.order-table ::v-deep .jd-rebate-remark-strip {
|
||||||
|
display: flex;
|
||||||
|
align-items: flex-start;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 6px 8px;
|
||||||
|
margin-top: 8px;
|
||||||
|
padding-top: 8px;
|
||||||
|
border-top: 1px solid #f1f5f9;
|
||||||
|
}
|
||||||
|
.order-table ::v-deep .jd-rebate-remark-strip-label {
|
||||||
|
flex-shrink: 0;
|
||||||
|
width: 52px;
|
||||||
|
font-size: 11px;
|
||||||
|
font-weight: 500;
|
||||||
|
color: var(--jd-muted);
|
||||||
|
line-height: 22px;
|
||||||
|
}
|
||||||
|
.order-table ::v-deep .jd-rebate-remark-strip-body {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
align-items: center;
|
||||||
|
gap: 6px;
|
||||||
|
min-width: 0;
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
.order-table ::v-deep .jd-rebate-remark-empty {
|
||||||
|
color: #c0c4cc;
|
||||||
|
font-size: 12px;
|
||||||
|
line-height: 22px;
|
||||||
|
}
|
||||||
|
|
||||||
/* 操作列 */
|
/* 操作列 */
|
||||||
.jd-action-cell {
|
.jd-action-cell {
|
||||||
text-align: left;
|
text-align: left;
|
||||||
@@ -3110,12 +3300,75 @@ export default {
|
|||||||
.order-table ::v-deep .jd-act-link--danger:hover {
|
.order-table ::v-deep .jd-act-link--danger:hover {
|
||||||
background: #fef2f2 !important;
|
background: #fef2f2 !important;
|
||||||
}
|
}
|
||||||
.order-table ::v-deep .jd-action-row--meta .el-switch {
|
/* 操作列「统计」：与链接按钮同高的胶囊条 */
|
||||||
|
.order-table ::v-deep .jd-action-row--meta {
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
.order-table ::v-deep .jd-count-pill {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
box-sizing: border-box;
|
||||||
|
min-height: var(--jd-fn-chip-h);
|
||||||
|
padding: 0 10px 0 12px;
|
||||||
|
border-radius: var(--jd-fn-chip-radius);
|
||||||
|
background: var(--jd-fn-chip-bg);
|
||||||
|
border: 1px solid var(--jd-fn-chip-border);
|
||||||
margin-right: 6px;
|
margin-right: 6px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
.order-table ::v-deep .jd-count-pill-label {
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: 600;
|
||||||
|
letter-spacing: 0.02em;
|
||||||
|
color: var(--jd-fn-chip-text);
|
||||||
|
line-height: 1;
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
.order-table ::v-deep .jd-count-el-switch.el-switch {
|
||||||
|
margin: 0;
|
||||||
|
height: 22px;
|
||||||
|
}
|
||||||
|
.order-table ::v-deep .jd-count-el-switch.el-switch.is-checked .el-switch__core {
|
||||||
|
border-color: var(--jd-accent);
|
||||||
|
background-color: var(--jd-accent);
|
||||||
}
|
}
|
||||||
|
|
||||||
.order-table ::v-deep .el-table .jd-order-input-money {
|
/* 表格内售价渠道 / 售价 / 利润：撑满单元格 */
|
||||||
width: 118px !important;
|
.order-table ::v-deep .jd-cell-stretch {
|
||||||
|
width: 100%;
|
||||||
|
box-sizing: border-box;
|
||||||
|
padding: 0 6px;
|
||||||
|
}
|
||||||
|
.order-table ::v-deep .jd-cell-stretch--num {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
.order-table ::v-deep .jd-cell-stretch .jd-cell-select-full {
|
||||||
|
width: 100% !important;
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
.order-table ::v-deep .jd-cell-stretch .jd-order-input-money,
|
||||||
|
.order-table ::v-deep .jd-cell-stretch .jd-order-input-money.el-input-number {
|
||||||
|
width: 100% !important;
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
.order-table ::v-deep .jd-cell-stretch--num .jd-order-input-money .el-input__inner {
|
||||||
|
text-align: right;
|
||||||
|
padding-left: 8px;
|
||||||
|
padding-right: 36px;
|
||||||
|
}
|
||||||
|
.order-table ::v-deep .jd-col-channel .cell,
|
||||||
|
.order-table ::v-deep .jd-col-money .cell {
|
||||||
|
padding-left: 4px;
|
||||||
|
padding-right: 4px;
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
font-feature-settings: 'tnum' 1;
|
||||||
|
}
|
||||||
|
/* 售价列略宽（约四位数价位）、利润列略窄（三位数+两位小数）已在列 min-width 区分 */
|
||||||
|
.order-table ::v-deep .jd-col-money .jd-cell-stretch--num .jd-order-input-money--selling .el-input__inner,
|
||||||
|
.order-table ::v-deep .jd-col-money .jd-cell-stretch--num .jd-order-input-money--profit .el-input__inner {
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
font-feature-settings: 'tnum' 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 桌面端：占满 ListLayout 表格区，内部表格滚动，表头固定 */
|
/* 桌面端：占满 ListLayout 表格区，内部表格滚动，表头固定 */
|
||||||
@@ -3249,6 +3502,24 @@ export default {
|
|||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.mobile-order-card .mobile-rebate-remark-inline {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
align-items: center;
|
||||||
|
gap: 6px;
|
||||||
|
width: 100%;
|
||||||
|
margin-top: 6px;
|
||||||
|
padding-top: 8px;
|
||||||
|
border-top: 1px dashed #e5e7eb;
|
||||||
|
justify-content: flex-end;
|
||||||
|
}
|
||||||
|
.mobile-order-card .mobile-rebate-remark-hint {
|
||||||
|
font-size: 11px;
|
||||||
|
font-weight: 500;
|
||||||
|
color: #909399;
|
||||||
|
margin-right: auto;
|
||||||
|
}
|
||||||
|
|
||||||
.rebate-remark-popover .rebate-remark-item {
|
.rebate-remark-popover .rebate-remark-item {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
padding-bottom: 10px;
|
padding-bottom: 10px;
|
||||||
@@ -3321,19 +3592,15 @@ export default {
|
|||||||
.order-table ::v-deep .el-table__fixed-right {
|
.order-table ::v-deep .el-table__fixed-right {
|
||||||
width: 60px !important;
|
width: 60px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.order-table ::v-deep .el-table__fixed-right-patch {
|
|
||||||
width: 60px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 隐藏桌面端表格 */
|
/* 隐藏桌面端表格 */
|
||||||
.order-table {
|
.order-table {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 桌面端操作按钮优化布局 - 所有按钮一行显示 */
|
/* 桌面端操作列：新布局为 jd-action-cell 多行，勿用单行强约束 */
|
||||||
.desktop-action-buttons-wrapper {
|
.desktop-action-buttons-wrapper:not(.jd-action-cell) {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@@ -3344,7 +3611,7 @@ export default {
|
|||||||
gap: 2px;
|
gap: 2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.desktop-action-buttons-wrapper .action-row-all {
|
.desktop-action-buttons-wrapper:not(.jd-action-cell) .action-row-all {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
gap: 2px;
|
gap: 2px;
|
||||||
@@ -3354,7 +3621,7 @@ export default {
|
|||||||
line-height: 1.2;
|
line-height: 1.2;
|
||||||
}
|
}
|
||||||
|
|
||||||
.desktop-action-buttons-wrapper .el-button {
|
.desktop-action-buttons-wrapper:not(.jd-action-cell) .el-button {
|
||||||
padding: 3px 6px !important;
|
padding: 3px 6px !important;
|
||||||
font-size: 12px !important;
|
font-size: 12px !important;
|
||||||
white-space: nowrap !important;
|
white-space: nowrap !important;
|
||||||
@@ -3368,11 +3635,18 @@ export default {
|
|||||||
align-items: center !important;
|
align-items: center !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.desktop-action-buttons-wrapper .el-switch {
|
.desktop-action-buttons-wrapper:not(.jd-action-cell) .el-switch {
|
||||||
margin-left: 4px !important;
|
margin-left: 4px !important;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.desktop-action-buttons-wrapper.jd-action-cell {
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: stretch;
|
||||||
|
gap: 0;
|
||||||
|
flex-wrap: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
/* 桌面端下拉菜单样式 */
|
/* 桌面端下拉菜单样式 */
|
||||||
::v-deep .desktop-action-dropdown {
|
::v-deep .desktop-action-dropdown {
|
||||||
min-width: 160px;
|
min-width: 160px;
|
||||||
@@ -3387,20 +3661,16 @@ export default {
|
|||||||
color: #67C23A;
|
color: #67C23A;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 桌面端确保操作列正常显示 */
|
/* 桌面端确保操作列正常显示（宽度与 el-table-column :width="288" 一致；勿改 fixed-right-patch，否则会出现整块无意义空白列） */
|
||||||
@media (min-width: 769px) {
|
@media (min-width: 769px) {
|
||||||
.order-table ::v-deep .action-column {
|
.order-table ::v-deep .action-column {
|
||||||
width: 380px !important;
|
width: 288px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.order-table ::v-deep .el-table__fixed-right {
|
.order-table ::v-deep .el-table__fixed-right {
|
||||||
width: 380px !important;
|
width: 288px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.order-table ::v-deep .el-table__fixed-right-patch {
|
|
||||||
width: 380px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 隐藏移动端按钮 */
|
/* 隐藏移动端按钮 */
|
||||||
.mobile-action-wrapper {
|
.mobile-action-wrapper {
|
||||||
display: none !important;
|
display: none !important;
|
||||||
|
|||||||
Reference in New Issue
Block a user