From f143d2a63e00e43b461914a0660e4a91dd50a1db Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 09 十月 2024 19:56:17 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2
---
pages/order/list/index.vue | 71 ++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 2 deletions(-)
diff --git a/pages/order/list/index.vue b/pages/order/list/index.vue
index bc7e38b..706be30 100644
--- a/pages/order/list/index.vue
+++ b/pages/order/list/index.vue
@@ -37,10 +37,14 @@
orderList: [],
tableConfig: {
url: 'flower/api/order/list',
+ editUrl: 'flower/api/order/page/update',
hasNew: false,
- hasEdit: false,
+ hasEdit: true,
hasDelete: false,
persistSelection: true,
+ hasExport: true,
+ exportUrl: 'flower/api/order/list/export',
+ exportText: '导出订单',
onResetView: (row) => {
this.$router.push(`${this.$route.path}/${row.id}`)
},
@@ -57,6 +61,11 @@
statusComp.extraQuery = { ...params, statusBackend: '' }
statusComp.getOtherOptions()
}
+ }
+ },
+ beforeOpen: (row, isNew) => {
+ if (!isNew) {
+ row.districtStr = this.getDistrict(row)
}
},
columns: [
@@ -77,7 +86,10 @@
{ label: '底价(元)', prop: 'supplierAmount', minWidth: 150 },
{ label: '订单状态', prop: 'statusBackendStr', minWidth: 120 },
{ label: '下单时间', prop: 'createTime', minWidth: 180 },
+ { label: '支付时间', prop: 'paymentTime', minWidth: 180 },
{ label: '合伙人', prop: 'partnerName', minWidth: 120 },
+ { label: '库位', prop: 'warehouseLocationCode', minWidth: 120 },
+ { label: '特殊需求', prop: 'specialNeedsStr', minWidth: 120 },
{
label: '备注',
formatter: (row) => (
@@ -154,6 +166,54 @@
type: 'input',
el: { placeholder: '收货人姓名/手机号' },
},
+ { label: '收货地址：', id: 'address', type: 'input' },
+ { label: '库位：', id: 'warehouseLocationCode', type: 'input' },
+ ],
+ },
+ ],
+ form: [
+ {
+ type: 'row',
+ span: 12,
+ items: [
+ {
+ label: '地区：',
+ id: 'customerProvince',
+ component: 'el-bus-select-area',
+ span: 24,
+ commonFormat: true,
+ commonFormatProps: [
+ 'customerProvince',
+ 'customerCity',
+ 'customerRegion',
+ ],
+ str: true,
+ strKey: 'districtStr',
+ rules: { required: true, message: '请选择地区' },
+ },
+ {
+ label: '详细地址：',
+ id: 'customerAddress',
+ type: 'input',
+ span: 24,
+ rules: {
+ required: true,
+ message: '请输入详细地址且最大不超过50个汉字',
+ trigger: 'blur',
+ max: 50,
+ },
+ },
+ {
+ label: '联系方式：',
+ id: 'customerTel',
+ type: 'input',
+ rules: {
+ required: true,
+ pattern: this.$elBusUtil.REG.MOBILEPHONE,
+ message: '请输入合法的手机号',
+ trigger: 'blur',
+ },
+ },
],
},
],
@@ -199,7 +259,7 @@
for (const tr of trs) {
const tds = tr.querySelectorAll('td')
if (tds && tds.length > 0) {
- tds[0].colSpan = 7
+ tds[0].colSpan = 8
tds[0].style.textAlign = 'center'
}
}
@@ -301,6 +361,13 @@
this.$refs.crud.search()
},
},
+ methods: {
+ getDistrict(row) {
+ return `${row.customerProvince || ''}${row.customerCity || ''}${
+ row.customerRegion || ''
+ }`
+ },
+ },
}
</script>
--
Gitblit v1.9.3