diff --git a/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue b/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue index b9511b6..5e36b0a 100644 --- a/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue +++ b/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue @@ -390,8 +390,9 @@

联系方式:{{ formModel.customNid }}

- {{ `报名的门店${index + 1}为` }}: {{ item.storeName }} -- - {{ `${item.reservationDate?.toString().split(' ')[0]} ${item.reservationTime}` }} + {{ `报名的门店${index + 1}为` }}:{{ item.storeName }} +  {{ item.reservationDate?.toString().split(' ')[0] }} +  {{ item.reservationTime }}

@@ -694,7 +695,7 @@ const match = async (detailAddress: string) => { const resetForm = () => { formModel.address = [] formModel.detailAddress = '' - formModel.radius = '' + formModel.radius = '5000' // initMap() listData.value.length = 0 map.value.clearMap() @@ -736,7 +737,7 @@ const storeResetForm = () => { if (title.value !== '编辑预约') { formModel.address = [] formModel.detailAddress = '' - formModel.radius = '' + formModel.radius = '5000' } formModel.customStoreEntities.length = 0 diff --git a/src/views/qualityInspectionDistribution/inspectionIndex.vue b/src/views/qualityInspectionDistribution/inspectionIndex.vue index 34d081d..2cbb5c6 100644 --- a/src/views/qualityInspectionDistribution/inspectionIndex.vue +++ b/src/views/qualityInspectionDistribution/inspectionIndex.vue @@ -111,7 +111,7 @@ const columns: ProColumns[] = [ dataIndex: 'enrollStatus', customRender: function ({ record }: any) { if (record.enrollStatus === 0) { - return h('div', '暂缓中') + return h('div', '暂存中') } else if (record.enrollStatus === 1) { return h('div', '待分发') } else if (record.enrollStatus === 2) { diff --git a/src/views/qualityInspectionDistribution/inspectionModal.vue b/src/views/qualityInspectionDistribution/inspectionModal.vue index 38703b6..4da75ee 100644 --- a/src/views/qualityInspectionDistribution/inspectionModal.vue +++ b/src/views/qualityInspectionDistribution/inspectionModal.vue @@ -59,7 +59,7 @@ - + @@ -186,7 +186,7 @@ defineExpose({ const targetObj = formModel.customStoreVOList.find( (i: any) => i.storeId === item.storeId ) - if (targetObj) { + if (targetObj && item.reservationDate) { targetObj.reservationTime = item.reservationDate.split(' ')[0] + ' ' + item.reservationTime } diff --git a/src/views/shopManage/shopIndex.vue b/src/views/shopManage/shopIndex.vue index bb708c9..9718ca1 100644 --- a/src/views/shopManage/shopIndex.vue +++ b/src/views/shopManage/shopIndex.vue @@ -157,11 +157,11 @@ const columns: ProColumns[] = [ }, { title: '承接销售', - dataIndex: 'address' + dataIndex: 'userName' }, { title: '店铺地址', - dataIndex: 'userName' + dataIndex: 'address' }, { title: '创建日期',