diff --git a/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue b/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
index 7ed91bb..cee0298 100644
--- a/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
+++ b/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
@@ -63,23 +63,28 @@
:readonly="title === '详情' || title === '审核'"
/>
-
-
-
+
+
+
+
+
+
+
@@ -30,7 +30,7 @@
编辑
-
+
预约详情
@@ -94,7 +94,7 @@ const editShop = (record: shopDetailVO) => {
const selectReservation = (record: shopDetailVO) => {
reservationModalRef.value?.open(FormAction.OTHER, record)
}
-// 删除门店
+// 删除店铺
const deleteShopFun = (record: shopDetailVO) => {
doRequest(deleteShop(record.id as number), {
successMessage: '删除成功!',
@@ -115,11 +115,11 @@ const columns: ProColumns[] = [
dataIndex: 'id'
},
{
- title: '门店名称',
+ title: '店铺名称',
dataIndex: 'storeName'
},
{
- title: '门店类型',
+ title: '店铺类型',
dataIndex: 'storeType',
customRender: ({ record }: any) => {
if (record.storeType === 0) {
@@ -130,7 +130,7 @@ const columns: ProColumns[] = [
}
},
{
- title: '门店状态',
+ title: '店铺状态',
dataIndex: 'storeStatus',
customRender: function ({ record }: any) {
if (record.storeStatus === 0) {
@@ -157,6 +157,10 @@ const columns: ProColumns[] = [
},
{
title: '承接销售',
+ dataIndex: 'address'
+ },
+ {
+ title: '店铺地址',
dataIndex: 'userName'
},
{
@@ -192,12 +196,6 @@ const columns: ProColumns[] = [
.operationButtonArea {
padding-bottom: 20px;
}
-// .operationButton {
-// background-color: #f4f4f5;
-// border-radius: 5px;
-// color: #909399;
-// margin-right: 10px;
-// }
.editable-row-operations a {
margin-right: 8px;
}
diff --git a/src/views/shopManage/shopModal.vue b/src/views/shopManage/shopModal.vue
index e20fa41..15ffa64 100644
--- a/src/views/shopManage/shopModal.vue
+++ b/src/views/shopManage/shopModal.vue
@@ -96,7 +96,7 @@
-
+
-
@@ -258,6 +260,7 @@ const selectUserList = () => {
}
const handleClose = () => {
closeModal()
+ formModel.tradeTime = []
submitLoading.value = false
}