-
+
[] }
})
-const emit = defineEmits(['update:tableObject', 'getList', 'getCheckedColumns'])
+const emit = defineEmits(['update:tableObject', 'getList', 'getCheckedColumns', 'selection-change'])
const route = useRoute()
const pageNo = ref(props.tableObject?.pageNo || 1)
@@ -110,6 +115,10 @@ function onDragEnd() {
emitColumns()
}
+function handleSelectionChange(val) {
+ emit('selection-change', val)
+}
+
// 勾选确认
function confirm() {
ClueCacheApi.setClueCache({
diff --git a/src/views/Basic/GeneralSet/index.vue b/src/views/Basic/GeneralSet/index.vue
index e0dc5ce..10a5564 100644
--- a/src/views/Basic/GeneralSet/index.vue
+++ b/src/views/Basic/GeneralSet/index.vue
@@ -4,16 +4,16 @@
-
+
diff --git a/src/views/Clue/Pool/Comp/ClueMap.vue b/src/views/Clue/Pool/Comp/ClueMap.vue
index e3afcc6..202f727 100644
--- a/src/views/Clue/Pool/Comp/ClueMap.vue
+++ b/src/views/Clue/Pool/Comp/ClueMap.vue
@@ -39,6 +39,7 @@
+
+
diff --git a/src/views/Clue/Pool/Comp/DialogClue.vue b/src/views/Clue/Pool/Comp/DialogClue.vue
index 7132df4..95e2f81 100644
--- a/src/views/Clue/Pool/Comp/DialogClue.vue
+++ b/src/views/Clue/Pool/Comp/DialogClue.vue
@@ -133,6 +133,7 @@
import { useAppStore } from '@/store/modules/app'
import { useUserStore } from '@/store/modules/user'
import { getPlaceList } from '@/api/school/place'
+import { getConfigByConfigKey } from '@/api/system/set'
import * as ClueApi from '@/api/clue'
import { getDiyFieldList } from '@/api/clue/clueField'
import { formatDate } from '@/utils/formatTime'
@@ -226,6 +227,7 @@ const defaultLatLng = ref({
lat: 31.86119,
lng: 117.283042
})
+const defaultCity = ref('合肥')
const info = ref({})
const diyFieldArr = ref([])
@@ -265,9 +267,14 @@ const open = async (type, id) => {
}
]
address.value = ''
- defaultLatLng.value = {
- lat: 31.86119,
- lng: 117.283042
+ if (appStore.getAppInfo?.instanceType == 1) {
+ const data = await getConfigByConfigKey({ configKey: 'defaultLocation' })
+ const cityInfo = JSON.parse(data.configValue)
+ defaultLatLng.value = {
+ lat: cityInfo.lat,
+ lng: cityInfo.lng
+ }
+ defaultCity.value = cityInfo.locationName
}
nextTick(() => {
formRef.value.setValues(info.value, true)
@@ -396,7 +403,7 @@ function initMap(data) {
})
addmark(defaultLatLng.value.lng, defaultLatLng.value.lat, AMap)
AutoComplete.value = new AMap.AutoComplete({
- city: '合肥'
+ city: defaultCity.value
})
geoCoder.value = new AMap.Geocoder()
dialogMap.value.on('click', (e) => {
diff --git a/src/views/Clue/Pool/Comp/DialogSuccess.vue b/src/views/Clue/Pool/Comp/DialogSuccess.vue
index 80487bf..ec6c301 100644
--- a/src/views/Clue/Pool/Comp/DialogSuccess.vue
+++ b/src/views/Clue/Pool/Comp/DialogSuccess.vue
@@ -328,6 +328,7 @@ import { getDiyFieldList } from '@/api/clue/orderField'
import { getPlaceList } from '@/api/school/place'
import { getClassTypeList } from '@/api/school/class'
import { getSimpleProductList } from '@/api/mall/product'
+import { getConfigByConfigKey } from '@/api/system/set'
// import { getSimpleWarehouseList } from '@/api/mall/warehouse'
import { formatDate } from '@/utils/formatTime'
@@ -415,7 +416,8 @@ async function open(id) {
}
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
-function resetForm(id) {
+async function resetForm(id) {
+ const data = await getConfigByConfigKey({ configKey: 'companyCollectionConfig' })
form.value = {
clueId: id,
dealDate: formatDate(new Date()),
@@ -423,7 +425,7 @@ function resetForm(id) {
signPrice: 0,
payAmount: 0,
remark: undefined,
- isCompanyReceipts: appStore.getAppInfo?.instanceType == 2,
+ isCompanyReceipts: data.configValue == 'true',
receiver: undefined,
extraPay: [],
signProducts: []
diff --git a/src/views/Clue/Pool/index.vue b/src/views/Clue/Pool/index.vue
index daa0c20..c15172c 100644
--- a/src/views/Clue/Pool/index.vue
+++ b/src/views/Clue/Pool/index.vue
@@ -53,6 +53,12 @@
搜索
重置
+
+ 批量修改跟进人
+
@@ -63,7 +69,9 @@
:tableColumns="allSchemas.tableColumns"
@get-list="getTableList"
@get-checked-columns="getCheckedColumns"
+ @selection-change="handleSelectionChange"
>
+
+