|
|
@@ -49,12 +49,12 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
-
|
|
|
+
|
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="订单金额" prop="orderAmountRange">
|
|
|
@@ -90,15 +90,15 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
-
|
|
|
+
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
-
|
|
|
+
|
|
|
</el-col>
|
|
|
|
|
|
</el-row>
|
|
|
|
|
|
- <el-row :gutter="20">
|
|
|
+ <el-row :gutter="20">
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="创建时间" prop="createTimeRange">
|
|
|
<el-date-picker
|
|
|
@@ -124,7 +124,7 @@
|
|
|
end-placeholder="结束日期">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
+
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item>
|
|
|
@@ -150,10 +150,10 @@
|
|
|
</el-col>
|
|
|
<el-col :span="8" style="text-align: right;">
|
|
|
<div style="margin-top: 5px;">
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- icon="el-icon-check"
|
|
|
- size="mini"
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ icon="el-icon-check"
|
|
|
+ size="mini"
|
|
|
:disabled="selectedRows.length === 0"
|
|
|
@click="handleBatchAudit"
|
|
|
v-hasPermi="['store:storeOrderAudit:audit']"
|
|
|
@@ -167,10 +167,10 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
|
|
|
- <el-table height="500"
|
|
|
- border
|
|
|
- v-loading="loading"
|
|
|
- :data="storeOrderAuditList"
|
|
|
+ <el-table height="500"
|
|
|
+ border
|
|
|
+ v-loading="loading"
|
|
|
+ :data="storeOrderAuditList"
|
|
|
:key="tableKey"
|
|
|
class="scrollable-table"
|
|
|
@selection-change="handleSelectionChange"
|
|
|
@@ -193,6 +193,21 @@
|
|
|
<el-tag prop="status" v-for="(item, index) in orderTypeOptions" v-if="scope.row.orderType==item.dictValue">{{item.dictLabel}}</el-tag>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column label="订单产品" align="center" width="200px">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div v-if="scope.row.items && scope.row.items.length > 0">
|
|
|
+ <el-tag
|
|
|
+ v-for="(item, index) in scope.row.items"
|
|
|
+ :key="index"
|
|
|
+ size="mini"
|
|
|
+ class="product-tag"
|
|
|
+ >
|
|
|
+ {{ JSON.parse(item.jsonInfo).productName }} × {{ item.num }}
|
|
|
+ </el-tag>
|
|
|
+ </div>
|
|
|
+ <span v-else class="no-products">暂无商品</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="收件人" align="center" prop="realName" />
|
|
|
<el-table-column label="送货地址" align="center" prop="userAddress" show-overflow-tooltip/>
|
|
|
<el-table-column label="实收金额" align="center" prop="payPrice">
|
|
|
@@ -265,10 +280,10 @@
|
|
|
</el-dialog>
|
|
|
|
|
|
<!-- 添加批量审核确认对话框 -->
|
|
|
- <el-dialog
|
|
|
- title="批量审核确认"
|
|
|
- :visible.sync="batchAuditDialogVisible"
|
|
|
- width="500px"
|
|
|
+ <el-dialog
|
|
|
+ title="批量审核确认"
|
|
|
+ :visible.sync="batchAuditDialogVisible"
|
|
|
+ width="500px"
|
|
|
append-to-body
|
|
|
>
|
|
|
<p>确定要审核通过选中的 {{ selectedRows.length }} 个订单吗？</p>
|
|
|
@@ -384,10 +399,10 @@ export default {
|
|
|
// 确认批量审核
|
|
|
confirmBatchAudit() {
|
|
|
// 这里需要调用批量审核接口，假设有一个批量审核的API
|
|
|
-
|
|
|
+
|
|
|
const ids = this.selectedRows.map(item => item.id).join(",");
|
|
|
console.log("批量审核订单IDs:", ids);
|
|
|
-
|
|
|
+
|
|
|
// 示例：调用批量审核API
|
|
|
auditBatch({ids}).then(response => {
|
|
|
this.$message.success("批量审核完成");
|
|
|
@@ -396,7 +411,7 @@ export default {
|
|
|
}).catch(error => {
|
|
|
this.$message.error("批量审核失败");
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
// 由于没有提供批量审核API，这里只是演示逻辑
|
|
|
console.log("批量审核订单IDs:", auditIds);
|
|
|
this.batchAuditDialogVisible = false;
|
|
|
@@ -433,7 +448,7 @@ export default {
|
|
|
this.queryParams.auditEndTime = null;
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
// 手动重置订单金额范围
|
|
|
this.queryParams.orderAmountSmall = null;
|
|
|
this.queryParams.orderAmountBig = null;
|
