添加备注

master
doublekou 1 year ago
parent 6717c6568c
commit 78fa06f859

@ -171,6 +171,8 @@ export interface CustomerDTO {
customName?: string | undefined customName?: string | undefined
//客户联系方式 //客户联系方式
customNid?: string | undefined customNid?: string | undefined
//备注
remark?: string | undefined
address?: Array<any> address?: Array<any>
//省 //省
economize?: string economize?: string

@ -12,6 +12,17 @@ import 'ant-design-vue/es/modal/style/index.less'
import './styles/index.less' import './styles/index.less'
import App from './App.vue' import App from './App.vue'
import { enableI18n } from '@/config' import { enableI18n } from '@/config'
import { provincesAndCitiesAndAutonomousRegions } from '@/utils/geopolitical-customers'
// 声明一个全局变量,将数据赋值给它
declare global {
interface Window {
globalProvincesAndCitiesAndAutonomousRegions: any
}
}
// 将数据赋值给全局变量
window.globalProvincesAndCitiesAndAutonomousRegions = provincesAndCitiesAndAutonomousRegions
const app = createApp(App) const app = createApp(App)
app.use(createPinia()) app.use(createPinia())

@ -63,6 +63,23 @@
:readonly="title === '详情' || title === '审核'" :readonly="title === '详情' || title === '审核'"
/> />
</a-form-item> </a-form-item>
<a-form-item
label="备注"
name="remark"
:label-col="{ sm: { span: 24 }, md: { span: 5 } }"
:wrapper-col="
title === '详情' || title === '审核'
? { sm: { span: 24 }, md: { span: 9 } }
: { sm: { span: 24 }, md: { span: 11 } }
"
>
<a-input
v-model:value="formModel.remark"
placeholder="请输入备注"
style="width: 65%"
:readonly="title === '详情' || title === '审核'"
/>
</a-form-item>
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :xl="14" :md="14" :sm="14"> <a-col :xl="14" :md="14" :sm="14">
<a-form-item <a-form-item
@ -388,7 +405,8 @@ onMounted(() => {
appointmentTimeOptions.value?.push({ value: item, label: item }) appointmentTimeOptions.value?.push({ value: item, label: item })
}) })
// //
provincesAndCitiesAndAutonomousOptions.value = provincesAndCitiesAndAutonomousRegions // provincesAndCitiesAndAutonomousOptions.value = provincesAndCitiesAndAutonomousRegions
provincesAndCitiesAndAutonomousOptions.value = window.globalProvincesAndCitiesAndAutonomousRegions
}) })
/// ///
@ -528,6 +546,7 @@ const pagingQuery = () => {
message.info('当前位置附近暂无相关门店') message.info('当前位置附近暂无相关门店')
} else { } else {
const ids = formModel.customStoreEntities.map(item => item.storeId) const ids = formModel.customStoreEntities.map(item => item.storeId)
listData.value.length = 0
result.data && result.data &&
result.data.forEach((item: any) => { result.data.forEach((item: any) => {
const disabled = ids.includes(Number(item.id)) const disabled = ids.includes(Number(item.id))
@ -728,10 +747,11 @@ const submitOperate = (type: string, status?: number) => {
if (res.code === 200) { if (res.code === 200) {
isSubmit.value = true isSubmit.value = true
registerVisible.value = false registerVisible.value = false
handleSubmit()
message.success('操作成功') message.success('操作成功')
if (type === 'zc' || title.value === '审核') { // if (type === 'zc' || title.value === '') {
handleSubmit()
} // }
} }
} }
@ -795,12 +815,13 @@ const formModel = reactive<CustomerDTO>({
customId: undefined, customId: undefined,
customName: '', customName: '',
customNid: '', customNid: '',
remark: '',
address: [], address: [],
economize: '', economize: '',
market: '', market: '',
distinguish: '', distinguish: '',
detailAddress: '', detailAddress: '',
radius: '', radius: '5000',
enrollStatus: 1, enrollStatus: 1,
customStoreEntities: [] customStoreEntities: []
}) })
@ -876,6 +897,7 @@ defineExpose({
customId, customId,
customName, customName,
customNid, customNid,
remark,
economize, economize,
market, market,
distinguish, distinguish,
@ -887,6 +909,7 @@ defineExpose({
formModel.customId = customId formModel.customId = customId
formModel.customName = customName formModel.customName = customName
formModel.customNid = customNid formModel.customNid = customNid
formModel.remark = remark
formModel.address = [economize, market, distinguish] formModel.address = [economize, market, distinguish]
formModel.economize = economize formModel.economize = economize
formModel.market = market formModel.market = market
@ -931,7 +954,7 @@ defineExpose({
}) })
// //
import { provincesAndCitiesAndAutonomousRegions } from '@/utils/geopolitical-customers' // import { provincesAndCitiesAndAutonomousRegions } from '@/utils/geopolitical-customers'
import type { ShowSearchType } from 'ant-design-vue/es/cascader' import type { ShowSearchType } from 'ant-design-vue/es/cascader'
declare const AMap: any declare const AMap: any

@ -22,13 +22,13 @@ import { antdvStyleDeps } from './src/utils/resolvers'
//项目 //项目
// const serverAddress = 'http://admin.ballcat.cn' // const serverAddress = 'http://admin.ballcat.cn'
//xy //xy
// const serverAddress = 'http://172.18.0.225:8000' const serverAddress = 'http://172.18.0.225:8000'
//jt //jt
// const serverAddress = 'http://172.18.1.8:8000' // const serverAddress = 'http://172.18.1.8:8000'
//ts //ts
// const serverAddress = 'http://172.18.0.228:8000' // const serverAddress = 'http://172.18.0.228:8000'
//测试 //测试
const serverAddress = 'http://39.100.77.21:8000' // const serverAddress = 'http://39.100.77.21:8000'
//线上ip //线上ip
// const serverAddress = 'http://175.27.212.74:80' // const serverAddress = 'http://175.27.212.74:80'

Loading…
Cancel
Save