|
|
@ -170,7 +170,7 @@ |
|
|
<!-- 时段选择 --> |
|
|
<!-- 时段选择 --> |
|
|
<van-popup v-model:show="showTimePicker" position="bottom" round> |
|
|
<van-popup v-model:show="showTimePicker" position="bottom" round> |
|
|
<van-picker |
|
|
<van-picker |
|
|
:columns="timeColumns" |
|
|
:columns="availableTimeColumns" |
|
|
@confirm="onTimeConfirm" |
|
|
@confirm="onTimeConfirm" |
|
|
@cancel="showTimePicker = false" |
|
|
@cancel="showTimePicker = false" |
|
|
/> |
|
|
/> |
|
|
@ -217,17 +217,19 @@ |
|
|
<span class="person-picker-title">选择执法人员</span> |
|
|
<span class="person-picker-title">选择执法人员</span> |
|
|
<van-icon name="cross" @click="showPersonPicker = false" /> |
|
|
<van-icon name="cross" @click="showPersonPicker = false" /> |
|
|
</div> |
|
|
</div> |
|
|
<van-search |
|
|
<div class="search-bar"> |
|
|
v-model="personSearchKeyword" |
|
|
<van-search v-model="personSearchKeyword" placeholder="请输入至少1个字搜索" |
|
|
placeholder="输入姓名/账号检索单位人员" |
|
|
@search="handlePersonSearch" @clear="clearPersonSearch" /> |
|
|
shape="round" |
|
|
<van-button class="search-btn" type="primary" @click="handlePersonSearch">搜索</van-button> |
|
|
@update:model-value="onPersonSearchInput" |
|
|
</div> |
|
|
/> |
|
|
|
|
|
<div class="person-picker-body"> |
|
|
<div class="person-picker-body"> |
|
|
<div v-if="personSearching" class="person-loading"> |
|
|
<van-list |
|
|
<van-loading size="18" /> 加载中... |
|
|
v-model:loading="personLoading" |
|
|
</div> |
|
|
:finished="personFinished" |
|
|
<template v-else> |
|
|
:finished-text="personFinishedText" |
|
|
|
|
|
:offset="50" |
|
|
|
|
|
@load="onPersonLoad" |
|
|
|
|
|
> |
|
|
<div |
|
|
<div |
|
|
v-for="(user, idx) in personSearchResult" |
|
|
v-for="(user, idx) in personSearchResult" |
|
|
:key="user.userId || idx" |
|
|
:key="user.userId || idx" |
|
|
@ -236,12 +238,12 @@ |
|
|
> |
|
|
> |
|
|
<div class="person-item-name">{{ user.fullname || user.userName }}</div> |
|
|
<div class="person-item-name">{{ user.fullname || user.userName }}</div> |
|
|
<div class="person-item-meta"> |
|
|
<div class="person-item-meta"> |
|
|
<span>{{ user.lawCertificateNum || user.phonenumber || user.mobileNumber }}</span> |
|
|
<span>{{user.lawCertificateNum?'执法证件号：':'联系电话：'}} {{ user.lawCertificateNum || user.phonenumber || user.mobileNumber }}</span> |
|
|
<span v-if="user.loginName" class="person-item-login">@{{ user.loginName }}</span> |
|
|
<!-- <span v-if="user.loginName" class="person-item-login">@{{ user.loginName }}</span> --> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
<van-empty v-if="!personSearchResult.length" description="未检索到人员" image-size="80" /> |
|
|
<van-empty v-if="!personLoading && !personSearchResult.length" :description="personEmptyText" image-size="80" /> |
|
|
</template> |
|
|
</van-list> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
</van-popup> |
|
|
</van-popup> |
|
|
@ -354,6 +356,38 @@ const timeColumns = [ |
|
|
{ text: '其他（18:00-21:00）', value: 3 }, |
|
|
{ text: '其他（18:00-21:00）', value: 3 }, |
|
|
]; |
|
|
]; |
|
|
|
|
|
|
|
|
|
|
|
// 可选时段：执法日期为今天时过滤已过去的时段 |
|
|
|
|
|
const availableTimeColumns = computed(() => { |
|
|
|
|
|
// 依赖弹窗显隐，打开时重新计算获取最新时间 |
|
|
|
|
|
void showTimePicker.value; |
|
|
|
|
|
const dateStr = form.value.enforceDate; |
|
|
|
|
|
if (!dateStr) return timeColumns; |
|
|
|
|
|
const todayStr = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`; |
|
|
|
|
|
if (dateStr !== todayStr) return timeColumns; |
|
|
|
|
|
const now = new Date(); |
|
|
|
|
|
const nowMinutes = now.getHours() * 60 + now.getMinutes(); |
|
|
|
|
|
const periodEnds = { 1: 12 * 60, 2: 18 * 60, 3: 21 * 60 }; |
|
|
|
|
|
return timeColumns.filter(item => nowMinutes < periodEnds[item.value]); |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
// 默认时段设为当前可选的第一个 |
|
|
|
|
|
const syncDefaultEnforceTime = () => { |
|
|
|
|
|
const available = availableTimeColumns.value; |
|
|
|
|
|
if (available.length === 0) return; |
|
|
|
|
|
const dateStr = form.value.enforceDate; |
|
|
|
|
|
const todayStr = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`; |
|
|
|
|
|
// 非今天（未来日期）默认取第一个（上午） |
|
|
|
|
|
if (dateStr !== todayStr) { |
|
|
|
|
|
form.value.enforceTime = available[0].value; |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
|
|
|
// 今天：当前值不可用时取第一个 |
|
|
|
|
|
const currentValid = available.some(item => item.value === form.value.enforceTime); |
|
|
|
|
|
if (!currentValid) { |
|
|
|
|
|
form.value.enforceTime = available[0].value; |
|
|
|
|
|
} |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
// 日期+时段展示 |
|
|
// 日期+时段展示 |
|
|
const enforceTimeDisplay = computed(() => { |
|
|
const enforceTimeDisplay = computed(() => { |
|
|
const timeText = { 1: '上午（9:00-12:00）', 2: '下午（14:00-18:00）', 3: '其他（18:00-21:00）' }; |
|
|
const timeText = { 1: '上午（9:00-12:00）', 2: '下午（14:00-18:00）', 3: '其他（18:00-21:00）' }; |
|
|
@ -378,10 +412,16 @@ let enterpriseSearchSeq = 0; |
|
|
const showPersonPicker = ref(false); |
|
|
const showPersonPicker = ref(false); |
|
|
const personSearchKeyword = ref(''); |
|
|
const personSearchKeyword = ref(''); |
|
|
const personSearchResult = ref([]); |
|
|
const personSearchResult = ref([]); |
|
|
const personSearching = ref(false); |
|
|
const personLoading = ref(false); |
|
|
let personSearchTimer = null; |
|
|
const personFinished = ref(false); |
|
|
|
|
|
const personPageNum = ref(1); |
|
|
|
|
|
const personPageSize = 10; |
|
|
|
|
|
const personSearched = ref(false); |
|
|
let personSearchSeq = 0; |
|
|
let personSearchSeq = 0; |
|
|
|
|
|
|
|
|
|
|
|
const personEmptyText = computed(() => personSearched.value ? '未检索到人员' : '请输入至少1个字搜索'); |
|
|
|
|
|
const personFinishedText = computed(() => personSearchResult.value.length > 0 ? '没有更多了' : ''); |
|
|
|
|
|
|
|
|
// 计划列表 |
|
|
// 计划列表 |
|
|
const planOptions = ref([]); |
|
|
const planOptions = ref([]); |
|
|
const planLoading = ref(false); |
|
|
const planLoading = ref(false); |
|
|
@ -396,6 +436,8 @@ onMounted(() => { |
|
|
form.value.deptName = useCommon.deptName || ''; |
|
|
form.value.deptName = useCommon.deptName || ''; |
|
|
// 默认绑定当前用户为首位执法人员 |
|
|
// 默认绑定当前用户为首位执法人员 |
|
|
bindCurrentUserAsDefaultPerson(); |
|
|
bindCurrentUserAsDefaultPerson(); |
|
|
|
|
|
// 默认时段设为当前可选的第一个 |
|
|
|
|
|
syncDefaultEnforceTime(); |
|
|
|
|
|
|
|
|
if (isEdit.value) { |
|
|
if (isEdit.value) { |
|
|
loadDetail(route.query.id); |
|
|
loadDetail(route.query.id); |
|
|
@ -448,6 +490,7 @@ const loadDetail = (id, isReinitiateMode = false) => { |
|
|
const onDateConfirm = ({ selectedValues }) => { |
|
|
const onDateConfirm = ({ selectedValues }) => { |
|
|
form.value.enforceDate = selectedValues.join('-'); |
|
|
form.value.enforceDate = selectedValues.join('-'); |
|
|
showDatePicker.value = false; |
|
|
showDatePicker.value = false; |
|
|
|
|
|
syncDefaultEnforceTime(); |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
// 时段确认 |
|
|
// 时段确认 |
|
|
@ -519,24 +562,55 @@ const onAddPerson = () => { |
|
|
} |
|
|
} |
|
|
personSearchKeyword.value = ''; |
|
|
personSearchKeyword.value = ''; |
|
|
personSearchResult.value = []; |
|
|
personSearchResult.value = []; |
|
|
|
|
|
personPageNum.value = 1; |
|
|
|
|
|
personFinished.value = true; |
|
|
|
|
|
personLoading.value = false; |
|
|
|
|
|
personSearched.value = false; |
|
|
showPersonPicker.value = true; |
|
|
showPersonPicker.value = true; |
|
|
triggerPersonSearch(''); |
|
|
|
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
const onPersonSearchInput = (val) => { |
|
|
const handlePersonSearch = () => { |
|
|
if (personSearchTimer) clearTimeout(personSearchTimer); |
|
|
const keyword = (personSearchKeyword.value || '').trim(); |
|
|
const keyword = (val || '').trim(); |
|
|
if (keyword.length < 1) { |
|
|
personSearchTimer = setTimeout(() => triggerPersonSearch(keyword), 300); |
|
|
showToast('请输入至少1个字搜索'); |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
|
|
|
personPageNum.value = 1; |
|
|
|
|
|
personFinished.value = false; |
|
|
|
|
|
personSearchResult.value = []; |
|
|
|
|
|
personLoading.value = true; |
|
|
|
|
|
personSearched.value = true; |
|
|
|
|
|
fetchPersonList(keyword); |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
const triggerPersonSearch = (keyword) => { |
|
|
const clearPersonSearch = () => { |
|
|
|
|
|
personSearchKeyword.value = ''; |
|
|
|
|
|
personPageNum.value = 1; |
|
|
|
|
|
personFinished.value = true; |
|
|
|
|
|
personSearchResult.value = []; |
|
|
|
|
|
personLoading.value = false; |
|
|
|
|
|
personSearched.value = false; |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
// van-list 触底加载 |
|
|
|
|
|
const onPersonLoad = () => { |
|
|
|
|
|
fetchPersonList(personSearchKeyword.value.trim()); |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
// 实际发起人员检索(分页追加) |
|
|
|
|
|
const fetchPersonList = (keyword) => { |
|
|
|
|
|
if ((keyword || '').trim().length < 1) { |
|
|
|
|
|
personFinished.value = true; |
|
|
|
|
|
personLoading.value = false; |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
const seq = ++personSearchSeq; |
|
|
const seq = ++personSearchSeq; |
|
|
personSearching.value = true; |
|
|
personLoading.value = true; |
|
|
searchBureauUnitUsers( |
|
|
searchBureauUnitUsers( |
|
|
{ sysDeptId: useCommon.bureauUnitId || '', keyword, globalSearch: false, pageNum: 1, pageSize: 30 }, |
|
|
{ sysDeptId: useCommon.bureauUnitId || '', userName: keyword, globalSearch: false, pageNum: personPageNum.value, pageSize: personPageSize, isShowCardId: '0' }, |
|
|
(res) => { |
|
|
(res) => { |
|
|
if (seq !== personSearchSeq) return; |
|
|
if (seq !== personSearchSeq) return; |
|
|
personSearching.value = false; |
|
|
personLoading.value = false; |
|
|
if (res && res.code === 200 && Array.isArray(res.rows)) { |
|
|
if (res && res.code === 200 && Array.isArray(res.rows)) { |
|
|
let rows = res.rows; |
|
|
let rows = res.rows; |
|
|
// 过滤掉已选择的执法人员 |
|
|
// 过滤掉已选择的执法人员 |
|
|
@ -544,15 +618,26 @@ const triggerPersonSearch = (keyword) => { |
|
|
const selectedIds = personList.value.map(p => String(p.id || '')).filter(Boolean); |
|
|
const selectedIds = personList.value.map(p => String(p.id || '')).filter(Boolean); |
|
|
rows = rows.filter(item => !selectedIds.includes(String(item.userId || ''))); |
|
|
rows = rows.filter(item => !selectedIds.includes(String(item.userId || ''))); |
|
|
} |
|
|
} |
|
|
personSearchResult.value = rows; |
|
|
if (personPageNum.value === 1) { |
|
|
|
|
|
personSearchResult.value = rows; |
|
|
|
|
|
} else { |
|
|
|
|
|
personSearchResult.value = [...personSearchResult.value, ...rows]; |
|
|
|
|
|
} |
|
|
|
|
|
const total = res.total || 0; |
|
|
|
|
|
if (total <= personPageSize * personPageNum.value) { |
|
|
|
|
|
personFinished.value = true; |
|
|
|
|
|
} else { |
|
|
|
|
|
personPageNum.value++; |
|
|
|
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
personSearchResult.value = []; |
|
|
if (personPageNum.value === 1) personSearchResult.value = []; |
|
|
|
|
|
personFinished.value = true; |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
() => { |
|
|
() => { |
|
|
if (seq !== personSearchSeq) return; |
|
|
if (seq !== personSearchSeq) return; |
|
|
personSearching.value = false; |
|
|
personLoading.value = false; |
|
|
personSearchResult.value = []; |
|
|
personFinished.value = true; |
|
|
} |
|
|
} |
|
|
); |
|
|
); |
|
|
}; |
|
|
}; |
|
|
@ -578,7 +663,6 @@ const removePerson = (index) => { |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
const syncPersonData = () => { |
|
|
const syncPersonData = () => { |
|
|
console.log(personList.value); |
|
|
|
|
|
form.value.enforceUserNames = personList.value.map(p => p.name).join(','); |
|
|
form.value.enforceUserNames = personList.value.map(p => p.name).join(','); |
|
|
form.value.enforceUserIds = personList.value.map(p => p.id || '').join(','); |
|
|
form.value.enforceUserIds = personList.value.map(p => p.id || '').join(','); |
|
|
form.value.enforceUserTels = personList.value.map(p => p.phone || '').join(','); |
|
|
form.value.enforceUserTels = personList.value.map(p => p.phone || '').join(','); |
|
|
@ -870,6 +954,20 @@ const doSubmit = (isDraft) => { |
|
|
display: flex; |
|
|
display: flex; |
|
|
flex-direction: column; |
|
|
flex-direction: column; |
|
|
height: 100%; |
|
|
height: 100%; |
|
|
|
|
|
.search-bar { |
|
|
|
|
|
display: flex; |
|
|
|
|
|
align-items: center; |
|
|
|
|
|
margin: 0.3rem; |
|
|
|
|
|
:deep(.van-search) { |
|
|
|
|
|
padding-right: 0px; |
|
|
|
|
|
flex: 1; |
|
|
|
|
|
height: 34px; |
|
|
|
|
|
} |
|
|
|
|
|
.search-btn { |
|
|
|
|
|
flex: none; |
|
|
|
|
|
height: 34px; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
.person-picker-header { |
|
|
.person-picker-header { |
|
|
display: flex; |
|
|
display: flex; |
|
|
justify-content: space-between; |
|
|
justify-content: space-between; |
|
|
|
niujiyi
3 months ago